Added various tweaks to dependencies and translations

app/build.gradle.kts

@@ -1,7 +1,6 @@
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.compose.compiler)
-    alias(libs.plugins.google.ksp)
 }
 
 kotlin {
@@ -32,7 +31,7 @@ android {
     }
     androidResources {
         generateLocaleConfig = true
-        localeFilters.addAll(listOf("en", "es-rES", "ru", "si", "uk", "zh-rCN"))
+        localeFilters.addAll(listOf("en", "es", "ru", "si", "uk", "zh"))
     }
 }
 
@@ -41,14 +40,8 @@ dependencies {
     implementation(project(":domain"))
 
     implementation(libs.androidx.core.splashscreen)
-    implementation(libs.androidx.room)
-    implementation(libs.androidx.room.runtime)
-    ksp(libs.androidx.room.compiler)
-
     implementation(platform(libs.compose.bom))
     implementation(libs.bundles.composeAll)
-
-    implementation(libs.other.okhttp)
     implementation(libs.other.osmdroid)
 
     debugImplementation(libs.bundles.composeDebug)

app/src/main/java/com/rtbishop/look4sat/MainApplication.kt

@@ -18,6 +18,7 @@
 package com.rtbishop.look4sat
 
 import android.app.Application
+import com.rtbishop.look4sat.data.injection.MainContainer
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale

data/build.gradle.kts

@@ -22,7 +22,6 @@ dependencies {
     implementation(libs.androidx.room)
     implementation(libs.androidx.room.runtime)
     ksp(libs.androidx.room.compiler)
-
     implementation(libs.other.coroutines)
     implementation(libs.other.okhttp)
 

data/src/main/java/com/rtbishop/look4sat/data/injection/MainContainer.kt

@@ -1,4 +1,4 @@
-package com.rtbishop.look4sat
+package com.rtbishop.look4sat.data.injection
 
 import android.bluetooth.BluetoothManager
 import android.content.Context
@@ -33,14 +33,11 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import okhttp3.OkHttpClient
-import org.osmdroid.config.Configuration
 
 class MainContainer(private val context: Context) {
 
     private val localSource = provideLocalSource()
-    private val mainHandler = CoroutineExceptionHandler { _, error ->
+    private val mainHandler = CoroutineExceptionHandler { _, error -> println("MainHandler: $error") }
-        println("MainHandler: $error")
-    }
     val appScope = CoroutineScope(SupervisorJob() + Dispatchers.Default + mainHandler)
     val settingsRepo = provideSettingsRepo()
     val selectionRepo = provideSelectionRepo()
@@ -48,26 +45,19 @@ class MainContainer(private val context: Context) {
     val databaseRepo = provideDatabaseRepo()
 
     fun provideAppVersionName(): String {
-        val packageInfo = context.packageManager.getPackageInfo(context.packageName, 0)
+        return context.packageManager.getPackageInfo(context.packageName, 0).versionName ?: "4.0.0"
-        return packageInfo.versionName ?: "4.0.0"
     }
 
-    fun provideAddToCalendar(): IAddToCalendar {
+    fun provideAddToCalendar(): IAddToCalendar = AddToCalendar(context)
-        return AddToCalendar(context)
-    }
 
-    fun provideShowToast(): IShowToast {
+    fun provideShowToast(): IShowToast = ShowToast(context)
-        return ShowToast(context)
-    }
 
     fun provideBluetoothReporter(): BluetoothReporter {
         val manager = context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager
         return BluetoothReporter(manager, CoroutineScope(Dispatchers.IO))
     }
 
-    fun provideNetworkReporter(): NetworkReporter {
+    fun provideNetworkReporter(): NetworkReporter = NetworkReporter(CoroutineScope(Dispatchers.IO))
-        return NetworkReporter(CoroutineScope(Dispatchers.IO))
-    }
 
     fun provideSensorsRepo(): ISensorsRepo {
         val manager = context.getSystemService(Context.SENSOR_SERVICE) as SensorManager
@@ -104,9 +94,6 @@ class MainContainer(private val context: Context) {
         val manager = context.getSystemService(Context.LOCATION_SERVICE) as LocationManager
         val appPrefsFileName = "${context.packageName}_preferences"
         val appPreferences = context.getSharedPreferences(appPrefsFileName, Context.MODE_PRIVATE)
-        val mapPrefsFileName = "${context.packageName}_osmdroid"
-        val mapPreferences = context.getSharedPreferences(mapPrefsFileName, Context.MODE_PRIVATE)
-        Configuration.getInstance().load(context, mapPreferences)
         return SettingsRepo(manager, appPreferences)
     }
 }