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

assets/html/furikake/index.html

@@ -93,7 +93,7 @@ img {
     border-radius: 4px;
 }
 
-.bahan-container {
+.div-grid {
     display: flex;
     flex-wrap: wrap;
     justify-content: center;
@@ -101,21 +101,21 @@ img {
     margin: 20px 0;
 }
 
-.bahan-item {
+.div-item {
     text-align: center;
     flex: 1 0 calc(25% - 15px); /* 4 items per row by default */
     min-width: calc(25% - 15px);
     max-width: calc(25% - 15px);
 }
 
-.bahan-item img {
+.div-item img {
     width: 100%;
     height: 120px;
     object-fit: cover;
     border-radius: 8px;
 }
 
-.bahan-item p {
+.div-item p {
     margin-top: 8px;
     font-size: 0.9em;
 }
@@ -138,7 +138,7 @@ figcaption {
 
 /* Tablet Size (768px and below) - 2 items per row */
 @media (max-width: 768px) {
-    .bahan-item {
+    .div-item {
         flex: 1 0 calc(50% - 15px);
         min-width: calc(50% - 15px);
         max-width: calc(50% - 15px);
@@ -171,7 +171,7 @@ figcaption {
         padding: 15px;
     }
 
-    .bahan-item {
+    .div-item {
         flex: 1 0 100%;
         min-width: 100%;
         max-width: 100%;
@@ -222,20 +222,20 @@ figcaption {
                 <h2>Apa Saja Isi Furikake?</h2>
                 <p>Furikake biasanya terbuat dari campuran beberapa bahan seperti:</p>
                 
-                <div class="bahan-container">
+                <div class="div-grid">
-                    <div class="bahan-item">
+                    <div class="div-item">
                         <img src="assets/html/furikake/nori.jpeg" alt="Nori">
                         <p>Nori (Rumput Laut)</p>
                     </div>
-                    <div class="bahan-item">
+                    <div class="div-item">
                         <img src="assets/html/furikake/wijen.jpeg" alt="Biji Wijen">
                         <p>Biji Wijen</p>
                     </div>
-                    <div class="bahan-item">
+                    <div class="div-item">
                         <img src="assets/html/furikake/ikankering.jpg" alt="Katsuobushi">
                         <p>Katsuobushi (Ikan Kering)</p>
                     </div>
-                    <div class="bahan-item">
+                    <div class="div-item">
                         <img src="assets/html/furikake/gulagaram.jpg" alt="Garam dan Gula">
                         <p>Garam & Gula</p>
                     </div>
@@ -259,7 +259,7 @@ figcaption {
                 </ul>
                 
                 <figure>
-                    <img src="furikake.jpg" alt="Contoh produk furikake" class="full-width-image">
+                    <img src="assets/html/furikake/furikake.jpg" alt="Contoh produk furikake" class="full-width-image">
                     <figcaption>Berbagai varian produk furikake yang tersedia di pasaran</figcaption>
                 </figure>
             </section>

assets/html/index.html

@@ -92,7 +92,7 @@
             border-radius: 4px;
         }
 
-        .gizi-grid {
+        .div-grid {
           display: flex;
           flex-wrap: wrap;
           justify-content: center;
@@ -100,13 +100,13 @@
           margin-top: 5px;
         }
 
-        .gizi-item {
+        .div-item {
           text-align: center;
           max-width: 100px;
           flex: 1 1 200px;
         }
 
-        .gizi-item img {
+        .div-item img {
           width: 100%;
           height: auto;
           border-radius: 10px;
@@ -148,12 +148,12 @@
                 padding: 15px;
             }
 
-            .gizi-grid {
+            .div-grid {
               flex-direction: column;
               align-items: center;
             }
 
-            .gizi-item {
+            .div-item {
               max-width: 80%;
             }
         }
@@ -175,24 +175,24 @@
               <h2>Apa Itu Gizi Seimbang?</h2>
               <p>Gizi seimbang adalah cara makan yang mengandung semua zat gizi yang dibutuhkan tubuh. Zat gizi itu terdiri dari:</p>
               
-              <div class="gizi-grid">
+              <div class="div-grid">
-                <div class="gizi-item">
+                <div class="div-item">
                   <img src="assets/html/karbohidrat.png" alt="Karbohidrat" />
                   <p><strong>Karbohidrat</strong><br>Sumber energi seperti nasi, roti, dan kentang.</p>
                 </div>
-                <div class="gizi-item">
+                <div class="div-item">
                   <img src="assets/html/protein.png" alt="Protein" />
                   <p><strong>Protein</strong><br>Untuk membangun otot, misalnya ikan, telur, dan tahu.</p>
                 </div>
-                <div class="gizi-item">
+                <div class="div-item">
                   <img src="assets/html/lemak.png" alt="Lemak" />
                   <p><strong>Lemak</strong><br>Memberikan tenaga, seperti dari kacang-kacangan dan minyak sehat.</p>
                 </div>
-                <div class="gizi-item">
+                <div class="div-item">
                   <img src="assets/html/vitaminmineral.png" alt="Vitamin dan Mineral" />
                   <p><strong>Vitamin dan mineral</strong><br>Dari sayur dan buah yang membantu tubuh bekerja dengan baik.</p>
                 </div>
-                <div class="gizi-item">
+                <div class="div-item">
                   <img src="assets/html/seratair.png" alt="Serat dan Air" />
                   <p><strong>Serat dan air</strong><br>Membantu pencernaan dan menjaga tubuh tetap segar!</p>
                 </div>

lib/components/bottom_navbar.dart

@@ -1,9 +1,10 @@
-import 'package:flutter/material.dart';
-import 'package:freekake/components/navbar_container.dart';
-import 'package:freekake/components/navbar_shape_1.dart';
-import 'package:freekake/components/navbar_shape_2.dart';
 import 'package:freekake/components/navbar_shape_3.dart';
-import 'package:freekake/components/custom_shape.dart';
+import 'package:flutter/material.dart';
+import 'package:furibase/components/navbar_container.dart';
+import 'package:furibase/components/navbar_shape_1.dart';
+import 'package:furibase/components/navbar_shape_2.dart';
+import 'package:furibase/components/navbar_shape_3.dart';
+import 'package:furibase/components/custom_shape.dart';
 
 class BottomNavbar extends StatefulWidget {
   const BottomNavbar({super.key});
@@ -13,6 +14,7 @@ class BottomNavbar extends StatefulWidget {
 }
 
 class _BottomNavbarState extends State<BottomNavbar> {
+  @override
   Widget build(BuildContext context) {
     final Size screenSize = MediaQuery.of(context).size;
     return CustomPaint(

lib/components/card_list.dart

@@ -3,8 +3,20 @@ import 'package:flutter/material.dart';
 class CardList extends StatelessWidget {
   final String title;
   final String body;
+  final String? gambar;
+  final String? tipe;
+  final String? point;
+  final String? coint;
 
-  const CardList({super.key, required this.title, required this.body});
+  const CardList({
+    super.key,
+    required this.title,
+    required this.body,
+    this.gambar,
+    this.tipe,
+    this.point,
+    this.coint,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -21,12 +33,20 @@ class CardList extends StatelessWidget {
               borderRadius: BorderRadius.circular(
                 10.0,
               ), // Opsional: membuat gambar lebih rounded
-              child: Image.asset(
+              child:
-                'assets/images/cepott.png',
+                  (gambar != null)
-                width: 80, // Atur ukuran gambar
+                      ? Image.asset(
-                height: 120,
+                        gambar!,
-                fit: BoxFit.cover,
+                        width: 65, // Atur ukuran gambar
-              ),
+                        height: 80,
+                        fit: BoxFit.cover,
+                      )
+                      : Image.asset(
+                        'assets/images/cepott.png',
+                        width: 80, // Atur ukuran gambar
+                        height: 120,
+                        fit: BoxFit.cover,
+                      ),
             ),
             const SizedBox(width: 10),
             Expanded(
@@ -34,7 +54,7 @@ class CardList extends StatelessWidget {
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
                   Text(
-                    this.title,
+                    title,
                     style: const TextStyle(
                       fontSize: 14,
                       fontWeight: FontWeight.bold,
@@ -54,18 +74,70 @@ class CardList extends StatelessWidget {
                   const Spacer(),
                   Padding(
                     padding: EdgeInsets.all(0.08),
-                    child: const Row(
+                    child: Row(
                       crossAxisAlignment: CrossAxisAlignment.start,
                       mainAxisAlignment: MainAxisAlignment.spaceBetween,
                       children: [
                         Row(
                           children: [
-                            Text("50"),
+                            Chip(
+                              labelPadding: EdgeInsets.symmetric(
+                                horizontal: 0,
+                                vertical: 0,
+                              ),
+                              label: Text(
+                                point ?? ' 200',
+                                style: TextStyle(
+                                  color: Colors.white,
+                                  fontSize: 12,
+                                ),
+                              ),
+                              backgroundColor: Colors.blue,
+                              avatar: const CircleAvatar(
+                                backgroundColor: Colors.transparent,
+                                child: Icon(
+                                  Icons.emoji_events,
+                                  size: 16,
+                                  color: Colors.amber,
+                                ),
+                              ),
+                            ),
                             SizedBox(width: 40),
-                            Text("100"),
+                            Chip(
+                              labelPadding: EdgeInsets.symmetric(
+                                horizontal: 0,
+                                vertical: 0,
+                              ),
+                              label: Text(
+                                coint ?? " 100",
+                                style: TextStyle(
+                                  color: Colors.white,
+                                  fontSize: 12,
+                                ),
+                              ),
+                              backgroundColor: Colors.blue,
+                              avatar: const CircleAvatar(
+                                backgroundColor: Colors.transparent,
+                                child: Icon(
+                                  Icons.monetization_on,
+                                  size: 12,
+                                  color: Colors.amber,
+                                ),
+                              ),
+                            ),
                           ],
                         ),
-                        Text("Quiz"),
+                        Chip(
+                          labelPadding: EdgeInsets.symmetric(
+                            horizontal: 0,
+                            vertical: 0,
+                          ),
+                          label: Text(
+                            tipe ?? "Text",
+                            style: TextStyle(color: Colors.white, fontSize: 14),
+                          ),
+                          backgroundColor: Colors.blue,
+                        ),
                       ],
                     ),
                   ),

lib/components/characcter_info.dart

@@ -0,0 +1,142 @@
+import 'package:flutter/material.dart';
+
+class CharacterInfo extends StatelessWidget {
+  final String nama;
+  final String kelamin;
+  final String asal;
+  final String content;
+
+  const CharacterInfo({
+    super.key,
+    required this.nama,
+    required this.kelamin,
+    required this.asal,
+    required this.content,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      children: [
+        Row(
+          children: [
+            SizedBox(
+              width: 120,
+              child: Text(
+                "Nama Karakter",
+                style: const TextStyle(
+                  letterSpacing: 0.2,
+                  fontSize: 16,
+                  fontWeight: FontWeight.bold,
+                  color: Colors.black,
+                ),
+              ),
+            ),
+            SizedBox(width: 5),
+            Text(
+              ":",
+              style: const TextStyle(
+                letterSpacing: 0.2,
+                fontSize: 16,
+                fontWeight: FontWeight.bold,
+                color: Colors.black,
+              ),
+            ),
+            SizedBox(width: 5),
+            Text(
+              nama,
+              style: const TextStyle(
+                letterSpacing: 0.2,
+                fontSize: 16,
+                fontWeight: FontWeight.bold,
+                color: Colors.black,
+              ),
+            ),
+          ],
+        ),
+        Row(
+          children: [
+            SizedBox(
+              width: 120,
+              child: Text(
+                "Jenis Kelamin",
+                style: const TextStyle(
+                  letterSpacing: 0.2,
+                  fontSize: 16,
+                  fontWeight: FontWeight.bold,
+                  color: Colors.black,
+                ),
+              ),
+            ),
+            SizedBox(width: 5),
+            Text(
+              ":",
+              style: const TextStyle(
+                letterSpacing: 0.2,
+                fontSize: 16,
+                fontWeight: FontWeight.bold,
+                color: Colors.black,
+              ),
+            ),
+            SizedBox(width: 5),
+            Text(
+              kelamin,
+              style: const TextStyle(
+                letterSpacing: 0.2,
+                fontSize: 16,
+                fontWeight: FontWeight.bold,
+                color: Colors.black,
+              ),
+            ),
+          ],
+        ),
+        Row(
+          children: [
+            SizedBox(
+              width: 120,
+              child: Text(
+                "Asal Karakter",
+                style: const TextStyle(
+                  letterSpacing: 0.2,
+                  fontSize: 16,
+                  fontWeight: FontWeight.bold,
+                  color: Colors.black,
+                ),
+              ),
+            ),
+            SizedBox(width: 5),
+            Text(
+              ":",
+              style: const TextStyle(
+                letterSpacing: 0.2,
+                fontSize: 16,
+                fontWeight: FontWeight.bold,
+                color: Colors.black,
+              ),
+            ),
+            SizedBox(width: 5),
+            Text(
+              asal,
+              style: const TextStyle(
+                letterSpacing: 0.2,
+                fontSize: 16,
+                fontWeight: FontWeight.bold,
+                color: Colors.black,
+              ),
+            ),
+          ],
+        ),
+        SizedBox(height: 20),
+        Text(
+          content,
+          style: const TextStyle(
+            letterSpacing: 0.2,
+            fontSize: 16,
+            fontWeight: FontWeight.normal,
+            color: Colors.black,
+          ),
+        ),
+      ],
+    );
+  }
+}

lib/components/collection_container.dart

@@ -17,7 +17,7 @@ class CollectionContainer extends StatelessWidget {
   final bool? small;
 
   const CollectionContainer({
-    Key? key,
+    super.key,
     this.label,
     this.imagesrc,
     this.imageSvg,
@@ -31,7 +31,7 @@ class CollectionContainer extends StatelessWidget {
     this.circle,
     this.colorContiner,
     this.small,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {

lib/components/curve_bottom_border_tab.dart

@@ -6,6 +6,7 @@ class CurvedBottomBorderTab extends StatelessWidget {
   final VoidCallback tap;
 
   const CurvedBottomBorderTab({
+    super.key,
     required this.isSelected,
     required this.label,
     required this.tap,
@@ -16,6 +17,7 @@ class CurvedBottomBorderTab extends StatelessWidget {
     return CustomPaint(
       painter: isSelected ? CurvedBottomPainter() : null,
       child: GestureDetector(
+        onTap: tap,
         child: Container(
           width: 110,
           padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
@@ -34,7 +36,6 @@ class CurvedBottomBorderTab extends StatelessWidget {
             ),
           ),
         ),
-        onTap: tap,
       ),
     );
   }

lib/components/custom_shape.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:freekake/components/navbar_shape_2.dart';
+// import 'package:freekake/components/navbar_shape_2.dart';
 
 class CustomShape extends StatelessWidget {
   const CustomShape({super.key});
@@ -23,7 +23,7 @@ class RPSCustomPainter extends CustomPainter {
   void paint(Canvas canvas, Size size) {
     // Layer 1
 
-    Paint paint_fill_0 =
+    Paint paintFill0 =
         Paint()
           ..color = const Color.fromARGB(255, 189, 18, 18)
           ..style = PaintingStyle.fill
@@ -67,11 +67,11 @@ class RPSCustomPainter extends CustomPainter {
     );
     path_0.close();
 
-    canvas.drawPath(path_0, paint_fill_0);
+    canvas.drawPath(path_0, paintFill0);
 
     // Layer 1
 
-    Paint paint_stroke_0 =
+    Paint paintStroke0 =
         Paint()
           ..color = const Color.fromARGB(255, 33, 150, 243)
           ..style = PaintingStyle.stroke
@@ -79,11 +79,11 @@ class RPSCustomPainter extends CustomPainter {
           ..strokeCap = StrokeCap.butt
           ..strokeJoin = StrokeJoin.miter;
 
-    canvas.drawPath(path_0, paint_stroke_0);
+    canvas.drawPath(path_0, paintStroke0);
 
     // Layer 1
 
-    Paint paint_fill_1 =
+    Paint paintFill1 =
         Paint()
           ..color = const Color.fromARGB(255, 28, 163, 52)
           ..style = PaintingStyle.fill
@@ -116,11 +116,11 @@ class RPSCustomPainter extends CustomPainter {
     );
     path_1.close();
 
-    canvas.drawPath(path_1, paint_fill_1);
+    canvas.drawPath(path_1, paintFill1);
 
     // Layer 1
 
-    Paint paint_stroke_1 =
+    Paint paintStroke1 =
         Paint()
           ..color = const Color.fromARGB(255, 33, 150, 243)
           ..style = PaintingStyle.stroke
@@ -128,7 +128,7 @@ class RPSCustomPainter extends CustomPainter {
           ..strokeCap = StrokeCap.butt
           ..strokeJoin = StrokeJoin.miter;
 
-    canvas.drawPath(path_1, paint_stroke_1);
+    canvas.drawPath(path_1, paintStroke1);
 
     // layer 2
     // Paint paint_fill_0 =
@@ -164,7 +164,7 @@ class RPSCustomPainter extends CustomPainter {
     );
     path_0.close();
 
-    canvas.drawPath(path_0, paint_fill_0);
+    canvas.drawPath(path_0, paintFill0);
 
     // Layer 1
 

lib/components/main_menu.dart

@@ -1,21 +1,15 @@
 import 'package:flutter/material.dart';
-import 'package:freekake/components/bottom_navbar.dart';
+import 'package:freekake/providers/menu_selection_provider.dart';
-import 'package:freekake/components/menu_button.dart';
-import 'package:freekake/components/scan_button.dart';
-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/components/bottom_navbar.dart';
-import 'package:freekake/components/menu_button.dart';
-import 'package:freekake/components/scan_button.dart';
 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:flutter/material.dart';
+import 'package:provider/provider.dart';
 
 class MainMenu extends StatefulWidget {
   const MainMenu({super.key});
+  @override
   _MainMenuState createState() => _MainMenuState();
 }
 
@@ -29,19 +23,6 @@ class _MainMenuState extends State<MainMenu> {
     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;
@@ -50,57 +31,41 @@ class _MainMenuState extends State<MainMenu> {
     return Container(
       color: Colors.transparent,
       padding: const EdgeInsets.symmetric(vertical: 20, horizontal: 5),
-      child: Row(
+      child: _btns(context, selectedIndex),
-        mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+    );
-        mainAxisSize: MainAxisSize.min,
+  }
-        children: [
+
-          MenuButton(
+  Row _btns(BuildContext context, int selectedIndex) {
-            label: "E-furibuddy",
+    return Row(
-            icon: 'assets/icons/furrybuddy.svg',
+      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-            onPress:
+      mainAxisSize: MainAxisSize.min,
-                () => {
+      children: [
-                  Navigator.push(
+        MenuButton(
-                    context,
+          label: "E-furibuddy",
-                    MaterialPageRoute(builder: (context) => HomeScreen()),
+          icon: 'assets/icons/furrybuddy.svg',
-                  ),
+          onPress: () => _onItemTapped(context, 0),
-                },
+          isSelected: selectedIndex == 0,
-          ),
+        ),
-          MenuButton(
+        MenuButton(
-            label: "Koleksi",
+          label: "Koleksi",
-            icon: 'assets/icons/Koleksi.svg',
+          icon: 'assets/icons/Koleksi.svg',
-            onPress:
+          onPress: () => _onItemTapped(context, 1),
-                () => {
+          isSelected: selectedIndex == 1,
-                  Navigator.push(
+        ),
-                    context,
+        SizedBox(width: 100),
-                    MaterialPageRoute(builder: (context) => KoleksiScreen()),
+        MenuButton(
-                  ),
+          label: "Pustaka",
-                },
+          icon: 'assets/icons/Pustaka.svg',
-          ),
+          onPress: () => _onItemTapped(context, 2),
-          SizedBox(width: 100),
+          isSelected: selectedIndex == 2,
-          MenuButton(
+        ),
-            label: "Pustaka",
+        MenuButton(
-            icon: 'assets/icons/Pustaka.svg',
+          label: "Saya",
-            onPress:
+          icon: 'assets/icons/Saya.svg',
-                () => {
+          onPress: () => _onItemTapped(context, 3),
-                  Navigator.push(
+          isSelected: selectedIndex == 3,
-                    context,
+        ),
-                    MaterialPageRoute(builder: (context) => PustakaScreen()),
+      ],
-                  ),
-                },
-          ),
-          MenuButton(
-            label: "Saya",
-            icon: 'assets/icons/Saya.svg',
-            onPress:
-                () => {
-                  Navigator.push(
-                    context,
-                    MaterialPageRoute(builder: (context) => ProfileScreen()),
-                  ),
-                },
-          ),
-        ],
-      ),
     );
   }
 

lib/components/menu_item.dart

@@ -0,0 +1,7 @@
+import 'package:flutter/material.dart';
+
+class MenuItem {
+  const MenuItem({required this.text, required this.icon});
+  final String text;
+  final IconData icon;
+}

lib/components/navbar_container.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:freekake/components/navbar_shape_2.dart';
 
 class NavbarContainer extends StatelessWidget {
   const NavbarContainer({super.key});
@@ -23,7 +22,7 @@ class MyShape extends CustomPainter {
   void paint(Canvas canvas, Size size) {
     // TODO: implement paint
     Paint paint =
-        new Paint()
+        Paint()
           ..color = const Color.fromARGB(255, 166, 12, 66)
           ..style = PaintingStyle.fill;
 

lib/components/navbar_shape_2.dart

@@ -7,7 +7,7 @@ class BNBCustomPainter2 extends CustomPainter {
   void paint(Canvas canvas, Size size) {
     debugPrint("Drawing navbar...");
     Paint paint =
-        new Paint()
+        Paint()
           ..color = const Color.fromARGB(255, 79, 76, 182)
           ..style = PaintingStyle.fill;
 

lib/components/navbar_shape_3.dart

@@ -7,7 +7,7 @@ class BNBCustomPainter3 extends CustomPainter {
   void paint(Canvas canvas, Size size) {
     debugPrint("Drawing navbar...");
     Paint paint =
-        new Paint()
+        Paint()
           ..color = const Color.fromARGB(255, 79, 76, 182)
           ..style = PaintingStyle.fill;
 

lib/components/scan_button.dart

@@ -1,10 +1,11 @@
+import 'package:freekake/screen/camera_screen.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:freekake/screen/camera_screen.dart';
 
 class ScanButton extends StatelessWidget {
   const ScanButton({super.key});
-  static const Color transparent = Color(0xFFFFFFF);
+  static const Color transparent = Color(0x0fffffff);
 
   @override
   Widget build(BuildContext context) {

lib/components/skin_info.dart

@@ -0,0 +1,104 @@
+import 'package:flutter/material.dart';
+
+class SkinInfo extends StatelessWidget {
+  final String nama;
+  final String asal;
+  final String content;
+
+  const SkinInfo({
+    super.key,
+    required this.nama,
+    required this.asal,
+    required this.content,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      children: [
+        Row(
+          children: [
+            SizedBox(
+              width: 120,
+              child: Text(
+                "Nama Pakaian",
+                style: const TextStyle(
+                  letterSpacing: 0.2,
+                  fontSize: 16,
+                  fontWeight: FontWeight.bold,
+                  color: Colors.black,
+                ),
+              ),
+            ),
+            SizedBox(width: 5),
+            Text(
+              ":",
+              style: const TextStyle(
+                letterSpacing: 0.2,
+                fontSize: 16,
+                fontWeight: FontWeight.bold,
+                color: Colors.black,
+              ),
+            ),
+            SizedBox(width: 5),
+            Text(
+              nama,
+              style: const TextStyle(
+                letterSpacing: 0.2,
+                fontSize: 16,
+                fontWeight: FontWeight.bold,
+                color: Colors.black,
+              ),
+            ),
+          ],
+        ),
+        Row(
+          children: [
+            SizedBox(
+              width: 120,
+              child: Text(
+                "Daerah Asal",
+                style: const TextStyle(
+                  letterSpacing: 0.2,
+                  fontSize: 16,
+                  fontWeight: FontWeight.bold,
+                  color: Colors.black,
+                ),
+              ),
+            ),
+            SizedBox(width: 5),
+            Text(
+              ":",
+              style: const TextStyle(
+                letterSpacing: 0.2,
+                fontSize: 16,
+                fontWeight: FontWeight.bold,
+                color: Colors.black,
+              ),
+            ),
+            SizedBox(width: 5),
+            Text(
+              asal,
+              style: const TextStyle(
+                letterSpacing: 0.2,
+                fontSize: 16,
+                fontWeight: FontWeight.bold,
+                color: Colors.black,
+              ),
+            ),
+          ],
+        ),
+        SizedBox(height: 20),
+        Text(
+          content,
+          style: const TextStyle(
+            letterSpacing: 0.2,
+            fontSize: 16,
+            fontWeight: FontWeight.normal,
+            color: Colors.black,
+          ),
+        ),
+      ],
+    );
+  }
+}

lib/components/topbar_container.dart

@@ -8,6 +8,7 @@ class TopbarContainer extends StatefulWidget {
 }
 
 class _TopbarContainerState extends State<TopbarContainer> {
+  @override
   Widget build(BuildContext context) {
     final Size size = MediaQuery.of(context).size;
     return Container(

lib/main.dart

@@ -4,7 +4,6 @@ import 'package:freekake/providers/character_provider.dart';
 import 'package:freekake/providers/menu_selection_provider.dart';
 import 'package:freekake/screen/Home_screen.dart';
 import 'package:provider/provider.dart';
-import 'package:furibase/providers/menu_selection_provider.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();

lib/screen/Home_screen.dart

@@ -3,20 +3,19 @@ import 'package:flutter/material.dart';
 import 'package:freekake/components/bottom_navbar.dart';
 import 'package:freekake/components/buildcard_info.dart';
 import 'package:freekake/components/main_menu.dart';
+import 'package:freekake/components/menu_item.dart';
 import 'package:freekake/components/scan_button.dart';
 import 'package:flutter_unity_widget/flutter_unity_widget.dart';
 
 class HomeScreen extends StatefulWidget {
-  HomeScreen({super.key});
+  const HomeScreen({super.key});
 
   @override
   State<HomeScreen> createState() => _HomeScreenState();
 }
 
 class _HomeScreenState extends State<HomeScreen> {
-  final String username = "User01";
+  final String username = "luffy01";
-  double _sliderValue = 0.0;
-  static const Color transparent = Color(0xFFFFFFFF);
   // Image image
   late UnityWidgetController _unityWidgetController;
 
@@ -28,75 +27,39 @@ class _HomeScreenState extends State<HomeScreen> {
     final buttonScanSize = screenWidth * 0.20;
     final double bottomPadding = (9000 / screenWidth).clamp(0, 0.2);
     double bottomOffset = -(screenWidth * 0.25) + 180;
-    double sunRiseCurve(double width) {
-      // kamu bisa mainin fungsi ini sesuka hati
-      return -((400 / width) * 100); // semakin kecil width, hasil makin negatif
-    }
 
     return Scaffold(
-      // appBar: AppBar(
+      body: homeBody(
-      //   elevation: 0,
+        context,
-      //   backgroundColor: Color(0x00000000),
+        isLandscape,
-      //   title: Row(
+        bottomOffset,
-      //     mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        bottomPadding,
-      //     children: [
+        screenWidth,
-      //       Row(
+        buttonScanSize,
-      //         children: [
+      ),
-      //           Text(
+    );
-      //             username,
+  }
-      //             style: const TextStyle(
+
-      //               fontSize: 18,
+  Stack homeBody(
-      //               fontWeight: FontWeight.bold,
+    BuildContext context,
-      //             ),
+    bool isLandscape,
-      //           ),
+    double bottomOffset,
-      //           SizedBox(width: 10),
+    double bottomPadding,
-      //           IconButton(
+    double screenWidth,
-      //             icon: Icon(Icons.emoji_events, color: Color(0xFFE32087)),
+    double buttonScanSize,
-      //             onPressed: () {},
+  ) {
-      //           ),
+    return Stack(
-      //           Text(
+      children: <Widget>[
-      //             "5000",
+        Positioned.fill(
-      //             style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
+          child: RepaintBoundary(
-      //           ),
+            child: Container(
-      //         ],
+              decoration: const BoxDecoration(
-      //       ),
+                image: DecorationImage(
-      //       Row(
+                  image: AssetImage("assets/images/background.jpeg"),
-      //         children: [
+                  fit: BoxFit.cover,
-      //           IconButton(
+                ),
-      //             icon: Icon(Icons.monetization_on, color: Color(0xFFE32087)),
+              ),
-      //             onPressed: () {},
-      //           ),
-      //           Text(
-      //             "1.300",
-      //             style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
-      //           ),
-      //           // IconButton(
-      //           //   icon: Image.asset("images/icon.png", width: 24),
-      //           //   onPressed: () {},
-      //           // ),
-      //         ],
-      //       ),
-      //     ],
-      //   ),
-      // ),
-      body: Stack(
-        children: <Widget>[
-          Positioned.fill(
-            child: UnityWidget(
-              onUnityCreated: onUnityCreated,
-              //isARScene: true,
-              onUnityMessage: onUnityMessage,
-              //onUnitySceneLoaded: onUnitySceneLoaded,
-              fullscreen: false,
             ),
-            // child: Container(
-            //   decoration: BoxDecoration(
-            //     image: DecorationImage(
-            //       image: AssetImage("assets/images/background.jpeg"),
-            //       fit: BoxFit.cover,
-            //     ),
-            //   ),
-            // ),
           ),
           // Positioned(
           //   top: 0,
@@ -256,23 +219,18 @@ class _HomeScreenState extends State<HomeScreen> {
           ),
           Positioned(bottom: 0, left: 0, right: 0, child: MainMenu()),
 
-          Positioned(
+        Positioned(
-            // bottom: -150, //bottomPadding * 32,
+          bottom:
-            // bottom: sunRiseCurve(
+              isLandscape
-            //   screenWidth,
+                  ? bottomOffset.clamp(-200.0, -50.0)
-            // ),
+                  : bottomPadding * 55,
-            bottom:
+          left: (screenWidth - buttonScanSize) / 2,
-                isLandscape
+          child: Transform.translate(
-                    ? bottomOffset.clamp(-200.0, -50.0)
+            offset: Offset(0, -30),
-                    : bottomPadding * 10,
+            child: ScanButton(),
-            left: (screenWidth - buttonScanSize) / 2 - 5,
-            child: Transform.translate(
-              offset: Offset(0, -30),
-              child: ScanButton(),
-            ),
           ),
-        ],
+        ),
-      ),
+      ],
     );
   }
 
@@ -326,31 +284,31 @@ class _HomeScreenState extends State<HomeScreen> {
   Widget setHomeImage(String src, double size) {
     return Image.asset("assets/" + src, width: size);
   }
-}
 
-class _MenuItem {
+  void onUnityCreated(controller) {
-  const _MenuItem({required this.text, required this.icon});
+    _unityWidgetController = controller;
-  final String text;
+  }
-  final IconData icon;
+
+  void onUnityMessage(message) {
+    print('Received message from unity: ${message.toString()}');
+  }
 }
 
 class _MenuItems {
-  static const List<_MenuItem> firstItems = [like, share, download];
+  static const List<MenuItem> firstItems = [like, share, download];
-  static const List<_MenuItem> secondItems = [cancel];
+  static const List<MenuItem> secondItems = [cancel];
-  static const like = _MenuItem(text: 'Like', icon: Icons.favorite);
+  static const like = MenuItem(text: 'Like', icon: Icons.favorite);
-  static const share = _MenuItem(text: 'Share', icon: Icons.share);
+  static const share = MenuItem(text: 'Share', icon: Icons.share);
-  static const download = _MenuItem(text: 'Download', icon: Icons.download);
+  static const download = MenuItem(text: 'Download', icon: Icons.download);
-  static const cancel = _MenuItem(text: 'Cancel', icon: Icons.cancel);
+  static const cancel = MenuItem(text: 'Cancel', icon: Icons.cancel);
 
-  static Widget buildItem(_MenuItem item) {
+  static Widget buildItem(MenuItem item) {
     return Container(
       height: 30,
       padding: EdgeInsets.symmetric(vertical: 2),
       alignment: Alignment.centerLeft,
       child: Row(
         children: [
-          // Icon(item.icon, color: Color.fromRGBO(242, 240, 240, 1), size: 22),
-          // const SizedBox(width: 10),
           Expanded(
             child: Text(
               item.text,
@@ -364,7 +322,7 @@ class _MenuItems {
     );
   }
 
-  static void onChanged(BuildContext context, _MenuItem item) {
+  static void onChanged(BuildContext context, MenuItem item) {
     switch (item) {
       case _MenuItems.like:
         //Do something

lib/screen/camera_screen.dart

@@ -5,6 +5,8 @@ import 'package:flutter/material.dart';
 import 'package:permission_handler/permission_handler.dart';
 
 class CameraScreen extends StatefulWidget {
+  const CameraScreen({super.key});
+
   @override
   _CameraScreenState createState() => _CameraScreenState();
 }

lib/screen/collection/character_view.dart

@@ -1,65 +1,92 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
+import 'package:freekake/components/characcter_info.dart';
-import 'package:flutter_html/flutter_html.dart';
 
 class CharacterView extends StatefulWidget {
   final String title;
   final String imagePath;
   final String content;
+  // caracter info
+  final String charName;
+  final String charOrigin;
+  final String charSex;
 
   const CharacterView({
-    Key? key,
+    super.key,
     required this.title,
     required this.imagePath,
     required this.content,
-  }) : super(key: key);
+    required this.charName,
+    required this.charSex,
+    required this.charOrigin,
+  });
 
   @override
   _CharacterViewState createState() => _CharacterViewState();
 }
 
 class _CharacterViewState extends State<CharacterView> {
-  String _content = '';
+  late String _content;
+  late String _charName;
+  late String _charOrigin;
+  late String _charSex;
 
   @override
   void initState() {
     super.initState();
     _content = widget.content;
+    _charName = widget.charName;
+    _charSex = widget.charSex;
+    _charOrigin = widget.charOrigin;
   }
 
   @override
   Widget build(BuildContext context) {
+    final screenHeight = MediaQuery.of(context).size.height;
+
     return Scaffold(
       backgroundColor: Colors.white,
       appBar: AppBar(
         title: Text(widget.title),
-        backgroundColor: Color.fromARGB(225, 79, 76, 182),
+        backgroundColor: const Color.fromARGB(255, 79, 76, 182),
       ),
       body: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
         children: [
+          // Gambar 1/3 dari tinggi layar
           SizedBox(
-            height: 10,
+            height: 20,
             child: Container(
               decoration: BoxDecoration(
                 borderRadius: BorderRadius.only(
                   bottomLeft: Radius.circular(40),
                   bottomRight: Radius.circular(40),
                 ),
-                color: Color.fromARGB(225, 79, 76, 182),
+                color: Color.fromARGB(255, 79, 76, 182),
               ),
             ),
           ),
-          const SizedBox(height: 0),
+          SizedBox(height: 10),
+          Padding(
+            padding: const EdgeInsets.all(8.0),
+            child: SizedBox(
+              height: screenHeight / 2,
+              width: double.infinity,
+              child: Image.asset(widget.imagePath, fit: BoxFit.fitHeight),
+            ),
+          ),
+          // Konten text scrollable
           Expanded(
             child: SingleChildScrollView(
-              padding: const EdgeInsets.only(left: 18.0, right: 18, bottom: 18),
+              padding: const EdgeInsets.all(18.0),
-              child: Text(_content),
+              child: CharacterInfo(
+                nama: _charName,
+                kelamin: _charSex,
+                asal: _charOrigin,
+                content: _content,
+              ),
             ),
           ),
         ],
       ),
-      // ),
     );
   }
 }

lib/screen/collection/collection_caracter_screen.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:freekake/components/collection_container.dart';
+import 'package:freekake/screen/collection/character_view.dart';
 
 class CollectionCaraterScreen extends StatefulWidget {
   const CollectionCaraterScreen({super.key});
@@ -22,32 +23,14 @@ class _CollectionCaraterScreenState extends State<CollectionCaraterScreen> {
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                Text("Favorit", style: TextStyle(color: Colors.black)),
+                Text(
-                Divider(height: 20, color: Colors.transparent),
+                  "Favorite",
-                SingleChildScrollView(
+                  style: TextStyle(
-                  scrollDirection: Axis.horizontal,
+                    color: Colors.black,
-                  child: Row(
+                    fontWeight: FontWeight.bold,
-                    // alignment: WrapAlignment.spaceAround,
-                    spacing: 10, // Horizontal spacing between the containers
-                    // runSpacing: 10, // Vertical spacing between lines
-                    children: [
-                      CollectionContainer(
-                        label: "Luffy",
-                        imagesrc: 'assets/images/luffy.png',
-                        colorContiner: Color.fromRGBO(12, 199, 215, 1),
-                        onTapAc: () => {},
-                      ),
-                      CollectionContainer(
-                        label: "Oni Chan",
-                        imagesrc: 'assets/images/klipartz.png',
-                        onTapAc: () => {},
-                      ),
-                    ],
                   ),
                 ),
                 Divider(height: 20, color: Colors.transparent),
-                Text("Semua", style: TextStyle(color: Colors.black)),
-                Divider(height: 20, color: Colors.transparent),
                 SingleChildScrollView(
                   scrollDirection: Axis.horizontal,
                   child: Row(
@@ -55,22 +38,94 @@ class _CollectionCaraterScreenState extends State<CollectionCaraterScreen> {
                     spacing: 10, // Horizontal spacing between the containers
                     // runSpacing: 10, // Vertical spacing between lines
                     children: [
-                      CollectionContainer(
-                        label: "Luffy",
-                        imagesrc: 'assets/images/luffy.png',
-                        colorContiner: Color.fromRGBO(12, 199, 215, 1),
-                        onTapAc: () => {},
-                      ),
-                      CollectionContainer(
-                        label: "Oni Chan",
-                        imagesrc: 'assets/images/klipartz.png',
-                        onTapAc: () => {},
-                      ),
                       CollectionContainer(
                         label: "Cepot",
                         imagesrc: 'assets/images/cepott.png',
                         colorContiner: Color.fromRGBO(237, 207, 100, 1.0),
-                        onTapAc: () => {},
+                        onTapAc:
+                            () => {
+                              Navigator.push(
+                                context,
+                                MaterialPageRoute(
+                                  builder:
+                                      (context) => CharacterView(
+                                        title: "Tentang Cepot",
+                                        imagePath: 'assets/images/cepott.png',
+                                        charName: "Cepot",
+                                        charSex: "Laki-laki",
+                                        charOrigin: "Jawa Barat",
+                                        content:
+                                            """Cepot adalah sosok yang begitu menarik—aneh, ceria, dan penuh kejutan! Ia muncul seperti tokoh dari dongeng lama yang lupa pulang ke rumah, dengan wajah merah seperti apel matang, hidung besar yang tampak siap mencium rahasia, dan mata bulat yang selalu bersinar penuh rasa ingin tahu. Ia suka tertawa keras, suka bermain-main dengan kata-kata, dan sangat pandai membuat siapa pun merasa nyaman di dekatnya. \nMeski kadang terlihat konyol, Cepot sebenarnya sangat cerdik—ia tahu kapan harus berbicara, kapan harus diam, dan yang paling penting, ia tahu bagaimana menghibur orang-orang yang sedang sedih. \nAnak-anak menyukainya, orang tua menghormatinya, dan tak jarang hewan-hewan kecil pun tampak betah duduk di dekatnya saat ia bercerita.
+                                                  """,
+                                      ),
+                                ),
+                              ),
+                            },
+                      ),
+                      // CollectionContainer(
+                      //   label: "Luffy",
+                      //   imagesrc: 'assets/images/luffy.png',
+                      //   colorContiner: Color.fromRGBO(12, 199, 215, 1),
+                      //   onTapAc: () => {},
+                      // ),
+                      // CollectionContainer(
+                      //   label: "Oni Chan",
+                      //   imagesrc: 'assets/images/klipartz.png',
+                      //   onTapAc: () => {},
+                      // ),
+                    ],
+                  ),
+                ),
+                Divider(height: 20, color: Colors.transparent),
+                Text(
+                  "All",
+                  style: TextStyle(
+                    color: Colors.black,
+                    fontWeight: FontWeight.bold,
+                  ),
+                ),
+                Divider(height: 20, color: Colors.transparent),
+                SingleChildScrollView(
+                  scrollDirection: Axis.horizontal,
+                  child: Row(
+                    // alignment: WrapAlignment.spaceAround,
+                    spacing: 10, // Horizontal spacing between the containers
+                    // runSpacing: 10, // Vertical spacing between lines
+                    children: [
+                      // CollectionContainer(
+                      //   label: "Luffy",
+                      //   imagesrc: 'assets/images/luffy.png',
+                      //   colorContiner: Color.fromRGBO(12, 199, 215, 1),
+                      //   onTapAc: () => {},
+                      // ),
+                      // CollectionContainer(
+                      //   label: "Oni Chan",
+                      //   imagesrc: 'assets/images/klipartz.png',
+                      //   onTapAc: () => {},
+                      // ),
+                      CollectionContainer(
+                        label: "Cepot",
+                        imagesrc: 'assets/images/cepott.png',
+                        colorContiner: Color.fromRGBO(237, 207, 100, 1.0),
+                        onTapAc:
+                            () => {
+                              Navigator.push(
+                                context,
+                                MaterialPageRoute(
+                                  builder:
+                                      (context) => CharacterView(
+                                        title: "Tentang Cepot",
+                                        imagePath: 'assets/images/cepott.png',
+                                        charName: "Cepot",
+                                        charSex: "Laki-laki",
+                                        charOrigin: "Jawa Barat",
+                                        content:
+                                            """Cepot adalah sosok yang begitu menarik—aneh, ceria, dan penuh kejutan! Ia muncul seperti tokoh dari dongeng lama yang lupa pulang ke rumah, dengan wajah merah seperti apel matang, hidung besar yang tampak siap mencium rahasia, dan mata bulat yang selalu bersinar penuh rasa ingin tahu. Ia suka tertawa keras, suka bermain-main dengan kata-kata, dan sangat pandai membuat siapa pun merasa nyaman di dekatnya. \nMeski kadang terlihat konyol, Cepot sebenarnya sangat cerdik—ia tahu kapan harus berbicara, kapan harus diam, dan yang paling penting, ia tahu bagaimana menghibur orang-orang yang sedang sedih. \nAnak-anak menyukainya, orang tua menghormatinya, dan tak jarang hewan-hewan kecil pun tampak betah duduk di dekatnya saat ia bercerita.
+                                                  """,
+                                      ),
+                                ),
+                              ),
+                            },
                       ),
                     ],
                   ),

lib/screen/collection/collection_fragment_screen.dart

@@ -27,14 +27,14 @@ class _CollectionFragmentScreenState extends State<CollectionFragmentScreen> {
                 spacing: 10, // Horizontal spacing between the containers
                 runSpacing: 10, // Vertical spacing between lines
                 children: [
+                  // CollectionContainer(
+                  //   label: "Luffy",
+                  //   imagesrc: 'assets/images/ft_luffy.png',
+                  //   onTapAc: () => {},
+                  //   colorContiner: ColorHelper.hexToColor("0xE2E5E9"),
+                  // ),
                   CollectionContainer(
-                    label: "Luffy",
+                    label: "Cepot",
-                    imagesrc: 'assets/images/ft_luffy.png',
-                    onTapAc: () => {},
-                    colorContiner: ColorHelper.hexToColor("0xE2E5E9"),
-                  ),
-                  CollectionContainer(
-                    label: "Oni Chan",
                     imagesrc: 'assets/images/ft_cepot.png',
                     onTapAc: () => {},
                     colorContiner: ColorHelper.hexToColor("0xE2E5E9"),

lib/screen/collection/collection_skin_screen.dart

@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:freekake/components/collection_container.dart';
+import 'package:freekake/screen/collection/character_view.dart';
+import 'package:freekake/screen/collection/skin_view.dart';
 
 class CollectionSkinScreen extends StatefulWidget {
   const CollectionSkinScreen({super.key});
@@ -11,7 +13,7 @@ class CollectionSkinScreen extends StatefulWidget {
 class _CollectionSkinScreenState extends State<CollectionSkinScreen> {
   @override
   Widget build(BuildContext context) {
-    return Container(
+    return SizedBox(
       // scrollDirection: Axis.horizontal,
       height: MediaQuery.of(context).size.height,
       child: Column(
@@ -23,53 +25,70 @@ class _CollectionSkinScreenState extends State<CollectionSkinScreen> {
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                Text("Luffy", style: TextStyle(color: Colors.black)),
+                // Text("Luffy", style: TextStyle(color: Colors.black)),
-                Divider(height: 10),
+                // Divider(height: 10),
-                SingleChildScrollView(
+                // SingleChildScrollView(
-                  scrollDirection: Axis.horizontal,
+                //   scrollDirection: Axis.horizontal,
-                  child: Row(
+                //   child: Row(
-                    spacing: 10, // Horizontal spacing between the containers
+                //     spacing: 10, // Horizontal spacing between the containers
-                    children: [
+                //     children: [
-                      CollectionContainer(
+                //       CollectionContainer(
-                        label: "Luffy Kimono",
+                //         label: "Luffy Kimono",
-                        imagesrc: 'assets/images/luffy-kimono.png',
+                //         imagesrc: 'assets/images/luffy-kimono.png',
-                        colorContiner: Color.fromRGBO(12, 199, 215, 1),
+                //         colorContiner: Color.fromRGBO(12, 199, 215, 1),
-                        onTapAc: () => {},
+                //         onTapAc: () => {},
-                      ),
+                //       ),
 
-                      CollectionContainer(
+                //       CollectionContainer(
-                        label: "Luffy (Default)",
+                //         label: "Luffy (Default)",
-                        imagesrc: 'assets/images/luffy.png',
+                //         imagesrc: 'assets/images/luffy.png',
-                        colorContiner: Color.fromRGBO(12, 199, 215, 1),
+                //         colorContiner: Color.fromRGBO(12, 199, 215, 1),
-                        onTapAc: () => {},
+                //         onTapAc: () => {},
-                      ),
+                //       ),
-                      CollectionContainer(
+                //       CollectionContainer(
-                        label: "Luffy King",
+                //         label: "Luffy King",
-                        imagesrc: 'assets/images/luffy-king.png',
+                //         imagesrc: 'assets/images/luffy-king.png',
-                        colorContiner: Color.fromRGBO(12, 199, 215, 1),
+                //         colorContiner: Color.fromRGBO(12, 199, 215, 1),
-                        onTapAc: () => {},
+                //         onTapAc: () => {},
-                      ),
+                //       ),
-                    ],
+                //     ],
-                  ),
+                //   ),
-                ),
+                // ),
-                Divider(height: 20, color: Colors.transparent),
+                // Divider(height: 20, color: Colors.transparent),
-                Text("Lainnya", style: TextStyle(color: Colors.black)),
+                Text("Cepot", style: TextStyle(color: Colors.black)),
                 Divider(height: 10),
                 SingleChildScrollView(
                   scrollDirection: Axis.horizontal,
                   child: Row(
                     spacing: 10,
                     children: [
-                      CollectionContainer(
+                      // CollectionContainer(
-                        label: "Oni Chan (Default)",
+                      //   label: "Oni Chan (Default)",
-                        imagesrc: 'assets/images/klipartz.png',
+                      //   imagesrc: 'assets/images/klipartz.png',
-                        onTapAc: () => {},
+                      //   onTapAc: () => {},
-                      ),
+                      // ),
                       CollectionContainer(
                         label: "Cepot (Default)",
                         imagesrc: 'assets/images/cepott.png',
                         colorContiner: Color.fromRGBO(237, 207, 100, 1.0),
-                        onTapAc: () => {},
+                        onTapAc:
+                            () => {
+                              Navigator.push(
+                                context,
+                                MaterialPageRoute(
+                                  builder:
+                                      (context) => SkinView(
+                                        title: "Tentang Skin",
+                                        imagePath: 'assets/images/cepott.png',
+                                        skinName: "Pangsi",
+                                        skinOrigin: "Jawa Barat",
+                                        content:
+                                            """Pakaian Cepot juga punya makna, lho! Ia selalu memakai baju pangsi hitam panjang yang sederhana, melambangkan kesederhanaan dan kerendahan hati. \nBaju ini longgar dan nyaman, cocok untuk Cepot yang suka bergerak bebas dan menghibur orang-orang di sekitarnya. \nSarung kotak-kotak yang dililit di pinggang bukan hanya pelengkap, tapi juga simbol budaya rakyat biasa yang tetap rapi dan terhormat. \nDan jangan lupa iket batik di kepalanya—itu bukan cuma hiasan, tapi lambang kebanggaan dan identitas sebagai orang Sunda. Lewat pakaiannya, Cepot mengajarkan kita bahwa kita tidak perlu pakaian mahal untuk terlihat hebat. Yang penting adalah sikap baik, rasa hormat pada budaya, dan keberanian untuk jadi diri sendiri!
+                                                  """,
+                                      ),
+                                ),
+                              ),
+                            },
                       ),
                     ],
                   ),

lib/screen/collection/skin_view.dart

@@ -0,0 +1,87 @@
+import 'package:flutter/material.dart';
+import 'package:freekake/components/characcter_info.dart';
+import 'package:freekake/components/skin_info.dart';
+
+class SkinView extends StatefulWidget {
+  final String title;
+  final String imagePath;
+  final String content;
+  // caracter info
+  final String skinName;
+  final String skinOrigin;
+
+  const SkinView({
+    super.key,
+    required this.title,
+    required this.imagePath,
+    required this.content,
+    required this.skinName,
+    required this.skinOrigin,
+  });
+
+  @override
+  _SkinViewState createState() => _SkinViewState();
+}
+
+class _SkinViewState extends State<SkinView> {
+  late String _content;
+  late String _skinName;
+  late String _skinOrigin;
+
+  @override
+  void initState() {
+    super.initState();
+    _content = widget.content;
+    _skinName = widget.skinName;
+    _skinOrigin = widget.skinOrigin;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final screenHeight = MediaQuery.of(context).size.height;
+
+    return Scaffold(
+      backgroundColor: Colors.white,
+      appBar: AppBar(
+        title: Text(widget.title),
+        backgroundColor: const Color.fromARGB(255, 79, 76, 182),
+      ),
+      body: Column(
+        children: [
+          SizedBox(
+            height: 20,
+            child: Container(
+              decoration: BoxDecoration(
+                borderRadius: BorderRadius.only(
+                  bottomLeft: Radius.circular(40),
+                  bottomRight: Radius.circular(40),
+                ),
+                color: Color.fromARGB(255, 79, 76, 182),
+              ),
+            ),
+          ),
+          SizedBox(height: 10),
+          Padding(
+            padding: const EdgeInsets.all(8.0),
+            child: SizedBox(
+              height: screenHeight / 2,
+              width: double.infinity,
+              child: Image.asset(widget.imagePath, fit: BoxFit.fitHeight),
+            ),
+          ),
+          // Konten text scrollable
+          Expanded(
+            child: SingleChildScrollView(
+              padding: const EdgeInsets.all(18.0),
+              child: SkinInfo(
+                nama: _skinName,
+                asal: _skinOrigin,
+                content: _content,
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/screen/koleksi_screen.dart

@@ -41,127 +41,135 @@ class _KoleksiScreenState extends State<KoleksiScreen> {
     final double bottomPadding = (9000 / screenWidth).clamp(0, 0.2);
     return Scaffold(
       extendBody: true,
-      body: Stack(
+      body: koleksiBody(bottomPadding, screenWidth, buttonScanSize),
-        children: <Widget>[
+    );
-          Positioned.fill(
+  }
-            child: Container(color: const Color.fromARGB(255, 255, 255, 255)),
+
-          ),
+  Stack koleksiBody(
-          Positioned.fill(
+    double bottomPadding,
-            top: 30,
+    double screenWidth,
-            child: PageView(
+    double buttonScanSize,
-              controller: _pageController,
+  ) {
-              onPageChanged: (index) {
+    return Stack(
-                setState(() {
+      children: <Widget>[
-                  _selectedIndex = index;
+        Positioned.fill(
-                });
+          child: Container(color: const Color.fromARGB(255, 255, 255, 255)),
-              },
+        ),
-              children: [
+        Positioned.fill(
-                const CollectionCaraterScreen(),
+          top: 30,
-                const CollectionSkinScreen(),
+          child: PageView(
-                const CollectionFragmentScreen(),
+            controller: _pageController,
-              ],
+            onPageChanged: (index) {
-            ),
+              setState(() {
-          ),
+                _selectedIndex = index;
-          // BG MEnu
+              });
-          Stack(
+            },
             children: [
-              Positioned(
+              const CollectionCaraterScreen(),
-                bottom: 0,
+              const CollectionSkinScreen(),
-                left: 0,
+              const CollectionFragmentScreen(),
-                right: 0,
+            ],
-                child: SizedBox(height: 85, child: BottomNavbar()),
+          ),
+        ),
+        // BG MEnu
+        Stack(
+          children: [
+            Positioned(
+              bottom: 0,
+              left: 0,
+              right: 0,
+              child: SizedBox(height: 85, child: BottomNavbar()),
+            ),
+          ],
+        ),
+        //TopBar
+        Positioned(
+          top: 0,
+          left: 0,
+          right: 0,
+          child: SizedBox(height: 130, child: TopbarContainer()),
+        ),
+
+        Positioned(
+          top: 10,
+          left: 10,
+          right: 10,
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              BuildcardInfo(
+                icon: Icons.person,
+                text: 'User01',
+                extraIcon: Icons.emoji_events,
+                extraText: "5000",
+                width: 180,
+              ),
+              BuildcardInfo(
+                icon: Icons.monetization_on,
+                text: "1.300",
+                width: 90,
               ),
             ],
           ),
-          //TopBar
+        ),
-          Positioned(
+        // Positioned.fill(
-            top: 0,
+        //   top: 30,
-            left: 0,
+        //   child: PageView(
-            right: 0,
+        //     controller: _pageController,
-            child: SizedBox(height: 130, child: TopbarContainer()),
+        //     onPageChanged: (index) {
-          ),
+        //       setState(() {
-
+        //         _selectedIndex = index;
-          Positioned(
+        //       });
-            top: 10,
+        //     },
-            left: 10,
+        //     children: [
-            right: 10,
+        //       const CollectionCaraterScreen(),
+        //       const CollectionSkinScreen(),
+        //       const CollectionFragmentScreen(),
+        //     ],
+        //   ),
+        // ),
+        Positioned(
+          top: 70,
+          left: 10,
+          right: 10,
+          child: Container(
+            // decoration: const BoxDecoration(
+            //   borderRadius: BorderRadius.all(Radius.circular(20)),
+            //   color: Color.fromARGB(116, 125, 129, 133),
+            // ),
+            padding: const EdgeInsets.all(1),
             child: Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              mainAxisAlignment: MainAxisAlignment.spaceAround,
               children: [
-                BuildcardInfo(
+                CurvedBottomBorderTab(
-                  icon: Icons.person,
+                  label: "Karakter",
-                  text: 'User01',
+                  isSelected: _selectedIndex == 0,
-                  extraIcon: Icons.emoji_events,
+                  tap: () => _onMenuTapped(0),
-                  extraText: "5000",
-                  width: 180,
                 ),
-                BuildcardInfo(
+                CurvedBottomBorderTab(
-                  icon: Icons.monetization_on,
+                  label: "Skin",
-                  text: "1.300",
+                  isSelected: _selectedIndex == 1,
-                  width: 90,
+                  tap: () => _onMenuTapped(1),
+                ),
+                CurvedBottomBorderTab(
+                  label: "Fragment",
+                  isSelected: _selectedIndex == 2,
+                  tap: () => _onMenuTapped(2),
                 ),
               ],
             ),
           ),
-          // Positioned.fill(
+        ),
-          //   top: 30,
+        Positioned(bottom: 0, left: 0, right: 0, child: MainMenu()),
-          //   child: PageView(
+        Positioned(
-          //     controller: _pageController,
+          bottom: bottomPadding * 98,
-          //     onPageChanged: (index) {
+          left: (screenWidth - buttonScanSize) / 2,
-          //       setState(() {
+          child: Transform.translate(
-          //         _selectedIndex = index;
+            offset: Offset(0, -20),
-          //       });
+            child: ScanButton(),
-          //     },
-          //     children: [
-          //       const CollectionCaraterScreen(),
-          //       const CollectionSkinScreen(),
-          //       const CollectionFragmentScreen(),
-          //     ],
-          //   ),
-          // ),
-          Positioned(
-            top: 70,
-            left: 10,
-            right: 10,
-            child: Container(
-              // decoration: const BoxDecoration(
-              //   borderRadius: BorderRadius.all(Radius.circular(20)),
-              //   color: Color.fromARGB(116, 125, 129, 133),
-              // ),
-              padding: const EdgeInsets.all(1),
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.spaceAround,
-                children: [
-                  CurvedBottomBorderTab(
-                    label: "Karakter",
-                    isSelected: _selectedIndex == 0,
-                    tap: () => _onMenuTapped(0),
-                  ),
-                  CurvedBottomBorderTab(
-                    label: "Skin",
-                    isSelected: _selectedIndex == 1,
-                    tap: () => _onMenuTapped(1),
-                  ),
-                  CurvedBottomBorderTab(
-                    label: "Fragment",
-                    isSelected: _selectedIndex == 2,
-                    tap: () => _onMenuTapped(2),
-                  ),
-                ],
-              ),
-            ),
           ),
-          Positioned(bottom: 0, left: 0, right: 0, child: MainMenu()),
+        ),
-          Positioned(
+      ],
-            bottom: bottomPadding * 98,
-            left: (screenWidth - buttonScanSize) / 2,
-            child: Transform.translate(
-              offset: Offset(0, -20),
-              child: ScanButton(),
-            ),
-          ),
-        ],
-      ),
     );
   }
 }

lib/screen/pustaka/list_education.dart

@@ -3,13 +3,12 @@ import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:freekake/components/buildcard_info.dart';
 import 'package:freekake/components/card_list.dart';
 import 'package:freekake/components/collection_container%20copy.dart';
-import 'package:freekake/components/main_menu.dart';
-import 'package:freekake/components/topbar_container.dart';
 import 'package:freekake/helpers/color_helper.dart';
-import 'package:freekake/screen/pustaka/pustaka_detail_screen.dart';
+import 'package:list_detail_extension/list_detail_extension.dart';
+import 'package:webview_flutter/webview_flutter.dart';
+import 'package:flutter/foundation.dart' show kIsWeb;
 
 class ListEducation extends StatefulWidget {
   const ListEducation({super.key});
@@ -43,9 +42,12 @@ class _ListEducationState extends State<ListEducation> {
   final List<Map<String, dynamic>> _listContent = [
     {
       "title": "Taburan Lezat untuk Nasi!",
-      "image": "assets/icons/healthy.svg",
+      "image": "assets/html/furikake/furikake.jpg",
       "color": "#cdd0ee",
       "category": "Kesehatan",
+      "type": "Materi",
+      "point": "10",
+      "coint": "100",
       "body":
           """Tahukah kamu bahwa di Jepang ada bumbu tabur yang bisa membuat nasi 
                 menjadi lebih enak? 
@@ -54,9 +56,12 @@ class _ListEducationState extends State<ListEducation> {
     },
     {
       "title": "Makan Sehat dengan Gizi Seimbang",
-      "image": "assets/icons/Safety.svg",
+      "image": "assets/html/lemak.png",
       "color": "#cef1da",
       "category": "Keselamatan",
+      "type": "Materi",
+      "point": "100",
+      "coint": "20",
       "body":
           """upaya makan kita sehat, ada aturan "Isi Piringku" yang bisa kita ikuti: 
           🍽️ Separuh piring: Sayur dan buah 🍽️ Seperempat piring: Karbohidrat (seperti nasi atau roti) 
@@ -82,7 +87,7 @@ class _ListEducationState extends State<ListEducation> {
   }
 
   void _loadContent(String path) async {
-    if (_shouldShowWebView && _controller != null) {
+    if (_shouldShowWebView) {
       if (path.startsWith('http')) {
         // Load dari Internet
         _controller.loadRequest(Uri.parse(path));
@@ -121,8 +126,8 @@ class _ListEducationState extends State<ListEducation> {
 
   @override
   Widget build(BuildContext context) {
-    String _searchQuery = "";
+    String searchQuery = "";
-    final List<Map<String, dynamic>> _collections = [
+    final List<Map<String, dynamic>> collections = [
       {
         "label": "Kesehatan",
         "image": "assets/icons/healthy.svg",
@@ -150,14 +155,14 @@ class _ListEducationState extends State<ListEducation> {
     ];
 
     final List<Map<String, dynamic>> filteredCollections =
-        _collections
+        collections
             .where(
               (item) => item["label"].toLowerCase().contains(
-                _searchQuery.toLowerCase(),
+                searchQuery.toLowerCase(),
               ),
             )
             .toList();
-    if (_shouldShowWebView && _controller != null) {
+    if (_shouldShowWebView) {
       return Scaffold(
         appBar: AppBar(
           backgroundColor: Color.fromARGB(225, 79, 76, 182),
@@ -171,215 +176,10 @@ class _ListEducationState extends State<ListEducation> {
         body: Column(
           children: [
             // Header Section
-            Container(
+            headerContainer(context, filteredCollections),
-              width: MediaQuery.of(context).size.width,
-              height: 150,
-              decoration: BoxDecoration(
-                color: const Color.fromARGB(225, 79, 76, 182),
-                borderRadius: BorderRadius.only(
-                  bottomLeft: Radius.circular(25),
-                  bottomRight: Radius.circular(25),
-                ),
-              ),
-              child: Column(
-                children: [
-                  Padding(
-                    padding: const EdgeInsets.symmetric(
-                      horizontal: 20,
-                      vertical: 6,
-                    ),
-                    child: Container(
-                      height: 47,
-                      decoration: BoxDecoration(
-                        borderRadius: BorderRadius.circular(20),
-                        color: Colors.grey.shade200,
-                      ),
-                      padding: const EdgeInsets.symmetric(horizontal: 10),
-                      child: Row(
-                        children: [
-                          const Icon(
-                            Icons.search,
-                            color: Color.fromARGB(137, 180, 172, 172),
-                            size: 18,
-                          ),
-                          const SizedBox(width: 8),
-                          Expanded(
-                            child: TextField(
-                              controller: searchController,
-                              onChanged:
-                                  filterSearch, // Memanggil filter saat mengetik
-                              style: const TextStyle(
-                                color: Colors.black,
-                                fontSize: 14,
-                              ),
-                              decoration: const InputDecoration(
-                                border: InputBorder.none,
-                                hintText: 'Cari pelajaran...',
-                                hintStyle: TextStyle(color: Colors.black54),
-                              ),
-                            ),
-                          ),
-                          if (searchController.text.isNotEmpty)
-                            IconButton(
-                              icon: const Icon(
-                                Icons.close,
-                                color: Colors.black54,
-                              ),
-                              onPressed: () {
-                                searchController.clear();
-                                filterSearch('');
-                              },
-                            ),
-                        ],
-                      ),
-                    ),
-                  ),
-                  Row(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                    children:
-                        filteredCollections.map((item) {
-                          return CollectionContainer(
-                            label: item["label"]!,
-                            imageSvg: item["image"]!,
-                            iconw: 20,
-                            iconh: 20,
-                            width: 70,
-                            height: 70,
-                            textColor: Colors.black,
-                            lblSize: 10,
-                            colorContiner: ColorHelper.hexToColor(
-                              item["color"],
-                            ),
-                            onTapAc:
-                                () => {
-                                  searchController.clear(),
-                                  filterByCategory(item["category"]),
-                                },
-                          );
-                        }).toList(),
-                  ),
-                ],
-              ),
-            ),
             // Collection Items dengan Filter
             SizedBox(height: 20),
-            Expanded(
+            Expanded(child: contentContainer(context)),
-              child: Container(
-                decoration: BoxDecoration(
-                  color: const Color.fromARGB(223, 200, 200, 206),
-                  borderRadius: BorderRadius.only(
-                    topLeft: Radius.circular(25),
-                    topRight: Radius.circular(25),
-                  ),
-                ),
-                child: Column(
-                  children: [
-                    SizedBox(height: 5),
-                    Padding(
-                      padding: EdgeInsets.symmetric(
-                        horizontal: MediaQuery.of(context).size.width / 4,
-                      ),
-                      child: Divider(
-                        color: const Color.fromARGB(255, 255, 255, 255),
-                        thickness: 2,
-                      ),
-                    ),
-                    Expanded(
-                      child: Padding(
-                        padding: const EdgeInsets.symmetric(
-                          horizontal: 10,
-                          // vertical: 10,
-                        ),
-                        child:
-                            filteredItems.isEmpty
-                                ? const Center(
-                                  child: Text(
-                                    "Tidak ada hasil",
-                                    style: TextStyle(
-                                      fontSize: 16,
-                                      color: Colors.black54,
-                                    ),
-                                  ),
-                                )
-                                : Padding(
-                                  padding: EdgeInsets.only(
-                                    top: 10.0,
-                                    left: 10,
-                                    right: 10,
-                                  ),
-                                  child: Container(
-                                    decoration: BoxDecoration(
-                                      borderRadius: BorderRadius.only(
-                                        topLeft: Radius.circular(20),
-                                        topRight: Radius.circular(20),
-                                      ),
-                                      color: const Color.fromARGB(
-                                        255,
-                                        222,
-                                        181,
-                                        133,
-                                      ),
-                                    ),
-                                    child: Padding(
-                                      padding: EdgeInsets.only(
-                                        top: 12,
-                                        right: 20,
-                                        left: 20,
-                                      ),
-                                      child: GridView.builder(
-                                        gridDelegate:
-                                            const SliverGridDelegateWithFixedCrossAxisCount(
-                                              crossAxisCount: 1, // 2 Kolom
-                                              crossAxisSpacing: 10,
-                                              mainAxisSpacing: 10,
-                                              childAspectRatio: 2.5,
-                                            ),
-                                        itemCount: _listContent.length,
-                                        itemBuilder: (context, index) {
-                                          return GestureDetector(
-                                            child: CardList(
-                                              title:
-                                                  _listContent[index]["title"] ??
-                                                  "",
-                                              body:
-                                                  _listContent[index]["body"] ??
-                                                  "",
-                                            ),
-                                            onTap: () {
-                                              Navigator.push(
-                                                context,
-                                                MaterialPageRoute(
-                                                  builder:
-                                                      (
-                                                        context,
-                                                      ) => listDetailExtension.buildPage({
-                                                        'title':
-                                                            filteredItems[index]['category'],
-                                                        'imagePath':
-                                                            filteredItems[index]['image'],
-                                                        'filepath':
-                                                            filteredItems[index]['file'],
-                                                        'paragraphs':
-                                                            """
-                                                           """ +
-                                                            "<h1> ${_listContent[index]["title"]} </h1> <p> ${_listContent[index]["body"]}",
-                                                      }),
-                                                ),
-                                              );
-                                            },
-                                          );
-                                        },
-                                      ),
-                                    ),
-                                  ),
-                                ),
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-            ),
           ],
         ),
       );
@@ -392,4 +192,196 @@ class _ListEducationState extends State<ListEducation> {
       );
     }
   }
+
+  Container headerContainer(
+    BuildContext context,
+    List<Map<String, dynamic>> filteredCollections,
+  ) {
+    return Container(
+      width: MediaQuery.of(context).size.width,
+      height: 150,
+      decoration: BoxDecoration(
+        color: const Color.fromARGB(225, 79, 76, 182),
+        borderRadius: BorderRadius.only(
+          bottomLeft: Radius.circular(25),
+          bottomRight: Radius.circular(25),
+        ),
+      ),
+      child: Column(
+        children: [
+          Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 6),
+            child: Container(
+              height: 47,
+              decoration: BoxDecoration(
+                borderRadius: BorderRadius.circular(20),
+                color: Colors.grey.shade200,
+              ),
+              padding: const EdgeInsets.symmetric(horizontal: 10),
+              child: Row(
+                children: [
+                  const Icon(
+                    Icons.search,
+                    color: Color.fromARGB(137, 180, 172, 172),
+                    size: 18,
+                  ),
+                  const SizedBox(width: 8),
+                  Expanded(
+                    child: TextField(
+                      controller: searchController,
+                      onChanged: filterSearch, // Memanggil filter saat mengetik
+                      style: const TextStyle(color: Colors.black, fontSize: 14),
+                      decoration: const InputDecoration(
+                        border: InputBorder.none,
+                        hintText: 'Cari pelajaran...',
+                        hintStyle: TextStyle(color: Colors.black54),
+                      ),
+                    ),
+                  ),
+                  if (searchController.text.isNotEmpty)
+                    IconButton(
+                      icon: const Icon(Icons.close, color: Colors.black54),
+                      onPressed: () {
+                        searchController.clear();
+                        filterSearch('');
+                      },
+                    ),
+                ],
+              ),
+            ),
+          ),
+          Row(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+            children:
+                filteredCollections.map((item) {
+                  return CollectionContainer(
+                    label: item["label"]!,
+                    imageSvg: item["image"]!,
+                    iconw: 20,
+                    iconh: 20,
+                    width: 70,
+                    height: 70,
+                    textColor: Colors.black,
+                    lblSize: 10,
+                    colorContiner: ColorHelper.hexToColor(item["color"]),
+                    onTapAc:
+                        () => {
+                          searchController.clear(),
+                          filterByCategory(item["category"]),
+                        },
+                  );
+                }).toList(),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Container contentContainer(BuildContext context) {
+    return Container(
+      decoration: BoxDecoration(
+        color: const Color.fromARGB(223, 200, 200, 206),
+        borderRadius: BorderRadius.only(
+          topLeft: Radius.circular(25),
+          topRight: Radius.circular(25),
+        ),
+      ),
+      child: _listCard(context),
+    );
+  }
+
+  Column _listCard(BuildContext context) {
+    return Column(
+      children: [
+        SizedBox(height: 5),
+        Padding(
+          padding: EdgeInsets.symmetric(
+            horizontal: MediaQuery.of(context).size.width / 4,
+          ),
+          child: Divider(
+            color: const Color.fromARGB(255, 255, 255, 255),
+            thickness: 2,
+          ),
+        ),
+        Expanded(
+          child: Padding(
+            padding: const EdgeInsets.symmetric(
+              horizontal: 10,
+              // vertical: 10,
+            ),
+            child:
+                filteredItems.isEmpty
+                    ? const Center(
+                      child: Text(
+                        "Tidak ada hasil",
+                        style: TextStyle(fontSize: 16, color: Colors.black54),
+                      ),
+                    )
+                    : Padding(
+                      padding: EdgeInsets.only(top: 10.0, left: 10, right: 10),
+                      child: Container(
+                        decoration: BoxDecoration(
+                          borderRadius: BorderRadius.only(
+                            topLeft: Radius.circular(20),
+                            topRight: Radius.circular(20),
+                          ),
+                          color: const Color.fromARGB(255, 222, 181, 133),
+                        ),
+                        child: Padding(
+                          padding: EdgeInsets.only(
+                            top: 12,
+                            right: 20,
+                            left: 20,
+                          ),
+                          child: _generateList(),
+                        ),
+                      ),
+                    ),
+          ),
+        ),
+      ],
+    );
+  }
+
+  GridView _generateList() {
+    return GridView.builder(
+      gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+        crossAxisCount: 1, // 2 Kolom
+        crossAxisSpacing: 10,
+        mainAxisSpacing: 10,
+        childAspectRatio: 2.5,
+      ),
+      itemCount: _listContent.length,
+      itemBuilder: (context, index) {
+        return GestureDetector(
+          child: CardList(
+            title: _listContent[index]["title"] ?? "",
+            body: _listContent[index]["body"] ?? "",
+            gambar: _listContent[index]['image'],
+            point: _listContent[index]['coint'],
+            coint: _listContent[index]['point'],
+            tipe: _listContent[index]['tipe'],
+          ),
+          onTap: () {
+            Navigator.push(
+              context,
+              MaterialPageRoute(
+                builder:
+                    (context) => listDetailExtension.buildPage({
+                      'title': filteredItems[index]['category'],
+                      'imagePath': filteredItems[index]['image'],
+                      'filepath': filteredItems[index]['file'],
+                      'paragraphs':
+                          """
+                                  """
+                          "<h1> ${_listContent[index]["title"]} </h1> <p> ${_listContent[index]["body"]}",
+                    }),
+              ),
+            );
+          },
+        );
+      },
+    );
+  }
 }

lib/screen/pustaka/pustaka_detail_screen copy.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:freekakes/components/buildcard_info.dart';
+import 'package:freekake/components/buildcard_info.dart';
 import 'package:freekake/components/collection_container.dart';
 
 class DetailScreen extends StatefulWidget {

lib/screen/pustaka/pustaka_detail_screen.dart

@@ -2,25 +2,25 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_html/flutter_html.dart';
 
-class ListDetailScreen extends StatefulWidget {
+class ListPustakaDetailScreen extends StatefulWidget {
   final String title;
   final String imagePath;
   final String paragraphs;
   final String filepath;
 
-  const ListDetailScreen({
+  const ListPustakaDetailScreen({
-    Key? key,
+    super.key,
     required this.title,
     required this.imagePath,
     required this.paragraphs,
     required this.filepath,
-  }) : super(key: key);
+  });
 
   @override
   _ListDetailScreenState createState() => _ListDetailScreenState();
 }
 
-class _ListDetailScreenState extends State<ListDetailScreen> {
+class _ListDetailScreenState extends State<ListPustakaDetailScreen> {
   late List<bool> _readStatus;
   String _htmlContent = '';
 
@@ -41,6 +41,11 @@ class _ListDetailScreenState extends State<ListDetailScreen> {
     String html = await DefaultAssetBundle.of(
       context,
     ).loadString(widget.filepath);
+
+    html = html.replaceAllMapped(
+      RegExp(r'<div class="gizi-grid">(.*?)</div>', dotAll: true),
+      (match) => '<gizi-grid>${match.group(1)}</gizi-grid>',
+    );
     setState(() {
       _htmlContent = html;
     });
@@ -102,115 +107,73 @@ class _ListDetailScreenState extends State<ListDetailScreen> {
             child: SingleChildScrollView(
               padding: const EdgeInsets.only(left: 18.0, right: 18, bottom: 18),
               child:
-              // ListView.builder(
+                  // ListView.builder(
-              //   itemCount: widget.paragraphs.length,
+                  //   itemCount: widget.paragraphs.length,
-              //   itemBuilder: (context, index) {
+                  //   itemBuilder: (context, index) {
-              //     return
+                  //     return
-              //     Padding(
+                  //     Padding(
-              //       padding: const EdgeInsets.only(bottom: 16.0),
+                  //       padding: const EdgeInsets.only(bottom: 16.0),
-              //       child: Row(
+                  //       child: Row(
-              //         crossAxisAlignment: CrossAxisAlignment.start,
+                  //         crossAxisAlignment: CrossAxisAlignment.start,
-              //         children: [
+                  //         children: [
-              //           Expanded(
+                  //           Expanded(
-              //             child:
+                  //             child:
-              //             // Text(
+                  //             // Text(
-              //             // widget.paragraphs[index] +
+                  //             // widget.paragraphs[index] +
-              //             // style: TextStyle(color: Colors.black),
+                  //             // style: TextStyle(color: Colors.black),
-              //             Html(
+                  //             Html(
-              //               // style: {
+                  //               // style: {
-              //               //   "body": Style(
+                  //               //   "body": Style(
-              //               //     color: const Color.fromRGBO(0, 0, 0, 1),
+                  //               //     color: const Color.fromRGBO(0, 0, 0, 1),
-              //               //   ),
+                  //               //   ),
-              //               // },
+                  //               // },
-              //               data:
+                  //               data:
-              //                   widget.paragraphs +
+                  //                   widget.paragraphs +
-              //                   """
+                  //                   """
-              //                     <html>
+                  //                     <html>
-              //                       <!-- Text between angle brackets is an HTML tag and is not displayed.
+                  //                       <!-- Text between angle brackets is an HTML tag and is not displayed.
-              //                       Most tags, such as the HTML and /HTML tags that surround the contents of
+                  //                       Most tags, such as the HTML and /HTML tags that surround the contents of
-              //                       a page, come in pairs; some tags, like HR, for a horizontal rule, stand
+                  //                       a page, come in pairs; some tags, like HR, for a horizontal rule, stand
-              //                       alone. Comments, such as the text you're reading, are not displayed when
+                  //                       alone. Comments, such as the text you're reading, are not displayed when
-              //                       the Web page is shown. The information between the HEAD and /HEAD tags is
+                  //                       the Web page is shown. The information between the HEAD and /HEAD tags is
-              //                       not displayed. The information between the BODY and /BODY tags is displayed.-->
+                  //                       not displayed. The information between the BODY and /BODY tags is displayed.-->
-              //                       <head>
+                  //                       <head>
-              //                       <title>Enter a title, displayed at the top of the window.</title>
+                  //                       <title>Enter a title, displayed at the top of the window.</title>
-              //                       </head>
+                  //                       </head>
-              //                       <!-- The information between the BODY and /BODY tags is displayed.-->
+                  //                       <!-- The information between the BODY and /BODY tags is displayed.-->
-              //                       <body>
+                  //                       <body>
-              //                       <h1>Enter the main heading, usually the same as the title.</h1>
+                  //                       <h1>Enter the main heading, usually the same as the title.</h1>
-              //                       <p>Be <b>bold</b> in stating your key points. Put them in a list: </p>
+                  //                       <p>Be <b>bold</b> in stating your key points. Put them in a list: </p>
-              //                       <ul>
+                  //                       <ul>
-              //                       <li>The first item in your list</li>
+                  //                       <li>The first item in your list</li>
-              //                       <li>The second item; <i>italicize</i> key words</li>
+                  //                       <li>The second item; <i>italicize</i> key words</li>
-              //                       </ul>
+                  //                       </ul>
-              //                       <p>Improve your image by including an image. </p>
+                  //                       <p>Improve your image by including an image. </p>
-              //                       <p><img src="http://www.mygifs.com/CoverImage.gif" alt="A Great HTML Resource"></p>
+                  //                       <p><img src="http://www.mygifs.com/CoverImage.gif" alt="A Great HTML Resource"></p>
-              //                       <p>Add a link to your favorite <a href="https://www.dummies.com/">Web site</a>.
+                  //                       <p>Add a link to your favorite <a href="https://www.dummies.com/">Web site</a>.
-              //                       Break up your page with a horizontal rule or two. </p>
+                  //                       Break up your page with a horizontal rule or two. </p>
-              //                       <hr>
+                  //                       <hr>
-              //                       <p>Finally, link to <a href="page2.html">another page</a> in your own Web site.</p>
+                  //                       <p>Finally, link to <a href="page2.html">another page</a> in your own Web site.</p>
-              //                       <!-- And add a copyright notice.-->
+                  //                       <!-- And add a copyright notice.-->
-              //                       <p>© Wiley Publishing, 2011</p>
+                  //                       <p>© Wiley Publishing, 2011</p>
-              //                       </body>
+                  //                       </body>
-              //                     </html>
+                  //                     </html>
-              //                 """,
+                  //                 """,
-              //             ),
+                  //             ),
-              //           ),
+                  //           ),
-              //           // ),
+                  //           // ),
-              //           // Checkbox(
+                  //           // Checkbox(
-              //           //   value: _readStatus[index],
+                  //           //   value: _readStatus[index],
-              //           //   onChanged: (bool? value) {
+                  //           //   onChanged: (bool? value) {
-              //           //     _toggleReadStatus(index);
+                  //           //     _toggleReadStatus(index);
-              //           //   },
+                  //           //   },
-              //           // ),
+                  //           // ),
-              //         ],
+                  //         ],
-              //       ),
+                  //       ),
-              //     );
+                  //     );
-              //   },
+                  //   },
-              // ),
+                  // ),
-              Html(
+                  htmlBody(),
-                style: {"body": Style(color: const Color.fromRGBO(0, 0, 0, 1))},
-                // data: widget.paragraphs,
-                data: _htmlContent,
-                extensions: [
-                  TagExtension(
-                    tagsToExtend: {"img"},
-                    builder: (ExtensionContext context) {
-                      final attrs = context.attributes;
-                      final src = attrs['src'] ?? '';
-
-                      if (src.isNotEmpty) {
-                        if (src.startsWith('assets/html/')) {
-                          return Image.asset(
-                            src,
-                            width: 100,
-                            errorBuilder:
-                                (context, error, stackTrace) =>
-                                    const Text('Image not found'),
-                          );
-                        } else if (!src.startsWith('http')) {
-                          return Image.asset(
-                            'assets/images/$src',
-                            width: 100,
-                            errorBuilder:
-                                (context, error, stackTrace) =>
-                                    const Text('Image not found'),
-                          );
-                        } else {
-                          return Image.network(
-                            src,
-                            width: 100,
-                            errorBuilder:
-                                (context, error, stackTrace) =>
-                                    const Text('Image failed to load'),
-                          );
-                        }
-                      }
-                      return const SizedBox();
-                    },
-                  ),
-                ],
-              ),
             ),
           ),
         ],
@@ -218,4 +181,71 @@ class _ListDetailScreenState extends State<ListDetailScreen> {
       // ),
     );
   }
+
+  Html htmlBody() {
+    return Html(
+      style: {"body": Style(color: const Color.fromRGBO(0, 0, 0, 1))},
+      // data: widget.paragraphs,
+      data: _htmlContent,
+      extensions: [
+        TagExtension(
+          tagsToExtend: {"img"},
+          builder: (ExtensionContext context) {
+            final attrs = context.attributes;
+            final src = attrs['src'] ?? '';
+
+            if (src.isNotEmpty) {
+              if (src.startsWith('assets/html/')) {
+                return Image.asset(
+                  src,
+                  width: 100,
+                  errorBuilder:
+                      (context, error, stackTrace) =>
+                          const Text('Image not found'),
+                );
+              } else if (!src.startsWith('http')) {
+                return Image.asset(
+                  'assets/images/$src',
+                  width: 100,
+                  errorBuilder:
+                      (context, error, stackTrace) =>
+                          const Text('Image not found'),
+                );
+              } else {
+                return Image.network(
+                  src,
+                  width: 100,
+                  errorBuilder:
+                      (context, error, stackTrace) =>
+                          const Text('Image failed to load'),
+                );
+              }
+            }
+            return const SizedBox();
+          },
+        ),
+        TagExtension(
+          tagsToExtend: {"gizi-grid"},
+          builder: (context) {
+            final spans = context.inlineSpanChildren ?? [];
+
+            final widgets =
+                spans.map((span) {
+                  if (span is WidgetSpan) return span.child;
+                  return const SizedBox();
+                }).toList();
+
+            return Wrap(
+              spacing: 12,
+              runSpacing: 12,
+              children:
+                  widgets.map((child) {
+                    return SizedBox(width: 160, child: child);
+                  }).toList(),
+            );
+          },
+        ),
+      ],
+    );
+  }
 }

lib/screen/pustaka_screen copy 2.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
-import 'package:furibase/components/buildcard_info.dart';
+import 'package:freekake/components/buildcard_info.dart';
-import 'package:furibase/components/collection_container.dart';
+import 'package:freekake/components/collection_container.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/pustaka/list_education.dart';
+import 'package:freekake/screen/pustaka/list_education.dart';
 
 class PustakaScreen extends StatefulWidget {
   const PustakaScreen({super.key});

lib/screen/pustaka_screen copy 3.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
-import 'package:furibase/components/buildcard_info.dart';
+import 'package:freekake/components/buildcard_info.dart';
-import 'package:furibase/components/collection_container.dart';
+import 'package:freekake/components/collection_container.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/pustaka/list_education.dart';
+import 'package:freekake/screen/pustaka/list_education.dart';
 
 class PustakaScreen extends StatefulWidget {
   const PustakaScreen({super.key});

lib/screen/pustaka_screen copy.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
-import 'package:furibase/components/buildcard_info.dart';
+import 'package:freekake/components/buildcard_info.dart';
-import 'package:furibase/components/collection_container.dart';
+import 'package:freekake/components/collection_container.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/pustaka/list_education.dart';
+import 'package:freekake/screen/pustaka/list_education.dart';
 
 class PustakaScreen extends StatefulWidget {
   const PustakaScreen({super.key});

lib/screen/pustaka_screen.dart

@@ -7,14 +7,6 @@ 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});
@@ -63,204 +55,211 @@ class _PustakaScreenState extends State<PustakaScreen> {
 
     return Scaffold(
       backgroundColor: const Color.fromARGB(255, 255, 255, 255),
-      body: Stack(
+      body: pustakaBody(
-        children: [
+        filteredCollections,
-          //Top Bar
+        context,
-          Positioned(
+        bottomPadding,
-            top: 0,
+        screenWidth,
-            left: 0,
+        buttonScanSize,
-            right: 0,
+      ),
-            child: SizedBox(height: 130, child: TopbarContainer()),
+    );
-          ),
+  }
-          Column(
+
-            children: [
+  Stack pustakaBody(
-              // Header Section
+    List<Map<String, dynamic>> filteredCollections,
-              Container(
+    BuildContext context,
-                padding: const EdgeInsets.all(10),
+    double bottomPadding,
-                color: const Color.fromARGB(
+    double screenWidth,
-                  250,
+    double buttonScanSize,
-                  255,
+  ) {
-                  255,
+    return Stack(
-                  255,
+      children: [
-                ).withOpacity(0.0),
+        //Top Bar
+        Positioned(
+          top: 0,
+          left: 0,
+          right: 0,
+          child: SizedBox(height: 130, child: TopbarContainer()),
+        ),
+        Column(
+          children: [
+            // Header Section
+            Container(
+              padding: const EdgeInsets.all(10),
+              color: const Color.fromARGB(250, 255, 255, 255).withOpacity(0.0),
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                children: [
+                  BuildcardInfo(
+                    icon: Icons.person,
+                    text: 'User01',
+                    extraIcon: Icons.emoji_events,
+                    extraText: "5000",
+                    width: 180,
+                  ),
+                  BuildcardInfo(
+                    icon: Icons.monetization_on,
+                    text: "1.300",
+                    width: 90,
+                  ),
+                ],
+              ),
+            ),
+
+            // // Date Display
+            // Padding(
+            //   padding: const EdgeInsets.symmetric(vertical: 10),
+            //   child: Text(
+            //     DateTime.now().toString(),
+            //     style: const TextStyle(color: Colors.white),
+            //   ),
+            // ),
+
+            // Search Bar
+            Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 40, vertical: 10),
+              child: Container(
+                height: 47,
+                decoration: BoxDecoration(
+                  borderRadius: BorderRadius.circular(20),
+                  color: const Color.fromARGB(255, 237, 227, 227),
+                ),
+                padding: const EdgeInsets.symmetric(horizontal: 15),
                 child: Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
                   children: [
-                    BuildcardInfo(
+                    const Icon(Icons.search, color: Colors.black54, size: 18),
-                      icon: Icons.person,
+                    const SizedBox(width: 8),
-                      text: 'User01',
+                    Expanded(
-                      extraIcon: Icons.emoji_events,
+                      child: TextField(
-                      extraText: "5000",
+                        controller: _searchController,
-                      width: 180,
+                        onChanged: (value) {
-                    ),
+                          setState(() {
-                    BuildcardInfo(
+                            _searchQuery = value;
-                      icon: Icons.monetization_on,
+                          });
-                      text: "1.300",
+                        },
-                      width: 90,
+                        style: const TextStyle(
+                          color: Colors.black,
+                          fontSize: 12,
+                        ),
+                        decoration: const InputDecoration(
+                          border: InputBorder.none,
+                          hintText: 'Cari konten...',
+                          hintStyle: TextStyle(color: Colors.grey),
+                        ),
+                      ),
                     ),
                   ],
                 ),
               ),
-
+            ),
-              // // Date Display
+            // Collection Items
-              // Padding(
+            SizedBox(
-              //   padding: const EdgeInsets.symmetric(vertical: 10),
+              height: 440,
-              //   child: Text(
+              child: Padding(
-              //     DateTime.now().toString(),
-              //     style: const TextStyle(color: Colors.white),
-              //   ),
-              // ),
-
-              // Search Bar
-              Padding(
                 padding: const EdgeInsets.symmetric(
-                  horizontal: 40,
+                  horizontal: 58,
-                  vertical: 10,
+                  vertical: 60,
                 ),
-                child: Container(
+                child: GridView.builder(
-                  height: 47,
+                  gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent(
-                  decoration: BoxDecoration(
+                    maxCrossAxisExtent: 140,
-                    borderRadius: BorderRadius.circular(20),
+                    mainAxisSpacing: 20,
-                    color: const Color.fromARGB(255, 237, 227, 227),
+                    crossAxisSpacing: 20,
+                    childAspectRatio: 1, // 1:1 rasio (kotak)
                   ),
-                  padding: const EdgeInsets.symmetric(horizontal: 15),
+                  itemCount: filteredCollections.length,
-                  child: Row(
+                  itemBuilder: (context, index) {
-                    children: [
+                    final item = filteredCollections[index];
-                      const Icon(Icons.search, color: Colors.black54, size: 18),
+                    return CollectionContainer(
-                      const SizedBox(width: 8),
+                      label: item["label"]!,
-                      Expanded(
-                        child: TextField(
-                          controller: _searchController,
-                          onChanged: (value) {
-                            setState(() {
-                              _searchQuery = value;
-                            });
-                          },
-                          style: const TextStyle(
-                            color: Colors.black,
-                            fontSize: 12,
-                          ),
-                          decoration: const InputDecoration(
-                            border: InputBorder.none,
-                            hintText: 'Cari konten...',
-                            hintStyle: TextStyle(color: Colors.grey),
-                          ),
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-              ),
-              // Collection Items
-              Container(
-                height: 440,
-                child: Padding(
-                  padding: const EdgeInsets.symmetric(
-                    horizontal: 58,
-                    vertical: 60,
-                  ),
-                  child: GridView.builder(
-                    gridDelegate:
-                        const SliverGridDelegateWithMaxCrossAxisExtent(
-                          maxCrossAxisExtent: 140,
-                          mainAxisSpacing: 20,
-                          crossAxisSpacing: 20,
-                          childAspectRatio: 1, // 1:1 rasio (kotak)
-                        ),
-                    itemCount: filteredCollections.length,
-                    itemBuilder: (context, index) {
-                      final item = filteredCollections[index];
-                      return CollectionContainer(
-                        label: item["label"]!,
                         lblSize: 11,
-                        imageSvg: item["image"]!,
+                      imageSvg: item["image"]!,
-                        width: 30,
+                      width: 30,
-                        height: 80,
+                      height: 80,
-                        textColor: Colors.black,
+                      textColor: Colors.black,
-                        circle: true,
+                      circle: true,
-                        colorContiner: ColorHelper.hexToColor(item["color"]),
+                      colorContiner: ColorHelper.hexToColor(item["color"]),
-                        onTapAc: () {
+                      onTapAc: () {
-                          Navigator.push(
+                        Navigator.push(
-                            context,
+                          context,
-                            MaterialPageRoute(
+                          MaterialPageRoute(
-                              builder: (_) => const ListEducation(),
+                            builder: (_) => const ListEducation(),
-                            ),
+                          ),
-                          );
+                        );
-                        },
+                      },
-                      );
+                    );
-                    },
+                  },
-                  ),
                 ),
               ),
-              SizedBox(
+            ),
-                child: Padding(
+            // SizedBox(
-                  padding: const EdgeInsets.symmetric(
+            //   child: Padding(
-                    horizontal: 40,
+            //     padding: const EdgeInsets.symmetric(
-                    vertical: 1,
+            //       horizontal: 5,
-                  ),
+            //       vertical: 1,
-                  child: Column(
+            //     ),
-                    crossAxisAlignment: CrossAxisAlignment.start,
+            //     child: Column(
-                    children: [
+            //       crossAxisAlignment: CrossAxisAlignment.start,
-                      Text("Daftar Topik", style: TextStyle(color: Colors.black)),
+            //       children: [
-                      Divider(color: Colors.transparent),
+            //         Text("List Topic", style: TextStyle(color: Colors.black)),
-                    ],
+            //         Divider(color: Colors.transparent),
-                  ),
+            //       ],
-                ),
+            //     ),
-              ),
+            //   ),
-              // Horizontal Scroll List
+            // ),
-              Padding(
+            // Horizontal Scroll List
-                padding: EdgeInsets.symmetric(horizontal: 5, vertical: 5),
+            Padding(
-                child: SizedBox(
+              padding: EdgeInsets.symmetric(horizontal: 5, vertical: 5),
-                  width: MediaQuery.of(context).size.width,
+              child: SizedBox(
-                  height: 100,
+                width: MediaQuery.of(context).size.width,
-                  child: SingleChildScrollView(
+                height: 100,
-                    scrollDirection: Axis.horizontal,
+                child: SingleChildScrollView(
-                    child: Row(
+                  scrollDirection: Axis.horizontal,
-                      children: List.generate(
+                  child: Row(
-                        10,
+                    children: List.generate(
-                        (index) => Padding(
+                      10,
-                          padding: const EdgeInsets.symmetric(horizontal: 8.0),
+                      (index) => Padding(
-                          child: Card(
+                        padding: const EdgeInsets.symmetric(horizontal: 8.0),
-                            shape: RoundedRectangleBorder(
+                        child: Card(
-                              borderRadius: BorderRadius.circular(10.0),
+                          shape: RoundedRectangleBorder(
-                            ),
+                            borderRadius: BorderRadius.circular(10.0),
-                            elevation: 5,
+                          ),
-                            color: ColorHelper.hexToColor("#efd8c6"),
+                          elevation: 5,
-                            // color: const Color.fromARGB(140, 255, 255, 255),
+                          color: ColorHelper.hexToColor("#efd8c6"),
-                            // shape: RoundedRectangleBorder(
+                          // color: const Color.fromARGB(140, 255, 255, 255),
-                            //   borderRadius: BorderRadius.circular(15),
+                          // shape: RoundedRectangleBorder(
-                            // ),
+                          //   borderRadius: BorderRadius.circular(15),
-                            child: GestureDetector(
+                          // ),
-                              onTap:
+                          child: GestureDetector(
-                                  () => {
+                            onTap:
-                                    Navigator.push(
+                                () => {
-                                      context,
+                                  Navigator.push(
-                                      MaterialPageRoute(
+                                    context,
-                                        builder: (context) => ListEducation(),
+                                    MaterialPageRoute(
-                                      ),
+                                      builder: (context) => ListEducation(),
                                     ),
-                                  },
+                                  ),
-                              child: Container(
+                                },
-                                width: 80,
+                            child: Container(
-                                padding: const EdgeInsets.all(10),
+                              width: 80,
-                                child: Column(
+                              padding: const EdgeInsets.all(10),
-                                  mainAxisAlignment: MainAxisAlignment.center,
+                              child: Column(
-                                  children: [
+                                mainAxisAlignment: MainAxisAlignment.center,
-                                    Icon(
+                                children: [
-                                      Icons.book,
+                                  Icon(
-                                      size: 50,
+                                    Icons.book,
-                                      color: Colors.blueAccent,
+                                    size: 50,
-                                    ),
+                                    color: Colors.blueAccent,
-                                    Text(
+                                  ),
-                                      'Topik ' + (index + 1).toString(),
+                                  Text(
-                                      style: const TextStyle(
+                                    'Topik ${index + 1}',
-                                        fontWeight: FontWeight.bold,
+                                    style: const TextStyle(
+                                      fontWeight: FontWeight.bold,
                                         fontSize: 11,
-                                        color: Color.fromARGB(255, 0, 0, 0),
+                                      color: Color.fromARGB(255, 0, 0, 0),
-                                      ),
                                     ),
-                                  ],
+                                  ),
-                                ),
+                                ],
                               ),
                             ),
                           ),
@@ -270,32 +269,32 @@ class _PustakaScreenState extends State<PustakaScreen> {
                   ),
                 ),
               ),
-              // Bottom Navigation
-              // MainMenu(),
-            ],
-          ),
-          // BG MEnu
-          Stack(
-            children: [
-              Positioned(
-                bottom: 0,
-                left: 0,
-                right: 0,
-                child: SizedBox(height: 85, child: BottomNavbar()),
-              ),
-              Positioned(bottom: 0, left: 0, right: 0, child: MainMenu()),
-            ],
-          ),
-          Positioned(
-            bottom: bottomPadding * 98,
-            left: (screenWidth - buttonScanSize) / 2,
-            child: Transform.translate(
-              offset: Offset(0, -20),
-              child: ScanButton(),
             ),
+            // Bottom Navigation
+            // MainMenu(),
+          ],
+        ),
+        // BG MEnu
+        Stack(
+          children: [
+            Positioned(
+              bottom: 0,
+              left: 0,
+              right: 0,
+              child: SizedBox(height: 85, child: BottomNavbar()),
+            ),
+            Positioned(bottom: 0, left: 0, right: 0, child: MainMenu()),
+          ],
+        ),
+        Positioned(
+          bottom: bottomPadding * 98,
+          left: (screenWidth - buttonScanSize) / 2,
+          child: Transform.translate(
+            offset: Offset(0, -20),
+            child: ScanButton(),
           ),
-        ],
+        ),
-      ),
+      ],
     );
   }
 }

lib/screen/saya/akun_saya.dart

@@ -10,6 +10,8 @@ import 'dart:io';
 import 'package:flutter/foundation.dart' show kIsWeb;
 
 class AkunSaya extends StatefulWidget {
+  const AkunSaya({super.key});
+
   @override
   _AkunSayaState createState() => _AkunSayaState();
 }
@@ -72,7 +74,7 @@ class _AkunSayaState extends State<AkunSaya> {
                 height: MediaQuery.of(context).size.height * 0.7,
                 width: MediaQuery.of(context).size.width,
                 decoration: BoxDecoration(
-                  color: const Color.fromARGB(255, 205, 202, 189),
+                  color: const Color.fromARGB(255, 212, 211, 208),
                   borderRadius: BorderRadius.only(
                     topLeft: Radius.circular(20),
                     topRight: Radius.circular(20),

lib/screen/saya/profile_screen copy.dart

@@ -2,10 +2,10 @@ import 'dart:typed_data';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_html/flutter_html.dart';
-import 'package:furibase/components/bottom_navbar.dart';
+import 'package:freekake/components/bottom_navbar.dart';
-import 'package:furibase/components/main_menu.dart';
+import 'package:freekake/components/main_menu.dart';
-import 'package:furibase/components/scan_button.dart';
+import 'package:freekake/components/scan_button.dart';
-import 'package:furibase/screen/saya/akun_saya.dart';
+import 'package:freekake/screen/saya/akun_saya.dart';
 import 'package:image_picker/image_picker.dart';
 import 'dart:io';
 
@@ -13,6 +13,8 @@ import 'package:image_picker_web/image_picker_web.dart';
 import 'package:flutter/foundation.dart' show kIsWeb;
 
 class ProfileScreenCopy extends StatefulWidget {
+  const ProfileScreenCopy({super.key});
+
   @override
   _ProfileScreenState createState() => _ProfileScreenState();
 }

lib/screen/saya/profile_screen.dart

@@ -1,7 +1,7 @@
 import 'dart:typed_data';
 
 import 'package:flutter/material.dart';
-import 'package:flutter_html/flutter_html.dart';
+// import 'package:flutter_html/flutter_html.dart';
 import 'package:freekake/components/bottom_navbar.dart';
 import 'package:freekake/components/main_menu.dart';
 import 'package:freekake/components/scan_button.dart';
@@ -13,6 +13,8 @@ import 'dart:io';
 import 'package:flutter/foundation.dart' show kIsWeb;
 
 class ProfileScreen extends StatefulWidget {
+  const ProfileScreen({super.key});
+
   @override
   _ProfileScreenState createState() => _ProfileScreenState();
 }

test/widget_test.dart

@@ -8,7 +8,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import 'package:furibase/main.dart';
+import 'package:freekake/main.dart';
 
 void main() {
   testWidgets('Counter increments smoke test', (WidgetTester tester) async {