From 0195a08bcf6d7ed554898844c40b2e60abd0c977 Mon Sep 17 00:00:00 2001
From: Aadarsha Bastola <aadarsha.com@gmail.com>
Date: Tue, 8 Oct 2024 18:34:28 -0700
Subject: [PATCH 01/11] removed grayscale function

---
 mobile/ios/Podfile.lock               |  7 +++++++
 mobile/lib/screens/homepage.dart      | 27 +++++++++++++++++----------
 mobile/lib/widgets/sherd_details.dart | 12 ++++++++++--
 3 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/mobile/ios/Podfile.lock b/mobile/ios/Podfile.lock
index b830997..638b94a 100644
--- a/mobile/ios/Podfile.lock
+++ b/mobile/ios/Podfile.lock
@@ -1367,6 +1367,9 @@ PODS:
     - Flutter
     - FlutterMacOS
   - RecaptchaInterop (100.0.0)
+  - shared_preferences_foundation (0.0.1):
+    - Flutter
+    - FlutterMacOS
   - TensorFlowLiteC (2.12.0):
     - TensorFlowLiteC/Core (= 2.12.0)
   - TensorFlowLiteC/Core (2.12.0)
@@ -1409,6 +1412,7 @@ DEPENDENCIES:
   - image_cropper (from `.symlinks/plugins/image_cropper/ios`)
   - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
+  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
   - tflite_flutter (from `.symlinks/plugins/tflite_flutter/ios`)
   - tflite_flutter_helper_plus (from `.symlinks/plugins/tflite_flutter_helper_plus/ios`)
   - tflite_flutter_plus (from `.symlinks/plugins/tflite_flutter_plus/ios`)
@@ -1465,6 +1469,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/image_picker_ios/ios"
   path_provider_foundation:
     :path: ".symlinks/plugins/path_provider_foundation/darwin"
+  shared_preferences_foundation:
+    :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
   tflite_flutter:
     :path: ".symlinks/plugins/tflite_flutter/ios"
   tflite_flutter_helper_plus:
@@ -1508,6 +1514,7 @@ SPEC CHECKSUMS:
   nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
   path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
   RecaptchaInterop: 7d1a4a01a6b2cb1610a47ef3f85f0c411434cb21
+  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
   TensorFlowLiteC: 20785a69299185a379ba9852b6625f00afd7984a
   TensorFlowLiteSwift: 3a4928286e9e35bdd3e17970f48e53c80d25e793
   tflite_flutter: 9433d086a3060431bbc9f3c7c20d017db0e72d08
diff --git a/mobile/lib/screens/homepage.dart b/mobile/lib/screens/homepage.dart
index 6504d4a..842eed2 100644
--- a/mobile/lib/screens/homepage.dart
+++ b/mobile/lib/screens/homepage.dart
@@ -129,6 +129,10 @@ class _HomePageState extends State<HomePage> {
       return;
     }
 
+    setState(() {
+      selectedImage = File(croppedFile.path);
+    });
+
     //convert croppedFile to grayscale
     // Read the image file
     final File imageFile = File(croppedFile.path);
@@ -142,19 +146,22 @@ class _HomePageState extends State<HomePage> {
     }
 
     // Convert the image to grayscale
-    img.Image grayscaleImage = img.grayscale(image);
-    imageForModel = grayscaleImage;
+    // img.Image grayscaleImage = img.grayscale(image);
+
+    imageForModel = image;
+
+    // imageForModel = grayscaleImage;
 
     // Encode the grayscale image back to PNG format
-    final List<int> grayscaleBytes = img.encodePng(grayscaleImage);
+    // final List<int> grayscaleBytes = img.encodePng(grayscaleImage);
 
-    // Save the grayscale image as a new file
-    final File grayscaleFile =
-        await File(croppedFile.path).writeAsBytes(grayscaleBytes);
+    // // Save the grayscale image as a new file
+    // final File grayscaleFile =
+    //     await File(croppedFile.path).writeAsBytes(grayscaleBytes);
 
-    setState(() {
-      selectedImage = grayscaleFile;
-    });
+    // setState(() {
+    //   selectedImage = grayscaleFile;
+    // });
   }
 
   void resetScreen() {
@@ -535,7 +542,7 @@ class _HomePageState extends State<HomePage> {
                                         FittedBox(
                                           fit: BoxFit.contain,
                                           child: Text(
-                                            'ABOUT\nTUYSAYAN\nWHITE\nWARE',
+                                            'ABOUT\nTUSAYAN\nWHITE\nWARE',
                                             style: TextStyle(
                                               fontSize: 20,
                                               fontFamily: 'Uber',
diff --git a/mobile/lib/widgets/sherd_details.dart b/mobile/lib/widgets/sherd_details.dart
index 10f1184..a4eaca9 100644
--- a/mobile/lib/widgets/sherd_details.dart
+++ b/mobile/lib/widgets/sherd_details.dart
@@ -69,8 +69,16 @@ class SherdDetails extends StatelessWidget {
               ClipRRect(
                 borderRadius: BorderRadius.circular(5),
                 child: (!fromHive)
-                    ? Image.network(imageUrl)
-                    : Image.file(File(imageUrl)),
+                    ? Image.network(
+                        imageUrl,
+                        width: double.infinity,
+                        fit: BoxFit.cover,
+                      )
+                    : Image.file(
+                        File(imageUrl),
+                        width: double.infinity,
+                        fit: BoxFit.cover,
+                      ),
               ),
               ExpansionTile(
                 title: const Text('Model Confidence'),

From c3834124a4f640fb8e74e87632c726d07e36f24a Mon Sep 17 00:00:00 2001
From: Aadarsha Bastola <aadarsha.com@gmail.com>
Date: Tue, 8 Oct 2024 18:40:07 -0700
Subject: [PATCH 02/11] minor details changes

---
 mobile/lib/widgets/sherd_details.dart | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/mobile/lib/widgets/sherd_details.dart b/mobile/lib/widgets/sherd_details.dart
index a4eaca9..1395fb3 100644
--- a/mobile/lib/widgets/sherd_details.dart
+++ b/mobile/lib/widgets/sherd_details.dart
@@ -107,13 +107,16 @@ class SherdDetails extends StatelessWidget {
                 ),
               ),
               const SizedBox(height: 16),
-              Center(
-                child: FilledButton(
-                  onPressed: () {
-                    Navigator.of(context).pop();
-                  },
-                  child: const Text('Dismiss'),
-                ),
+              Row(
+                mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                children: [
+                  FilledButton(
+                    onPressed: () {
+                      Navigator.of(context).pop();
+                    },
+                    child: const Text('Dismiss'),
+                  ),
+                ],
               ),
             ],
           ),

From a15eea430f8416cf57749d6f131900a4fb69025f Mon Sep 17 00:00:00 2001
From: Aadarsha Bastola <aadarsha.com@gmail.com>
Date: Wed, 9 Oct 2024 10:20:23 -0700
Subject: [PATCH 03/11] removed image grayscale feature

---
 mobile/lib/screens/homepage.dart | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/mobile/lib/screens/homepage.dart b/mobile/lib/screens/homepage.dart
index 842eed2..dd3b77a 100644
--- a/mobile/lib/screens/homepage.dart
+++ b/mobile/lib/screens/homepage.dart
@@ -150,6 +150,8 @@ class _HomePageState extends State<HomePage> {
 
     imageForModel = image;
 
+    classifyImage();
+
     // imageForModel = grayscaleImage;
 
     // Encode the grayscale image back to PNG format
@@ -225,7 +227,11 @@ class _HomePageState extends State<HomePage> {
     Map<String, double> resultMap = {};
 
     for (int i = 0; i < labels.length; i++) {
-      resultMap[labels[i]] = _outputBuffer.getDoubleList()[i];
+      // resultMap[labels[i]] = _outputBuffer.getDoubleList()[i];
+      double confidence = _outputBuffer.getDoubleList()[i];
+      if (confidence > 0.1) {
+        resultMap[labels[i]] = confidence;
+      }
     }
     String highestConfidenceLabel = '';
     double highestConfidenceValue = 0.0;
@@ -687,14 +693,24 @@ class _HomePageState extends State<HomePage> {
                           padding: const EdgeInsets.all(12.0),
                           child: Column(
                             children: [
-                              const Text('Primary Classification:'),
+                              // const Text('Primary Classification:',
+                              //     style:
+                              //         TextStyle(fontWeight: FontWeight.bold)),
                               Text(
-                                "${classificatoinMap!['primaryClassification'].toString()} [${classificatoinMap!['allClassificatoins']?[classificatoinMap!['primaryClassification'].toString()].toStringAsFixed(3)}]",
+                                "${classificatoinMap!['primaryClassification'].toString()} [${classificatoinMap!['allClassificatoins']?[classificatoinMap!['primaryClassification'].toStringAsFixed(3)] ?? ""}]",
                                 style: const TextStyle(
                                     fontSize: 20, fontWeight: FontWeight.bold),
                               ),
-                              Text(
-                                  "Location: ${classificatoinMap!['lattitude'].toStringAsFixed(4)}, ${classificatoinMap!['longitude'].toStringAsFixed(4)}"),
+                              const Text(
+                                'All classifications and confidence:',
+                                style: TextStyle(fontWeight: FontWeight.bold),
+                              ),
+                              ...classificatoinMap!['allClassificatoins']
+                                  .entries
+                                  .map((entry) => Text(
+                                      '${entry.key}: ${entry.value.toStringAsFixed(3)}')),
+                              // Text(
+                              //     "Location: ${classificatoinMap!['lattitude'].toStringAsFixed(4)}, ${classificatoinMap!['longitude'].toStringAsFixed(4)}"),
                               // const Text("Other Classifications:"),
                             ],
                           )),

From 99978d77a7897b932d793f9d17a0c5d94ab19072 Mon Sep 17 00:00:00 2001
From: Aadarsha Bastola <aadarsha.com@gmail.com>
Date: Mon, 14 Oct 2024 10:18:51 -0700
Subject: [PATCH 04/11] output disply change

---
 mobile/lib/screens/homepage.dart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mobile/lib/screens/homepage.dart b/mobile/lib/screens/homepage.dart
index dd3b77a..3c67c27 100644
--- a/mobile/lib/screens/homepage.dart
+++ b/mobile/lib/screens/homepage.dart
@@ -697,12 +697,12 @@ class _HomePageState extends State<HomePage> {
                               //     style:
                               //         TextStyle(fontWeight: FontWeight.bold)),
                               Text(
-                                "${classificatoinMap!['primaryClassification'].toString()} [${classificatoinMap!['allClassificatoins']?[classificatoinMap!['primaryClassification'].toStringAsFixed(3)] ?? ""}]",
+                                "${classificatoinMap!['primaryClassification'].toString()} [${classificatoinMap!['allClassificatoins']?[classificatoinMap!['primaryClassification']]?.toStringAsFixed(3) ?? "0.0"}]",
                                 style: const TextStyle(
                                     fontSize: 20, fontWeight: FontWeight.bold),
                               ),
                               const Text(
-                                'All classifications and confidence:',
+                                'Model Prediction:',
                                 style: TextStyle(fontWeight: FontWeight.bold),
                               ),
                               ...classificatoinMap!['allClassificatoins']

From 6f67ff267448d9e872941a8f1759d961c0a1294e Mon Sep 17 00:00:00 2001
From: Aadarsha Bastola <aadarsha.com@gmail.com>
Date: Wed, 6 Nov 2024 12:28:26 -0700
Subject: [PATCH 05/11] leszek suggestions

---
 mobile/android/app/src/main/AndroidManifest.xml |  3 ++-
 mobile/lib/screens/about/about_knaa.dart        |  2 +-
 mobile/lib/screens/homepage.dart                | 11 +++++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/mobile/android/app/src/main/AndroidManifest.xml b/mobile/android/app/src/main/AndroidManifest.xml
index 527fe38..69838d2 100644
--- a/mobile/android/app/src/main/AndroidManifest.xml
+++ b/mobile/android/app/src/main/AndroidManifest.xml
@@ -13,7 +13,8 @@
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
-            android:windowSoftInputMode="adjustResize">
+            android:windowSoftInputMode="adjustResize"
+            android:screenOrientation="portrait">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues
diff --git a/mobile/lib/screens/about/about_knaa.dart b/mobile/lib/screens/about/about_knaa.dart
index 8dc11b4..4390bc6 100644
--- a/mobile/lib/screens/about/about_knaa.dart
+++ b/mobile/lib/screens/about/about_knaa.dart
@@ -31,7 +31,7 @@ class AboutKnaa extends StatelessWidget {
         title: const Padding(
           padding: EdgeInsets.symmetric(horizontal: 8.0),
           child: Text(
-            "Kna'a",
+            "Kana'a",
             style: TextStyle(
                 fontFamily: 'Uber', fontSize: 60, fontWeight: FontWeight.w700),
           ),
diff --git a/mobile/lib/screens/homepage.dart b/mobile/lib/screens/homepage.dart
index 3c67c27..21c0ebd 100644
--- a/mobile/lib/screens/homepage.dart
+++ b/mobile/lib/screens/homepage.dart
@@ -720,10 +720,13 @@ class _HomePageState extends State<HomePage> {
                 height: 16,
               ),
               selectedImage != null && classificaitonData == null
-                  ? Center(
-                      child: FilledButton(
-                          onPressed: classifyImage,
-                          child: const Text('Classify')),
+                  // ? Center(
+                  //     child: FilledButton(
+                  //         onPressed: classifyImage,
+                  //         child: const Text('Classify')),
+                  //   )
+                  ? const Center(
+                      child: CircularProgressIndicator(),
                     )
                   : Container(),
               selectedImage != null && classificaitonData == null

From 08e649277b754b780a154e5f4c86da667a74a802 Mon Sep 17 00:00:00 2001
From: Aadarsha Bastola <aadarsha.com@gmail.com>
Date: Mon, 9 Dec 2024 22:52:59 -0700
Subject: [PATCH 06/11] updated to convnext model, tested IOS

---
 mobile/lib/screens/homepage.dart | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mobile/lib/screens/homepage.dart b/mobile/lib/screens/homepage.dart
index 21c0ebd..a769907 100644
--- a/mobile/lib/screens/homepage.dart
+++ b/mobile/lib/screens/homepage.dart
@@ -58,7 +58,9 @@ class _HomePageState extends State<HomePage> {
   }
 
   Future<void> loadModel() async {
-    interpreter = await Interpreter.fromAsset('ResNet152V2.tflite');
+    interpreter = await Interpreter.fromAsset('convnext.tflite');
+
+    print('Interpreter loaded successfully');
 
     _inputShape = interpreter.getInputTensor(0).shape;
     _outputShape = interpreter.getOutputTensor(0).shape;
@@ -75,7 +77,7 @@ class _HomePageState extends State<HomePage> {
         .add(ResizeWithCropOrPadOp(cropSize, cropSize))
         .add(ResizeOp(
             _inputShape[1], _inputShape[2], ResizeMethod.nearestneighbour))
-        .add(NormalizeOp(0, 255))
+        // .add(NormalizeOp(0, 255))
         .build()
         .process(_inputImage);
   }

From a2a54aa16a2752b85bddc511e901b7115571a09c Mon Sep 17 00:00:00 2001
From: Aadarsha Bastola <aadarsha.com@gmail.com>
Date: Wed, 11 Dec 2024 20:33:02 -0700
Subject: [PATCH 07/11] updated android gradle

---
 mobile/android/app/build.gradle                         | 2 ++
 mobile/android/build.gradle                             | 4 ++--
 mobile/android/gradle.properties                        | 3 +++
 mobile/android/gradle/wrapper/gradle-wrapper.properties | 4 +++-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle
index 7102104..c341210 100644
--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -56,6 +56,7 @@ android {
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
+        multiDexEnabled true
     }
 
     buildTypes {
@@ -80,4 +81,5 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation platform('com.google.firebase:firebase-bom:33.2.0')
     implementation 'com.google.firebase:firebase-analytics'
+    implementation 'com.android.support:multidex:2.0.1'
 }
diff --git a/mobile/android/build.gradle b/mobile/android/build.gradle
index f48f77e..6ee2178 100644
--- a/mobile/android/build.gradle
+++ b/mobile/android/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.9.23'
+    ext.kotlin_version = '2.1.0'
     repositories {
         google()
         mavenCentral()
@@ -9,7 +9,7 @@ buildscript {
         // START: FlutterFire Configuration
         classpath 'com.google.gms:google-services:4.3.15'
         // END: FlutterFire Configuration
-        classpath 'com.android.tools.build:gradle:7.3.0'
+        classpath 'com.android.tools.build:gradle:8.7.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/mobile/android/gradle.properties b/mobile/android/gradle.properties
index 94adc3a..b9a9a24 100644
--- a/mobile/android/gradle.properties
+++ b/mobile/android/gradle.properties
@@ -1,3 +1,6 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/mobile/android/gradle/wrapper/gradle-wrapper.properties b/mobile/android/gradle/wrapper/gradle-wrapper.properties
index 3c472b9..09523c0 100644
--- a/mobile/android/gradle/wrapper/gradle-wrapper.properties
+++ b/mobile/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip

From 256787f9616a98bca007fb4e6f18cd4839f74d61 Mon Sep 17 00:00:00 2001
From: Aadarsha Bastola <aadarsha.com@gmail.com>
Date: Wed, 11 Dec 2024 20:35:02 -0700
Subject: [PATCH 08/11] gradle changes

---
 mobile/android/app/build.gradle | 2 --
 mobile/android/build.gradle     | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle
index c341210..7102104 100644
--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -56,7 +56,6 @@ android {
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        multiDexEnabled true
     }
 
     buildTypes {
@@ -81,5 +80,4 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation platform('com.google.firebase:firebase-bom:33.2.0')
     implementation 'com.google.firebase:firebase-analytics'
-    implementation 'com.android.support:multidex:2.0.1'
 }
diff --git a/mobile/android/build.gradle b/mobile/android/build.gradle
index 6ee2178..9b55166 100644
--- a/mobile/android/build.gradle
+++ b/mobile/android/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '2.1.0'
+    ext.kotlin_version = '1.9.23'
     repositories {
         google()
         mavenCentral()

From 72e38d4534176d6120f3cbf8f2c26d17033652d4 Mon Sep 17 00:00:00 2001
From: Aadarsha Bastola <aadarsha.com@gmail.com>
Date: Wed, 11 Dec 2024 21:30:33 -0700
Subject: [PATCH 09/11] working model, need to figure out preprocessing

---
 mobile/android/app/build.gradle               |   3 +-
 mobile/lib/screens/homepage.dart              | 155 ++++++++++--------
 .../flutter/generated_plugin_registrant.cc    |   4 -
 mobile/linux/flutter/generated_plugins.cmake  |   1 -
 mobile/pubspec.lock                           |  64 --------
 mobile/pubspec.yaml                           |   2 -
 6 files changed, 91 insertions(+), 138 deletions(-)

diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle
index 7102104..a89cf43 100644
--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -32,7 +32,8 @@ android {
     namespace "com.example.craft"
     // might need to change to 33
     compileSdkVersion flutter.compileSdkVersion
-    ndkVersion flutter.ndkVersion
+    // ndkVersion flutter.ndkVersion
+    ndkVersion = "27.0.12077973"
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
diff --git a/mobile/lib/screens/homepage.dart b/mobile/lib/screens/homepage.dart
index a769907..ccc9bf2 100644
--- a/mobile/lib/screens/homepage.dart
+++ b/mobile/lib/screens/homepage.dart
@@ -16,8 +16,7 @@ import 'package:image_picker/image_picker.dart';
 import 'package:page_transition/page_transition.dart';
 import 'package:provider/provider.dart';
 import 'package:image/image.dart' as img;
-import 'package:tflite_flutter_helper_plus/tflite_flutter_helper_plus.dart';
-import 'package:tflite_flutter_plus/tflite_flutter_plus.dart';
+import 'package:tflite_flutter/tflite_flutter.dart';
 
 class HomePage extends StatefulWidget {
   static const String id = 'home';
@@ -40,12 +39,6 @@ class _HomePageState extends State<HomePage> {
   late List<int> _inputShape;
   late List<int> _outputShape;
 
-  late TensorImage _inputImage;
-  late TensorBuffer _outputBuffer;
-
-  late TfLiteType _inputType;
-  late TfLiteType _outputType;
-
   final String _labelsFileName = 'assets/tww_labels.txt';
 
   Map<String, dynamic>? classificatoinMap;
@@ -58,28 +51,29 @@ class _HomePageState extends State<HomePage> {
   }
 
   Future<void> loadModel() async {
-    interpreter = await Interpreter.fromAsset('convnext.tflite');
+    interpreter = await Interpreter.fromAsset('assets/convnext.tflite');
 
     print('Interpreter loaded successfully');
 
     _inputShape = interpreter.getInputTensor(0).shape;
     _outputShape = interpreter.getOutputTensor(0).shape;
-    _inputType = interpreter.getInputTensor(0).type;
-    _outputType = interpreter.getOutputTensor(0).type;
-    _outputBuffer = TensorBuffer.createFixedSize(_outputShape, _outputType);
-
-    labels = await FileUtil.loadLabels(_labelsFileName);
   }
 
-  TensorImage _preProcess() {
-    int cropSize = min(_inputImage.height, _inputImage.width);
-    return ImageProcessorBuilder()
-        .add(ResizeWithCropOrPadOp(cropSize, cropSize))
-        .add(ResizeOp(
-            _inputShape[1], _inputShape[2], ResizeMethod.nearestneighbour))
-        // .add(NormalizeOp(0, 255))
-        .build()
-        .process(_inputImage);
+  Uint8List preprocessImage(img.Image image, int inputSize) {
+    final resizedImage =
+        img.copyResize(image, width: inputSize, height: inputSize);
+    final Uint8List input = Uint8List(inputSize * inputSize * 3);
+
+    for (int y = 0; y < inputSize; y++) {
+      for (int x = 0; x < inputSize; x++) {
+        final pixel = resizedImage.getPixel(x, y);
+        input[(y * inputSize + x) * 3] = (img.getRed(pixel) * 255).toInt();
+        input[(y * inputSize + x) * 3 + 1] =
+            (img.getGreen(pixel) * 255).toInt();
+        input[(y * inputSize + x) * 3 + 2] = (img.getBlue(pixel) * 255).toInt();
+      }
+    }
+    return input;
   }
 
   Future<void> getCurrentUser() async {
@@ -147,9 +141,6 @@ class _HomePageState extends State<HomePage> {
       return;
     }
 
-    // Convert the image to grayscale
-    // img.Image grayscaleImage = img.grayscale(image);
-
     imageForModel = image;
 
     classifyImage();
@@ -220,39 +211,71 @@ class _HomePageState extends State<HomePage> {
       classificaitonData = "Classified";
     });
 
-    _inputImage = TensorImage(_inputType);
-    _inputImage.loadImage(imageForModel!);
-    _inputImage = _preProcess();
+    // Ensure input size is exactly 224x224
+    final inputSize = 224;
+    final resizedImage = img.copyResize(imageForModel!,
+        width: inputSize,
+        height: inputSize,
+        interpolation: img.Interpolation.average);
+
+    final input = List.generate(
+        1,
+        (_) => List.generate(
+            inputSize,
+            (_) =>
+                List.generate(inputSize, (_) => List<double>.filled(3, 0.0))));
+
+    for (int y = 0; y < inputSize; y++) {
+      for (int x = 0; x < inputSize; x++) {
+        final pixel = resizedImage.getPixel(x, y);
+
+        // Preprocessing matches the script's cv2 preprocessing
+        // Convert to BGR (OpenCV default) and normalize
+        input[0][y][x][0] = (img.getBlue(pixel) / 255.0);
+        input[0][y][x][1] = (img.getGreen(pixel) / 255.0);
+        input[0][y][x][2] = (img.getRed(pixel) / 255.0);
+      }
+    }
 
-    interpreter.run(_inputImage.buffer, _outputBuffer.getBuffer());
+    final outputBuffer =
+        List.generate(1, (_) => List.filled(_outputShape[1], 0.0));
 
-    Map<String, double> resultMap = {};
+    try {
+      interpreter.run(input, outputBuffer);
 
-    for (int i = 0; i < labels.length; i++) {
-      // resultMap[labels[i]] = _outputBuffer.getDoubleList()[i];
-      double confidence = _outputBuffer.getDoubleList()[i];
-      if (confidence > 0.1) {
-        resultMap[labels[i]] = confidence;
-      }
+      final results = outputBuffer[0];
+      print('Raw output: $results');
+    } catch (e) {
+      print('Error running inference: $e');
     }
-    String highestConfidenceLabel = '';
-    double highestConfidenceValue = 0.0;
 
-    resultMap.forEach((label, value) {
-      if (value > highestConfidenceValue) {
-        highestConfidenceValue = value;
-        highestConfidenceLabel = label;
-      }
-    });
+    // Map<String, double> resultMap = {};
+
+    // for (int i = 0; i < labels.length; i++) {
+    //   // resultMap[labels[i]] = _outputBuffer.getDoubleList()[i];
+    //   double confidence = _outputBuffer.getDoubleList()[i];
+    //   if (confidence > 0.1) {
+    //     resultMap[labels[i]] = confidence;
+    //   }
+    // }
+    // String highestConfidenceLabel = '';
+    // double highestConfidenceValue = 0.0;
+
+    // resultMap.forEach((label, value) {
+    //   if (value > highestConfidenceValue) {
+    //     highestConfidenceValue = value;
+    //     highestConfidenceLabel = label;
+    //   }
+    // });
 
-    setState(() {
-      classificatoinMap = {
-        'primaryClassification': highestConfidenceLabel,
-        'allClassificatoins': resultMap,
-        'lattitude': pos.latitude,
-        'longitude': pos.longitude,
-      };
-    });
+    // setState(() {
+    //   classificatoinMap = {
+    //     'primaryClassification': highestConfidenceLabel,
+    //     'allClassificatoins': resultMap,
+    //     'lattitude': pos.latitude,
+    //     'longitude': pos.longitude,
+    //   };
+    // });
   }
 
   Future<Position> _determinePosition() async {
@@ -698,19 +721,19 @@ class _HomePageState extends State<HomePage> {
                               // const Text('Primary Classification:',
                               //     style:
                               //         TextStyle(fontWeight: FontWeight.bold)),
-                              Text(
-                                "${classificatoinMap!['primaryClassification'].toString()} [${classificatoinMap!['allClassificatoins']?[classificatoinMap!['primaryClassification']]?.toStringAsFixed(3) ?? "0.0"}]",
-                                style: const TextStyle(
-                                    fontSize: 20, fontWeight: FontWeight.bold),
-                              ),
-                              const Text(
-                                'Model Prediction:',
-                                style: TextStyle(fontWeight: FontWeight.bold),
-                              ),
-                              ...classificatoinMap!['allClassificatoins']
-                                  .entries
-                                  .map((entry) => Text(
-                                      '${entry.key}: ${entry.value.toStringAsFixed(3)}')),
+                              // Text(
+                              //   "${classificatoinMap!['primaryClassification'].toString()} [${classificatoinMap!['allClassificatoins']?[classificatoinMap!['primaryClassification']]?.toStringAsFixed(3) ?? "0.0"}]",
+                              //   style: const TextStyle(
+                              //       fontSize: 20, fontWeight: FontWeight.bold),
+                              // ),
+                              // const Text(
+                              //   'Model Prediction:',
+                              //   style: TextStyle(fontWeight: FontWeight.bold),
+                              // ),
+                              // ...classificatoinMap!['allClassificatoins']
+                              //     .entries
+                              //     .map((entry) => Text(
+                              //         '${entry.key}: ${entry.value.toStringAsFixed(3)}')),
                               // Text(
                               //     "Location: ${classificatoinMap!['lattitude'].toStringAsFixed(4)}, ${classificatoinMap!['longitude'].toStringAsFixed(4)}"),
                               // const Text("Other Classifications:"),
diff --git a/mobile/linux/flutter/generated_plugin_registrant.cc b/mobile/linux/flutter/generated_plugin_registrant.cc
index b74b609..7299b5c 100644
--- a/mobile/linux/flutter/generated_plugin_registrant.cc
+++ b/mobile/linux/flutter/generated_plugin_registrant.cc
@@ -7,16 +7,12 @@
 #include "generated_plugin_registrant.h"
 
 #include <file_selector_linux/file_selector_plugin.h>
-#include <tflite_flutter_plus/tflite_flutter_plus_plugin.h>
 #include <url_launcher_linux/url_launcher_plugin.h>
 
 void fl_register_plugins(FlPluginRegistry* registry) {
   g_autoptr(FlPluginRegistrar) file_selector_linux_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "FileSelectorPlugin");
   file_selector_plugin_register_with_registrar(file_selector_linux_registrar);
-  g_autoptr(FlPluginRegistrar) tflite_flutter_plus_registrar =
-      fl_plugin_registry_get_registrar_for_plugin(registry, "TfliteFlutterPlusPlugin");
-  tflite_flutter_plus_plugin_register_with_registrar(tflite_flutter_plus_registrar);
   g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
   url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);
diff --git a/mobile/linux/flutter/generated_plugins.cmake b/mobile/linux/flutter/generated_plugins.cmake
index 9c2299d..9cde083 100644
--- a/mobile/linux/flutter/generated_plugins.cmake
+++ b/mobile/linux/flutter/generated_plugins.cmake
@@ -4,7 +4,6 @@
 
 list(APPEND FLUTTER_PLUGIN_LIST
   file_selector_linux
-  tflite_flutter_plus
   url_launcher_linux
 )
 
diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock
index b481cdf..547dd4e 100644
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -33,46 +33,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.1"
-  camera:
-    dependency: transitive
-    description:
-      name: camera
-      sha256: dfa8fc5a1adaeb95e7a54d86a5bd56f4bb0e035515354c8ac6d262e35cec2ec8
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.10.6"
-  camera_android:
-    dependency: transitive
-    description:
-      name: camera_android
-      sha256: "32f04948a284b71d938fe275616faf4957d07f9b3aab8021bfc8c418301a289e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.10.9+11"
-  camera_avfoundation:
-    dependency: transitive
-    description:
-      name: camera_avfoundation
-      sha256: "7c28969a975a7eb2349bc2cb2dfe3ad218a33dba9968ecfb181ce08c87486655"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.9.17+3"
-  camera_platform_interface:
-    dependency: transitive
-    description:
-      name: camera_platform_interface
-      sha256: b3ede1f171532e0d83111fe0980b46d17f1aa9788a07a2fbed07366bbdbb9061
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.8.0"
-  camera_web:
-    dependency: transitive
-    description:
-      name: camera_web
-      sha256: "595f28c89d1fb62d77c73c633193755b781c6d2e0ebcd8dc25b763b514e6ba8f"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.3.5"
   carousel_slider:
     dependency: "direct main"
     description:
@@ -877,30 +837,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.11.0"
-  tflite_flutter_helper_plus:
-    dependency: "direct main"
-    description:
-      name: tflite_flutter_helper_plus
-      sha256: df46a79487efacf2bf9fe608fa935aaa3dce4be1af97442681975c3414eb6574
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.0.2"
-  tflite_flutter_plus:
-    dependency: "direct main"
-    description:
-      name: tflite_flutter_plus
-      sha256: "72c7363df4be932541b82f8bc7e544df343f6dea1f6e614a3efa2a7dd73dff2e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.0.1"
-  tuple:
-    dependency: transitive
-    description:
-      name: tuple
-      sha256: a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.2"
   typed_data:
     dependency: transitive
     description:
diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index 1604798..1bca557 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -25,9 +25,7 @@ dependencies:
   provider: ^6.1.2
   url_launcher: ^6.3.0
   image: ^3.3.0
-  tflite_flutter_plus: ^0.0.1
   tflite_flutter: ^0.11.0
-  tflite_flutter_helper_plus: ^0.0.2
   shared_preferences: ^2.3.2
 
 dev_dependencies:

From 311d2ff071532dc0c41f12fa691bfb23a7d41c92 Mon Sep 17 00:00:00 2001
From: Aadarsha Bastola <aadarsha.com@gmail.com>
Date: Thu, 12 Dec 2024 00:54:29 -0700
Subject: [PATCH 10/11] working model, android, tested

---
 mobile/ios/Podfile.lock          |  18 ----
 mobile/lib/screens/homepage.dart | 163 ++++++++++++++-----------------
 mobile/pubspec.lock              |   4 +-
 3 files changed, 73 insertions(+), 112 deletions(-)

diff --git a/mobile/ios/Podfile.lock b/mobile/ios/Podfile.lock
index 638b94a..b63d7fa 100644
--- a/mobile/ios/Podfile.lock
+++ b/mobile/ios/Podfile.lock
@@ -1151,8 +1151,6 @@ PODS:
   - BoringSSL-GRPC/Implementation (0.0.36):
     - BoringSSL-GRPC/Interface (= 0.0.36)
   - BoringSSL-GRPC/Interface (0.0.36)
-  - camera_avfoundation (0.0.1):
-    - Flutter
   - cloud_firestore (5.4.1):
     - Firebase/Firestore (= 11.0.0)
     - firebase_core
@@ -1392,16 +1390,11 @@ PODS:
     - TensorFlowLiteSwift (= 2.12.0)
     - TensorFlowLiteSwift/CoreML (= 2.12.0)
     - TensorFlowLiteSwift/Metal (= 2.12.0)
-  - tflite_flutter_helper_plus (0.0.1):
-    - Flutter
-  - tflite_flutter_plus (0.0.1):
-    - Flutter
   - TOCropViewController (2.7.4)
   - url_launcher_ios (0.0.1):
     - Flutter
 
 DEPENDENCIES:
-  - camera_avfoundation (from `.symlinks/plugins/camera_avfoundation/ios`)
   - cloud_firestore (from `.symlinks/plugins/cloud_firestore/ios`)
   - firebase_auth (from `.symlinks/plugins/firebase_auth/ios`)
   - firebase_core (from `.symlinks/plugins/firebase_core/ios`)
@@ -1414,8 +1407,6 @@ DEPENDENCIES:
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
   - tflite_flutter (from `.symlinks/plugins/tflite_flutter/ios`)
-  - tflite_flutter_helper_plus (from `.symlinks/plugins/tflite_flutter_helper_plus/ios`)
-  - tflite_flutter_plus (from `.symlinks/plugins/tflite_flutter_plus/ios`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
 
 SPEC REPOS:
@@ -1447,8 +1438,6 @@ SPEC REPOS:
     - TOCropViewController
 
 EXTERNAL SOURCES:
-  camera_avfoundation:
-    :path: ".symlinks/plugins/camera_avfoundation/ios"
   cloud_firestore:
     :path: ".symlinks/plugins/cloud_firestore/ios"
   firebase_auth:
@@ -1473,17 +1462,12 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
   tflite_flutter:
     :path: ".symlinks/plugins/tflite_flutter/ios"
-  tflite_flutter_helper_plus:
-    :path: ".symlinks/plugins/tflite_flutter_helper_plus/ios"
-  tflite_flutter_plus:
-    :path: ".symlinks/plugins/tflite_flutter_plus/ios"
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
 
 SPEC CHECKSUMS:
   abseil: d121da9ef7e2ff4cab7666e76c5a3e0915ae08c3
   BoringSSL-GRPC: ca6a8e5d04812fce8ffd6437810c2d46f925eaeb
-  camera_avfoundation: dd002b0330f4981e1bbcb46ae9b62829237459a4
   cloud_firestore: 6e3caf23a764c0ca66606ce8034d3f395f4d8c64
   Firebase: 9f574c08c2396885b5e7e100ed4293d956218af9
   firebase_auth: 78dab5e2826921865b33799c66ce7868542beed0
@@ -1518,8 +1502,6 @@ SPEC CHECKSUMS:
   TensorFlowLiteC: 20785a69299185a379ba9852b6625f00afd7984a
   TensorFlowLiteSwift: 3a4928286e9e35bdd3e17970f48e53c80d25e793
   tflite_flutter: 9433d086a3060431bbc9f3c7c20d017db0e72d08
-  tflite_flutter_helper_plus: 33b8f41f9d67ab70280309ed75ff6c709eb4bec6
-  tflite_flutter_plus: f8d7529404eb499ffd29d5682625f8b5b3dddb3a
   TOCropViewController: 80b8985ad794298fb69d3341de183f33d1853654
   url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
 
diff --git a/mobile/lib/screens/homepage.dart b/mobile/lib/screens/homepage.dart
index ccc9bf2..b4bee0f 100644
--- a/mobile/lib/screens/homepage.dart
+++ b/mobile/lib/screens/homepage.dart
@@ -34,13 +34,17 @@ class _HomePageState extends State<HomePage> {
   img.Image? imageForModel;
 
   late Interpreter interpreter;
-  late List<String> labels;
-
-  late List<int> _inputShape;
+  List<String> labels = [
+    "Kana'a",
+    "Black Mesa",
+    "Sosi",
+    "Dogoszhi",
+    "Flagstaff",
+    "Tusayan",
+    "Kayenta"
+  ];
   late List<int> _outputShape;
 
-  final String _labelsFileName = 'assets/tww_labels.txt';
-
   Map<String, dynamic>? classificatoinMap;
 
   @override
@@ -52,30 +56,9 @@ class _HomePageState extends State<HomePage> {
 
   Future<void> loadModel() async {
     interpreter = await Interpreter.fromAsset('assets/convnext.tflite');
-
-    print('Interpreter loaded successfully');
-
-    _inputShape = interpreter.getInputTensor(0).shape;
     _outputShape = interpreter.getOutputTensor(0).shape;
   }
 
-  Uint8List preprocessImage(img.Image image, int inputSize) {
-    final resizedImage =
-        img.copyResize(image, width: inputSize, height: inputSize);
-    final Uint8List input = Uint8List(inputSize * inputSize * 3);
-
-    for (int y = 0; y < inputSize; y++) {
-      for (int x = 0; x < inputSize; x++) {
-        final pixel = resizedImage.getPixel(x, y);
-        input[(y * inputSize + x) * 3] = (img.getRed(pixel) * 255).toInt();
-        input[(y * inputSize + x) * 3 + 1] =
-            (img.getGreen(pixel) * 255).toInt();
-        input[(y * inputSize + x) * 3 + 2] = (img.getBlue(pixel) * 255).toInt();
-      }
-    }
-    return input;
-  }
-
   Future<void> getCurrentUser() async {
     if (currentUser != null) {
       // Fetch user details from Firestore
@@ -135,7 +118,7 @@ class _HomePageState extends State<HomePage> {
     final Uint8List imageBytes = await imageFile.readAsBytes();
 
     // Decode the image using the image package
-    img.Image? image = img.decodeImage(imageBytes);
+    img.Image? image = img.decodeImage(Uint8List.fromList(imageBytes));
 
     if (image == null) {
       return;
@@ -206,18 +189,17 @@ class _HomePageState extends State<HomePage> {
     //randomize the position by 500 meters
     pos = randomizePosition(pos, 500);
 
-    setState(() {
-      currentPosition = pos;
-      classificaitonData = "Classified";
-    });
-
-    // Ensure input size is exactly 224x224
-    final inputSize = 224;
-    final resizedImage = img.copyResize(imageForModel!,
+    const inputSize = 224;
+    // Resize the image
+    final imageBytes = await selectedImage!.readAsBytes();
+    final decodedImage = img.decodeImage(imageBytes);
+    if (decodedImage == null) return;
+    final resizedImage = img.copyResize(decodedImage,
         width: inputSize,
         height: inputSize,
         interpolation: img.Interpolation.average);
 
+    // Prepare the input buffer for the TFLite model
     final input = List.generate(
         1,
         (_) => List.generate(
@@ -225,57 +207,54 @@ class _HomePageState extends State<HomePage> {
             (_) =>
                 List.generate(inputSize, (_) => List<double>.filled(3, 0.0))));
 
+    // Keep original RGB values
     for (int y = 0; y < inputSize; y++) {
       for (int x = 0; x < inputSize; x++) {
         final pixel = resizedImage.getPixel(x, y);
-
-        // Preprocessing matches the script's cv2 preprocessing
-        // Convert to BGR (OpenCV default) and normalize
-        input[0][y][x][0] = (img.getBlue(pixel) / 255.0);
-        input[0][y][x][1] = (img.getGreen(pixel) / 255.0);
-        input[0][y][x][2] = (img.getRed(pixel) / 255.0);
+        input[0][y][x][0] = img.getRed(pixel).toDouble();
+        input[0][y][x][1] = img.getGreen(pixel).toDouble();
+        input[0][y][x][2] = img.getBlue(pixel).toDouble();
       }
     }
 
+// Run the model inference
     final outputBuffer =
         List.generate(1, (_) => List.filled(_outputShape[1], 0.0));
 
-    try {
-      interpreter.run(input, outputBuffer);
+    interpreter.run(input, outputBuffer);
 
-      final results = outputBuffer[0];
-      print('Raw output: $results');
-    } catch (e) {
-      print('Error running inference: $e');
+    Map<String, double> resultMap = {};
+
+    for (int i = 0; i < labels.length; i++) {
+      double confidence = outputBuffer[0][i];
+      if (confidence > 0.1) {
+        resultMap[labels[i]] = confidence;
+      }
     }
 
-    // Map<String, double> resultMap = {};
-
-    // for (int i = 0; i < labels.length; i++) {
-    //   // resultMap[labels[i]] = _outputBuffer.getDoubleList()[i];
-    //   double confidence = _outputBuffer.getDoubleList()[i];
-    //   if (confidence > 0.1) {
-    //     resultMap[labels[i]] = confidence;
-    //   }
-    // }
-    // String highestConfidenceLabel = '';
-    // double highestConfidenceValue = 0.0;
-
-    // resultMap.forEach((label, value) {
-    //   if (value > highestConfidenceValue) {
-    //     highestConfidenceValue = value;
-    //     highestConfidenceLabel = label;
-    //   }
-    // });
+    String highestConfidenceLabel = '';
+    double highestConfidenceValue = 0.0;
 
-    // setState(() {
-    //   classificatoinMap = {
-    //     'primaryClassification': highestConfidenceLabel,
-    //     'allClassificatoins': resultMap,
-    //     'lattitude': pos.latitude,
-    //     'longitude': pos.longitude,
-    //   };
-    // });
+    resultMap.forEach((label, value) {
+      if (value > highestConfidenceValue) {
+        highestConfidenceValue = value;
+        highestConfidenceLabel = label;
+      }
+    });
+
+    setState(() {
+      classificatoinMap = {
+        'primaryClassification': highestConfidenceLabel,
+        'allClassificatoins': resultMap,
+        'lattitude': pos.latitude,
+        'longitude': pos.longitude,
+      };
+    });
+
+    setState(() {
+      currentPosition = pos;
+      classificaitonData = "Classified";
+    });
   }
 
   Future<Position> _determinePosition() async {
@@ -718,25 +697,25 @@ class _HomePageState extends State<HomePage> {
                           padding: const EdgeInsets.all(12.0),
                           child: Column(
                             children: [
-                              // const Text('Primary Classification:',
-                              //     style:
-                              //         TextStyle(fontWeight: FontWeight.bold)),
-                              // Text(
-                              //   "${classificatoinMap!['primaryClassification'].toString()} [${classificatoinMap!['allClassificatoins']?[classificatoinMap!['primaryClassification']]?.toStringAsFixed(3) ?? "0.0"}]",
-                              //   style: const TextStyle(
-                              //       fontSize: 20, fontWeight: FontWeight.bold),
-                              // ),
-                              // const Text(
-                              //   'Model Prediction:',
-                              //   style: TextStyle(fontWeight: FontWeight.bold),
-                              // ),
-                              // ...classificatoinMap!['allClassificatoins']
-                              //     .entries
-                              //     .map((entry) => Text(
-                              //         '${entry.key}: ${entry.value.toStringAsFixed(3)}')),
-                              // Text(
-                              //     "Location: ${classificatoinMap!['lattitude'].toStringAsFixed(4)}, ${classificatoinMap!['longitude'].toStringAsFixed(4)}"),
-                              // const Text("Other Classifications:"),
+                              const Text('Primary Classification:',
+                                  style:
+                                      TextStyle(fontWeight: FontWeight.bold)),
+                              Text(
+                                "${classificatoinMap!['primaryClassification'].toString()} [${classificatoinMap!['allClassificatoins']?[classificatoinMap!['primaryClassification']]?.toStringAsFixed(3) ?? "0.0"}]",
+                                style: const TextStyle(
+                                    fontSize: 20, fontWeight: FontWeight.bold),
+                              ),
+                              const Text(
+                                'Model Prediction:',
+                                style: TextStyle(fontWeight: FontWeight.bold),
+                              ),
+                              ...classificatoinMap!['allClassificatoins']
+                                  .entries
+                                  .map((entry) => Text(
+                                      '${entry.key}: ${entry.value.toStringAsFixed(3)}')),
+                              Text(
+                                  "Location: ${classificatoinMap!['lattitude'].toStringAsFixed(4)}, ${classificatoinMap!['longitude'].toStringAsFixed(4)}"),
+                              const Text("Other Classifications:"),
                             ],
                           )),
                     )
diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock
index 547dd4e..02ee453 100644
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -612,10 +612,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider
-      sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378
+      sha256: "3087813781ab814e4157b172f1a11c46be20179fcc9bea043e0fba36bc0acaa2"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.0.15"
   path_provider_android:
     dependency: transitive
     description:

From 8d34264a1721f8da0d95b67df8396cbcb824fe8a Mon Sep 17 00:00:00 2001
From: Aadarsha Bastola <aadarsha.com@gmail.com>
Date: Thu, 12 Dec 2024 02:00:48 -0700
Subject: [PATCH 11/11] UI updates

---
 mobile/android/app/proguard-rules.pro         |   6 +
 mobile/lib/screens/about/about_craft.dart     | 109 ++++++++++
 mobile/lib/screens/about/about_knaa.dart      |   2 +-
 mobile/lib/screens/about/about_tww.dart       | 187 +++++++++---------
 mobile/lib/screens/homepage.dart              |  22 ++-
 .../user_management/settings_page.dart        |  22 ++-
 6 files changed, 247 insertions(+), 101 deletions(-)
 create mode 100644 mobile/android/app/proguard-rules.pro
 create mode 100644 mobile/lib/screens/about/about_craft.dart

diff --git a/mobile/android/app/proguard-rules.pro b/mobile/android/app/proguard-rules.pro
new file mode 100644
index 0000000..867958a
--- /dev/null
+++ b/mobile/android/app/proguard-rules.pro
@@ -0,0 +1,6 @@
+-keep class org.tensorflow.** { *; }
+-keep class org.tensorflow.lite.** { *; }
+-keep class org.tensorflow.lite.gpu.** { *; }
+# Please add these rules to your existing keep rules in order to suppress warnings.
+# This is generated automatically by the Android Gradle plugin.
+-dontwarn org.tensorflow.lite.gpu.GpuDelegateFactory$Options
\ No newline at end of file
diff --git a/mobile/lib/screens/about/about_craft.dart b/mobile/lib/screens/about/about_craft.dart
new file mode 100644
index 0000000..a02e43c
--- /dev/null
+++ b/mobile/lib/screens/about/about_craft.dart
@@ -0,0 +1,109 @@
+import 'package:flutter/material.dart';
+
+class AboutCraft extends StatelessWidget {
+  const AboutCraft({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        toolbarHeight: 80,
+        title: const Padding(
+          padding: EdgeInsets.symmetric(horizontal: 8.0),
+          child: Text(
+            'About',
+            style: TextStyle(
+                fontFamily: 'Uber', fontSize: 60, fontWeight: FontWeight.w700),
+          ),
+        ),
+      ),
+      body: SingleChildScrollView(
+        child: Padding(
+          padding: const EdgeInsets.all(16),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              const SizedBox(height: 16),
+              const Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    "The goal of CRAFT is to increase the consistency of classification streamline the process of classifying Tusayan White Ware pottery shards by archeologists, use use cutting edge ConvNeXT model for imagge classification to ensure consistency and accuracy for TWW classifications.",
+                    style: TextStyle(
+                      fontFamily: 'Uber',
+                      fontSize: 18,
+                    ),
+                  ),
+                  SizedBox(height: 16),
+                  Text(
+                    'Project Sponsor',
+                    style: TextStyle(
+                      fontFamily: 'Uber',
+                      fontSize: 25,
+                      fontWeight: FontWeight.w700,
+                    ),
+                  ),
+                  SizedBox(height: 8),
+                  Text(
+                    "    Dr. Leszek Pawlowicz ",
+                    style: TextStyle(
+                      fontFamily: 'Uber',
+                      fontSize: 18,
+                    ),
+                  ),
+                  Text(
+                    "    Leszek.Pawlowicz@nau.edu",
+                    style: TextStyle(
+                      fontFamily: 'Uber',
+                      fontSize: 15,
+                    ),
+                  ),
+                  SizedBox(
+                    height: 16,
+                  ),
+                  Text(
+                    'Project Developers',
+                    style: TextStyle(
+                      fontFamily: 'Uber',
+                      fontSize: 25,
+                      fontWeight: FontWeight.w700,
+                    ),
+                  ),
+                  SizedBox(height: 8),
+                  Text(
+                    "    Kimberly Allison",
+                    style: TextStyle(
+                      fontFamily: 'Uber',
+                      fontSize: 18,
+                    ),
+                  ),
+                  Text(
+                    "    Aadarsha Bastola",
+                    style: TextStyle(
+                      fontFamily: 'Uber',
+                      fontSize: 18,
+                    ),
+                  ),
+                  Text(
+                    "    Alan Hakala",
+                    style: TextStyle(
+                      fontFamily: 'Uber',
+                      fontSize: 18,
+                    ),
+                  ),
+                  Text(
+                    "    Nick Wiley",
+                    style: TextStyle(
+                      fontFamily: 'Uber',
+                      fontSize: 18,
+                    ),
+                  ),
+                ],
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/screens/about/about_knaa.dart b/mobile/lib/screens/about/about_knaa.dart
index 4390bc6..114549f 100644
--- a/mobile/lib/screens/about/about_knaa.dart
+++ b/mobile/lib/screens/about/about_knaa.dart
@@ -69,7 +69,7 @@ class AboutKnaa extends StatelessWidget {
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
                   Text(
-                    "Kna'a B/W",
+                    "Kana'a B/W",
                     style: TextStyle(
                       fontFamily: 'Uber',
                       fontSize: 25,
diff --git a/mobile/lib/screens/about/about_tww.dart b/mobile/lib/screens/about/about_tww.dart
index 81c6446..7288ad3 100644
--- a/mobile/lib/screens/about/about_tww.dart
+++ b/mobile/lib/screens/about/about_tww.dart
@@ -43,99 +43,8 @@ class AboutTww extends StatelessWidget {
                 ),
               ),
               const SizedBox(height: 8),
-              const Text(
-                'Manufactured',
-                style: TextStyle(
-                  fontFamily: 'Uber',
-                  fontSize: 25,
-                  fontWeight: FontWeight.w700,
-                ),
-              ),
-              const Text(
-                "Primarily between modern day Tuba City and Kayenta (Kayenta Series).",
-                style: TextStyle(
-                  fontFamily: 'Uber',
-                  fontSize: 18,
-                ),
-              ),
-              const SizedBox(height: 16),
-              const Text(
-                'Distribution:',
-                style: TextStyle(
-                  fontFamily: 'Uber',
-                  fontSize: 25,
-                  fontWeight: FontWeight.w700,
-                ),
-              ),
-              const Text(
-                "Throughout much of the US Southwest.",
-                style: TextStyle(
-                  fontFamily: 'Uber',
-                  fontSize: 18,
-                ),
-              ),
-              const SizedBox(height: 16),
-              const Text(
-                'Physical Characteristics:',
-                style: TextStyle(
-                  fontFamily: 'Uber',
-                  fontSize: 25,
-                  fontWeight: FontWeight.w700,
-                ),
-              ),
-              const Text(
-                "Paste color: Light gray to white, often with carbon streak.",
-                style: TextStyle(
-                  fontFamily: 'Uber',
-                  fontSize: 18,
-                ),
-              ),
-              const Text(
-                "Temper: Mostly fine sand; later types may have sherd or volcanic temper.",
-                style: TextStyle(
-                  fontFamily: 'Uber',
-                  fontSize: 18,
-                ),
-              ),
-              const Text(
-                "Surface Treatment: Polished. Slip uncommon in early types, but does occur in later types. Temper does not protrude through surface.",
-                style: TextStyle(
-                  fontFamily: 'Uber',
-                  fontSize: 18,
-                ),
-              ),
-              const Text(
-                "Paint: Organic, soaks into surface. Blurred edges. Bidahochi type has mineral paint, sharp edges, dark.",
-                style: TextStyle(
-                  fontFamily: 'Uber',
-                  fontSize: 18,
-                ),
-              ),
-              const SizedBox(height: 16),
-              const Text(
-                'Other White Ware Types In Area',
-                style: TextStyle(
-                  fontFamily: 'Uber',
-                  fontSize: 25,
-                  fontWeight: FontWeight.w700,
-                ),
-              ),
-              const Text(
-                "Cibola: Light gray to white paste, often with carbon streak; sand, sherd or both temper; no slip early, thin later; mineral paint.",
-                style: TextStyle(
-                  fontFamily: 'Uber',
-                  fontSize: 18,
-                ),
-              ),
-              const Text(
-                "Little Colorado White Ware: Darker paste color; thick white slip; sherd temper, sometimes with sand; organic paint.",
-                style: TextStyle(
-                  fontFamily: 'Uber',
-                  fontSize: 18,
-                ),
-              ),
-              const SizedBox(height: 16),
               ExpansionTile(
+                initiallyExpanded: true,
                 title: const Text(
                   'Types',
                   style: TextStyle(
@@ -284,7 +193,99 @@ class AboutTww extends StatelessWidget {
                   ),
                   const SizedBox(height: 16),
                 ],
-              )
+              ),
+              const SizedBox(height: 8),
+              const Text(
+                'Manufactured',
+                style: TextStyle(
+                  fontFamily: 'Uber',
+                  fontSize: 25,
+                  fontWeight: FontWeight.w700,
+                ),
+              ),
+              const Text(
+                "Primarily between modern day Tuba City and Kayenta (Kayenta Series).",
+                style: TextStyle(
+                  fontFamily: 'Uber',
+                  fontSize: 18,
+                ),
+              ),
+              const SizedBox(height: 16),
+              const Text(
+                'Distribution:',
+                style: TextStyle(
+                  fontFamily: 'Uber',
+                  fontSize: 25,
+                  fontWeight: FontWeight.w700,
+                ),
+              ),
+              const Text(
+                "Throughout much of the US Southwest.",
+                style: TextStyle(
+                  fontFamily: 'Uber',
+                  fontSize: 18,
+                ),
+              ),
+              const SizedBox(height: 16),
+              const Text(
+                'Physical Characteristics:',
+                style: TextStyle(
+                  fontFamily: 'Uber',
+                  fontSize: 25,
+                  fontWeight: FontWeight.w700,
+                ),
+              ),
+              const Text(
+                "Paste color: Light gray to white, often with carbon streak.",
+                style: TextStyle(
+                  fontFamily: 'Uber',
+                  fontSize: 18,
+                ),
+              ),
+              const Text(
+                "Temper: Mostly fine sand; later types may have sherd or volcanic temper.",
+                style: TextStyle(
+                  fontFamily: 'Uber',
+                  fontSize: 18,
+                ),
+              ),
+              const Text(
+                "Surface Treatment: Polished. Slip uncommon in early types, but does occur in later types. Temper does not protrude through surface.",
+                style: TextStyle(
+                  fontFamily: 'Uber',
+                  fontSize: 18,
+                ),
+              ),
+              const Text(
+                "Paint: Organic, soaks into surface. Blurred edges. Bidahochi type has mineral paint, sharp edges, dark.",
+                style: TextStyle(
+                  fontFamily: 'Uber',
+                  fontSize: 18,
+                ),
+              ),
+              const SizedBox(height: 16),
+              const Text(
+                'Other White Ware Types In Area',
+                style: TextStyle(
+                  fontFamily: 'Uber',
+                  fontSize: 25,
+                  fontWeight: FontWeight.w700,
+                ),
+              ),
+              const Text(
+                "Cibola: Light gray to white paste, often with carbon streak; sand, sherd or both temper; no slip early, thin later; mineral paint.",
+                style: TextStyle(
+                  fontFamily: 'Uber',
+                  fontSize: 18,
+                ),
+              ),
+              const Text(
+                "Little Colorado White Ware: Darker paste color; thick white slip; sherd temper, sometimes with sand; organic paint.",
+                style: TextStyle(
+                  fontFamily: 'Uber',
+                  fontSize: 18,
+                ),
+              ),
             ],
           ),
         ),
diff --git a/mobile/lib/screens/homepage.dart b/mobile/lib/screens/homepage.dart
index b4bee0f..e63516b 100644
--- a/mobile/lib/screens/homepage.dart
+++ b/mobile/lib/screens/homepage.dart
@@ -715,7 +715,6 @@ class _HomePageState extends State<HomePage> {
                                       '${entry.key}: ${entry.value.toStringAsFixed(3)}')),
                               Text(
                                   "Location: ${classificatoinMap!['lattitude'].toStringAsFixed(4)}, ${classificatoinMap!['longitude'].toStringAsFixed(4)}"),
-                              const Text("Other Classifications:"),
                             ],
                           )),
                     )
@@ -742,11 +741,26 @@ class _HomePageState extends State<HomePage> {
                   : Container(),
               selectedImage != null && classificaitonData != null
                   ? Center(
-                      child: FilledButton(
-                          onPressed: saveClassificationLocally,
-                          child: const Text('Save Classification')),
+                      child: Row(
+                        mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                        children: [
+                          FilledButton(
+                              onPressed: saveClassificationLocally,
+                              child: const Text('Save Classification')),
+                          FilledButton(
+                              onPressed: () {
+                                Navigator.push(
+                                    context,
+                                    PageTransition(
+                                        child: const AboutTww(),
+                                        type: PageTransitionType.fade));
+                              },
+                              child: const Text('TWW About')),
+                        ],
+                      ),
                     )
                   : Container(),
+
               selectedImage != null && classificaitonData != null
                   ? Center(
                       child: TextButton(
diff --git a/mobile/lib/screens/user_management/settings_page.dart b/mobile/lib/screens/user_management/settings_page.dart
index cd6e701..ba01707 100644
--- a/mobile/lib/screens/user_management/settings_page.dart
+++ b/mobile/lib/screens/user_management/settings_page.dart
@@ -1,6 +1,7 @@
 import 'package:craft/global_variables.dart';
 import 'package:craft/provider/login_provider.dart';
 import 'package:craft/provider/theme_provider.dart';
+import 'package:craft/screens/about/about_craft.dart';
 import 'package:craft/screens/homepage.dart';
 import 'package:craft/screens/user_management/login_page.dart';
 import 'package:firebase_auth/firebase_auth.dart';
@@ -210,9 +211,24 @@ class SettingsPage extends StatelessWidget {
               child: Column(
                 children: [
                   const Text('© 2024 CRAFT All rights reserved.'),
-                  TextButton(
-                    onPressed: _launchAboutURL,
-                    child: const Text("Learn More"),
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: [
+                      TextButton(
+                        onPressed: () {
+                          Navigator.push(
+                              context,
+                              PageTransition(
+                                  child: const AboutCraft(),
+                                  type: PageTransitionType.fade));
+                        },
+                        child: const Text("About CRAFT"),
+                      ),
+                      TextButton(
+                        onPressed: _launchAboutURL,
+                        child: const Text("Learn More"),
+                      ),
+                    ],
                   ),
                 ],
               ),