Merge branch 'unity_embed' of https://git.probindo.com/Probindo/FreekakeApp into unity_embed

lib/components/main_menu.dart

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

lib/components/scan_button.dart

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

lib/main.dart

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

lib/screen/pustaka_screen.dart

@@ -7,6 +7,14 @@ 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';
+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 {
   const PustakaScreen({super.key});
@@ -22,26 +30,10 @@ class _PustakaScreenState extends State<PustakaScreen> {
   String _searchQuery = "";
 
   final List<Map<String, dynamic>> _collections = [
-    {
+    {"label": "Kesehatan", "image": "assets/icons/healthy.svg", "color": "#cdd0ee"},
-      "label": "Kesehatan",
+    {"label": "Gizi", "image": "assets/icons/Nutrition.svg", "color": "#e8e29a"},
-      "image": "assets/icons/healthy.svg",
+    {"label": "Pendidikan", "image": "assets/icons/Education.svg", "color": "#efd8c6"},
-      "color": "#cdd0ee",
+    {"label": "Keselamatan", "image": "assets/icons/Safety.svg", "color": "#cef1da"},
-    },
-    {
-      "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) {