Skip to content

Commit

Permalink
Merge pull request #15 from nickw409/mobile-dev-experimental
Browse files Browse the repository at this point in the history
Mobile dev experimental
  • Loading branch information
aadarshabastola authored Dec 12, 2024
2 parents 8e3e62e + 8d34264 commit cc5fa1c
Show file tree
Hide file tree
Showing 17 changed files with 377 additions and 265 deletions.
3 changes: 2 additions & 1 deletion mobile/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions mobile/android/app/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -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
3 changes: 2 additions & 1 deletion mobile/android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mobile/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
Expand Down
3 changes: 3 additions & 0 deletions mobile/android/gradle.properties
Original file line number Diff line number Diff line change
@@ -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
4 changes: 3 additions & 1 deletion mobile/android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
25 changes: 7 additions & 18 deletions mobile/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -1367,6 +1365,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)
Expand All @@ -1389,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`)
Expand All @@ -1409,9 +1405,8 @@ 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`)
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)

SPEC REPOS:
Expand Down Expand Up @@ -1443,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:
Expand All @@ -1465,19 +1458,16 @@ 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:
: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
Expand Down Expand Up @@ -1508,11 +1498,10 @@ SPEC CHECKSUMS:
nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
RecaptchaInterop: 7d1a4a01a6b2cb1610a47ef3f85f0c411434cb21
shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
TensorFlowLiteC: 20785a69299185a379ba9852b6625f00afd7984a
TensorFlowLiteSwift: 3a4928286e9e35bdd3e17970f48e53c80d25e793
tflite_flutter: 9433d086a3060431bbc9f3c7c20d017db0e72d08
tflite_flutter_helper_plus: 33b8f41f9d67ab70280309ed75ff6c709eb4bec6
tflite_flutter_plus: f8d7529404eb499ffd29d5682625f8b5b3dddb3a
TOCropViewController: 80b8985ad794298fb69d3341de183f33d1853654
url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe

Expand Down
109 changes: 109 additions & 0 deletions mobile/lib/screens/about/about_craft.dart
Original file line number Diff line number Diff line change
@@ -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,
),
),
],
),
],
),
),
),
);
}
}
4 changes: 2 additions & 2 deletions mobile/lib/screens/about/about_knaa.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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),
),
Expand Down Expand Up @@ -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,
Expand Down
Loading

0 comments on commit cc5fa1c

Please sign in to comment.