Refactor project to replace Dagger Hilt with Koin for dependency injection

- Removed Dagger Hilt dependencies and annotations across multiple modules.
- Integrated Koin for dependency injection, updating ViewModels and repositories accordingly.
- Updated ProGuard rules to accommodate changes in dependency management.
- Incremented version code and name in build.gradle.kts for the upcoming release.
- Enhanced various Gradle files to ensure compatibility with new dependencies.

Author: CSPE-Trifork

app/build.gradle.kts

@@ -4,7 +4,6 @@ plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.org.jetbrains.kotlin.android)
     alias(libs.plugins.com.google.devtools.ksp)
-    alias(libs.plugins.dagger.hilt)
     alias(libs.plugins.compose.compiler)
 }
 
@@ -16,8 +15,8 @@ android {
         applicationId = "com.arklan.weather"
         minSdk = ConfigData.minSdk
         targetSdk = ConfigData.targetSdk
-        versionCode = 17
-        versionName = "2.6.1"
+        versionCode = 18
+        versionName = "2.6.2"
         setProperty("archivesBaseName", "weekly-weather-v$versionName.$versionCode")
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -26,15 +25,14 @@ android {
         }
     }
 
-
-
     buildTypes {
         release {
             isMinifyEnabled = ConfigData.isMinifyRelease
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
+            isShrinkResources = true
         }
         debug {
             isMinifyEnabled = ConfigData.isMinifyDebug
@@ -60,9 +58,6 @@ android {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
         }
     }
-    hilt {
-        enableAggregatingTask = true
-    }
 }
 
 dependencies {
@@ -87,10 +82,10 @@ dependencies {
     implementation(libs.androidx.compose.graphics)
     implementation(libs.androidx.compose.tooling.preview)
 
-    //Dagger - Hilt
-    implementation(libs.hilt.android)
-    implementation(libs.hilt.navigation.compose)
-    ksp(libs.hilt.android.compiler)
+    // Koin
+    implementation(libs.koin.android)
+    implementation(libs.koin.androidx.compose)
+    implementation(libs.koin.androidx.compose.navigation)
 
     implementation(libs.coroutines.test)
     testImplementation(libs.junit.junit)

app/proguard-rules.pro

@@ -35,9 +35,81 @@
 -keep class com.codeskraps.maps.** { *; }
 -keep class com.codeskraps.umami.** { *; }
 
+# Additional dontwarn rules from missing_rules.txt
+-dontwarn com.codeskraps.feature.geocoding.di.FeatureModuleKt
+-dontwarn com.codeskraps.feature.weather.di.FeatureModuleKt
+
+# Koin
+-keepnames class android.arch.lifecycle.ViewModel
+-keepclassmembers public class * extends android.arch.lifecycle.ViewModel { public <init>(...); }
+-keepclassmembers class com.codeskraps.** { public <init>(...); }
+-keepclassmembers class * { @org.koin.core.annotation.KoinInternalApi *; }
+-keep class org.koin.** { *; }
+-keep class com.codeskraps.**.di.** { *; }
+-keep class * extends org.koin.core.module.Module { *; }
+
+# Keep Koin Modules
+-keep class com.codeskraps.feature.geocoding.di.FeatureModuleKt { *; }
+-keep class com.codeskraps.feature.maps.di.FeatureModuleKt { *; }
+-keep class com.codeskraps.feature.weather.di.FeatureModuleKt { *; }
+
 # Java language APIs
 -dontwarn java.lang.invoke.StringConcatFactory
 
+# Hilt ViewModel classes
+-keep class * extends androidx.lifecycle.ViewModel { *; }
+-keep class * extends dagger.hilt.android.lifecycle.HiltViewModel { *; }
+-keep,allowobfuscation @dagger.hilt.android.lifecycle.HiltViewModel class *
+-keepclasseswithmembers class * {
+    @javax.inject.Inject <init>(...);
+}
+
+# Explicitly keep Hilt generated ViewModel classes
+-keep class com.codeskraps.feature.geocoding.presentation.GeocodingViewModel_HiltModules$* { *; }
+-keep class com.codeskraps.feature.weather.presentation.WeatherViewModel_HiltModules$* { *; }
+-keep class com.codeskraps.maps.presentation.MapViewModel_HiltModules$* { *; }
+
+# Keep all Hilt related classes
+-keep class com.codeskraps.weather.WeatherApp_HiltComponents$* { *; }
+-keep class dagger.hilt.** { *; }
+-keep class javax.inject.** { *; }
+-keep class * extends dagger.hilt.android.internal.managers.ViewComponentManager$FragmentContextWrapper { *; }
+
+# Keep Dagger components
+-keep,allowobfuscation,allowshrinking @dagger.** class *
+-keep,allowobfuscation,allowshrinking class dagger.** { *; }
+-keep,allowobfuscation,allowshrinking class javax.inject.** { *; }
+-keep,allowobfuscation,allowshrinking class * extends dagger.internal.Factory { *; }
+-keepclassmembers,allowobfuscation class * {
+    @javax.inject.* *;
+    @dagger.* *;
+    <init>();
+}
+
+# Keep all generated Hilt code
+-keep class **_HiltModules$* { *; }
+-keep class **_Impl { *; }
+-keep class **_Factory { *; }
+-keep class **_MembersInjector { *; }
+
+# Keep specific Hilt ViewModel components
+-keep class com.codeskraps.feature.geocoding.presentation.GeocodingViewModel_HiltModules$BindsModule { *; }
+-keep class com.codeskraps.feature.geocoding.presentation.GeocodingViewModel_HiltModules$KeyModule { *; }
+-keep class com.codeskraps.feature.weather.presentation.WeatherViewModel_HiltModules$BindsModule { *; }
+-keep class com.codeskraps.feature.weather.presentation.WeatherViewModel_HiltModules$KeyModule { *; }
+-keep class com.codeskraps.maps.presentation.MapViewModel_HiltModules$BindsModule { *; }
+-keep class com.codeskraps.maps.presentation.MapViewModel_HiltModules$KeyModule { *; }
+
+# Keep Hilt ViewModel factories
+-keep class com.codeskraps.feature.geocoding.presentation.GeocodingViewModel_Factory { *; }
+-keep class com.codeskraps.feature.weather.presentation.WeatherViewModel_Factory { *; }
+-keep class com.codeskraps.maps.presentation.MapViewModel_Factory { *; }
+
+# Keep Hilt ViewModel members injectors
+-keep class com.codeskraps.feature.geocoding.presentation.GeocodingViewModel_MembersInjector { *; }
+-keep class com.codeskraps.feature.weather.presentation.WeatherViewModel_MembersInjector { *; }
+-keep class com.codeskraps.maps.presentation.MapViewModel_MembersInjector { *; }
+
 # Additionally, adding specific rules from the missing_rules.txt
 -dontwarn com.codeskraps.core.local.data.repository.LocalGeocodingRepositoryImpl
 -dontwarn com.codeskraps.core.local.data.repository.LocalResourceRepositoryImpl
@@ -57,7 +129,6 @@
 -dontwarn com.codeskraps.feature.geocoding.data.repository.GeocodingRepositoryImpl
 -dontwarn com.codeskraps.feature.geocoding.di.FeatureModule_ProvidesGeocodingApiFactory
 -dontwarn com.codeskraps.feature.geocoding.presentation.GeocodingViewModel
--dontwarn com.codeskraps.feature.geocoding.presentation.GeocodingViewModel_HiltModules$KeyModule
 -dontwarn com.codeskraps.feature.geocoding.presentation.components.GeocodingScreenKt
 -dontwarn com.codeskraps.feature.geocoding.presentation.mvi.GeoEvent
 -dontwarn com.codeskraps.feature.geocoding.presentation.mvi.GeoState
@@ -67,12 +138,10 @@
 -dontwarn com.codeskraps.feature.weather.di.FeatureModule_ProvidesWeatherApiFactory
 -dontwarn com.codeskraps.feature.weather.domain.repository.WeatherRepository
 -dontwarn com.codeskraps.feature.weather.presentation.WeatherViewModel
--dontwarn com.codeskraps.feature.weather.presentation.WeatherViewModel_HiltModules$KeyModule
 -dontwarn com.codeskraps.feature.weather.presentation.components.WeatherScreenKt
 -dontwarn com.codeskraps.feature.weather.presentation.mvi.WeatherEvent
 -dontwarn com.codeskraps.feature.weather.presentation.mvi.WeatherState
 -dontwarn com.codeskraps.maps.presentation.MapViewModel
--dontwarn com.codeskraps.maps.presentation.MapViewModel_HiltModules$KeyModule
 -dontwarn com.codeskraps.maps.presentation.components.MapScreenKt
 -dontwarn com.codeskraps.maps.presentation.mvi.MapEvent
 -dontwarn com.codeskraps.maps.presentation.mvi.MapState

app/src/main/java/com/codeskraps/weather/WeatherApp.kt

@@ -1,7 +1,33 @@
 package com.codeskraps.weather
 
 import android.app.Application
-import dagger.hilt.android.HiltAndroidApp
+import com.codeskraps.core.local.di.localModule
+import com.codeskraps.core.location.di.locationModule
+import com.codeskraps.feature.common.di.commonModule
+import com.codeskraps.feature.geocoding.di.geocodingModule
+import com.codeskraps.feature.weather.di.weatherModule
+import com.codeskraps.maps.di.mapsFeatureModule
+import com.codeskraps.umami.di.umamiModule
+import org.koin.android.ext.koin.androidContext
+import org.koin.android.ext.koin.androidLogger
+import org.koin.core.context.startKoin
 
-@HiltAndroidApp
-class WeatherApp : Application()
+class WeatherApp : Application() {
+    override fun onCreate() {
+        super.onCreate()
+
+        startKoin {
+            androidLogger()
+            androidContext(this@WeatherApp)
+            modules(
+                commonModule,
+                localModule,
+                locationModule,
+                geocodingModule,
+                weatherModule,
+                mapsFeatureModule,
+                umamiModule
+            )
+        }
+    }
+}

app/src/main/java/com/codeskraps/weather/ui/MainActivity.kt

@@ -9,7 +9,6 @@ import androidx.compose.animation.AnimatedContentTransitionScope
 import androidx.compose.animation.core.tween
 import androidx.compose.runtime.getValue
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavType
@@ -27,15 +26,13 @@ import com.codeskraps.maps.presentation.components.MapScreen
 import com.codeskraps.umami.domain.AnalyticsRepository
 import com.codeskraps.weather.ui.theme.ScreenTransitions
 import com.codeskraps.weather.ui.theme.WeatherTheme
-import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
-import javax.inject.Inject
+import org.koin.android.ext.android.inject
+import org.koin.androidx.compose.koinViewModel
 
-@AndroidEntryPoint
 class MainActivity : ComponentActivity() {
 
-    @Inject
-    lateinit var analyticsRepository: AnalyticsRepository
+    private val analyticsRepository: AnalyticsRepository by inject()
 
     private var isAnalyticsInitialized = false
 
@@ -94,7 +91,7 @@ class MainActivity : ComponentActivity() {
                         popEnterTransition = { ScreenTransitions.slideRightIntoContainer(this) },
                         popExitTransition = { ScreenTransitions.slideLeftOutOfContainer(this) }
                     ) {
-                        val viewModel = hiltViewModel<WeatherViewModel>()
+                        val viewModel = koinViewModel<WeatherViewModel>()
                         val state by viewModel.state.collectAsStateWithLifecycle()
 
                         WeatherScreen(
@@ -112,7 +109,7 @@ class MainActivity : ComponentActivity() {
                         popEnterTransition = { ScreenTransitions.slideLeftIntoContainer(this) },
                         popExitTransition = { ScreenTransitions.slideRightOutOfContainer(this) }
                     ) {
-                        val viewModel = hiltViewModel<GeocodingViewModel>()
+                        val viewModel = koinViewModel<GeocodingViewModel>()
                         val state by viewModel.state.collectAsStateWithLifecycle()
 
                         GeocodingScreen(
@@ -142,23 +139,17 @@ class MainActivity : ComponentActivity() {
                         }
                     ) {
                         Log.d("Navigation", "Attempting to navigate to Map screen")
-                        val viewModel = hiltViewModel<MapViewModel>()
+                        val viewModel = koinViewModel<MapViewModel>()
                         val state by viewModel.state.collectAsStateWithLifecycle()
                         MapScreen(
                             state = state,
                             handleEvent = viewModel.state::handleEvent,
                             action = viewModel.action,
                             navRoute = { route ->
-                                when (route) {
-                                    "nav_up" -> {
-                                        Log.d("Navigation", "Map screen navigation up")
-                                        navController.navigateUp()
-                                    }
-
-                                    else -> {
-                                        Log.d("Navigation", "Map screen navigation to $route")
-                                        navController.navigate(route)
-                                    }
+                                if (route == "nav_up") {
+                                    navController.navigateUp()
+                                } else {
+                                    navController.navigate(route)
                                 }
                             }
                         )

build.gradle.kts

@@ -3,9 +3,8 @@ plugins {
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.org.jetbrains.kotlin.android) apply false
     alias(libs.plugins.com.google.devtools.ksp) apply false
-    alias(libs.plugins.dagger.hilt) apply false
-    alias(libs.plugins.secrets.gradle.plugin) apply false
     alias(libs.plugins.compose.compiler) apply false
+    alias(libs.plugins.secrets.gradle.plugin) apply false
 }
 
 tasks.register("clean", Delete::class) {

core/local/build.gradle.kts

@@ -4,7 +4,6 @@ plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.org.jetbrains.kotlin.android)
     alias(libs.plugins.com.google.devtools.ksp)
-    alias(libs.plugins.dagger.hilt)
 }
 
 android {
@@ -46,15 +45,14 @@ dependencies {
     implementation(libs.appcompat)
     implementation(libs.material)
 
-    //Dagger - Hilt
-    implementation(libs.hilt.android)
-    ksp(libs.hilt.android.compiler)
-
     // Room
     implementation(libs.room.runtime)
-    annotationProcessor(libs.room.compiler)
+    implementation(libs.androidx.room.ktx)
     ksp(libs.room.compiler)
 
+    // Koin
+    implementation(libs.koin.android)
+
     testImplementation(libs.junit.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.espresso.core)

core/local/src/main/java/com/codeskraps/core/local/data/dao/GeoLocationDao.kt

@@ -0,0 +1,26 @@
+package com.codeskraps.core.local.data.dao
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import com.codeskraps.core.local.data.model.GeoLocationEntity
+
+@Dao
+interface GeoLocationDao {
+    @Query("SELECT * FROM GeoLocationEntity")
+    suspend fun getAll(): List<GeoLocationEntity>
+
+    @Query("SELECT * FROM GeoLocationEntity WHERE latitude = :latitude AND longitude = :longitude")
+    suspend fun getByLocation(latitude: Double, longitude: Double): List<GeoLocationEntity>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insert(geoLocation: GeoLocationEntity)
+
+    @Delete
+    suspend fun delete(geoLocation: GeoLocationEntity)
+
+    @Query("DELETE FROM GeoLocationEntity WHERE latitude = :latitude AND longitude = :longitude")
+    suspend fun delete(latitude: Double, longitude: Double)
+} 

core/local/src/main/java/com/codeskraps/core/local/data/db/GeocodingDB.kt

@@ -1,15 +1,34 @@
 package com.codeskraps.core.local.data.db
 
+import android.content.Context
 import androidx.room.Database
+import androidx.room.Room
 import androidx.room.RoomDatabase
+import com.codeskraps.core.local.data.dao.GeoLocationDao
 import com.codeskraps.core.local.data.model.GeoLocationEntity
 
 @Database(
     entities = [GeoLocationEntity::class],
     version = 1,
     exportSchema = false
 )
-abstract class GeocodingDB: RoomDatabase() {
+abstract class GeocodingDB : RoomDatabase() {
+    abstract fun geocodingDao(): GeoLocationDao
 
-    abstract fun geocodingDao(): GeocodingDao
+    companion object {
+        @Volatile
+        private var INSTANCE: GeocodingDB? = null
+
+        fun getInstance(context: Context): GeocodingDB {
+            return INSTANCE ?: synchronized(this) {
+                val instance = Room.databaseBuilder(
+                    context.applicationContext,
+                    GeocodingDB::class.java,
+                    "geocoding_database"
+                ).build()
+                INSTANCE = instance
+                instance
+            }
+        }
+    }
 }