Replace Anko entirely

alanwoolley · Aug 19, 2023 · 51d39b3 · 51d39b3
1 parent 12f14e0
commit 51d39b3
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 21 deletions.
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,6 @@ import com.android.build.gradle.tasks.MergeSourceSetFolders
 
 buildscript {
     ext.kotlin_version = '1.9.0'
-    ext.anko_version = '0.10.4'
 
     repositories {
         mavenCentral()
@@ -50,14 +49,12 @@ dependencies {
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlin_version")
-    implementation "org.jetbrains.anko:anko-commons:$anko_version"
-    implementation "org.jetbrains.anko:anko-appcompat-v7:$anko_version"
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
     implementation "com.lazygeniouz:dfc:1.0.7"
-    implementation 'androidx.preference:preference-ktx:1.2.0'
+    implementation 'androidx.preference:preference-ktx:1.2.1'
     implementation 'androidx.core:core-ktx:1.10.1'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
     implementation 'uk.co.armedpineapple.innoextract:service:2.1.0'

diff --git a/src/Java/uk/co/armedpineapple/cth/CTHApplication.kt b/src/Java/uk/co/armedpineapple/cth/CTHApplication.kt
@@ -2,7 +2,6 @@ package uk.co.armedpineapple.cth
 
 import androidx.preference.PreferenceManager
 import androidx.room.Room
-import org.jetbrains.anko.defaultSharedPreferences
 import uk.co.armedpineapple.cth.files.FilesService
 import uk.co.armedpineapple.cth.files.persistence.GameDatabase
 import uk.co.armedpineapple.cth.localisation.LanguageService

diff --git a/src/Java/uk/co/armedpineapple/cth/GameActivity.kt b/src/Java/uk/co/armedpineapple/cth/GameActivity.kt
@@ -13,7 +13,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
-import org.jetbrains.anko.AnkoLogger
 import org.libsdl.app.SDLActivity
 import uk.co.armedpineapple.cth.files.FilesService
 import uk.co.armedpineapple.cth.files.SaveGameContract

diff --git a/src/Java/uk/co/armedpineapple/cth/GameConfiguration.kt b/src/Java/uk/co/armedpineapple/cth/GameConfiguration.kt
@@ -3,9 +3,6 @@ package uk.co.armedpineapple.cth
 import android.content.Context
 import android.content.SharedPreferences
 import androidx.annotation.Keep
-import org.jetbrains.anko.AnkoLogger
-import org.jetbrains.anko.displayMetrics
-import org.jetbrains.anko.info
 import java.io.BufferedOutputStream
 import java.io.BufferedReader
 import java.io.File
@@ -17,7 +14,7 @@ import kotlin.reflect.full.starProjectedType
 
 
 class GameConfiguration(private val ctx: Context, private val preferences: SharedPreferences) :
-    AnkoLogger {
+    Loggable {
 
     val cthFiles: File = File(ctx.noBackupFilesDir, "cth")
     val cthLaunchScript = File(cthFiles, "CorsixTH.lua")

diff --git a/src/Java/uk/co/armedpineapple/cth/Reporting.kt b/src/Java/uk/co/armedpineapple/cth/Reporting.kt
@@ -11,7 +11,6 @@ import androidx.appcompat.app.AlertDialog
 import com.google.firebase.analytics.ktx.analytics
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase
-import org.jetbrains.anko.defaultSharedPreferences
 
 
 /**

diff --git a/src/Java/uk/co/armedpineapple/cth/Utility.kt b/src/Java/uk/co/armedpineapple/cth/Utility.kt
@@ -0,0 +1,8 @@
+package uk.co.armedpineapple.cth
+
+import android.content.Context
+import android.content.SharedPreferences
+import androidx.preference.PreferenceManager
+
+inline val Context.defaultSharedPreferences: SharedPreferences
+    get() = PreferenceManager.getDefaultSharedPreferences(this)
diff --git a/src/Java/uk/co/armedpineapple/cth/files/FilesService.kt b/src/Java/uk/co/armedpineapple/cth/files/FilesService.kt
@@ -7,9 +7,9 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.channels.SendChannel
 import kotlinx.coroutines.withContext
-import org.jetbrains.anko.AnkoLogger
-import org.jetbrains.anko.warn
 import uk.co.armedpineapple.cth.GameConfiguration
+import uk.co.armedpineapple.cth.Loggable
+import uk.co.armedpineapple.cth.warn
 import java.io.File
 import java.io.FileDescriptor
 import java.io.FileOutputStream
@@ -23,7 +23,7 @@ import java.util.zip.ZipFile
  *
  * @constructor Create empty Files service
  */
-class FilesService(val ctx: Context) : AnkoLogger {
+class FilesService(val ctx: Context) : Loggable {
 
     private val storageManager: StorageManager = ctx.getSystemService(StorageManager::class.java)
 

diff --git a/src/Java/uk/co/armedpineapple/cth/localisation/LanguageService.kt b/src/Java/uk/co/armedpineapple/cth/localisation/LanguageService.kt
@@ -2,9 +2,9 @@ package uk.co.armedpineapple.cth.localisation
 
 import android.content.Context
 import androidx.core.os.LocaleListCompat
-import org.jetbrains.anko.AnkoLogger
-import org.jetbrains.anko.warn
+import uk.co.armedpineapple.cth.Loggable
 import uk.co.armedpineapple.cth.R
+import uk.co.armedpineapple.cth.warn
 import java.util.Locale
 
 /**
@@ -13,7 +13,7 @@ import java.util.Locale
  * @property ctx  context
  * @constructor Create Language service
  */
-class LanguageService(private val ctx: Context) : AnkoLogger {
+class LanguageService(private val ctx: Context) : Loggable {
 
     /**
      * Gets a default CTH language that matches a locale from the app's resource configuration.

diff --git a/src/Java/uk/co/armedpineapple/cth/settings/SettingsActivity.kt b/src/Java/uk/co/armedpineapple/cth/settings/SettingsActivity.kt
@@ -7,10 +7,10 @@ import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
-import org.jetbrains.anko.defaultSharedPreferences
 import uk.co.armedpineapple.cth.CTHApplication
 import uk.co.armedpineapple.cth.GameActivity
 import uk.co.armedpineapple.cth.R
+import uk.co.armedpineapple.cth.defaultSharedPreferences
 import uk.co.armedpineapple.cth.setup.SetupActivity
 
 

diff --git a/src/Java/uk/co/armedpineapple/cth/setup/SetupViewModel.kt b/src/Java/uk/co/armedpineapple/cth/setup/SetupViewModel.kt
@@ -12,17 +12,16 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import org.jetbrains.anko.AnkoLogger
-import org.jetbrains.anko.info
 import uk.co.armedpineapple.cth.CTHApplication
+import uk.co.armedpineapple.cth.Loggable
 import uk.co.armedpineapple.cth.files.FilesService
 import uk.co.armedpineapple.innoextract.service.Configuration
 import uk.co.armedpineapple.innoextract.service.ExtractCallback
 import uk.co.armedpineapple.innoextract.service.IExtractService
 import java.io.File
 import java.net.URL
 
-class SetupViewModel(application: Application) : AndroidViewModel(application), AnkoLogger {
+class SetupViewModel(application: Application) : AndroidViewModel(application), Loggable {
 
     private val filesService: FilesService = FilesService(application)