Probindo/FreekakeApp
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Probindo:1fdcc3773db8f3aa4b1df4e97aa56f65889fc147
Branches Tags
Probindo:main
Probindo:unity_embed
..
compare: Probindo:bab3893f8a3cfa08406e06ad6ae433b2658fc7a2
Branches Tags
Probindo:main
Probindo:unity_embed

No commits in common. "1fdcc3773db8f3aa4b1df4e97aa56f65889fc147" and "bab3893f8a3cfa08406e06ad6ae433b2658fc7a2" have entirely different histories.
1fdcc3773d ... bab3893f8a

4 changed files with 56 additions and 69 deletions
Show Stats Expand all files Collapse all files

58
lib/components/main_menu.dart
View File

@ -1,11 +1,11 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:furibase/components/bottom_navbar.dart'; import 'package:freekake/components/bottom_navbar.dart';
import 'package:furibase/components/menu_button.dart'; import 'package:freekake/components/menu_button.dart';
import 'package:furibase/components/scan_button.dart'; import 'package:freekake/components/scan_button.dart';
import 'package:furibase/screen/Home_screen.dart'; import 'package:freekake/screen/Home_screen.dart';
import 'package:furibase/screen/koleksi_screen.dart'; import 'package:freekake/screen/koleksi_screen.dart';
import 'package:furibase/screen/pustaka_screen.dart'; import 'package:freekake/screen/pustaka_screen.dart';
import 'package:furibase/screen/saya/profile_screen.dart'; import 'package:freekake/screen/saya/profile_screen.dart';
import 'package:freekake/providers/menu_selection_provider.dart'; import 'package:freekake/providers/menu_selection_provider.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -51,48 +51,28 @@ class _MainMenuState extends State<MainMenu> {
children: [ children: [
MenuButton( MenuButton(
label: "E-furibuddy", label: "E-furibuddy",
icon: 'icons/furrybuddy.svg', icon: 'assets/icons/furrybuddy.svg',
onPress: onPress: () => _onItemTapped(context, 0),
() => { isSelected: selectedIndex == 0,
Navigator.push(
context,
MaterialPageRoute(builder: (context) => HomeScreen()),
),
},
), ),
MenuButton( MenuButton(
label: "Koleksi", label: "Koleksi",
icon: 'icons/koleksi.svg', icon: 'assets/icons/Koleksi.svg',
onPress: onPress: () => _onItemTapped(context, 1),
() => { isSelected: selectedIndex == 1,
Navigator.push(
context,
MaterialPageRoute(builder: (context) => KoleksiScreen()),
),
},
), ),
SizedBox(width: 100), SizedBox(width: 100),
MenuButton( MenuButton(
label: "Pustaka", label: "Pustaka",
icon: 'icons/Pustaka.svg', icon: 'assets/icons/Pustaka.svg',
onPress: onPress: () => _onItemTapped(context, 2),
() => { isSelected: selectedIndex == 2,
Navigator.push(
context,
MaterialPageRoute(builder: (context) => PustakaScreen()),
),
},
), ),
MenuButton( MenuButton(
label: "Saya", label: "Saya",
icon: 'icons/Saya.svg', icon: 'assets/icons/Saya.svg',
onPress: onPress: () => _onItemTapped(context, 3),
() => { isSelected: selectedIndex == 3,
Navigator.push(
context,
MaterialPageRoute(builder: (context) => ProfileScreen()),
),
},
), ),
], ],
), ),

34
lib/components/scan_button.dart
View File

@ -7,25 +7,25 @@ class ScanButton extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Expanded( return Container(
child: Container( width: 76,
decoration: BoxDecoration( height: 76,
shape: BoxShape.circle, decoration: BoxDecoration(
color: const Color.fromARGB(223, 67, 63, 179), shape: BoxShape.circle,
), color: const Color.fromARGB(223, 67, 63, 179),
padding: EdgeInsets.all(10), ),
child: IconButton( padding: EdgeInsets.all(10),
icon: SvgPicture.asset( child: IconButton(
'assets/icons/Scan.svg', icon: SvgPicture.asset(
width: 60, 'assets/icons/Scan.svg',
height: 60, width: 60,
colorFilter: ColorFilter.mode( height: 60,
Color.fromARGB(255, 217, 219, 227), colorFilter: ColorFilter.mode(
BlendMode.srcIn, Color.fromARGB(255, 217, 219, 227),
), BlendMode.srcIn,
), ),
onPressed: () {},
), ),
onPressed: () {},
), ),
); );
} }

1
lib/main.dart
View File

@ -3,7 +3,6 @@ import 'package:flutter/services.dart';
import 'package:freekake/components/navbar_container.dart'; import 'package:freekake/components/navbar_container.dart';
import 'package:freekake/providers/character_provider.dart'; import 'package:freekake/providers/character_provider.dart';
import 'package:freekake/screen/Home_screen.dart'; import 'package:freekake/screen/Home_screen.dart';
import 'package:freekake/screen/drraw_screen.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:freekake/providers/menu_selection_provider.dart'; import 'package:freekake/providers/menu_selection_provider.dart';

32
lib/screen/pustaka_screen.dart
View File

@ -7,14 +7,6 @@ import 'package:freekake/components/scan_button.dart';
import 'package:freekake/components/topbar_container.dart'; import 'package:freekake/components/topbar_container.dart';
import 'package:freekake/helpers/color_helper.dart'; import 'package:freekake/helpers/color_helper.dart';
import 'package:freekake/screen/pustaka/list_education.dart'; import 'package:freekake/screen/pustaka/list_education.dart';
import 'package:freekake/components/bottom_navbar.dart';
import 'package:freekake/components/buildcard_info.dart';
import 'package:freekake/components/collection_container.dart';
import 'package:freekake/components/main_menu.dart';
import 'package:freekake/components/scan_button.dart';
import 'package:freekake/components/topbar_container.dart';
import 'package:freekake/helpers/color_helper.dart';
import 'package:freekake/screen/pustaka/list_education.dart';
class PustakaScreen extends StatefulWidget { class PustakaScreen extends StatefulWidget {
const PustakaScreen({super.key}); const PustakaScreen({super.key});
@ -30,10 +22,26 @@ class _PustakaScreenState extends State<PustakaScreen> {
String _searchQuery = ""; String _searchQuery = "";
final List<Map<String, dynamic>> _collections = [ final List<Map<String, dynamic>> _collections = [
{"label": "Kesehatan", "image": "assets/icons/healthy.svg", "color": "#cdd0ee"}, {
{"label": "Gizi", "image": "assets/icons/Nutrition.svg", "color": "#e8e29a"}, "label": "Kesehatan",
{"label": "Pendidikan", "image": "assets/icons/Education.svg", "color": "#efd8c6"}, "image": "assets/icons/healthy.svg",
{"label": "Keselamatan", "image": "assets/icons/Safety.svg", "color": "#cef1da"}, "color": "#cdd0ee",
},
{
"label": "Gizi",
"image": "assets/icons/Nutrition.svg",
"color": "#e8e29a",
},
{
"label": "Pendidikan",
"image": "assets/icons/Education.svg",
"color": "#efd8c6",
},
{
"label": "Keselamatan",
"image": "assets/icons/Safety.svg",
"color": "#cef1da",
},
]; ];
void _onMenuTapped(int index) { void _onMenuTapped(int index) {