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

@@ -9,26 +9,28 @@ android {
     namespace = "com.example.furibase"
     //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
@@ -46,3 +48,8 @@ android {
 flutter {
     source = "../.."
 }
+
+dependencies {
+    implementation(project(":unityLibrary"))
+    implementation(project(":flutter_unity_widget"))
+}

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

@@ -1,5 +1,8 @@
 package com.example.furibase
 
 import io.flutter.embedding.android.FlutterActivity
+import io.flutter.embedding.android.FlutterFragmentActivity;
 
-class MainActivity : FlutterActivity()
+//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/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,9 +1,9 @@
 import 'package:flutter/material.dart';
-import 'package:furibase/components/navbar_container.dart';
+import 'package:freekake/components/navbar_container.dart';
-import 'package:furibase/components/navbar_shape_1.dart';
+import 'package:freekake/components/navbar_shape_1.dart';
-import 'package:furibase/components/navbar_shape_2.dart';
+import 'package:freekake/components/navbar_shape_2.dart';
-import 'package:furibase/components/navbar_shape_3.dart';
+import 'package:freekake/components/navbar_shape_3.dart';
-import 'package:furibase/components/custom_shape.dart';
+import 'package:freekake/components/custom_shape.dart';
 
 class BottomNavbar extends StatefulWidget {
   const BottomNavbar({super.key});

lib/components/custom_shape.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:furibase/components/navbar_shape_2.dart';
+import 'package:freekake/components/navbar_shape_2.dart';
 
 class CustomShape extends StatelessWidget {
   const CustomShape({super.key});

lib/components/main_menu.dart

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

lib/components/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/navbar_container.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:furibase/components/navbar_shape_2.dart';
+import 'package:freekake/components/navbar_shape_2.dart';
 
 class NavbarContainer extends StatelessWidget {
   const NavbarContainer({super.key});

lib/components/scan_button.dart

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

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,9 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:furibase/providers/character_provider.dart';
+import 'package:freekake/components/navbar_container.dart';
-import 'package:furibase/providers/menu_selection_provider.dart';
+import 'package:freekake/providers/character_provider.dart';
-import 'package:furibase/screen/Home_screen.dart';
+import 'package:freekake/screen/Home_screen.dart';
+import 'package:freekake/screen/drraw_screen.dart';
 import 'package:provider/provider.dart';
+import 'package:freekake/providers/menu_selection_provider.dart';
 
 void main() {
   WidgetsFlutterBinding.ensureInitialized();

lib/screen/Home_screen.dart

@@ -1,9 +1,11 @@
 import 'package:dropdown_button2/dropdown_button2.dart';
 import 'package:flutter/material.dart';
-import 'package:furibase/components/bottom_navbar.dart';
+import 'package:freekake/components/bottom_navbar.dart';
-import 'package:furibase/components/buildcard_info.dart';
+import 'package:freekake/components/buildcard_info.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:freekake/components/topbar_container.dart';
+import 'package:flutter_unity_widget/flutter_unity_widget.dart';
 
 class HomeScreen extends StatefulWidget {
   HomeScreen({super.key});
@@ -17,6 +19,7 @@ class _HomeScreenState extends State<HomeScreen> {
   double _sliderValue = 0.0;
   static const Color transparent = Color(0xFFFFFFFF);
   // Image image
+  late UnityWidgetController _unityWidgetController;
 
   @override
   Widget build(BuildContext context) {
@@ -70,16 +73,21 @@ class _HomeScreenState extends State<HomeScreen> {
       body: Stack(
         children: <Widget>[
           Positioned.fill(
-            child: RepaintBoundary(
+            child: UnityWidget(
-              child: Container(
+              onUnityCreated: onUnityCreated,
-                decoration: const BoxDecoration(
+              //isARScene: true,
-                  image: const DecorationImage(
+              onUnityMessage: onUnityMessage,
-                    image: AssetImage("assets/images/background.jpeg"),
+              //onUnitySceneLoaded: onUnitySceneLoaded,
-                    fit: BoxFit.cover,
+              fullscreen: false,
-                  ),
-                ),
-              ),
             ),
+            // child: Container(
+            //   decoration: BoxDecoration(
+            //     image: DecorationImage(
+            //       image: AssetImage("assets/images/background.jpeg"),
+            //       fit: BoxFit.cover,
+            //     ),
+            //   ),
+            // ),
           ),
           // Positioned(
           //   top: 0,
@@ -192,39 +200,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("assets/images/luffy.png", 300),
+          //       setHomeImage("images/luffy.png", 300),
-              ],
+          //       // Image.asset("images/luffy.png", width: 300),
-            ),
+          //     ],
-          ),
+          //   ),
+          // ),
           // BG MEnu
           Stack(
             children: [
@@ -250,6 +259,14 @@ class _HomeScreenState extends State<HomeScreen> {
     );
   }
 
+  void onUnityCreated(controller) {
+    _unityWidgetController = controller;
+  }
+
+  void onUnityMessage(message) {
+    print('Received message from unity: ${message.toString()}');
+  }
+
   // Widget _menuButton(String label, Widget icon) {
   //   return Expanded(
   //     child: Column(
@@ -290,7 +307,7 @@ class _HomeScreenState extends State<HomeScreen> {
   // }
 
   Widget setHomeImage(String src, double size) {
-    return Image.asset(src, width: size);
+    return Image.asset("assets/" + src, width: size);
   }
 }
 

lib/screen/collection/collection_caracter_screen.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:furibase/components/collection_container.dart';
+import 'package:freekake/components/collection_container.dart';
 
 class CollectionCaraterScreen extends StatefulWidget {
   const CollectionCaraterScreen({super.key});
@@ -22,7 +22,7 @@ class _CollectionCaraterScreenState extends State<CollectionCaraterScreen> {
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                Text("Favorite", style: TextStyle(color: Colors.black)),
+                Text("Favorit", style: TextStyle(color: Colors.black)),
                 Divider(height: 20, color: Colors.transparent),
                 SingleChildScrollView(
                   scrollDirection: Axis.horizontal,
@@ -46,7 +46,7 @@ class _CollectionCaraterScreenState extends State<CollectionCaraterScreen> {
                   ),
                 ),
                 Divider(height: 20, color: Colors.transparent),
-                Text("All", style: TextStyle(color: Colors.black)),
+                Text("Semua", style: TextStyle(color: Colors.black)),
                 Divider(height: 20, color: Colors.transparent),
                 SingleChildScrollView(
                   scrollDirection: Axis.horizontal,

lib/screen/collection/collection_fragment_screen.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:furibase/components/collection_container.dart';
+import 'package:freekake/components/collection_container.dart';
-import 'package:furibase/helpers/color_helper.dart';
+import 'package:freekake/helpers/color_helper.dart';
 
 class CollectionFragmentScreen extends StatefulWidget {
   const CollectionFragmentScreen({super.key});

lib/screen/collection/collection_skin_screen.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:furibase/components/collection_container.dart';
+import 'package:freekake/components/collection_container.dart';
 
 class CollectionSkinScreen extends StatefulWidget {
   const CollectionSkinScreen({super.key});
@@ -53,7 +53,7 @@ class _CollectionSkinScreenState extends State<CollectionSkinScreen> {
                   ),
                 ),
                 Divider(height: 20, color: Colors.transparent),
-                Text("Others", style: TextStyle(color: Colors.black)),
+                Text("Lainnya", style: TextStyle(color: Colors.black)),
                 Divider(height: 10),
                 SingleChildScrollView(
                   scrollDirection: Axis.horizontal,

lib/screen/drraw_screen.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:furibase/components/navbar_container.dart';
+import 'package:freekake/components/navbar_container.dart';
 
 class DrawScreen extends StatelessWidget {
   const DrawScreen({super.key});

lib/screen/koleksi_screen.dart

@@ -1,14 +1,14 @@
 import 'package:flutter/material.dart';
-import 'package:furibase/components/bottom_navbar.dart';
+import 'package:freekake/components/bottom_navbar.dart';
-import 'package:furibase/components/buildcard_info.dart';
+import 'package:freekake/components/buildcard_info.dart';
-import 'package:furibase/components/curve_bottom_border_tab.dart';
+import 'package:freekake/components/curve_bottom_border_tab.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/components/tab_menu.dart';
+import 'package:freekake/components/tab_menu.dart';
-import 'package:furibase/components/topbar_container.dart';
+import 'package:freekake/components/topbar_container.dart';
-import 'package:furibase/screen/collection/collection_caracter_screen.dart';
+import 'package:freekake/screen/collection/collection_caracter_screen.dart';
-import 'package:furibase/screen/collection/collection_fragment_screen.dart';
+import 'package:freekake/screen/collection/collection_fragment_screen.dart';
-import 'package:furibase/screen/collection/collection_skin_screen.dart';
+import 'package:freekake/screen/collection/collection_skin_screen.dart';
 
 class KoleksiScreen extends StatefulWidget {
   const KoleksiScreen({super.key});

lib/screen/pustaka/list_education.dart

@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
-import 'package:furibase/components/buildcard_info.dart';
+import 'package:freekake/components/buildcard_info.dart';
-import 'package:furibase/components/card_list.dart';
+import 'package:freekake/components/card_list.dart';
-import 'package:furibase/components/collection_container%20copy.dart';
+import 'package:freekake/components/collection_container%20copy.dart';
-import 'package:furibase/components/main_menu.dart';
+import 'package:freekake/components/main_menu.dart';
-import 'package:furibase/components/topbar_container.dart';
+import 'package:freekake/components/topbar_container.dart';
-import 'package:furibase/helpers/color_helper.dart';
+import 'package:freekake/screen/pustaka/pustaka_detail_screen.dart';
-import 'package:furibase/screen/pustaka/pustaka_detail_screen.dart';
+import 'package:freekake/helpers/color_helper.dart';
 
 class ListEducation extends StatefulWidget {
   const ListEducation({super.key});

lib/screen/pustaka/pustaka_detail_screen copy.dart

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

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/pustaka_screen.dart

@@ -1,12 +1,20 @@
 import 'package:flutter/material.dart';
-import 'package:furibase/components/bottom_navbar.dart';
+import 'package:freekake/components/bottom_navbar.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/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/components/topbar_container.dart';
+import 'package:freekake/components/topbar_container.dart';
-import 'package:furibase/helpers/color_helper.dart';
+import 'package:freekake/helpers/color_helper.dart';
-import 'package:furibase/screen/pustaka/list_education.dart';
+import 'package:freekake/screen/pustaka/list_education.dart';
+import 'package:freekake/components/bottom_navbar.dart';
+import 'package:freekake/components/buildcard_info.dart';
+import 'package:freekake/components/collection_container.dart';
+import 'package:freekake/components/main_menu.dart';
+import 'package:freekake/components/scan_button.dart';
+import 'package:freekake/components/topbar_container.dart';
+import 'package:freekake/helpers/color_helper.dart';
+import 'package:freekake/screen/pustaka/list_education.dart';
 
 class PustakaScreen extends StatefulWidget {
   const PustakaScreen({super.key});
@@ -22,26 +30,10 @@ class _PustakaScreenState extends State<PustakaScreen> {
   String _searchQuery = "";
 
   final List<Map<String, dynamic>> _collections = [
-    {
+    {"label": "Kesehatan", "image": "assets/icons/healthy.svg", "color": "#cdd0ee"},
-      "label": "Kesehatan",
+    {"label": "Gizi", "image": "assets/icons/Nutrition.svg", "color": "#e8e29a"},
-      "image": "assets/icons/healthy.svg",
+    {"label": "Pendidikan", "image": "assets/icons/Education.svg", "color": "#efd8c6"},
-      "color": "#cdd0ee",
+    {"label": "Keselamatan", "image": "assets/icons/Safety.svg", "color": "#cef1da"},
-    },
-    {
-      "label": "Gizi",
-      "image": "assets/icons/Nutrition.svg",
-      "color": "#e8e29a",
-    },
-    {
-      "label": "Pendidikan",
-      "image": "assets/icons/Education.svg",
-      "color": "#efd8c6",
-    },
-    {
-      "label": "Keselamatan",
-      "image": "assets/icons/Safety.svg",
-      "color": "#cef1da",
-    },
   ];
 
   void _onMenuTapped(int index) {
@@ -147,7 +139,7 @@ class _PustakaScreenState extends State<PustakaScreen> {
                           ),
                           decoration: const InputDecoration(
                             border: InputBorder.none,
-                            hintText: 'Search...',
+                            hintText: 'Cari konten...',
                             hintStyle: TextStyle(color: Colors.grey),
                           ),
                         ),
@@ -177,6 +169,7 @@ class _PustakaScreenState extends State<PustakaScreen> {
                       final item = filteredCollections[index];
                       return CollectionContainer(
                         label: item["label"]!,
+                        lblSize: 11,
                         imageSvg: item["image"]!,
                         width: 30,
                         height: 80,
@@ -196,21 +189,21 @@ class _PustakaScreenState extends State<PustakaScreen> {
                   ),
                 ),
               ),
-              // SizedBox(
+              SizedBox(
-              //   child: Padding(
+                child: Padding(
-              //     padding: const EdgeInsets.symmetric(
+                  padding: const EdgeInsets.symmetric(
-              //       horizontal: 5,
+                    horizontal: 40,
-              //       vertical: 1,
+                    vertical: 1,
-              //     ),
+                  ),
-              //     child: Column(
+                  child: Column(
-              //       crossAxisAlignment: CrossAxisAlignment.start,
+                    crossAxisAlignment: CrossAxisAlignment.start,
-              //       children: [
+                    children: [
-              //         Text("List Topic", style: TextStyle(color: Colors.black)),
+                      Text("Daftar Topik", style: TextStyle(color: Colors.black)),
-              //         Divider(color: Colors.transparent),
+                      Divider(color: Colors.transparent),
-              //       ],
+                    ],
-              //     ),
+                  ),
-              //   ),
+                ),
-              // ),
+              ),
               // Horizontal Scroll List
               Padding(
                 padding: EdgeInsets.symmetric(horizontal: 5, vertical: 5),
@@ -256,9 +249,10 @@ class _PustakaScreenState extends State<PustakaScreen> {
                                       color: Colors.blueAccent,
                                     ),
                                     Text(
-                                      'Topic ' + (index + 1).toString(),
+                                      'Topik ' + (index + 1).toString(),
                                       style: const TextStyle(
                                         fontWeight: FontWeight.bold,
+                                        fontSize: 11,
                                         color: Color.fromARGB(255, 0, 0, 0),
                                       ),
                                     ),

lib/screen/saya/akun_saya copy.dart

@@ -0,0 +1,211 @@
+import 'dart:typed_data';
+
+import 'package:flutter/material.dart';
+import 'package:furibase/components/bottom_navbar.dart';
+import 'package:furibase/components/main_menu.dart';
+import 'package:furibase/components/scan_button.dart';
+import 'package:furibase/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

@@ -1,13 +1,12 @@
 import 'dart:typed_data';
 
 import 'package:flutter/material.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: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

@@ -1,16 +1,15 @@
 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: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/components/topbar_container.dart';
+import 'package:freekake/components/topbar_container.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';
 
-// import 'package:image_picker_web/image_picker_web.dart';
 import 'package:flutter/foundation.dart' show kIsWeb;
 
 class ProfileScreen extends StatefulWidget {

pubspec.lock

@@ -187,6 +187,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
@@ -533,6 +542,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
+  stream_transform:
+    dependency: transitive
+    description:
+      name: stream_transform
+      sha256: ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.1"
   string_scanner:
     dependency: transitive
     description:
@@ -701,6 +718,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     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:

pubspec.yaml

@@ -1,4 +1,4 @@
-name: furibase
+name: freekake
 description: "A new Flutter project."
 # The following line prevents the package from being accidentally published to
 # pub.dev using `flutter pub publish`. This is preferred for private packages.
@@ -49,6 +49,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: