Enhancements in Gradle, UI, and SDK Versions

lite/examples/optical_character_recognition/android/app/build.gradle

@@ -20,12 +20,17 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.2"
+    buildFeatures {
+        viewBinding = true
+    }
+    compileSdk 34
+    namespace = "org.tensorflow.lite.examples.ocr"
+    testNamespace = "org.tensorflow.lite.examples.ocr.test"
     defaultConfig {
         applicationId "org.tensorflow.lite.examples.ocr"
         minSdkVersion 21
-        targetSdkVersion 29
+        multiDexEnabled true
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -86,3 +91,4 @@ dependencies {
 
     implementation 'com.quickbirdstudios:opencv:4.5.3.0'
 }
+

lite/examples/optical_character_recognition/android/app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
-          package="org.tensorflow.lite.examples.ocr">
+          xmlns:tools="http://schemas.android.com/tools">
 
   <uses-sdk />
 

lite/examples/optical_character_recognition/android/app/src/main/res/layout/tfe_is_activity_main.xml

@@ -72,8 +72,8 @@
             android:contentDescription="@string/tfe_result_image_description"
             android:padding="8dp" />
 
+        <include layout="@layout/tfe_is_bottom_sheet_layout" />
     </LinearLayout>
 
-    <include layout="@layout/tfe_is_bottom_sheet_layout" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

lite/examples/optical_character_recognition/android/app/src/main/res/values/dimens.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="tfe_is_preview_size">250dp</dimen>
+    <dimen name="tfe_is_preview_size">150dp</dimen>
     <dimen name="tfe_bottom_sheet_corner_radius">15dp</dimen>
     <dimen name="tfe_bottom_sheet_top_padding">8dp</dimen>
 </resources>

lite/examples/optical_character_recognition/android/build.gradle

@@ -16,15 +16,20 @@ limitations under the License.
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.5.30-M1'
+    ext {
+
+        agp_version1 = '8.1.4'
+        agp_version = '8.1.4'
+    }
+    ext.kotlin_version = '1.6.21'
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0'
+        classpath "com.android.tools.build:gradle:$agp_version1"
         classpath 'de.undercouch:gradle-download-task:4.0.2'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.71'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

lite/examples/optical_character_recognition/android/gradle.properties

@@ -16,4 +16,7 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
+android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false

lite/examples/optical_character_recognition/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
+#Wed Nov 22 03:33:34 EST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME