Merge branch 'tf-integration' into docs-setup

Author: mhaeming

.github/workflows/create_release.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Setup JDK
         uses: actions/setup-java@v3.13.0
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: gradle
 

.github/workflows/debug_build.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Setup JDK
         uses: actions/setup-java@v3.13.0
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: gradle
       - name: Create local gradle properties files

.gitignore

@@ -1,6 +1,4 @@
 # Gradle files
-.gradle/
-build/
 
 # Local configuration file (sdk path, etc)
 local.properties

Feature Sheets.pdf

@@ -3,19 +3,18 @@ plugins {
     id 'org.jetbrains.kotlin.android'
     id 'kotlin-parcelize'
     id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin'
-
 }
 
 android {
     namespace 'com.nlinterface'
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "com.nlinterface"
         minSdk 24
         targetSdk 33
         versionCode 1
-        versionName '0.0.1'
+        versionName '0.0.3'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -36,26 +35,57 @@ android {
     buildFeatures {
         viewBinding true
     }
+    packaging {
+        resources {
+            excludes += "/META-INF/{AL2.0,LGPL2.1}"
+            excludes += "META-INF/DEPENDENCIES"
+            excludes += "mozilla/public-suffix-list.txt"
+        }
+    }
 }
 
 dependencies {
 
-    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.core:core-ktx:1.12.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.5.0-alpha04'
+    implementation 'com.google.android.material:material:1.11.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.5.3'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.5.3'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.7.7'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.7.7'
+    implementation 'androidx.lifecycle:lifecycle-process:2.7.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 
     // Set up the location feature dependency
-    implementation 'com.google.android.gms:play-services-location:21.0.1'
+    implementation 'com.google.android.gms:play-services-location:21.1.0'
 
     // GSON dependency
-    implementation 'com.google.code.gson:gson:2.8.5'
+    implementation 'com.google.code.gson:gson:2.10'
 
     // Places API
-    implementation 'com.google.android.libraries.places:places:3.2.0'
-}
+    implementation 'com.google.android.libraries.places:places:3.3.0'
+
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1")
+
+    // Camera + Tensorflow
+    implementation("androidx.camera:camera-core:1.3.1")
+    implementation("androidx.camera:camera-camera2:1.3.1")
+    implementation("androidx.camera:camera-lifecycle:1.3.1")
+    implementation("androidx.camera:camera-video:1.3.1")
+
+    implementation("androidx.camera:camera-view:1.3.1")
+    implementation("androidx.camera:camera-extensions:1.3.1")
+
+    implementation("org.tensorflow:tensorflow-lite-task-vision:0.4.0")
+    implementation("org.tensorflow:tensorflow-lite-gpu-delegate-plugin:0.4.0")
+    implementation("org.tensorflow:tensorflow-lite-gpu:2.9.0")
+
+    // Camera UI
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
+    //mlkit
+    implementation 'com.google.mlkit:barcode-scanning:17.2.0'
+
+    //it.jsoup
+    implementation "org.jsoup:jsoup:1.14.3"
+}

app/build.gradle

@@ -6,7 +6,11 @@
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
-
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
+    <uses-permission android:name="android.permission.CAMERA" />
     <application
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
@@ -43,7 +47,11 @@
             android:name=".activities.PlaceDetailsActivity" />
         <activity
             android:name=".activities.SettingsActivity"/>
-
+        <activity
+            android:name=".activities.ClassificationActivity"/>
+        <service
+            android:name=".viewmodels.ConstantScanning"
+            android:exported="false" />
     </application>
 
-</manifest>
+</manifest>

app/src/main/AndroidManifest.xml

@@ -0,0 +1,38 @@
+package com.nlinterface.activities
+
+import android.content.pm.PackageManager
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
+import android.Manifest
+import android.content.ContentValues.TAG
+import android.util.Log
+import androidx.camera.core.AspectRatio
+import androidx.camera.core.CameraSelector
+import androidx.camera.core.ImageAnalysis
+import androidx.camera.core.Preview
+import androidx.camera.lifecycle.ProcessCameraProvider
+import androidx.core.app.ActivityCompat
+import com.nlinterface.databinding.ActivityClassificationBinding
+import com.nlinterface.databinding.FragmentCameraBinding
+import com.nlinterface.utility.ObjectDetectorHelper
+
+class ClassificationActivity: AppCompatActivity() {
+
+    private lateinit var viewBinding: ActivityClassificationBinding
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        if(!hasCameraPermission()) {
+            ActivityCompat.requestPermissions(
+                this, arrayOf(Manifest.permission.CAMERA), 0
+            )
+        }
+
+        viewBinding = ActivityClassificationBinding.inflate(layoutInflater)
+        setContentView(viewBinding.root)
+    }
+
+    private fun hasCameraPermission() = ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED
+
+
+}