Merge pull request #6 from jitinsharma/refactor_to_viewmodel

Refactor to viewmodel

Author: jitinsharma

app/build.gradle

@@ -56,22 +56,22 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.3.1'
+    implementation 'androidx.core:core-ktx:1.3.2'
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.2.1'
     implementation "androidx.compose.runtime:runtime:$compose_version"
     implementation "androidx.compose.ui:ui:$compose_version"
     implementation "androidx.compose.foundation:foundation-layout:$compose_version"
     implementation "androidx.compose.material:material:$compose_version"
-    implementation "androidx.ui:ui-tooling:$compose_version"
+    implementation "androidx.compose.ui:ui-tooling:$compose_version"
     implementation "androidx.compose.runtime:runtime-livedata:$compose_version"
     implementation "androidx.compose.foundation:foundation:$compose_version"
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.13.1'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
     implementation 'org.jsoup:jsoup:1.13.1'
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0"
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.2.0"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.2.0"
@@ -86,7 +86,7 @@ dependencies {
     implementation "org.rekotlin:rekotlin:1.0.4"
     implementation "org.koin:koin-androidx-scope:$koin_version"
     implementation "org.koin:koin-androidx-viewmodel:$koin_version"
-    implementation "androidx.datastore:datastore-preferences:1.0.0-alpha01"
+    implementation "androidx.datastore:datastore-preferences:1.0.0-alpha05"
 
     implementation "androidx.work:work-runtime-ktx:2.4.0"
 }

app/src/main/java/in/jitinsharma/asg/conf/di/ConferenceModule.kt

@@ -2,28 +2,17 @@ package `in`.jitinsharma.asg.conf.di
 
 import `in`.jitinsharma.asg.conf.database.AppDatabase
 import `in`.jitinsharma.asg.conf.preferences.AppPreferences
-import `in`.jitinsharma.asg.conf.redux.middleware.ConferenceMiddleware
-import `in`.jitinsharma.asg.conf.redux.reducer.appReducer
 import `in`.jitinsharma.asg.conf.repository.ConferenceRepository
-import kotlinx.coroutines.CoroutineScope
+import `in`.jitinsharma.asg.conf.viewmodel.ConferenceViewModel
+import `in`.jitinsharma.asg.conf.viewmodel.FilterScreenViewModel
 import org.koin.android.ext.koin.androidApplication
+import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.dsl.module
-import org.rekotlin.Store
 
 val conferenceModule = module {
     single { AppDatabase.getDatabase(applicationContext = androidApplication()) }
     factory { ConferenceRepository(appDatabase = get()) }
-    single { (coroutineScope: CoroutineScope) ->
-        Store(
-            state = null,
-            reducer = ::appReducer,
-            middleware = listOf(
-                ConferenceMiddleware(
-                    coroutineScope = coroutineScope,
-                    conferenceRepository = get()
-                )
-            )
-        )
-    }
     single { AppPreferences(context = androidApplication()) }
+    viewModel { ConferenceViewModel(get()) }
+    viewModel { FilterScreenViewModel(get()) }
 }

app/src/main/java/in/jitinsharma/asg/conf/preferences/AppPreferences.kt

@@ -1,9 +1,9 @@
 package `in`.jitinsharma.asg.conf.preferences
 
 import android.content.Context
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.preferencesKey
 import androidx.datastore.preferences.createDataStore
-import androidx.datastore.preferences.edit
-import androidx.datastore.preferences.preferencesKey
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.map
@@ -13,9 +13,7 @@ val UPDATE_PREF_KEY = preferencesKey<Boolean>("UPDATE_PREF_KEY")
 
 class AppPreferences(context: Context) {
 
-    private val appPreferencesStore = context.createDataStore(
-        name = PREF_FILE
-    )
+    private val appPreferencesStore = context.createDataStore(name = PREF_FILE)
 
     suspend fun setUpdatePreference(enabled: Boolean) {
         appPreferencesStore.edit { preferences ->

app/src/main/java/in/jitinsharma/asg/conf/redux/StoreAdapter.kt

@@ -36,8 +36,9 @@ class ConferenceRepository(
                     conferenceData.isPast
                 }
         } catch (e: Exception) {
-            println(e)
-            return emptyList()
+            throw e
+            //println(e)
+            //return emptyList()
         }
     }
 
@@ -68,7 +69,9 @@ class ConferenceRepository(
             }
         }.trim()
         conferenceDataModel.id = conferenceDataModel.name + conferenceDataModel.city
-        conferenceDataModel.parseCfpAndStatusData(childNode(5).toString())
+        if (childNodeSize() > 5) {
+            conferenceDataModel.parseCfpAndStatusData(childNode(5).toString())
+        }
         return conferenceDataModel
     }
 
@@ -79,7 +82,7 @@ class ConferenceRepository(
                     val cfpData = ConferenceData.CfpData()
                     //TODO Try replacing matchers by parsing line with Jsoup
                     val cfpUrlMatcher =
-                        Pattern.compile("a href=(.*?)>", Pattern.DOTALL).matcher(line)
+                        Pattern.compile("href=(.*?)>", Pattern.DOTALL).matcher(line)
                     val cfpDateMatcher = Pattern.compile(">(.*?)<", Pattern.DOTALL).matcher(line)
                     while (cfpUrlMatcher.find()) {
                         val match = cfpUrlMatcher.group(1)

app/src/main/java/in/jitinsharma/asg/conf/redux/actions/Actions.kt

@@ -10,12 +10,13 @@ import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkerParameters
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
-import org.koin.core.KoinComponent
-import org.koin.core.inject
+import org.koin.core.component.KoinApiExtension
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
 import java.util.concurrent.TimeUnit
 
+@KoinApiExtension
 class ConferenceUpdateWorker(appContext: Context, params: WorkerParameters) :
     CoroutineWorker(appContext, params), KoinComponent {