Migrate filter screen to Viewmodel and StateFlow

jitinsharma · jitinsharma · commit 490977bb54b4 · 2020-12-20T18:39:00.000+05:30
diff --git a/app/src/main/java/in/jitinsharma/asg/conf/di/ConferenceModule.kt b/app/src/main/java/in/jitinsharma/asg/conf/di/ConferenceModule.kt
@@ -6,6 +6,7 @@ import `in`.jitinsharma.asg.conf.redux.middleware.ConferenceMiddleware
 import `in`.jitinsharma.asg.conf.redux.reducer.appReducer
 import `in`.jitinsharma.asg.conf.repository.ConferenceRepository
 import `in`.jitinsharma.asg.conf.viewmodel.ConferenceViewModel
+import `in`.jitinsharma.asg.conf.viewmodel.FilterScreenViewModel
 import kotlinx.coroutines.CoroutineScope
 import org.koin.android.ext.koin.androidApplication
 import org.koin.androidx.viewmodel.dsl.viewModel
@@ -29,4 +30,5 @@ val conferenceModule = module {
     }
     single { AppPreferences(context = androidApplication()) }
     viewModel { ConferenceViewModel(get()) }
+    viewModel { FilterScreenViewModel(get()) }
 }
diff --git a/app/src/main/java/in/jitinsharma/asg/conf/repository/ConferenceRepository.kt b/app/src/main/java/in/jitinsharma/asg/conf/repository/ConferenceRepository.kt
@@ -82,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)
diff --git a/app/src/main/java/in/jitinsharma/asg/conf/ui/ConferenceApp.kt b/app/src/main/java/in/jitinsharma/asg/conf/ui/ConferenceApp.kt
@@ -1,36 +1,59 @@
 package `in`.jitinsharma.asg.conf.ui
 
 import `in`.jitinsharma.asg.conf.viewmodel.ConferenceViewModel
+import `in`.jitinsharma.asg.conf.viewmodel.FilterScreenViewModel
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 
 @ExperimentalCoroutinesApi
 @Composable
 fun ConferenceApp(
-    conferenceViewModel: ConferenceViewModel
+    conferenceViewModel: ConferenceViewModel,
+    filterScreenViewModel: FilterScreenViewModel
 ) {
     Box(
         modifier = Modifier.fillMaxSize().background(color = MaterialTheme.colors.primary)
     ) {
         Column(modifier = Modifier.fillMaxWidth().padding(all = 16.dp)) {
+            val filterScreenDialogState = remember { mutableStateOf(false) }
             Header(
                 modifier = Modifier.padding(bottom = 16.dp),
-                onFilterClicked = {},
+                onFilterClicked = {
+                    filterScreenDialogState.value = filterScreenDialogState.value.not()
+                },
                 onSettingsClicked = {}
             )
+
             val conferenceUiState = conferenceViewModel.uiState.collectAsState()
             ConferencePage(
                 conferenceListUiState = conferenceUiState.value,
                 onRetryClick = {
                     conferenceViewModel.loadConferences()
                 }
             )
+
+            if (filterScreenDialogState.value) {
+                val filterScreenUiState = filterScreenViewModel.uiState.collectAsState()
+                FilterDialog(
+                    filterScreenUiState = filterScreenUiState.value,
+                    onDismissRequest = {
+                        filterScreenDialogState.value = false
+                    },
+                    onFilterRequest = { cfpFilterChecked, selectedCountries ->
+                        conferenceViewModel.filterConferences(cfpFilterChecked, selectedCountries)
+                        filterScreenViewModel.updateUiState(cfpFilterChecked, selectedCountries)
+                        filterScreenDialogState.value = false
+                    }
+                )
+            }
         }
     }
 }
diff --git a/app/src/main/java/in/jitinsharma/asg/conf/ui/FiltersScreen.kt b/app/src/main/java/in/jitinsharma/asg/conf/ui/FiltersScreen.kt
@@ -1,10 +1,8 @@
 package `in`.jitinsharma.asg.conf.ui
 
 import `in`.jitinsharma.asg.conf.model.Country
-import `in`.jitinsharma.asg.conf.redux.actions.*
-import `in`.jitinsharma.asg.conf.redux.state.AppState
-import `in`.jitinsharma.asg.conf.redux.state.FilterState
 import `in`.jitinsharma.asg.conf.utils.ThemedPreview
+import `in`.jitinsharma.asg.conf.viewmodel.FilterScreenUiState
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
@@ -22,33 +20,41 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
-import org.koin.java.KoinJavaComponent.getKoin
-import org.rekotlin.Store
 
 @Composable
 fun FilterDialog(
-    filterState: FilterState
+    filterScreenUiState: FilterScreenUiState,
+    onDismissRequest: () -> Unit,
+    onFilterRequest: (cfpFilterChecked: Boolean, selectedCountries: List<Country>) -> Unit
 ) {
-    if (filterState.displayDialog) {
-        val store = remember { getKoin().get<Store<AppState>>() }
-        store.dispatch(LoadCountries())
-        Dialog(onDismissRequest = { store.dispatch(HideDialog()) }) {
-            FiltersScreen(
-                cfpFilterChecked = filterState.cfpFilterChecked,
-                selectedCountries = filterState.selectedCountries,
-                countyList = filterState.countryList
-            )
+    //if (filterState.displayDialog) {
+    //val store = remember { getKoin().get<Store<AppState>>() }
+    //store.dispatch(LoadCountries())
+    Dialog(onDismissRequest = { onDismissRequest() }) {
+        when (filterScreenUiState) {
+            is FilterScreenUiState.Success -> {
+                FiltersScreen(
+                    cfpFilterChecked = filterScreenUiState.cfpFilterChecked,
+                    selectedCountries = filterScreenUiState.selectedCountries.toMutableList(),
+                    countyList = filterScreenUiState.countryList,
+                    onDismiss = onDismissRequest,
+                    onApply = onFilterRequest
+                )
+            }
         }
     }
+    //}
 }
 
 @Composable
 fun FiltersScreen(
     cfpFilterChecked: Boolean = false,
     selectedCountries: MutableList<Country>,
-    countyList: List<Country>?
+    countyList: List<Country>?,
+    onDismiss: () -> Unit,
+    onApply: (cfpFilterChecked: Boolean, selectedCountries: List<Country>) -> Unit
 ) {
-    val store = remember { getKoin().get<Store<AppState>>() }
+    //val store = remember { getKoin().get<Store<AppState>>() }
     Card(backgroundColor = themeColors.secondary) {
         Column(modifier = Modifier.wrapContentSize()) {
             Box(
@@ -94,7 +100,10 @@ fun FiltersScreen(
                         onCheckedChange = {
                             cfpFilterCheckState.value = cfpFilterCheckState.value.not()
                         },
-                        colors = CheckboxConstants.defaultColors(checkedColor = themeColors.primary)
+                        colors = CheckboxDefaults.colors(
+                            checkedColor = MaterialTheme.colors.primary,
+                            uncheckedColor = MaterialTheme.colors.primary
+                        )
                     )
                     Text(
                         text = "Cfp Open",
@@ -124,7 +133,7 @@ fun FiltersScreen(
                     Box(
                         Modifier.clickable(
                             indication = rememberRippleIndication(),
-                            onClick = { store.dispatch(HideDialog()) })
+                            onClick = { onDismiss() })
                     ) {
                         Text(
                             text = "CANCEL",
@@ -140,17 +149,7 @@ fun FiltersScreen(
                     Box(
                         Modifier.clickable(
                             indication = rememberRippleIndication(),
-                            onClick = {
-                                store.dispatch(SetCFPFilterCheck(cfpFilterCheckState.value))
-                                store.dispatch(SetSelectedCountries(selectedCountries))
-                                store.dispatch(HideDialog())
-                                store.dispatch(
-                                    FilterConferences(
-                                        cfpFilterCheckState.value,
-                                        selectedCountries
-                                    )
-                                )
-                            })
+                            onClick = { onApply(cfpFilterCheckState.value, selectedCountries) })
                     ) {
                         Text(
                             text = "APPLY",
@@ -217,7 +216,10 @@ fun CountryList(
                                     selectedCountries.remove(country)
                                 }
                             },
-                            colors = CheckboxConstants.defaultColors(checkedColor = themeColors.primary)
+                            colors = CheckboxDefaults.colors(
+                                checkedColor = MaterialTheme.colors.primary,
+                                uncheckedColor = MaterialTheme.colors.primary
+                            )
                         )
                         Text(
                             text = country.name,
@@ -245,7 +247,9 @@ fun FilterScreenPreview() {
                 Country("Japan"),
                 Country("Poland")
             ),
-            selectedCountries = mutableListOf()
+            selectedCountries = mutableListOf(),
+            onDismiss = {},
+            onApply = { _, _ -> }
         )
     }
 }
diff --git a/app/src/main/java/in/jitinsharma/asg/conf/ui/MainActivity.kt b/app/src/main/java/in/jitinsharma/asg/conf/ui/MainActivity.kt
@@ -1,27 +1,28 @@
 package `in`.jitinsharma.asg.conf.ui
 
 import `in`.jitinsharma.asg.conf.viewmodel.ConferenceViewModel
+import `in`.jitinsharma.asg.conf.viewmodel.FilterScreenViewModel
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.material.MaterialTheme
 import androidx.compose.ui.platform.setContent
-import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 @ExperimentalCoroutinesApi
 class MainActivity : AppCompatActivity() {
 
     private val conferenceViewModel by viewModel<ConferenceViewModel>()
+    private val filterScreenViewModel by viewModel<FilterScreenViewModel>()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContent {
             MaterialTheme(colors = themeColors) {
-                lifecycleScope.launchWhenStarted {
-                    conferenceViewModel.loadConferences()
-                }
-                ConferenceApp(conferenceViewModel = conferenceViewModel)
+                ConferenceApp(
+                    conferenceViewModel = conferenceViewModel,
+                    filterScreenViewModel = filterScreenViewModel
+                )
             }
         }
     }
diff --git a/app/src/main/java/in/jitinsharma/asg/conf/viewmodel/ConferenceViewModel.kt b/app/src/main/java/in/jitinsharma/asg/conf/viewmodel/ConferenceViewModel.kt
@@ -1,6 +1,7 @@
 package `in`.jitinsharma.asg.conf.viewmodel
 
 import `in`.jitinsharma.asg.conf.model.ConferenceData
+import `in`.jitinsharma.asg.conf.model.Country
 import `in`.jitinsharma.asg.conf.repository.ConferenceRepository
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -16,18 +17,41 @@ class ConferenceViewModel(
     private var _uiState: MutableStateFlow<ConferenceListUiState> =
         MutableStateFlow(ConferenceListUiState.Loading)
     val uiState: StateFlow<ConferenceListUiState> = _uiState
+    private var originalConferenceList = listOf<ConferenceData>()
+
+    init {
+        loadConferences()
+    }
 
     fun loadConferences() {
         viewModelScope.launch(Dispatchers.IO) {
             conferenceRepository.loadConferenceData()
             val conferenceDataList = conferenceRepository.getConferenceDataList()
             if (conferenceDataList.isNotEmpty()) {
                 _uiState.value = ConferenceListUiState.Success(conferenceDataList)
+                originalConferenceList = conferenceDataList
             } else {
                 _uiState.value = ConferenceListUiState.Error
             }
         }
     }
+
+    fun filterConferences(cfpFilterChecked: Boolean, selectedCountries: List<Country>) {
+        if (!cfpFilterChecked && selectedCountries.isEmpty()) {
+            _uiState.value = ConferenceListUiState.Success(originalConferenceList)
+        } else {
+            val filteredConferences = originalConferenceList.filter {
+                if (cfpFilterChecked) {
+                    it.cfpData != null && it.cfpData!!.isCfpActive
+                } else {
+                    true
+                }
+            }.filter {
+                selectedCountries.contains(Country(it.country))
+            }
+            _uiState.value = ConferenceListUiState.Success(filteredConferences)
+        }
+    }
 }
 
 sealed class ConferenceListUiState {
diff --git a/app/src/main/java/in/jitinsharma/asg/conf/viewmodel/FilterScreenViewModel.kt b/app/src/main/java/in/jitinsharma/asg/conf/viewmodel/FilterScreenViewModel.kt
@@ -0,0 +1,47 @@
+package `in`.jitinsharma.asg.conf.viewmodel
+
+import `in`.jitinsharma.asg.conf.model.Country
+import `in`.jitinsharma.asg.conf.repository.ConferenceRepository
+import androidx.collection.ArraySet
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
+
+class FilterScreenViewModel(
+    private val conferenceRepository: ConferenceRepository
+) : ViewModel() {
+
+    private var _uiState =
+        MutableStateFlow(FilterScreenUiState.Success())
+    val uiState: StateFlow<FilterScreenUiState> = _uiState
+
+    init {
+        loadCountries()
+    }
+
+    fun loadCountries() {
+        viewModelScope.launch(Dispatchers.IO) {
+            val conferenceDataList = conferenceRepository.getConferenceDataList()
+            val countries = conferenceDataList.mapTo(ArraySet()) { countryName ->
+                Country(name = countryName.country)
+            }.toList()
+            _uiState.value = FilterScreenUiState.Success(countryList = countries)
+        }
+    }
+
+    fun updateUiState(cfpFilterChecked: Boolean, selectedCountries: List<Country>) {
+        val countries = _uiState.value.countryList
+        _uiState.value = FilterScreenUiState.Success(cfpFilterChecked, selectedCountries, countries)
+    }
+}
+
+sealed class FilterScreenUiState {
+    class Success(
+        val cfpFilterChecked: Boolean = false,
+        val selectedCountries: List<Country> = emptyList(),
+        val countryList: List<Country> = emptyList()
+    ) : FilterScreenUiState()
+}

Original file line number	Diff line number	Diff line change
@@ -6,6 +6,7 @@ import `in`.jitinsharma.asg.conf.redux.middleware.ConferenceMiddleware
`6`	`6`	import `in`.jitinsharma.asg.conf.redux.reducer.appReducer
`7`	`7`	import `in`.jitinsharma.asg.conf.repository.ConferenceRepository
`8`	`8`	import `in`.jitinsharma.asg.conf.viewmodel.ConferenceViewModel
	`9`	+import `in`.jitinsharma.asg.conf.viewmodel.FilterScreenViewModel
`9`	`10`	`import kotlinx.coroutines.CoroutineScope`
`10`	`11`	`import org.koin.android.ext.koin.androidApplication`
`11`	`12`	`import org.koin.androidx.viewmodel.dsl.viewModel`
`@@ -29,4 +30,5 @@ val conferenceModule = module {`
`29`	`30`	`}`
`30`	`31`	`single { AppPreferences(context = androidApplication()) }`
`31`	`32`	`viewModel { ConferenceViewModel(get()) }`
	`33`	`+ viewModel { FilterScreenViewModel(get()) }`
`32`	`34`	`}`