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

lib/components/curve_bottom_border_tab.dart

@@ -0,0 +1,67 @@
+import 'package:flutter/material.dart';
+
+class CurvedBottomBorderTab extends StatelessWidget {
+  final bool isSelected;
+  final String label;
+  final VoidCallback tap;
+
+  const CurvedBottomBorderTab({
+    required this.isSelected,
+    required this.label,
+    required this.tap,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return CustomPaint(
+      painter: isSelected ? CurvedBottomPainter() : null,
+      child: GestureDetector(
+        child: Container(
+          width: 110,
+          padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
+          color: Colors.transparent,
+          child: Center(
+            child: Text(
+              label,
+              style: TextStyle(
+                fontSize: 16,
+                fontWeight: FontWeight.bold,
+                color:
+                    isSelected
+                        ? const Color.fromARGB(255, 255, 255, 255)
+                        : const Color.fromARGB(255, 197, 194, 194),
+              ),
+            ),
+          ),
+        ),
+        onTap: tap,
+      ),
+    );
+  }
+}
+
+class CurvedBottomPainter extends CustomPainter {
+  @override
+  void paint(Canvas canvas, Size size) {
+    final paint =
+        Paint()
+          ..color = Colors.white
+          ..strokeWidth = 2
+          ..style = PaintingStyle.stroke;
+
+    final path =
+        Path()
+          ..moveTo(0, size.height)
+          ..quadraticBezierTo(
+            size.width / 2,
+            size.height - 8,
+            size.width,
+            size.height,
+          );
+
+    canvas.drawPath(path, paint);
+  }
+
+  @override
+  bool shouldRepaint(CustomPainter oldDelegate) => false;
+}

lib/components/main_menu.dart

@@ -6,13 +6,42 @@ import 'package:freekake/screen/Home_screen.dart';
 import 'package:freekake/screen/koleksi_screen.dart';
 import 'package:freekake/screen/pustaka_screen.dart';
 import 'package:freekake/screen/saya/profile_screen.dart';
+import 'package:freekake/providers/menu_selection_provider.dart';
+import 'package:provider/provider.dart';
 
-class MainMenu extends StatelessWidget {
+class MainMenu extends StatefulWidget {
   const MainMenu({super.key});
+  _MainMenuState createState() => _MainMenuState();
+}
+
+class _MainMenuState extends State<MainMenu> {
+  int selectedIndex = 0;
+
+  final List<Widget> _screens = [
+    HomeScreen(),
+    KoleksiScreen(),
+    PustakaScreen(),
+    ProfileScreen(),
+  ];
+
+  // void _onItemTapped(int index) {
+  //   Future.delayed(Duration(milliseconds: 100), () {
+  //     Navigator.pushReplacement(
+  //       context,
+  //       MaterialPageRoute(builder: (context) => _screens[index]),
+  //     );
+  //   });
+
+  //   setState(() {
+  //     selectedIndex = index;
+  //   });
+  // }
 
   @override
   Widget build(BuildContext context) {
     final Size size = MediaQuery.of(context).size;
+    final selectedIndex =
+        Provider.of<MenuSelectionProvider>(context).selectedIndex;
     return Container(
       color: Colors.transparent,
       padding: const EdgeInsets.symmetric(vertical: 10),
@@ -23,50 +52,64 @@ class MainMenu extends StatelessWidget {
           MenuButton(
             label: "E-furibuddy",
             icon: 'assets/icons/furrybuddy.svg',
-            onPress:
+            onPress: () => _onItemTapped(context, 0),
-                () => {
+            isSelected: selectedIndex == 0,
-                  Navigator.push(
-                    context,
-                    MaterialPageRoute(builder: (context) => HomeScreen()),
-                  ),
-                },
           ),
           MenuButton(
             label: "Koleksi",
             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: 120),
           MenuButton(
             label: "Pustaka",
             icon: 'assets/icons/Pustaka.svg',
-            onPress:
+            onPress: () => _onItemTapped(context, 2),
-                () => {
+            isSelected: selectedIndex == 2,
-                  Navigator.push(
-                    context,
-                    MaterialPageRoute(builder: (context) => PustakaScreen()),
-                  ),
-                },
           ),
           MenuButton(
             label: "Saya",
             icon: 'assets/icons/Saya.svg',
-            onPress:
+            onPress: () => _onItemTapped(context, 3),
-                () => {
+            isSelected: selectedIndex == 3,
-                  Navigator.push(
-                    context,
-                    MaterialPageRoute(builder: (context) => ProfileScreen()),
-                  ),
-                },
           ),
         ],
       ),
     );
   }
+
+  void _onItemTapped(BuildContext context, int index) {
+    // Mengubah selectedIndex di MenuSelectionProvider
+    Provider.of<MenuSelectionProvider>(context, listen: false).selectedIndex =
+        index;
+
+    // Pindah halaman sesuai index yang dipilih
+    switch (index) {
+      case 0:
+        Navigator.pushReplacement(
+          context,
+          MaterialPageRoute(builder: (context) => HomeScreen()),
+        );
+        break;
+      case 1:
+        Navigator.pushReplacement(
+          context,
+          MaterialPageRoute(builder: (context) => KoleksiScreen()),
+        );
+        break;
+      case 2:
+        Navigator.pushReplacement(
+          context,
+          MaterialPageRoute(builder: (context) => PustakaScreen()),
+        );
+        break;
+      case 3:
+        Navigator.pushReplacement(
+          context,
+          MaterialPageRoute(builder: (context) => ProfileScreen()),
+        );
+        break;
+    }
+  }
 }

lib/components/menu_button.dart

@@ -32,7 +32,9 @@ class MenuButton extends StatelessWidget {
               height: h ?? 24,
               // allowDrawingOutsideViewBox: true,
               colorFilter: ColorFilter.mode(
-                Color.fromARGB(255, 255, 255, 255),
+                (isSelected ?? false)
+                    ? Color.fromARGB(255, 216, 182, 10)
+                    : Color.fromARGB(255, 255, 255, 255),
                 BlendMode.srcIn,
               ),
             ),
@@ -41,7 +43,10 @@ class MenuButton extends StatelessWidget {
           Text(
             label ?? '',
             style: TextStyle(
-              color: Color.fromARGB(255, 239, 224, 232),
+              color:
+                  (isSelected ?? false)
+                      ? Color.fromARGB(255, 216, 182, 10)
+                      : Color.fromARGB(255, 239, 224, 232),
               fontWeight: FontWeight.bold,
               fontSize: 10,
             ),

lib/components/scan_button.dart

@@ -8,8 +8,8 @@ class ScanButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-      width: 86,
+      width: 76,
-      height: 86,
+      height: 76,
       decoration: BoxDecoration(
         shape: BoxShape.circle,
         color: const Color.fromARGB(223, 67, 63, 179),

lib/components/tab_menu.dart

@@ -28,7 +28,7 @@ class TabMenuButton extends StatelessWidget {
               height: 20,
               colorFilter: ColorFilter.mode(
                 isSelected
-                    ? const Color.fromARGB(255, 106, 24, 207)
+                    ? const Color.fromARGB(255, 10, 144, 16)
                     : Colors.white,
                 BlendMode.srcIn,
               ),
@@ -43,13 +43,16 @@ class TabMenuButton extends StatelessWidget {
             decoration: BoxDecoration(
               color:
                   isSelected
-                      ? const Color.fromARGB(255, 199, 204, 212).withOpacity(0)
+                      ? const Color.fromARGB(255, 10, 144, 16).withOpacity(0)
-                      : Colors.transparent,
+                      : const Color.fromARGB(0, 0, 0, 0),
 
               border:
                   isSelected
                       ? const Border(
-                        top: BorderSide(color: Colors.white, width: 2),
+                        bottom: BorderSide(
+                          color: Color.fromARGB(255, 255, 255, 255),
+                          width: 2,
+                        ),
                       )
                       : null,
               // borderRadius: BorderRadius.circular(20),
@@ -63,7 +66,7 @@ class TabMenuButton extends StatelessWidget {
                   color:
                       isSelected
                           ? const Color.fromARGB(255, 255, 255, 255)
-                          : const Color.fromARGB(255, 0, 0, 0),
+                          : const Color.fromARGB(255, 197, 194, 194),
                 ),
               ),
             ),

lib/main.dart

@@ -3,8 +3,8 @@ 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';
 
 void main() {
   WidgetsFlutterBinding.ensureInitialized();
@@ -18,8 +18,11 @@ class MyApp extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return ChangeNotifierProvider(
+    return MultiProvider(
-      create: (context) => CharacterProvider(),
+      providers: [
+        ChangeNotifierProvider(create: (context) => CharacterProvider()),
+        ChangeNotifierProvider(create: (context) => MenuSelectionProvider()),
+      ],
       child: MaterialApp(
         debugShowCheckedModeBanner: false,
         title: 'AR Character App',

lib/providers/menu_selection_provider.dart

@@ -0,0 +1,12 @@
+import 'package:flutter/material.dart';
+
+class MenuSelectionProvider with ChangeNotifier {
+  int _selectedIndex = 0;
+
+  int get selectedIndex => _selectedIndex;
+
+  set selectedIndex(int index) {
+    _selectedIndex = index;
+    notifyListeners();
+  }
+}

lib/screen/Home_screen.dart

@@ -73,19 +73,21 @@ class _HomeScreenState extends State<HomeScreen> {
       body: Stack(
         children: <Widget>[
           Positioned.fill(
-            child: RepaintBoundary(
+            child: UnityWidget(
+              onUnityCreated: onUnityCreated,
+              //isARScene: true,
+              onUnityMessage: onUnityMessage,
+              //onUnitySceneLoaded: onUnitySceneLoaded,
+              fullscreen: false,
+            ),
             // child: Container(
-              //   decoration: const BoxDecoration(
+            //   decoration: BoxDecoration(
-              //     image: const DecorationImage(
+            //     image: DecorationImage(
             //       image: AssetImage("assets/images/background.jpeg"),
             //       fit: BoxFit.cover,
             //     ),
             //   ),
             // ),
-              child: UnityWidget(
-                onUnityCreated: onUnityCreated,
-              )
-            ),
           ),
           // Positioned(
           //   top: 0,
@@ -245,8 +247,8 @@ class _HomeScreenState extends State<HomeScreen> {
           ),
           Positioned(bottom: 0, left: 0, right: 0, child: MainMenu()),
           Positioned(
-            bottom: 5,
+            bottom: 8,
-            left: MediaQuery.of(context).size.width / 2 - 43,
+            left: MediaQuery.of(context).size.width / 2 - 38,
             child: Transform.translate(
               offset: Offset(0, -20),
               child: ScanButton(),

lib/screen/koleksi_screen.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:freekake/components/bottom_navbar.dart';
 import 'package:freekake/components/buildcard_info.dart';
+import 'package:freekake/components/curve_bottom_border_tab.dart';
 import 'package:freekake/components/main_menu.dart';
 import 'package:freekake/components/scan_button.dart';
 import 'package:freekake/components/tab_menu.dart';
@@ -128,20 +129,20 @@ class _KoleksiScreenState extends State<KoleksiScreen> {
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.spaceAround,
                 children: [
-                  TabMenuButton(
+                  CurvedBottomBorderTab(
                     label: "Karakter",
                     isSelected: _selectedIndex == 0,
-                    onPress: () => _onMenuTapped(0),
+                    tap: () => _onMenuTapped(0),
                   ),
-                  TabMenuButton(
+                  CurvedBottomBorderTab(
                     label: "Skin",
                     isSelected: _selectedIndex == 1,
-                    onPress: () => _onMenuTapped(1),
+                    tap: () => _onMenuTapped(1),
                   ),
-                  TabMenuButton(
+                  CurvedBottomBorderTab(
                     label: "Fragment",
                     isSelected: _selectedIndex == 2,
-                    onPress: () => _onMenuTapped(2),
+                    tap: () => _onMenuTapped(2),
                   ),
                 ],
               ),
@@ -149,8 +150,8 @@ class _KoleksiScreenState extends State<KoleksiScreen> {
           ),
           Positioned(bottom: 0, left: 0, right: 0, child: MainMenu()),
           Positioned(
-            bottom: 5,
+            bottom: 8,
-            left: MediaQuery.of(context).size.width / 2 - 43,
+            left: MediaQuery.of(context).size.width / 2 - 38,
             child: Transform.translate(
               offset: Offset(0, -20),
               child: ScanButton(),

lib/screen/pustaka_screen.dart

@@ -197,21 +197,21 @@ class _PustakaScreenState extends State<PustakaScreen> {
                   ),
                 ),
               ),
-              // SizedBox(
+              SizedBox(
-              //   child: Padding(
+                child: Padding(
-              //     padding: const EdgeInsets.symmetric(
+                  padding: const EdgeInsets.symmetric(
-              //       horizontal: 5,
+                    horizontal: 40,
-              //       vertical: 1,
+                    vertical: 1,
-              //     ),
+                  ),
-              //     child: Column(
+                  child: Column(
-              //       crossAxisAlignment: CrossAxisAlignment.start,
+                    crossAxisAlignment: CrossAxisAlignment.start,
-              //       children: [
+                    children: [
-              //         Text("List Topic", style: TextStyle(color: Colors.black)),
+                      Text("Daftar Topik", style: TextStyle(color: Colors.black)),
-              //         Divider(color: Colors.transparent),
+                      Divider(color: Colors.transparent),
-              //       ],
+                    ],
-              //     ),
+                  ),
-              //   ),
+                ),
-              // ),
+              ),
               // Horizontal Scroll List
               Padding(
                 padding: EdgeInsets.symmetric(horizontal: 5, vertical: 5),
@@ -292,8 +292,8 @@ class _PustakaScreenState extends State<PustakaScreen> {
             ],
           ),
           Positioned(
-            bottom: 5,
+            bottom: 8,
-            left: MediaQuery.of(context).size.width / 2 - 43,
+            left: MediaQuery.of(context).size.width / 2 - 38,
             child: Transform.translate(
               offset: Offset(0, -20),
               child: ScanButton(),

lib/screen/saya/akun_saya.dart

@@ -52,15 +52,14 @@ class _AkunSayaState extends State<AkunSaya> {
         title: Text("Saya"),
         backgroundColor: Color.fromARGB(225, 79, 76, 182),
       ),
+      resizeToAvoidBottomInset: false,
       backgroundColor: const Color.fromARGB(255, 255, 255, 255),
       body: Stack(
         children: [
-          Positioned(
+          Align(
-            bottom: 0,
+            alignment: Alignment.bottomCenter,
-            left: 0,
-            right: 0,
             child: Padding(
-              padding: const EdgeInsets.only(top: 20.0, left: 20, right: 20),
+              padding: const EdgeInsets.only(top: 0.0, left: 20, right: 20),
               child: Container(
                 height: MediaQuery.of(context).size.height * 0.7,
                 width: MediaQuery.of(context).size.width,
@@ -89,7 +88,7 @@ class _AkunSayaState extends State<AkunSaya> {
                   ),
                 ),
               ),
-              SizedBox(height: 40),
+              SizedBox(height: 70),
               Expanded(
                 child: Padding(
                   padding: EdgeInsets.all(20),

lib/screen/saya/profile_screen.dart

@@ -340,8 +340,8 @@ class _ProfileScreenState extends State<ProfileScreen> {
           ),
           Positioned(bottom: 0, left: 0, right: 0, child: MainMenu()),
           Positioned(
-            bottom: 5,
+            bottom: 8,
-            left: MediaQuery.of(context).size.width / 2 - 43,
+            left: MediaQuery.of(context).size.width / 2 - 38,
             child: Transform.translate(
               offset: Offset(0, -20),
               child: ScanButton(),