Release 2023-06-24

serbelga · Jun 24, 2023 · cb5fdd8 · cb5fdd8
2 parents 480f32e + 6e073e3
commit cb5fdd8
Show file tree

Hide file tree

Showing 65 changed files with 387 additions and 881 deletions.
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
@@ -18,7 +18,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <application
-        android:name="dev.sergiobelda.todometer.app.ToDometerApplication"
+        android:name="dev.sergiobelda.todometer.app.ToDometerApp"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"

diff --git a/...lda/todometer/app/ToDometerApplication.kt → ...sergiobelda/todometer/app/ToDometerApp.kt b/...lda/todometer/app/ToDometerApplication.kt → ...sergiobelda/todometer/app/ToDometerApp.kt
@@ -16,18 +16,18 @@
 
 package dev.sergiobelda.todometer.app
 
-import dev.sergiobelda.todometer.common.core.app.ToDometerBaseApplication
-import dev.sergiobelda.todometer.common.core.di.initKoin
+import dev.sergiobelda.todometer.common.core.app.ToDometerBaseApp
+import dev.sergiobelda.todometer.common.core.di.startAppDI
 import dev.sergiobelda.todometer.di.viewModelModule
 import org.koin.android.ext.koin.androidContext
 
-class ToDometerApplication : ToDometerBaseApplication() {
+class ToDometerApp : ToDometerBaseApp() {
 
     override fun onCreate() {
         super.onCreate()
-        initKoin {
+        startAppDI {
             modules(viewModelModule)
-            androidContext(this@ToDometerApplication)
+            androidContext(this@ToDometerApp)
         }
     }
 }
diff --git a/android/src/main/java/dev/sergiobelda/todometer/di/ViewModelModule.kt b/android/src/main/java/dev/sergiobelda/todometer/di/ViewModelModule.kt
@@ -17,28 +17,9 @@
 package dev.sergiobelda.todometer.di
 
 import dev.sergiobelda.todometer.ui.MainViewModel
-import dev.sergiobelda.todometer.ui.addtask.AddTaskViewModel
-import dev.sergiobelda.todometer.ui.addtasklist.AddTaskListViewModel
-import dev.sergiobelda.todometer.ui.edittask.EditTaskViewModel
-import dev.sergiobelda.todometer.ui.edittasklist.EditTaskListViewModel
-import dev.sergiobelda.todometer.ui.home.HomeViewModel
-import dev.sergiobelda.todometer.ui.settings.SettingsViewModel
-import dev.sergiobelda.todometer.ui.taskdetails.TaskDetailsViewModel
-import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.androidx.viewmodel.dsl.viewModelOf
 import org.koin.dsl.module
 
 internal val viewModelModule = module {
-    viewModelOf(::AddTaskListViewModel)
-    viewModelOf(::AddTaskViewModel)
-    viewModelOf(::EditTaskListViewModel)
-    viewModel { parameters ->
-        EditTaskViewModel(parameters.get(), get(), get())
-    }
-    viewModelOf(::HomeViewModel)
-    viewModel { parameters ->
-        TaskDetailsViewModel(parameters.get(), get(), get(), get(), get(), get(), get())
-    }
     viewModelOf(::MainViewModel)
-    viewModelOf(::SettingsViewModel)
 }
diff --git a/android/src/main/java/dev/sergiobelda/todometer/ui/addtask/AddTaskRoute.kt b/android/src/main/java/dev/sergiobelda/todometer/ui/addtask/AddTaskRoute.kt
@@ -18,6 +18,7 @@ package dev.sergiobelda.todometer.ui.addtask
 
 import androidx.compose.runtime.Composable
 import dev.sergiobelda.todometer.common.compose.ui.addtask.AddTaskScreen
+import dev.sergiobelda.todometer.common.compose.ui.addtask.AddTaskViewModel
 import org.koin.androidx.compose.getViewModel
 
 @Composable

diff --git a/android/src/main/java/dev/sergiobelda/todometer/ui/addtasklist/AddTaskListRoute.kt b/android/src/main/java/dev/sergiobelda/todometer/ui/addtasklist/AddTaskListRoute.kt
@@ -18,6 +18,7 @@ package dev.sergiobelda.todometer.ui.addtasklist
 
 import androidx.compose.runtime.Composable
 import dev.sergiobelda.todometer.common.compose.ui.addtasklist.AddTaskListScreen
+import dev.sergiobelda.todometer.common.compose.ui.addtasklist.AddTaskListViewModel
 import org.koin.androidx.compose.getViewModel
 
 @Composable

diff --git a/android/src/main/java/dev/sergiobelda/todometer/ui/addtasklist/AddTaskListViewModel.kt b/android/src/main/java/dev/sergiobelda/todometer/ui/addtasklist/AddTaskListViewModel.kt
diff --git a/android/src/main/java/dev/sergiobelda/todometer/ui/edittask/EditTaskRoute.kt b/android/src/main/java/dev/sergiobelda/todometer/ui/edittask/EditTaskRoute.kt
@@ -18,6 +18,7 @@ package dev.sergiobelda.todometer.ui.edittask
 
 import androidx.compose.runtime.Composable
 import dev.sergiobelda.todometer.common.compose.ui.edittask.EditTaskScreen
+import dev.sergiobelda.todometer.common.compose.ui.edittask.EditTaskViewModel
 import org.koin.androidx.compose.getViewModel
 import org.koin.core.parameter.parametersOf
 

diff --git a/android/src/main/java/dev/sergiobelda/todometer/ui/edittask/EditTaskViewModel.kt b/android/src/main/java/dev/sergiobelda/todometer/ui/edittask/EditTaskViewModel.kt
diff --git a/android/src/main/java/dev/sergiobelda/todometer/ui/edittasklist/EditTaskListRoute.kt b/android/src/main/java/dev/sergiobelda/todometer/ui/edittasklist/EditTaskListRoute.kt
@@ -18,6 +18,7 @@ package dev.sergiobelda.todometer.ui.edittasklist
 
 import androidx.compose.runtime.Composable
 import dev.sergiobelda.todometer.common.compose.ui.edittasklist.EditTaskListScreen
+import dev.sergiobelda.todometer.common.compose.ui.edittasklist.EditTaskListViewModel
 import org.koin.androidx.compose.getViewModel
 
 @Composable

diff --git a/android/src/main/java/dev/sergiobelda/todometer/ui/edittasklist/EditTaskListViewModel.kt b/android/src/main/java/dev/sergiobelda/todometer/ui/edittasklist/EditTaskListViewModel.kt
diff --git a/android/src/main/java/dev/sergiobelda/todometer/ui/home/HomeRoute.kt b/android/src/main/java/dev/sergiobelda/todometer/ui/home/HomeRoute.kt
@@ -18,6 +18,7 @@ package dev.sergiobelda.todometer.ui.home
 
 import androidx.compose.runtime.Composable
 import dev.sergiobelda.todometer.common.compose.ui.home.HomeScreen
+import dev.sergiobelda.todometer.common.compose.ui.home.HomeViewModel
 import org.koin.androidx.compose.getViewModel
 
 @Composable