build: optimise dependencies

Author: kid1412621

.github/workflows/build.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - '**'
+  pull_request:
   workflow_dispatch:
 
 jobs:

.github/workflows/dependency.yml

@@ -1,5 +1,10 @@
 name: 'Dependency Review'
-on: [ pull_request ]
+on:
+  push:
+    tags:
+      - 'v*'
+  pull_request:
+  workflow_dispatch:
 
 permissions:
   contents: read
@@ -10,7 +15,27 @@ jobs:
     steps:
       - name: 'Checkout Repository'
         uses: actions/checkout@v4
-      - name: 'Dependency Review'
+
+      - name: 'Dependency Review (Pull Request)'
+        if: github.event_name == 'pull_request'
+        uses: actions/dependency-review-action@v4
+        with:
+          fail-on-severity: 'high' # This is your custom setting
+
+      - name: 'Dependency Review (Manual)'
+        if: github.event_name == 'workflow_dispatch'
         uses: actions/dependency-review-action@v4
         with:
-          fail-on-severity: 'high'
+          head-ref: ${{ github.ref }}
+          base-ref: ${{ github.event.repository.default_branch }}
+          fail-on-severity: 'high'
+
+      - name: Set up Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: 21
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+      - name: analyze dependencies
+        run: ./gradlew clean analyzeReleaseDependencies

.gitignore

@@ -10,8 +10,6 @@
 .externalNativeBuild
 .cxx
 local.properties
-app/jni/
-app/jni/api-keys.c
 # Built application files
 *.apk
 *.aar

app/build.gradle.kts

@@ -16,8 +16,8 @@ android {
         applicationId = "me.nanova.summaryexpressive"
         minSdk = 33
         targetSdk = 36
-        versionCode = 2
-        versionName = "0.0.2"
+        versionCode = 3
+        versionName = "0.0.3"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
@@ -84,8 +84,10 @@ dependencies {
     implementation("androidx.datastore:datastore-preferences:1.1.7")
 
     // ml & llm
-    implementation("com.google.mlkit:text-recognition:16.0.1")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-play-services")
+    // this will bundle model to apk which is huge, use play service one first
+    //    implementation("com.google.mlkit:text-recognition:16.0.1")
+    implementation("com.google.android.gms:play-services-mlkit-text-recognition:19.0.1")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.10.2")
     implementation("io.ktor:ktor-client-android:3.2.2")
     implementation("ai.koog:koog-agents:0.3.0") {
         exclude(group = "io.ktor", module = "ktor-client-cio")

app/src/main/AndroidManifest.xml

@@ -7,16 +7,23 @@
     <!-- TODO: android:roundIcon="@mipmap/summary_you_round" -->
     <application
         android:name=".SummaryExpressiveApplication"
+        android:enableOnBackInvokedCallback="true"
         android:icon="@mipmap/summary_you"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/Theme.SummaryExpressive"
-        tools:ignore="MissingApplicationIcon">
+        android:usesCleartextTraffic="true"
+        android:windowSoftInputMode="adjustResize"
+        tools:ignore="MissingApplicationIcon"
+        tools:targetApi="36">
+
+        <meta-data
+            android:name="com.google.mlkit.vision.DEPENDENCIES"
+            android:value="ocr" />
+
         <activity
             android:name=".MainActivity"
-            android:enableOnBackInvokedCallback="true"
-            android:exported="true"
-            android:windowSoftInputMode="adjustResize">
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

app/src/main/kotlin/me/nanova/summaryexpressive/ui/page/HomeScreen.kt

@@ -15,8 +15,6 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.imeNestedScroll
-import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
@@ -116,7 +114,7 @@ fun HomeScreen(
     modifier: Modifier = Modifier,
     navController: NavHostController,
     initialUrl: String? = null,
-    viewModel: SummaryViewModel = hiltViewModel()
+    viewModel: SummaryViewModel = hiltViewModel(),
 ) {
     var isExtracting by remember { mutableStateOf(false) } // For Loading-Animation
     var url by remember { mutableStateOf(initialUrl ?: "") }
@@ -270,7 +268,7 @@ fun HomeScreen(
 @Composable
 private fun HomeTopAppBar(
     navController: NavHostController,
-    scrollBehavior: TopAppBarScrollBehavior
+    scrollBehavior: TopAppBarScrollBehavior,
 ) {
     MediumFlexibleTopAppBar(
         modifier = Modifier.height(100.dp),
@@ -313,7 +311,7 @@ private fun UrlInputSection(
     isExtracting: Boolean,
     multiLine: Boolean,
     singleLine: Boolean,
-    onSingleLineChange: (Boolean) -> Unit
+    onSingleLineChange: (Boolean) -> Unit,
 ) {
     val showCancelIcon = remember(url) { url.isNotBlank() }
 
@@ -370,12 +368,13 @@ private fun UrlInputSection(
                                 .size(55.dp)
                                 .align(Alignment.Center)
                         )
+                    } else {
+                        Icon(
+                            if (isDocument) Icons.Filled.CheckCircle else Icons.Filled.AddCircle,
+                            contentDescription = "Floating action button",
+                            modifier = Modifier.align(Alignment.Center)
+                        )
                     }
-                    Icon(
-                        if (isDocument && !isExtracting) Icons.Filled.CheckCircle else Icons.Filled.AddCircle,
-                        contentDescription = "Floating action button",
-                        modifier = Modifier.align(Alignment.Center)
-                    )
                 }
             }
             if (multiLine) {
@@ -436,7 +435,7 @@ private fun SummaryLengthSelector(
 private fun SummaryResultSection(
     summaryResult: SummaryResult,
     url: String,
-    onRegenerate: () -> Unit
+    onRegenerate: () -> Unit,
 ) {
     val scope = rememberCoroutineScope()
     val clipboard = LocalClipboard.current
@@ -490,7 +489,7 @@ private fun SummaryResultSection(
 private fun HomeFloatingActionButtons(
     onPaste: () -> Unit,
     onSummarize: () -> Unit,
-    isExtracting: Boolean
+    isExtracting: Boolean,
 ) {
     val context = LocalContext.current
     val stillLoading = stringResource(id = R.string.stillLoading)