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

android/app/build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 android {
     namespace = "com.example.furibase"
     //compileSdk = flutter.compileSdkVersion
-    compileSdk = 34
+    compileSdk = 35
     ndkVersion = "27.0.12077973"
     //ndkVersion = flutter.ndkVersion
 
@@ -29,7 +29,7 @@ android {
         //minSdk = flutter.minSdkVersion
         //targetSdk = flutter.targetSdkVersion
         minSdk = 24 // Set to 24 or higher
-        targetSdk = 34
+        targetSdk = 35
         versionCode = flutter.versionCode
         versionName = flutter.versionName
     }

lib/components/card_list.dart

@@ -19,7 +19,7 @@ class CardList extends StatelessWidget {
                 10.0,
               ), // Opsional: membuat gambar lebih rounded
               child: Image.asset(
-                'images/cepott.png', // Ganti dengan path gambar Anda
+                'assets/images/cepott.png', // Ganti dengan path gambar Anda
                 width: 80, // Atur ukuran gambar
                 height: 120,
                 fit: BoxFit.cover,

lib/components/collection_container copy.dart

@@ -13,6 +13,7 @@ class CollectionContainer extends StatelessWidget {
   final Color? textColor;
   final double? lblSize;
   final bool? circle;
+  final Color? colorContiner;
   const CollectionContainer({
     super.key,
     this.label,
@@ -26,6 +27,7 @@ class CollectionContainer extends StatelessWidget {
     this.iconw,
     this.lblSize,
     this.circle,
+    this.colorContiner,
   });
 
   @override
@@ -96,7 +98,7 @@ class CollectionContainer extends StatelessWidget {
                                 width: 20,
                                 height: 20,
                                 colorFilter: const ColorFilter.mode(
-                                  Color.fromARGB(255, 118, 3, 3),
+                                  Color.fromARGB(255, 255, 255, 255),
                                   BlendMode.srcIn,
                                 ),
                               ),

lib/components/collection_container.dart

@@ -14,6 +14,7 @@ class CollectionContainer extends StatelessWidget {
   final double? lblSize;
   final bool? circle;
   final Color? colorContiner;
+  final bool? small;
 
   const CollectionContainer({
     Key? key,
@@ -29,6 +30,7 @@ class CollectionContainer extends StatelessWidget {
     this.lblSize,
     this.circle,
     this.colorContiner,
+    this.small,
   }) : super(key: key);
 
   @override
@@ -55,7 +57,10 @@ class CollectionContainer extends StatelessWidget {
                 padding: const EdgeInsets.all(8.0),
                 child: Center(
                   child: Padding(
-                    padding: const EdgeInsets.only(bottom: 30.0),
+                    padding:
+                        (small ?? false)
+                            ? const EdgeInsets.only(bottom: 5.0)
+                            : const EdgeInsets.only(bottom: 30.0),
                     child:
                         imageSvg != null && imageSvg!.isNotEmpty
                             ? Container(
@@ -72,9 +77,10 @@ class CollectionContainer extends StatelessWidget {
                                       )
                                       : null,
                               child: Padding(
-                                padding: const EdgeInsets.all(
+                                padding:
-                                  8.0,
+                                    (small ?? false)
-                                ), // Tambahkan padding di sini
+                                        ? const EdgeInsets.all(1.0)
+                                        : const EdgeInsets.all(8.0),
                                 child: SvgPicture.asset(
                                   imageSvg!,
                                   width: iconw ?? 40,
@@ -102,7 +108,7 @@ class CollectionContainer extends StatelessWidget {
                 ),
               ),
               Positioned(
-                bottom: 10,
+                bottom: (small ?? false) ? 0 : 10,
                 left: 0,
                 right: 0,
                 child: Text(

lib/components/scan_button.dart

@@ -7,8 +7,9 @@ class ScanButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Expanded(
+    return Container(
-      child: Container(
+      width: 86,
+      height: 86,
       decoration: BoxDecoration(
         shape: BoxShape.circle,
         color: const Color.fromARGB(223, 67, 63, 179),
@@ -26,7 +27,6 @@ class ScanButton extends StatelessWidget {
         ),
         onPressed: () {},
       ),
-      ),
     );
   }
 }

lib/components/tab_menu.dart

@@ -24,8 +24,8 @@ class TabMenuButton extends StatelessWidget {
           IconButton(
             icon: SvgPicture.asset(
               icon!,
-              width: 28,
+              width: 20,
-              height: 28,
+              height: 20,
               colorFilter: ColorFilter.mode(
                 isSelected
                     ? const Color.fromARGB(255, 106, 24, 207)
@@ -38,7 +38,7 @@ class TabMenuButton extends StatelessWidget {
         GestureDetector(
           onTap: onPress, // Menggunakan satu event handler saja
           child: Container(
-            width: 120,
+            width: 110,
             padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
             decoration: BoxDecoration(
               color:

lib/main.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:freekake/components/navbar_container.dart';
 import 'package:freekake/providers/character_provider.dart';
 import 'package:freekake/screen/Home_screen.dart';
@@ -6,6 +7,9 @@ import 'package:freekake/screen/drraw_screen.dart';
 import 'package:provider/provider.dart';
 
 void main() {
+  WidgetsFlutterBinding.ensureInitialized();
+
+  SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersiveSticky);
   runApp(const MyApp());
 }
 

lib/screen/Home_screen.dart

@@ -73,21 +73,16 @@ class _HomeScreenState extends State<HomeScreen> {
       body: Stack(
         children: <Widget>[
           Positioned.fill(
-            child: UnityWidget(
+            child: RepaintBoundary(
-              onUnityCreated: onUnityCreated,
+              child: Container(
-              //isARScene: true,
+                decoration: const BoxDecoration(
-              onUnityMessage: onUnityMessage,
+                  image: const DecorationImage(
-              //onUnitySceneLoaded: onUnitySceneLoaded,
+                    image: AssetImage("assets/images/background.jpeg"),
-              fullscreen: false,
+                    fit: BoxFit.cover,
+                  ),
+                ),
+              ),
             ),
-            // child: Container(
-            //   decoration: BoxDecoration(
-            //     image: DecorationImage(
-            //       image: AssetImage("assets/images/background.jpeg"),
-            //       fit: BoxFit.cover,
-            //     ),
-            //   ),
-            // ),
           ),
           // Positioned(
           //   top: 0,
@@ -200,40 +195,40 @@ class _HomeScreenState extends State<HomeScreen> {
               ],
             ),
           ),
-          // Positioned(
+          Positioned(
-          //   bottom: 150,
+            bottom: 150,
-          //   left: 0,
+            left: 0,
-          //   right: 0,
+            right: 0,
-          //   child: Column(
+            child: Column(
-          //     children: [
+              children: [
-          //       Container(
+                Container(
-          //         padding: EdgeInsets.symmetric(horizontal: 20, vertical: 10),
+                  padding: EdgeInsets.symmetric(horizontal: 20, vertical: 10),
-          //         decoration: BoxDecoration(
+                  decoration: BoxDecoration(
-          //           color: Color.fromARGB(255, 247, 224, 236),
+                    color: Color.fromARGB(255, 247, 224, 236),
-          //           borderRadius: BorderRadius.circular(10),
+                    borderRadius: BorderRadius.circular(10),
-          //           boxShadow: [
+                    boxShadow: [
-          //             BoxShadow(
+                      BoxShadow(
-          //               color: Color.fromARGB(255, 214, 213, 121),
+                        color: Color.fromARGB(255, 214, 213, 121),
-          //               blurRadius: 5,
+                        blurRadius: 5,
-          //               spreadRadius: 2,
+                        spreadRadius: 2,
-          //             ),
+                      ),
-          //           ],
+                    ],
-          //         ),
+                  ),
-          //         child: Text(
+                  child: Text(
-          //           "Halo....Jotaslim",
+                    "Halo....Jotaslim",
-          //           style: TextStyle(
+                    style: TextStyle(
-          //             fontSize: 12,
+                      fontSize: 12,
-          //             fontWeight: FontWeight.bold,
+                      fontWeight: FontWeight.bold,
-          //             color: Color(0xFF000000),
+                      color: Color(0xFF000000),
-          //           ),
+                    ),
-          //         ),
+                  ),
-          //       ),
+                ),
-          //       SizedBox(height: 10),
+                SizedBox(height: 10),
-          //       setHomeImage("images/luffy.png", 300),
+                setHomeImage("assets/images/luffy.png", 300),
-          //       // Image.asset("images/luffy.png", width: 300),
+                // Image.asset("images/luffy.png", width: 300),
-          //     ],
+              ],
-          //   ),
+            ),
-          // ),
+          ),
           // BG MEnu
           Stack(
             children: [
@@ -247,8 +242,8 @@ class _HomeScreenState extends State<HomeScreen> {
           ),
           Positioned(bottom: 0, left: 0, right: 0, child: MainMenu()),
           Positioned(
-            bottom: 1,
+            bottom: 5,
-            left: MediaQuery.of(context).size.width / 2 - 48,
+            left: MediaQuery.of(context).size.width / 2 - 43,
             child: Transform.translate(
               offset: Offset(0, -20),
               child: ScanButton(),

lib/screen/collection/collection_caracter_screen.dart

@@ -24,7 +24,9 @@ class _CollectionCaraterScreenState extends State<CollectionCaraterScreen> {
               children: [
                 Text("Favorit", style: TextStyle(color: Colors.black)),
                 Divider(height: 20, color: Colors.transparent),
-                Row(
+                SingleChildScrollView(
+                  scrollDirection: Axis.horizontal,
+                  child: Row(
                     // alignment: WrapAlignment.spaceAround,
                     spacing: 10, // Horizontal spacing between the containers
                     // runSpacing: 10, // Vertical spacing between lines
@@ -42,10 +44,13 @@ class _CollectionCaraterScreenState extends State<CollectionCaraterScreen> {
                       ),
                     ],
                   ),
+                ),
                 Divider(height: 20, color: Colors.transparent),
                 Text("Semua", style: TextStyle(color: Colors.black)),
                 Divider(height: 20, color: Colors.transparent),
-                Row(
+                SingleChildScrollView(
+                  scrollDirection: Axis.horizontal,
+                  child: Row(
                     // alignment: WrapAlignment.spaceAround,
                     spacing: 10, // Horizontal spacing between the containers
                     // runSpacing: 10, // Vertical spacing between lines
@@ -69,6 +74,7 @@ class _CollectionCaraterScreenState extends State<CollectionCaraterScreen> {
                       ),
                     ],
                   ),
+                ),
               ],
             ),
           ),

lib/screen/collection/collection_skin_screen.dart

@@ -11,8 +11,9 @@ class CollectionSkinScreen extends StatefulWidget {
 class _CollectionSkinScreenState extends State<CollectionSkinScreen> {
   @override
   Widget build(BuildContext context) {
-    return SingleChildScrollView(
+    return Container(
-      scrollDirection: Axis.horizontal,
+      // scrollDirection: Axis.horizontal,
+      height: MediaQuery.of(context).size.height,
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
@@ -21,14 +22,13 @@ class _CollectionSkinScreenState extends State<CollectionSkinScreen> {
             padding: EdgeInsets.only(top: 40, left: 20, right: 20, bottom: 20),
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
-
               children: [
                 Text("Luffy", style: TextStyle(color: Colors.black)),
                 Divider(height: 10),
-                Row(
+                SingleChildScrollView(
-                  // alignment: WrapAlignment.start,
+                  scrollDirection: Axis.horizontal,
+                  child: Row(
                     spacing: 10, // Horizontal spacing between the containers
-                  // runSpacing: 10, // Vertical spacing between lines
                     children: [
                       CollectionContainer(
                         label: "Luffy Kimono",
@@ -51,13 +51,14 @@ class _CollectionSkinScreenState extends State<CollectionSkinScreen> {
                       ),
                     ],
                   ),
+                ),
                 Divider(height: 20, color: Colors.transparent),
                 Text("Lainnya", style: TextStyle(color: Colors.black)),
                 Divider(height: 10),
-                Row(
+                SingleChildScrollView(
-                  // alignment: WrapAlignment.start,
+                  scrollDirection: Axis.horizontal,
-                  spacing: 10, // Horizontal spacing between the containers
+                  child: Row(
-                  // runSpacing: 10, // Vertical spacing between lines
+                    spacing: 10,
                     children: [
                       CollectionContainer(
                         label: "Oni Chan (Default)",
@@ -72,6 +73,7 @@ class _CollectionSkinScreenState extends State<CollectionSkinScreen> {
                       ),
                     ],
                   ),
+                ),
               ],
             ),
           ),

lib/screen/koleksi_screen.dart

@@ -36,6 +36,7 @@ class _KoleksiScreenState extends State<KoleksiScreen> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
+      extendBody: true,
       body: Stack(
         children: <Widget>[
           Positioned.fill(
@@ -115,9 +116,9 @@ class _KoleksiScreenState extends State<KoleksiScreen> {
           //   ),
           // ),
           Positioned(
-            top: 80,
+            top: 70,
-            left: 40,
+            left: 10,
-            right: 40,
+            right: 10,
             child: Container(
               // decoration: const BoxDecoration(
               //   borderRadius: BorderRadius.all(Radius.circular(20)),
@@ -148,8 +149,8 @@ class _KoleksiScreenState extends State<KoleksiScreen> {
           ),
           Positioned(bottom: 0, left: 0, right: 0, child: MainMenu()),
           Positioned(
-            bottom: 1,
+            bottom: 5,
-            left: MediaQuery.of(context).size.width / 2 - 48,
+            left: MediaQuery.of(context).size.width / 2 - 43,
             child: Transform.translate(
               offset: Offset(0, -20),
               child: ScanButton(),

lib/screen/pustaka/list_education.dart

@@ -5,6 +5,7 @@ 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/screen/pustaka/pustaka_detail_screen.dart';
+import 'package:freekake/helpers/color_helper.dart';
 
 class ListEducation extends StatefulWidget {
   const ListEducation({super.key});
@@ -43,13 +44,33 @@ class _ListEducationState extends State<ListEducation> {
   @override
   Widget build(BuildContext context) {
     String _searchQuery = "";
-    final List<Map<String, String>> _collections = [
+    final List<Map<String, dynamic>> _collections = [
-      {"label": "Kesehatan", "image": "assets/icons/healthy.svg"},
+      {
-      {"label": "Gizi", "image": "assets/icons/Nutrition.svg"},
+        "label": "Kesehatan",
-      {"label": "Pendidikan", "image": "assets/icons/Education.svg"},
+        "image": "assets/icons/healthy.svg",
-      {"label": "Keselamatan", "image": "assets/icons/Safety.svg"},
+        "color": "#cdd0ee",
+        "category": "kesehatan",
+      },
+      {
+        "label": "Gizi",
+        "image": "assets/icons/Nutrition.svg",
+        "color": "#e8e29a",
+        "category": "gizi",
+      },
+      {
+        "label": "Pendidikan",
+        "image": "assets/icons/Education.svg",
+        "color": "#efd8c6",
+        "category": "pendidikan",
+      },
+      {
+        "label": "Keselamatan",
+        "image": "assets/icons/Safety.svg",
+        "color": "#cef1da",
+        "category": "keselamatan",
+      },
     ];
-    List<Map<String, String>> filteredCollections =
+    List<Map<String, dynamic>> filteredCollections =
         _collections
             .where(
               (item) => item["label"]!.toLowerCase().contains(
@@ -66,13 +87,13 @@ class _ListEducationState extends State<ListEducation> {
         ),
         actions: <Widget>[],
       ),
-      backgroundColor: Colors.black26,
+      backgroundColor: const Color.fromARGB(255, 255, 255, 255),
       body: Column(
         children: [
           // Header Section
           Container(
             width: MediaQuery.of(context).size.width,
-            height: 165,
+            height: 150,
             decoration: BoxDecoration(
               color: const Color.fromARGB(225, 79, 76, 182),
               borderRadius: BorderRadius.only(
@@ -85,7 +106,7 @@ class _ListEducationState extends State<ListEducation> {
                 Padding(
                   padding: const EdgeInsets.symmetric(
                     horizontal: 20,
-                    vertical: 20,
+                    vertical: 6,
                   ),
                   child: Container(
                     height: 47,
@@ -141,21 +162,17 @@ class _ListEducationState extends State<ListEducation> {
                         return CollectionContainer(
                           label: item["label"]!,
                           imageSvg: item["image"]!,
-                          iconw: 60,
+                          iconw: 20,
-                          iconh: 60,
+                          iconh: 20,
                           width: 70,
                           height: 70,
-                          circle: false,
                           textColor: Colors.black,
                           lblSize: 10,
+                          colorContiner: ColorHelper.hexToColor(item["color"]),
                           onTapAc:
                               () => {
-                                Navigator.push(
+                                searchController.clear(),
-                                  context,
+                                filterSearch(item["category"]),
-                                  MaterialPageRoute(
-                                    builder: (context) => ListEducation(),
-                                  ),
-                                ),
                               },
                         );
                       }).toList(),

lib/screen/pustaka/pustaka_detail_screen copy.dart

@@ -91,25 +91,25 @@ class _PustakaScreenState extends State<PustakaScreen> {
   final List<Map<String, String>> _collections = [
     {
       "label": "Luffy",
-      "image": "images/luffy.png",
+      "image": "assets/images/luffy.png",
       "description":
           "Karakter utama di One Piece.\nDia adalah bajak laut yang bercita-cita menjadi Raja Bajak Laut.",
     },
     {
       "label": "Oni Chan",
-      "image": "images/klipartz.png",
+      "image": "assets/images/klipartz.png",
       "description":
           "Karakter ikonik dari anime.\nIa dikenal karena sifatnya yang protektif dan penyayang.",
     },
     {
       "label": "Cepot",
-      "image": "images/cepott.png",
+      "image": "assets/images/cepott.png",
       "description":
           "Tokoh wayang golek terkenal.\nCepot dikenal dengan lelucon dan kebijaksanaannya.",
     },
     {
       "label": "Cepot",
-      "image": "images/cepott.png",
+      "image": "assets/images/cepott.png",
       "description":
           "Tokoh wayang golek terkenal.\nCepot dikenal dengan lelucon dan kebijaksanaannya.",
     },

lib/screen/pustaka_screen.dart

@@ -22,10 +22,26 @@ class _PustakaScreenState extends State<PustakaScreen> {
   String _searchQuery = "";
 
   final List<Map<String, dynamic>> _collections = [
-    {"label": "Kesehatan", "image": "assets/icons/healthy.svg", "color": "#cdd0ee"},
+    {
-    {"label": "Gizi", "image": "assets/icons/Nutrition.svg", "color": "#e8e29a"},
+      "label": "Kesehatan",
-    {"label": "Pendidikan", "image": "assets/icons/Education.svg", "color": "#efd8c6"},
+      "image": "assets/icons/healthy.svg",
-    {"label": "Keselamatan", "image": "assets/icons/Safety.svg", "color": "#cef1da"},
+      "color": "#cdd0ee",
+    },
+    {
+      "label": "Gizi",
+      "image": "assets/icons/Nutrition.svg",
+      "color": "#e8e29a",
+    },
+    {
+      "label": "Pendidikan",
+      "image": "assets/icons/Education.svg",
+      "color": "#efd8c6",
+    },
+    {
+      "label": "Keselamatan",
+      "image": "assets/icons/Safety.svg",
+      "color": "#cef1da",
+    },
   ];
 
   void _onMenuTapped(int index) {
@@ -110,7 +126,7 @@ class _PustakaScreenState extends State<PustakaScreen> {
                   height: 47,
                   decoration: BoxDecoration(
                     borderRadius: BorderRadius.circular(20),
-                    color: const Color.fromARGB(50, 237, 227, 227),
+                    color: const Color.fromARGB(255, 237, 227, 227),
                   ),
                   padding: const EdgeInsets.symmetric(horizontal: 15),
                   child: Row(
@@ -141,16 +157,17 @@ class _PustakaScreenState extends State<PustakaScreen> {
                 ),
               ),
               // Collection Items
-              Expanded(
+              Container(
+                height: 440,
                 child: Padding(
                   padding: const EdgeInsets.symmetric(
-                    horizontal: 100,
+                    horizontal: 58,
-                    vertical: 40,
+                    vertical: 60,
                   ),
                   child: GridView.builder(
                     gridDelegate:
                         const SliverGridDelegateWithMaxCrossAxisExtent(
-                          maxCrossAxisExtent: 140, // Maksimum lebar tiap item
+                          maxCrossAxisExtent: 140,
                           mainAxisSpacing: 20,
                           crossAxisSpacing: 20,
                           childAspectRatio: 1, // 1:1 rasio (kotak)
@@ -177,52 +194,27 @@ class _PustakaScreenState extends State<PustakaScreen> {
                         },
                       );
                     },
-                    // GridView.count(
+                  ),
-                    // crossAxisCount: 2,
+                ),
-                    // crossAxisSpacing: 20,
+              ),
-                    // mainAxisSpacing: 20,
+              // SizedBox(
-                    // children:
+              //   child: Padding(
-                    //     filteredCollections.map((item) {
+              //     padding: const EdgeInsets.symmetric(
-                    //       return CollectionContainer(
+              //       horizontal: 5,
-                    //         label: item["label"]!,
+              //       vertical: 1,
-                    //         imageSvg: item["image"]!,
+              //     ),
-                    //         width: 80,
+              //     child: Column(
-                    //         height: 80,
+              //       crossAxisAlignment: CrossAxisAlignment.start,
-                    //         textColor: Colors.black,
+              //       children: [
-                    //         circle: true,
+              //         Text("List Topic", style: TextStyle(color: Colors.black)),
-                    //         colorContiner: item["color"]! as Color,
+              //         Divider(color: Colors.transparent),
-                    //         onTapAc:
+              //       ],
-                    //             () => {
+              //     ),
-                    //               Navigator.push(
-                    //                 context,
-                    //                 MaterialPageRoute(
-                    //                   builder: (context) => ListEducation(),
               //   ),
               // ),
-                    //             },
-                    //       );
-                    //     }).toList(),
-                  ),
-                ),
-              ),
-              SizedBox(
-                child: Padding(
-                  padding: const EdgeInsets.symmetric(
-                    horizontal: 40,
-                    vertical: 1,
-                  ),
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Text("Daftar Topik", style: TextStyle(color: Colors.black)),
-                      Divider(color: Colors.transparent),
-                    ],
-                  ),
-                ),
-              ),
               // Horizontal Scroll List
               Padding(
-                padding: EdgeInsets.symmetric(horizontal: 40, vertical: 10),
+                padding: EdgeInsets.symmetric(horizontal: 5, vertical: 5),
                 child: SizedBox(
                   width: MediaQuery.of(context).size.width,
                   height: 100,
@@ -284,7 +276,7 @@ class _PustakaScreenState extends State<PustakaScreen> {
                 ),
               ),
               // Bottom Navigation
-              MainMenu(),
+              // MainMenu(),
             ],
           ),
           // BG MEnu
@@ -300,8 +292,8 @@ class _PustakaScreenState extends State<PustakaScreen> {
             ],
           ),
           Positioned(
-            bottom: 1,
+            bottom: 5,
-            left: MediaQuery.of(context).size.width / 2 - 48,
+            left: MediaQuery.of(context).size.width / 2 - 43,
             child: Transform.translate(
               offset: Offset(0, -20),
               child: ScanButton(),

lib/screen/saya/profile_screen.dart

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

pubspec.lock

@@ -167,7 +167,7 @@ packages:
     source: hosted
     version: "5.0.0"
   flutter_plugin_android_lifecycle:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: flutter_plugin_android_lifecycle
       sha256: "1c2b787f99bdca1f3718543f81d38aa1b124817dfeb9fb196201bea85b6134bf"

pubspec.yaml

@@ -43,6 +43,7 @@ dependencies:
   flutter_html: ^3.0.0-beta.2
   image_picker_for_web: ^3.0.6
   image_picker_web: ^4.0.0
+  flutter_plugin_android_lifecycle: ^2.0.9
   # arcore_flutter_plugin: ^0.2.0-alpha
   # flutter_unity_widget: ^2022.2.1
   # arcore_flutter_plugin:
@@ -77,28 +78,32 @@ flutter:
   uses-material-design: true
 
   # To add assets to your application, add an assets section, like this:
-  # assets:
-  #   - images/a_dot_burr.jpeg
-  #   - images/a_dot_ham.jpeg
   assets:
-    - assets/icons/furrybuddy.svg
+    - assets/images/Artboard 15@4x.png 
-    - assets/icons/Scan.svg
+    - assets/images/Artboard 16@4x.png 
-    - assets/icons/Saya.svg
-    - assets/icons/Pustaka.svg
-    - assets/icons/koleksi.svg
-    - assets/icons/healthy.svg
-    - assets/icons/Nutrition.svg
-    - assets/icons/Education.svg
-    - assets/icons/Safety.svg
-    - assets/images/luffy.png
     - assets/images/background.jpeg 
-    - assets/images/luffy-u.png
-    - assets/images/klipartz.png
     - assets/images/cepott.png 
-    - assets/images/ft_luffy.png
     - assets/images/ft_cepot.png 
+    - assets/images/ft_luffy.png 
+    - assets/images/klipartz.png 
     - assets/images/luffy-kimono.png 
     - assets/images/luffy-king.png 
+    - assets/images/luffy-u.png 
+    - assets/images/luffy.gif 
+    - assets/images/luffy.png
+
+    # SVG files
+    - assets/icons/E-furrybuddy.svg 
+    - assets/icons/E-furrybuddy1.svg 
+    - assets/icons/Education.svg 
+    - assets/icons/furrybuddy.svg 
+    - assets/icons/healthy.svg 
+    - assets/icons/Koleksi.svg 
+    - assets/icons/Nutrition.svg 
+    - assets/icons/Pustaka.svg 
+    - assets/icons/Safety.svg 
+    - assets/icons/Saya.svg 
+    - assets/icons/Scan.svg
 
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.dev/to/resolution-aware-images