Merge pull request #146 from MobileFirstLLC/update-to-latest-android

Updated Android to Google required targets. Updated manifest and Sett…

Author: nkrusch

base/build.gradle

@@ -5,13 +5,12 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.3"
+    compileSdk 34
     buildFeatures.viewBinding = true
     defaultConfig {
         applicationId "mf.asciitext.lite"
-        minSdkVersion 14
-        targetSdkVersion 30
+        minSdk 30
+        targetSdk 34
         versionCode 16
         versionName "2.6.1"
         vectorDrawables.useSupportLibrary = true
@@ -20,10 +19,6 @@ android {
         resValue "string", "feedbackUri", "https://mobilefirst.me/feedback?appId=irregular-expressions&os=android&version=" + versionName
         resValue "string", "rateUri", "https://play.google.com/store/apps/details?id=" + applicationId
     }
-    lintOptions {
-        checkReleaseBuilds true
-        abortOnError true
-    }
     buildTypes {
         debug {
             dependencies {
@@ -43,18 +38,24 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    namespace 'mf.irregex'
+    lint {
+        abortOnError true
+        checkReleaseBuilds true
+    }
+    buildToolsVersion '34.0.0'
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'com.google.android.material:material:1.11.0'
     implementation "androidx.cardview:cardview:1.0.0"
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation 'androidx.recyclerview:recyclerview:1.2.1'
-    implementation 'androidx.preference:preference-ktx:1.2.0'
+    implementation 'androidx.recyclerview:recyclerview:1.3.2'
+    implementation 'androidx.preference:preference-ktx:1.2.1'
 }

base/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:dist="http://schemas.android.com/apk/distribution"
-    package="mf.irregex">
+    xmlns:dist="http://schemas.android.com/apk/distribution">
 
     <uses-permission android:name="android.permission.VIBRATE"/>
     <dist:module dist:instant="true" />
@@ -18,7 +17,8 @@
         android:theme="@style/AppTheme">
         <activity
             android:name="mf.irregex.SplashScreen"
-            android:theme="@style/SplashTheme">
+            android:theme="@style/SplashTheme"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -27,7 +27,8 @@
         </activity>
         <activity
             android:name="mf.irregex.MainActivity"
-            android:windowSoftInputMode="adjustPan">
+            android:windowSoftInputMode="adjustPan"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
             </intent-filter>
@@ -40,7 +41,8 @@
             android:theme="@style/AppToolbarTheme" />
 
         <service android:name="mf.irregex.keyboard.MyInputMethodService"
-            android:permission="android.permission.BIND_INPUT_METHOD">
+            android:permission="android.permission.BIND_INPUT_METHOD"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.view.InputMethod" />
             </intent-filter>

base/src/main/java/mf/irregex/settings/SettingsActivity.kt

@@ -64,13 +64,19 @@ class SettingsActivity : AppCompatActivity(),
         // Instantiate the new Fragment
         val args = pref.extras
         val fragment =
-            supportFragmentManager.fragmentFactory.instantiate(classLoader, pref.fragment)
-        fragment.arguments = args
-        fragment.setTargetFragment(caller, 0)
-        supportFragmentManager.beginTransaction()
-            .add(android.R.id.content, fragment)
-            .addToBackStack(null)
-            .commit()
+            pref.fragment?.let {
+                supportFragmentManager.fragmentFactory.instantiate(classLoader,
+                    it
+                )
+            }
+        fragment?.arguments = args
+        fragment?.setTargetFragment(caller, 0)
+        fragment?.let {
+            supportFragmentManager.beginTransaction()
+                .add(android.R.id.content, it)
+                .addToBackStack(null)
+                .commit()
+        }
         title = pref.title
         return true
     }

build.gradle

@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.5.31'
+    ext.kotlin_version = '1.9.22'
     repositories {
         google()
         mavenCentral()
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip