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

.gitignore

@@ -43,3 +43,12 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+
+# Place unity project here
+/unity
+
+# flutter will place unity Library dependency here
+/unityLibrary
+
+# unityLibrary will place build here
+/android/unityLibrary

README.md

@@ -1,16 +1,239 @@
-# furibase
+# Furikake App
 
-A new Flutter project.
+Project ini adalah aplikasi mobile Furikake.
 
-## Getting Started
+## Konfiguras dan perubahan android app
 
-This project is a starting point for a Flutter application.
+Edit android/app/src/main/kotlin ... /MainActivity.kt
 
-A few resources to get you started if this is your first Flutter project:
+```
+package com.paj.freekake
 
-- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab)
+import io.flutter.embedding.android.FlutterActivity
-- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook)
+import io.flutter.embedding.android.FlutterFragmentActivity;
 
-For help getting started with Flutter development, view the
+//class MainActivity : FlutterActivity()
-[online documentation](https://docs.flutter.dev/), which offers tutorials,
+class MainActivity: FlutterFragmentActivity() {
-samples, guidance on mobile development, and a full API reference.
+}
+```
+
+Gunakan konfigurasi ini pada file android/settings.gradle.kts
+
+```
+pluginManagement {
+    val flutterSdkPath = run {
+        val properties = java.util.Properties()
+        file("local.properties").inputStream().use { properties.load(it) }
+        val flutterSdkPath = properties.getProperty("flutter.sdk")
+        require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
+        flutterSdkPath
+    }
+
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
+
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+plugins {
+    id("dev.flutter.flutter-plugin-loader") version "1.0.0"
+    id("com.android.application") version "8.9.0" apply false
+    id("org.jetbrains.kotlin.android") version "1.8.22" apply false
+}
+
+include(":app")
+
+include(":unityLibrary")
+project(":unityLibrary").projectDir = file("./unityLibrary")
+
+include(":unityLibrary:xrmanifest.androidlib")
+//project(":unityLibrary:xrmanifest.androidlib").projectDir = file("unityLibrary/xrmanifest.androidlib")
+
+//include(":unityLibrary:mobilenotifications.androidlib")
+//project(":unityLibrary:mobilenotifications.androidlib").projectDir = file("unityLibrary/mobilenotifications.androidlib")
+
+```
+
+Gunakan konfigurasi ini pada android/app/build.gradle.kts
+
+```
+plugins {
+    id("com.android.application")
+    id("kotlin-android")
+    // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
+    id("dev.flutter.flutter-gradle-plugin")
+}
+
+android {
+    namespace = "com.paj.freekake"
+    //compileSdk = flutter.compileSdkVersion
+    compileSdk = 35
+    //ndkVersion = "27.0.12077973"
+    //ndkVersion = flutter.ndkVersion
+    ndkVersion = "23.1.7779620"
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17.toString()
+    }
+
+    defaultConfig {
+        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
+        applicationId = "com.paj.freekake"
+        // You can update the following values to match your application needs.
+        // For more information, see: https://flutter.dev/to/review-gradle-config.
+        //minSdk = flutter.minSdkVersion
+        //targetSdk = flutter.targetSdkVersion
+        //minSdk = 24 // Set to 24 or higher
+        minSdk = 30
+        targetSdk = 35
+        versionCode = flutter.versionCode
+        versionName = flutter.versionName
+    }
+
+    buildTypes {
+        release {
+            // TODO: Add your own signing config for the release build.
+            // Signing with the debug keys for now, so `flutter run --release` works.
+            signingConfig = signingConfigs.getByName("debug")
+        }
+    }
+}
+
+flutter {
+    source = "../.."
+}
+
+dependencies {
+    implementation(project(":unityLibrary"))
+    implementation(project(":flutter_unity_widget"))
+}
+```
+
+## Konfigurasi UnityLibrary
+
+Gunakan konfigurasi ini pada file android/unityLibrary/build.gradle:
+
+```
+apply plugin: 'com.android.library'
+
+
+dependencies {
+    implementation(name: 'unity-classes', ext:'jar')
+    implementation(name: 'arcore_client', ext:'aar')
+    implementation(name: 'ARPresto', ext:'aar')
+    implementation(name: 'UnityARCore', ext:'aar')
+    implementation(name: 'unityandroidpermissions', ext:'aar')
+    implementation project('xrmanifest.androidlib')
+    //implementation project('mobilenotifications.androidlib')
+
+}
+
+android {
+    namespace "com.unity3d.player"
+    // ndkPath "/Applications/Unity/Hub/Editor/2022.3.60f1/PlaybackEngines/AndroidPlayer/NDK"
+    compileSdkVersion 35
+    buildToolsVersion '34.0.0'
+    ndkVersion "23.1.7779620"
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+
+    defaultConfig {
+        minSdkVersion 30
+        targetSdkVersion 35
+        ndk {
+            abiFilters 'armeabi-v7a', 'arm64-v8a'
+        }
+        versionCode 1
+        versionName '1.0.2'
+        consumerProguardFiles 'proguard-unity.txt'
+    }
+
+    lintOptions {
+        abortOnError false
+    }
+
+    aaptOptions {
+        noCompress = ['.unity3d', '.ress', '.resource', '.obb', '.bundle', '.unityexp']
+        ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:!CVS:!thumbs.db:!picasa.ini:!*~"
+    }
+
+    packagingOptions {
+        doNotStrip '*/armeabi-v7a/*.so'
+        doNotStrip '*/arm64-v8a/*.so'
+        jniLibs {
+            useLegacyPackaging true
+        }
+    }
+}
+
+def getSdkDir() {
+    Properties local = new Properties()
+    local.load(new FileInputStream("${rootDir}/local.properties"))
+    return local.getProperty('sdk.dir')
+}
+
+def BuildIl2Cpp(String workingDir, String configuration, String architecture, String abi, String[] staticLibraries) {
+    def commandLineArgs = []
+    commandLineArgs.add("--compile-cpp")
+    commandLineArgs.add("--platform=Android")
+    commandLineArgs.add("--architecture=" + architecture)
+    commandLineArgs.add("--outputpath=" + workingDir + "/src/main/jniLibs/" + abi + "/libil2cpp.so")
+    commandLineArgs.add("--baselib-directory=" + workingDir + "/src/main/jniStaticLibs/" + abi)
+    commandLineArgs.add("--incremental-g-c-time-slice=3")
+    commandLineArgs.add("--dotnetprofile=unityaot-linux")
+    commandLineArgs.add("--enable-debugger")
+    commandLineArgs.add("--profiler-report")
+    commandLineArgs.add("--profiler-output-file=" + workingDir + "/build/il2cpp_"+ abi + "_" + configuration + "/il2cpp_conv.traceevents")
+    commandLineArgs.add("--print-command-line")
+    commandLineArgs.add("--data-folder=" + workingDir + "/src/main/Il2CppOutputProject/Source/il2cppOutput/data")
+    commandLineArgs.add("--generatedcppdir=" + workingDir + "/src/main/Il2CppOutputProject/Source/il2cppOutput")
+    commandLineArgs.add("--cachedirectory=" + workingDir + "/build/il2cpp_"+ abi + "_" + configuration + "/il2cpp_cache")
+    commandLineArgs.add("--tool-chain-path=" + android.ndkDirectory)
+    staticLibraries.eachWithIndex {fileName, i->
+        commandLineArgs.add("--additional-libraries=" + workingDir + "/src/main/jniStaticLibs/" + abi + "/" + fileName)
+    }
+    def executableExtension = ""
+    if (org.gradle.internal.os.OperatingSystem.current().isWindows()) {
+        executableExtension = ".exe"
+        commandLineArgs = commandLineArgs*.replace('\"', '\\\"')
+    }
+    exec {
+        executable workingDir + "/src/main/Il2CppOutputProject/IL2CPP/build/deploy/il2cpp" + executableExtension
+        args commandLineArgs
+        environment "ANDROID_SDK_ROOT", getSdkDir()
+    }
+    delete workingDir + "/src/main/jniLibs/" + abi + "/libil2cpp.sym.so"
+    ant.move(file: workingDir + "/src/main/jniLibs/" + abi + "/libil2cpp.dbg.so", tofile: workingDir + "/symbols/" + abi + "/libil2cpp.so")
+}
+
+android {
+    task BuildIl2CppTask {
+        doLast {
+              BuildIl2Cpp(projectDir.toString().replaceAll('\\\\', '/'), 'Debug', 'armv7', 'armeabi-v7a', [  ] as String[]);
+              BuildIl2Cpp(projectDir.toString().replaceAll('\\\\', '/'), 'Debug', 'arm64', 'arm64-v8a', [  ] as String[]);
+        }
+    }
+    afterEvaluate {
+        if (project(':unityLibrary').tasks.findByName('mergeDebugJniLibFolders'))
+            project(':unityLibrary').mergeDebugJniLibFolders.dependsOn BuildIl2CppTask
+        if (project(':unityLibrary').tasks.findByName('mergeReleaseJniLibFolders'))
+            project(':unityLibrary').mergeReleaseJniLibFolders.dependsOn BuildIl2CppTask
+    }
+    sourceSets {
+        main {
+            jni.srcDirs = ["src/main/Il2CppOutputProject"]
+        }
+    }
+}
+```

android/app/build.gradle.kts

@@ -6,29 +6,31 @@ plugins {
 }
 
 android {
-    namespace = "com.example.furibase"
+    namespace = "com.paj.freekake"
     //compileSdk = flutter.compileSdkVersion
     compileSdk = 35
-    ndkVersion = "27.0.12077973"
+    //ndkVersion = "27.0.12077973"
     //ndkVersion = flutter.ndkVersion
+    ndkVersion = "23.1.7779620"
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId = "com.example.furibase"
+        applicationId = "com.paj.freekake"
         // You can update the following values to match your application needs.
         // For more information, see: https://flutter.dev/to/review-gradle-config.
         //minSdk = flutter.minSdkVersion
         //targetSdk = flutter.targetSdkVersion
-        minSdk = 24 // Set to 24 or higher
+        //minSdk = 24 // Set to 24 or higher
+        minSdk = 30
         targetSdk = 35
         versionCode = flutter.versionCode
         versionName = flutter.versionName
@@ -50,3 +52,8 @@ android {
 flutter {
     source = "../.."
 }
+
+dependencies {
+    implementation(project(":unityLibrary"))
+    implementation(project(":flutter_unity_widget"))
+}

android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application
-        android:label="furibase"
+        android:label="freekake"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity

android/app/src/main/kotlin/com/example/furibase/MainActivity.kt

@@ -1,5 +0,0 @@
-package com.example.furibase
-
-import io.flutter.embedding.android.FlutterActivity
-
-class MainActivity : FlutterActivity()

android/app/src/main/kotlin/com/paj/freekake/MainActivity.kt

@@ -0,0 +1,8 @@
+package com.paj.freekake
+
+import io.flutter.embedding.android.FlutterActivity
+import io.flutter.embedding.android.FlutterFragmentActivity;
+
+//class MainActivity : FlutterActivity()
+class MainActivity: FlutterFragmentActivity() {
+}

android/build.gradle.kts

@@ -1,5 +1,11 @@
 allprojects {
     repositories {
+        flatDir {
+            dirs(
+                file("${project(":unityLibrary").projectDir}/libs")
+            )
+        }
+
         google()
         mavenCentral()
     }
@@ -12,6 +18,39 @@ subprojects {
     val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name)
     project.layout.buildDirectory.value(newSubprojectBuildDir)
 }
+
+subprojects {
+    afterEvaluate {
+        if (project.extensions.findByName("android") != null) {
+            extensions.configure<com.android.build.gradle.BaseExtension>("android") {
+                if (namespace == null) {
+                    namespace = project.group.toString()
+                }
+            }
+        }
+
+        if (plugins.hasPlugin("com.android.application") || plugins.hasPlugin("com.android.library")) {
+            if (name == "flutter_unity_widget") {
+                extensions.configure<com.android.build.gradle.BaseExtension>("android") {
+                    compileOptions {
+                        sourceCompatibility = JavaVersion.VERSION_17
+                        targetCompatibility = JavaVersion.VERSION_17
+                    }
+                    (this as ExtensionAware).extensions.configure<org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions>("kotlinOptions") {
+                        jvmTarget = "17"
+                    }
+
+                    if (namespace == null) {
+                        namespace = project.group.toString()
+                    }
+
+                    compileSdkVersion(35)
+                }
+            }
+        }
+    }
+}
+
 subprojects {
     project.evaluationDependsOn(":app")
 }

android/gradle.properties

@@ -1,3 +1,4 @@
-org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
+# org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
+org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Thu May 08 22:45:23 WIB 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip

android/settings.gradle.kts

@@ -18,8 +18,30 @@ pluginManagement {
 
 plugins {
     id("dev.flutter.flutter-plugin-loader") version "1.0.0"
-    id("com.android.application") version "8.7.0" apply false
+    id("com.android.application") version "8.9.0" apply false
     id("org.jetbrains.kotlin.android") version "1.8.22" apply false
 }
 
 include(":app")
+
+include(":unityLibrary")
+project(":unityLibrary").projectDir = file("./unityLibrary")
+
+include(":unityLibrary:xrmanifest.androidlib")
+// project(":unityLibrary:xrmanifest.androidlib").projectDir = file("unityLibrary/xrmanifest.androidlib")
+
+// include(":unityLibrary:mobilenotifications.androidlib")
+// project(":unityLibrary:mobilenotifications.androidlib").projectDir = file("unityLibrary/mobilenotifications.androidlib")
+
+
+
+include(":unityLibrary")
+project(":unityLibrary").projectDir = file("./unityLibrary")
+
+
+include(":unityLibrary")
+project(":unityLibrary").projectDir = file("./unityLibrary")
+
+
+include(":unityLibrary")
+project(":unityLibrary").projectDir = file("./unityLibrary")

android/unityLibrary/build.gradle

@@ -0,0 +1,117 @@
+apply plugin: 'com.android.library'
+
+
+dependencies {
+    implementation(name: 'unity-classes', ext:'jar')
+    implementation(name: 'arcore_client', ext:'aar')
+    implementation(name: 'ARPresto', ext:'aar')
+    implementation(name: 'UnityARCore', ext:'aar')
+    implementation(name: 'unityandroidpermissions', ext:'aar')
+    implementation project('xrmanifest.androidlib')
+    //implementation project('mobilenotifications.androidlib')
+
+}
+
+android {
+    namespace "com.unity3d.player"
+    // ndkPath "/Applications/Unity/Hub/Editor/2022.3.60f1/PlaybackEngines/AndroidPlayer/NDK"
+    compileSdkVersion 35
+    buildToolsVersion '34.0.0'
+    ndkVersion "23.1.7779620"
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+
+    defaultConfig {
+        minSdkVersion 30
+        targetSdkVersion 35
+        ndk {
+            abiFilters 'armeabi-v7a', 'arm64-v8a'
+        }
+        versionCode 1
+        versionName '1.0.2'
+        consumerProguardFiles 'proguard-unity.txt'
+    }
+
+    lintOptions {
+        abortOnError false
+    }
+
+    aaptOptions {
+        noCompress = ['.unity3d', '.ress', '.resource', '.obb', '.bundle', '.unityexp']
+        ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:!CVS:!thumbs.db:!picasa.ini:!*~"
+    }
+
+    packagingOptions {
+        doNotStrip '*/armeabi-v7a/*.so'
+        doNotStrip '*/arm64-v8a/*.so'
+        jniLibs {
+            useLegacyPackaging true
+        }
+    }
+}
+
+def getSdkDir() {
+    Properties local = new Properties()
+    local.load(new FileInputStream("${rootDir}/local.properties"))
+    return local.getProperty('sdk.dir')
+}
+
+def BuildIl2Cpp(String workingDir, String configuration, String architecture, String abi, String[] staticLibraries) {
+    def commandLineArgs = []
+    commandLineArgs.add("--compile-cpp")
+    commandLineArgs.add("--platform=Android")
+    commandLineArgs.add("--architecture=" + architecture)
+    commandLineArgs.add("--outputpath=" + workingDir + "/src/main/jniLibs/" + abi + "/libil2cpp.so")
+    commandLineArgs.add("--baselib-directory=" + workingDir + "/src/main/jniStaticLibs/" + abi)
+    commandLineArgs.add("--incremental-g-c-time-slice=3")
+    commandLineArgs.add("--dotnetprofile=unityaot-linux")
+    commandLineArgs.add("--enable-debugger")
+    commandLineArgs.add("--profiler-report")
+    commandLineArgs.add("--profiler-output-file=" + workingDir + "/build/il2cpp_"+ abi + "_" + configuration + "/il2cpp_conv.traceevents")
+    commandLineArgs.add("--print-command-line")
+    commandLineArgs.add("--data-folder=" + workingDir + "/src/main/Il2CppOutputProject/Source/il2cppOutput/data")
+    commandLineArgs.add("--generatedcppdir=" + workingDir + "/src/main/Il2CppOutputProject/Source/il2cppOutput")
+    commandLineArgs.add("--cachedirectory=" + workingDir + "/build/il2cpp_"+ abi + "_" + configuration + "/il2cpp_cache")
+    commandLineArgs.add("--tool-chain-path=" + android.ndkDirectory)
+    staticLibraries.eachWithIndex {fileName, i->
+        commandLineArgs.add("--additional-libraries=" + workingDir + "/src/main/jniStaticLibs/" + abi + "/" + fileName)
+    }
+    def executableExtension = ""
+    if (org.gradle.internal.os.OperatingSystem.current().isWindows()) {
+        executableExtension = ".exe"
+        commandLineArgs = commandLineArgs*.replace('\"', '\\\"')
+    }
+    exec {
+        executable workingDir + "/src/main/Il2CppOutputProject/IL2CPP/build/deploy/il2cpp" + executableExtension
+        args commandLineArgs
+        environment "ANDROID_SDK_ROOT", getSdkDir()
+    }
+    delete workingDir + "/src/main/jniLibs/" + abi + "/libil2cpp.sym.so"
+    ant.move(file: workingDir + "/src/main/jniLibs/" + abi + "/libil2cpp.dbg.so", tofile: workingDir + "/symbols/" + abi + "/libil2cpp.so")
+}
+
+android {
+    task BuildIl2CppTask {
+        doLast {
+              BuildIl2Cpp(projectDir.toString().replaceAll('\\\\', '/'), 'Debug', 'armv7', 'armeabi-v7a', [  ] as String[]);
+              BuildIl2Cpp(projectDir.toString().replaceAll('\\\\', '/'), 'Debug', 'arm64', 'arm64-v8a', [  ] as String[]);
+        }
+    }
+    afterEvaluate {
+        if (project(':unityLibrary').tasks.findByName('mergeDebugJniLibFolders'))
+            project(':unityLibrary').mergeDebugJniLibFolders.dependsOn BuildIl2CppTask
+        if (project(':unityLibrary').tasks.findByName('mergeReleaseJniLibFolders'))
+            project(':unityLibrary').mergeReleaseJniLibFolders.dependsOn BuildIl2CppTask
+    }
+    sourceSets {
+        main {
+            jni.srcDirs = ["src/main/Il2CppOutputProject"]
+        }
+    }
+}
+
+
+

lib/components/bottom_navbar.dart

@@ -1,5 +1,9 @@
-import 'package:freekake/components/navbar_shape_3.dart';
 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';
 
 class BottomNavbar extends StatefulWidget {
   const BottomNavbar({super.key});

lib/components/card_list.dart

@@ -53,6 +53,7 @@ class CardList extends StatelessWidget {
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
+                  const SizedBox(height: 1, width: 5),
                   Text(
                     title,
                     style: const TextStyle(
@@ -61,16 +62,16 @@ class CardList extends StatelessWidget {
                     ),
                   ),
                   const SizedBox(height: 1, width: 5),
-                  Text(
+                  // Text(
-                    body,
+                  //   body,
-                    style: const TextStyle(
+                  //   style: const TextStyle(
-                      letterSpacing: 0.2,
+                  //     letterSpacing: 0.2,
-                      fontSize: 14,
+                  //     fontSize: 14,
-                      fontWeight: FontWeight.normal,
+                  //     fontWeight: FontWeight.normal,
-                    ),
+                  //   ),
-                    maxLines: 2,
+                  //   maxLines: 2,
-                    overflow: TextOverflow.ellipsis,
+                  //   overflow: TextOverflow.ellipsis,
-                  ),
+                  // ),
                   const Spacer(),
                   Padding(
                     padding: EdgeInsets.all(0.08),

lib/components/main_menu.dart

@@ -1,11 +1,11 @@
+import 'package:flutter/material.dart';
+import 'package:freekake/components/bottom_navbar.dart';
 import 'package:freekake/components/menu_button.dart';
-import 'package:freekake/providers/menu_selection_provider.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});

lib/components/menu_button.dart

@@ -28,8 +28,8 @@ class MenuButton extends StatelessWidget {
           IconButton(
             icon: SvgPicture.asset(
               icon ?? '',
-              width: w ?? 28,
+              width: w ?? 24,
-              height: h ?? 28,
+              height: h ?? 24,
               // allowDrawingOutsideViewBox: true,
               colorFilter: ColorFilter.mode(
                 (isSelected ?? false)
@@ -48,6 +48,7 @@ class MenuButton extends StatelessWidget {
                       ? Color.fromARGB(255, 216, 182, 10)
                       : Color.fromARGB(255, 239, 224, 232),
               fontWeight: FontWeight.bold,
+              fontSize: 10,
             ),
           ),
         ],

lib/components/scan_button.dart

@@ -1,7 +1,7 @@
 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';
+import 'package:freekake/screen/camera_screen.dart';
 
 class ScanButton extends StatelessWidget {
   const ScanButton({super.key});
@@ -45,4 +45,4 @@ class ScanButton extends StatelessWidget {
       ),
     );
   }
-}
+}

lib/helpers/image_picker_mobile.dart

@@ -0,0 +1,14 @@
+import 'dart:io';
+import 'package:image_picker/image_picker.dart';
+
+class ImagePickerHelper {
+  Future<dynamic> pickImage() async {
+    final ImagePicker picker = ImagePicker();
+    final XFile? pickedFile = await picker.pickImage(source: ImageSource.gallery);
+
+    if (pickedFile != null) {
+      File imageFile = File(pickedFile.path);
+      return imageFile;
+    }
+  }
+}

lib/helpers/image_picker_stub.dart

@@ -0,0 +1,5 @@
+class ImagePickerHelper {
+  Future<void> pickImage() async {
+    throw UnsupportedError('pickImage is not supported on this platform');
+  }
+}

lib/helpers/image_picker_web.dart

@@ -0,0 +1,35 @@
+// import 'package:image_picker_web/image_picker_web.dart';
+// import 'dart:typed_data';
+
+// class ImagePickerHelper {
+//   Future<dynamic> pickImage() async {
+//     Uint8List? bytesFromPicker = await ImagePickerWeb.getImageAsBytes();
+//     if (bytesFromPicker != null) {
+//       return bytesFromPicker;
+//     }
+//   }
+// }
+
+import 'dart:typed_data';
+import 'dart:html' as html;
+
+class ImagePickerHelper {
+  Future<void> pickImage() async {
+    html.FileUploadInputElement uploadInput = html.FileUploadInputElement();
+    uploadInput.accept = 'image/*';
+    uploadInput.click();
+
+    uploadInput.onChange.listen((event) async {
+      final file = uploadInput.files!.first;
+      final reader = html.FileReader();
+
+      reader.readAsArrayBuffer(file);
+      reader.onLoadEnd.listen((event) {
+        Uint8List imageBytes = reader.result as Uint8List;
+        if (imageBytes != null) {
+          return imageBytes;
+        } 
+      });
+    });
+  }
+}

lib/helpers/pick_image.dart

@@ -0,0 +1,3 @@
+export 'image_picker_stub.dart' 
+    if (dart.library.html) 'image_picker_web.dart' 
+    if (dart.library.io) 'image_picker_mobile.dart';

lib/main.dart

@@ -1,5 +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/providers/menu_selection_provider.dart';
 import 'package:freekake/providers/point_provider.dart';
@@ -9,12 +9,12 @@ import 'package:provider/provider.dart';
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
 
-  SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersiveSticky);
+  // SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersiveSticky);
 
-  await SystemChrome.setPreferredOrientations([
+  // await SystemChrome.setPreferredOrientations([
-    DeviceOrientation.portraitUp,
+  //   DeviceOrientation.portraitUp,
-    DeviceOrientation.portraitDown, // bisa dihapus jika hanya ingin satu arah
+  //   DeviceOrientation.portraitDown, // bisa dihapus jika hanya ingin satu arah
-  ]);
+  // ]);
 
   runApp(const MyApp());
 }
@@ -32,7 +32,7 @@ class MyApp extends StatelessWidget {
       ],
       child: MaterialApp(
         debugShowCheckedModeBanner: false,
-        title: 'AR Character App',
+        title: 'Freekake',
         theme: ThemeData.dark(),
         home:
             // DrawScreen(),

lib/screen/Home_screen.dart

@@ -5,6 +5,7 @@ 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 {
   const HomeScreen({super.key});
@@ -16,6 +17,7 @@ class HomeScreen extends StatefulWidget {
 class _HomeScreenState extends State<HomeScreen> {
   final String username = "luffy01";
   // Image image
+  late UnityWidgetController _unityWidgetController;
 
   @override
   Widget build(BuildContext context) {
@@ -49,89 +51,98 @@ class _HomeScreenState extends State<HomeScreen> {
     return Stack(
       children: <Widget>[
         Positioned.fill(
-          child: RepaintBoundary(
+          child: UnityWidget(
-            child: Container(
+            onUnityCreated: onUnityCreated,
-              decoration: const BoxDecoration(
+            //isARScene: true,
-                image: DecorationImage(
+            onUnityMessage: onUnityMessage,
-                  image: AssetImage("assets/images/background.jpeg"),
+            //onUnitySceneLoaded: onUnitySceneLoaded,
-                  fit: BoxFit.cover,
+            fullscreen: false,
-                ),
-              ),
-            ),
           ),
         ),
+        // Positioned.fill(
+        //   child: RepaintBoundary(
+        //     child: Container(
+        //       decoration: const BoxDecoration(
+        //         image: DecorationImage(
+        //           image: AssetImage("assets/images/background.jpeg"),
+        //           fit: BoxFit.cover,
+        //         ),
+        //       ),
+        //     ),
+        //   ),
+        // ),
 
-        Positioned(
+        // Positioned(
-          right: 0,
+        //   right: 0,
-          top: 100,
+        //   top: 100,
-          child: Padding(
+        //   child: Padding(
-            padding: EdgeInsets.only(right: 20),
+        //     padding: EdgeInsets.only(right: 20),
-            child: Container(
+        //     child: Container(
-              width: 40,
+        //       width: 40,
-              height: 40,
+        //       height: 40,
-              decoration: BoxDecoration(
+        //       decoration: BoxDecoration(
-                borderRadius: BorderRadius.circular(1),
+        //         borderRadius: BorderRadius.circular(1),
-                color: Color.fromARGB(1, 209, 174, 174).withAlpha(0),
+        //         color: Color.fromARGB(1, 209, 174, 174).withAlpha(0),
-              ),
+        //       ),
-              child: Center(
+        //       child: Center(
-                child: DropdownButtonHideUnderline(
+        //         child: DropdownButtonHideUnderline(
-                  child: DropdownButton2(
+        //           child: DropdownButton2(
-                    customButton: Container(
+        //             customButton: Container(
-                      height: 100,
+        //               height: 50,
-                      width: 100,
+        //               width: 50,
-                      decoration: BoxDecoration(
+        //               decoration: BoxDecoration(
-                        borderRadius: BorderRadius.circular(10),
+        //                 borderRadius: BorderRadius.circular(10),
-                        image: const DecorationImage(
+        //                 image: const DecorationImage(
-                          image: AssetImage('assets/images/cepot-u.png'),
+        //                   image: AssetImage('assets/images/cepot-u.png'),
-                          fit: BoxFit.cover,
+        //                   fit: BoxFit.cover,
-                        ),
+        //                 ),
-                      ),
+        //               ),
-                    ),
+        //             ),
-                    openWithLongPress: false,
+        //             openWithLongPress: false,
-                    items: [
+        //             items: [
-                      ..._MenuItems.firstItems.map(
+        //               ..._MenuItems.firstItems.map(
-                        (item) => DropdownMenuItem<MenuItem>(
+        //                 (item) => DropdownMenuItem<MenuItem>(
-                          value: item,
+        //                   value: item,
-                          child: _MenuItems.buildItem(item),
+        //                   child: _MenuItems.buildItem(item),
-                        ),
+        //                 ),
-                      ),
+        //               ),
-                    ],
+        //             ],
-                    onChanged: (value) {
+        //             onChanged: (value) {
-                      if (value != null) {
+        //               if (value != null) {
-                        _MenuItems.onChanged(context, value);
+        //                 _MenuItems.onChanged(context, value);
-                      } else {
+        //               } else {
-                        print("null");
+        //                 print("null");
-                      }
+        //               }
-                    },
+        //             },
-                    buttonStyleData: ButtonStyleData(
+        //             buttonStyleData: ButtonStyleData(
-                      decoration: BoxDecoration(
+        //               decoration: BoxDecoration(
-                        borderRadius: BorderRadius.circular(40),
+        //                 borderRadius: BorderRadius.circular(40),
-                      ),
+        //               ),
-                    ),
+        //             ),
-                    dropdownStyleData: DropdownStyleData(
+        //             dropdownStyleData: DropdownStyleData(
-                      width: 140,
+        //               width: 140,
-                      padding: EdgeInsets.zero,
+        //               padding: EdgeInsets.zero,
-                      maxHeight: 150,
+        //               maxHeight: 150,
-                      // padding: const EdgeInsets.symmetric(vertical: 6),
+        //               // padding: const EdgeInsets.symmetric(vertical: 6),
-                      decoration: BoxDecoration(
+        //               decoration: BoxDecoration(
-                        borderRadius: BorderRadius.circular(4),
+        //                 borderRadius: BorderRadius.circular(4),
-                        color: Color.fromRGBO(2, 104, 17, 1).withAlpha(50),
+        //                 color: Color.fromRGBO(2, 104, 17, 1).withAlpha(50),
-                      ),
+        //               ),
-                      offset: const Offset(40, -4),
+        //               offset: const Offset(40, -4),
-                    ),
+        //             ),
-                    menuItemStyleData: MenuItemStyleData(
+        //             menuItemStyleData: MenuItemStyleData(
-                      height: 35,
+        //               height: 35,
-                      padding: EdgeInsets.symmetric(horizontal: 10),
+        //               padding: EdgeInsets.symmetric(horizontal: 10),
-                    ),
+        //             ),
-                    // menuItemStyleData: const MenuItemStyleData(
+        //             // menuItemStyleData: const MenuItemStyleData(
-                    //   padding: EdgeInsets.only(left: 16, right: 16),
+        //             //   padding: EdgeInsets.only(left: 16, right: 16),
-                    // ),
+        //             // ),
-                  ),
+        //           ),
-                ),
+        //         ),
-              ),
+        //       ),
-            ),
+        //     ),
-          ),
+        //   ),
-        ),
+        // ),
         Positioned(
           top: 10,
           left: 10,
@@ -154,39 +165,39 @@ 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("assets/images/cepott.png", 300),
+        //       //setHomeImage("assets/images/cepott.png", 300),
-            ],
+        //     ],
-          ),
+        //   ),
-        ),
+        // ),
         // BG MEnu
         Stack(
           children: [
@@ -218,6 +229,14 @@ class _HomeScreenState extends State<HomeScreen> {
   Widget setHomeImage(String src, double size) {
     return Image.asset(src, width: size);
   }
+
+  void onUnityCreated(controller) {
+    _unityWidgetController = controller;
+  }
+
+  void onUnityMessage(message) {
+    print('Received message from unity: ${message.toString()}');
+  }
 }
 
 class _MenuItems {

lib/screen/collection/collection_caracter_screen.dart

@@ -1,6 +1,5 @@
 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});
@@ -23,13 +22,7 @@ class _CollectionCaraterScreenState extends State<CollectionCaraterScreen> {
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                Text(
+                Text("Favorit", style: TextStyle(color: Colors.black)),
-                  "Favorite",
-                  style: TextStyle(
-                    color: Colors.black,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
                 Divider(height: 20, color: Colors.transparent),
                 SingleChildScrollView(
                   scrollDirection: Axis.horizontal,
@@ -77,13 +70,7 @@ class _CollectionCaraterScreenState extends State<CollectionCaraterScreen> {
                   ),
                 ),
                 Divider(height: 20, color: Colors.transparent),
-                Text(
+                Text("Semua", style: TextStyle(color: Colors.black)),
-                  "All",
-                  style: TextStyle(
-                    color: Colors.black,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
                 Divider(height: 20, color: Colors.transparent),
                 SingleChildScrollView(
                   scrollDirection: Axis.horizontal,

lib/screen/collection/collection_skin_screen.dart

@@ -1,7 +1,5 @@
 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});

lib/screen/pustaka/list_education.dart

@@ -2,13 +2,13 @@ import 'dart:convert';
 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/screen/pustaka/pustaka_detail_screen.dart';
 import 'package:freekake/helpers/color_helper.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});
@@ -263,7 +263,7 @@ class _ListEducationState extends State<ListEducation> {
                     width: 70,
                     height: 70,
                     textColor: Colors.black,
-                    lblSize: 10,
+                    lblSize: 8,
                     colorContiner: ColorHelper.hexToColor(item["color"]),
                     onTapAc:
                         () => {

lib/screen/pustaka_screen copy 2.dart

@@ -108,7 +108,7 @@ class _PustakaScreenState extends State<PustakaScreen> {
                 children: [
                   CollectionContainer(
                     label: "Luffy",
-                    imagesrc: 'images/luffy.png',
+                    imagesrc: 'assets/images/luffy.png',
                     width: 100,
                     height: 100,
                     onTapAc:

lib/screen/pustaka_screen copy.dart

@@ -108,7 +108,7 @@ class _PustakaScreenState extends State<PustakaScreen> {
                 children: [
                   CollectionContainer(
                     label: "Luffy",
-                    imagesrc: 'images/luffy.png',
+                    imagesrc: 'assets/images/luffy.png',
                     width: 100,
                     height: 100,
                     onTapAc:

lib/screen/saya/akun_saya copy.dart

@@ -0,0 +1,211 @@
+import 'dart:typed_data';
+
+import 'package:flutter/material.dart';
+import 'package:freekake/components/bottom_navbar.dart';
+import 'package:freekake/components/main_menu.dart';
+import 'package:freekake/components/scan_button.dart';
+import 'package:freekake/helpers/pick_image.dart';
+import 'package:flutter/foundation.dart' show kIsWeb;
+
+class AkunSaya extends StatefulWidget {
+  @override
+  _AkunSayaState createState() => _AkunSayaState();
+}
+
+class _AkunSayaState extends State<AkunSaya> {
+  dynamic _profileImage;
+  dynamic _headerImage;
+  //final ImagePicker _picker = ImagePicker();
+
+  Future<void> _pickImage(bool isProfile) async {
+    final imagePicker = ImagePickerHelper();
+    dynamic pic = await imagePicker.pickImage();
+
+    if (pic != null) {
+      setState(() {
+        if (isProfile) {
+          _profileImage = pic;
+        } else {
+          _headerImage = pic;
+        }
+      });
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text("Saya"),
+        backgroundColor: Color.fromARGB(225, 79, 76, 182),
+      ),
+      backgroundColor: const Color.fromARGB(255, 255, 255, 255),
+      body: Stack(
+        children: [
+          Positioned(
+            bottom: 0,
+            left: 0,
+            right: 0,
+            child: Padding(
+              padding: const EdgeInsets.only(top: 20.0, left: 20, right: 20),
+              child: Container(
+                height: MediaQuery.of(context).size.height * 0.7,
+                width: MediaQuery.of(context).size.width,
+                decoration: BoxDecoration(
+                  color: const Color.fromARGB(255, 205, 202, 189),
+                  borderRadius: BorderRadius.only(
+                    topLeft: Radius.circular(20),
+                    topRight: Radius.circular(20),
+                  ),
+                ),
+              ),
+            ),
+          ),
+          Column(
+            children: [
+              // Header image (bisa diubah)
+              SizedBox(
+                height: 80,
+                child: Container(
+                  decoration: BoxDecoration(
+                    borderRadius: BorderRadius.only(
+                      bottomLeft: Radius.circular(40),
+                      bottomRight: Radius.circular(40),
+                    ),
+                    color: Color.fromARGB(225, 79, 76, 182),
+                  ),
+                ),
+              ),
+              SizedBox(height: 40),
+              Expanded(
+                child: Padding(
+                  padding: EdgeInsets.all(20),
+                  child: ListView(
+                    padding: EdgeInsets.symmetric(horizontal: 20, vertical: 40),
+                    children: [
+                      TextFormField(
+                        initialValue: "Cepot",
+                        decoration: const InputDecoration(
+                          border: UnderlineInputBorder(),
+                          labelText: 'Nama',
+                          labelStyle: TextStyle(color: Colors.black),
+                        ),
+                        style: TextStyle(color: Colors.black),
+                      ),
+                      TextFormField(
+                        initialValue: "cpt09",
+                        decoration: const InputDecoration(
+                          border: UnderlineInputBorder(),
+                          labelText: 'Nama Pengguna',
+                          labelStyle: TextStyle(color: Colors.black),
+                        ),
+                        style: TextStyle(color: Colors.black),
+                      ),
+
+                      TextFormField(
+                        initialValue: "Jl. Sentosa jaya",
+                        decoration: const InputDecoration(
+                          border: UnderlineInputBorder(),
+                          labelText: 'Alamat',
+                          labelStyle: TextStyle(color: Colors.black),
+                        ),
+                        style: TextStyle(color: Colors.black),
+                      ),
+
+                      TextFormField(
+                        initialValue: "******",
+                        decoration: const InputDecoration(
+                          border: UnderlineInputBorder(),
+                          labelText: 'Kata Sandi',
+                          labelStyle: TextStyle(color: Colors.black),
+                        ),
+                        style: TextStyle(color: Colors.black),
+                      ),
+                      TextFormField(
+                        initialValue: "+62923",
+                        decoration: const InputDecoration(
+                          border: UnderlineInputBorder(),
+                          labelText: 'No. HP',
+                          labelStyle: TextStyle(color: Colors.black),
+                        ),
+                        style: TextStyle(color: Colors.black),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            ],
+          ),
+          // Profile Picture (bisa diubah)
+          Positioned(
+            top: 25,
+            left: MediaQuery.of(context).size.width / 2 - 50,
+            child: GestureDetector(
+              onTap: () => _pickImage(true),
+              child: Stack(
+                alignment: Alignment.bottomRight,
+                children: [
+                  CircleAvatar(
+                    radius: 50,
+                    backgroundColor: Colors.grey[300],
+                    backgroundImage:
+                        _profileImage != null
+                            ? (kIsWeb
+                                ? MemoryImage(_profileImage) as ImageProvider
+                                : FileImage(_profileImage) as ImageProvider)
+                            : null,
+                    child:
+                        _profileImage == null
+                            ? Icon(Icons.person, size: 50, color: Colors.white)
+                            : null,
+                  ),
+                  CircleAvatar(
+                    radius: 15,
+                    backgroundColor: Colors.blue,
+                    child: Icon(Icons.edit, color: Colors.white, size: 15),
+                  ),
+                ],
+              ),
+            ),
+          ),
+
+          Positioned(
+            top: 130,
+            left: MediaQuery.of(context).size.width / 2 - 50,
+            child: GestureDetector(
+              onTap: () => _pickImage(true),
+              child: Stack(
+                alignment: Alignment.bottomRight,
+                children: [
+                  Text(
+                    "Nama Akun",
+                    style: TextStyle(
+                      color: Colors.deepPurple,
+                      fontSize: 18,
+                      fontWeight: FontWeight.bold,
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildListItem(IconData icon, String label, {bool isLogout = false}) {
+    return ListTile(
+      leading: Icon(
+        icon,
+        color:
+            isLogout
+                ? const Color.fromARGB(255, 181, 47, 47)
+                : const Color.fromARGB(255, 255, 255, 255),
+      ),
+      title: Text(label, style: TextStyle(fontSize: 16, color: Colors.black)),
+      trailing: Icon(Icons.arrow_forward_ios, size: 16),
+      onTap: () {},
+    );
+  }
+}

lib/screen/saya/akun_saya.dart

@@ -7,7 +7,6 @@ import 'package:freekake/components/scan_button.dart';
 import 'package:image_picker/image_picker.dart';
 import 'dart:io';
 
-// import 'package:image_picker_web/image_picker_web.dart';
 import 'package:flutter/foundation.dart' show kIsWeb;
 
 class AkunSaya extends StatefulWidget {

lib/screen/saya/profile_screen.dart

@@ -12,7 +12,6 @@ import 'package:freekake/screen/saya/point_saya.dart';
 import 'package:image_picker/image_picker.dart';
 import 'dart:io';
 
-// import 'package:image_picker_web/image_picker_web.dart';
 import 'package:flutter/foundation.dart' show kIsWeb;
 
 class ProfileScreen extends StatefulWidget {

pubspec.lock

@@ -235,6 +235,15 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_unity_widget:
+    dependency: "direct main"
+    description:
+      path: "."
+      ref: "flutter_3.24_android_hotfix"
+      resolved-ref: d2f6dc853d5b5054668ea9d79bb138d2d072696c
+      url: "https://github.com/juicycleff/flutter-unity-view-widget.git"
+    source: git
+    version: "2022.2.1"
   flutter_web_plugins:
     dependency: transitive
     description: flutter
@@ -813,7 +822,23 @@ packages:
       sha256: "18b1640839cf6546784a524c72aded5b6e86b23e7167dc2311cc96f7658b64bd"
       url: "https://pub.dev"
     source: hosted
-    version: "2.11.0"
+    version: "2.10.0"
+  webview_flutter_web:
+    dependency: transitive
+    description:
+      name: webview_flutter_web
+      sha256: "18a7ccc1c31dd9a5c759a1b7217a2a1e04bd8f65712714a4070bfac19a23ca9e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.3+4"
+  webview_flutter_wkwebview:
+    dependency: transitive
+    description:
+      name: webview_flutter_web
+      sha256: "18a7ccc1c31dd9a5c759a1b7217a2a1e04bd8f65712714a4070bfac19a23ca9e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.3+4"
   webview_flutter_wkwebview:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -59,6 +59,11 @@ dependencies:
   # arcore_flutter_plugin:
   #   git:
   #     url: https://github.com/giandifra/arcore_flutter_plugin.git
+  # flutter_unity_widget: ^2022.2.1
+  flutter_unity_widget:
+    git:
+      url: https://github.com/juicycleff/flutter-unity-view-widget.git
+      ref: flutter_3.24_android_hotfix 
 
 dev_dependencies:
   flutter_test:
@@ -85,45 +90,13 @@ flutter:
   # To add assets to your application, add an assets section, like this:
   assets:
     - assets/images/
-    - assets/images/Artboard 15@4x.png 
-    - assets/images/Artboard 16@4x.png 
-    - assets/images/background.jpeg 
-    - assets/images/cepott.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/
-    - 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
 
-    #HTML File
     - assets/html/
-    - assets/html/index.html
-    - assets/html/furikake/index.html
-    - assets/html/furikake/
-    # HTML Images
-    - assets/html/isipiringku.png 
-    - assets/html/karbohidrat.png 
-    - assets/html/lemak.png 
-    - assets/html/protein.png 
-    - assets/html/seratair.png 
-    - assets/html/vitaminmineral.png
 
+    - assets/html/furikake/
 
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.dev/to/resolution-aware-images