add sorting options and dialog

SmartToolFactory · SmartToolFactory · commit ccd76ba301b5 · 2020-09-08T10:19:12.000+03:00
diff --git a/features/home/src/main/java/com/smarttoolfactory/home/HomeFragment.kt b/features/home/src/main/java/com/smarttoolfactory/home/HomeFragment.kt
@@ -1,9 +1,13 @@
 package com.smarttoolfactory.home
 
-import android.widget.Toast
+import android.app.Dialog
+import android.os.Bundle
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.NavController
 import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.setupWithNavController
@@ -16,6 +20,7 @@ import com.smarttoolfactory.core.util.Event
 import com.smarttoolfactory.core.viewmodel.NavControllerViewModel
 import com.smarttoolfactory.home.adapter.HomeViewPager2FragmentStateAdapter
 import com.smarttoolfactory.home.databinding.FragmentHomeBinding
+import com.smarttoolfactory.home.viewmodel.HomeToolbarVM
 
 /**
  * Fragment that contains [ViewPager2] and [TabLayout].
@@ -37,8 +42,16 @@ class HomeFragment : DynamicNavigationFragment<FragmentHomeBinding>() {
 
     override fun getLayoutRes(): Int = R.layout.fragment_home
 
+    /**
+     * ViwModel for getting [NavController] for setting Toolbar navigation
+     */
     private val navControllerViewModel by activityViewModels<NavControllerViewModel>()
 
+    /**
+     * ViewModel for setting sort filter on top menu and property list fragments
+     */
+    private val toolbarVM by activityViewModels<HomeToolbarVM>()
+
     override fun bindViews() {
 
         // ViewPager2
@@ -59,19 +72,26 @@ class HomeFragment : DynamicNavigationFragment<FragmentHomeBinding>() {
 
         dataBinding!!.toolbar.inflateMenu(R.menu.menu_home)
 
+        // Bind tabs and viewpager
+        TabLayoutMediator(tabLayout, viewPager, tabConfigurationStrategy).attach()
+
+        setToolbarMenuItemListener()
+
+        subscribeAppbarNavigation()
+    }
+
+    private fun setToolbarMenuItemListener() {
         dataBinding!!.toolbar.setOnMenuItemClickListener {
             if (it.itemId == R.id.menu_item_sort) {
-                Toast.makeText(requireContext(), "Toast", Toast.LENGTH_SHORT).show()
+                val dialogFragment = SortDialogFragment().show(
+                    requireActivity().supportFragmentManager,
+                    "sort-dialog"
+                )
                 true
             }
 
             false
         }
-
-        // Bind tabs and viewpager
-        TabLayoutMediator(tabLayout, viewPager, tabConfigurationStrategy).attach()
-
-        subscribeAppbarNavigation()
     }
 
     private fun subscribeAppbarNavigation() {
@@ -125,3 +145,32 @@ class HomeFragment : DynamicNavigationFragment<FragmentHomeBinding>() {
             }
         }
 }
+
+class SortDialogFragment : DialogFragment() {
+
+    private lateinit var viewModel: HomeToolbarVM
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        viewModel = ViewModelProvider(requireActivity()).get(HomeToolbarVM::class.java)
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+
+        val items = viewModel.sortPropertyList.toTypedArray()
+        items[0] = "Featured"
+
+        val checkedItem = viewModel.sortPropertyList.indexOf(viewModel.currentSortFilter)
+
+        val builder = AlertDialog.Builder(requireActivity())
+        builder.setTitle("Sorting")
+            .setNegativeButton("CANCEL") { dialog, which ->
+                dismiss()
+            }
+            .setSingleChoiceItems(items, checkedItem) { dialog, which ->
+                viewModel.queryBySort.value = Event(viewModel.sortPropertyList[which])
+                dismiss()
+            }
+        return builder.create()
+    }
+}
diff --git a/features/home/src/main/java/com/smarttoolfactory/home/propertylist/PropertyListFlowFragment.kt b/features/home/src/main/java/com/smarttoolfactory/home/propertylist/PropertyListFlowFragment.kt
@@ -2,13 +2,16 @@ package com.smarttoolfactory.home.propertylist
 
 import android.os.Bundle
 import androidx.core.os.bundleOf
+import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.smarttoolfactory.core.di.CoreModuleDependencies
 import com.smarttoolfactory.core.ui.fragment.DynamicNavigationFragment
+import com.smarttoolfactory.core.util.observe
 import com.smarttoolfactory.home.R
 import com.smarttoolfactory.home.adapter.PropertyItemListAdapter
 import com.smarttoolfactory.home.databinding.FragmentPropertyListBinding
 import com.smarttoolfactory.home.di.DaggerHomeComponent
+import com.smarttoolfactory.home.viewmodel.HomeToolbarVM
 import com.smarttoolfactory.home.viewmodel.PropertyListViewModelFlow
 import dagger.hilt.android.EntryPointAccessors
 import javax.inject.Inject
@@ -18,6 +21,11 @@ class PropertyListFlowFragment : DynamicNavigationFragment<FragmentPropertyListB
     @Inject
     lateinit var viewModel: PropertyListViewModelFlow
 
+    /**
+     * ViewModel for setting sort filter on top menu and property list fragments
+     */
+    private val toolbarVM by activityViewModels<HomeToolbarVM>()
+
     override fun getLayoutRes(): Int = R.layout.fragment_property_list
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -53,6 +61,17 @@ class PropertyListFlowFragment : DynamicNavigationFragment<FragmentPropertyListB
         }
 
         subscribeGoToDetailScreen()
+
+        subscribeToolbarSortChange()
+    }
+
+    private fun subscribeToolbarSortChange() {
+
+        viewLifecycleOwner.observe(toolbarVM.queryBySort) {
+            it.getContentIfNotHandled()?.let { orderBy ->
+                viewModel.refreshPropertyList(orderBy)
+            }
+        }
     }
 
     private fun subscribeGoToDetailScreen() {
diff --git a/features/home/src/main/java/com/smarttoolfactory/home/propertylist/PropertyListRxjava3Fragment.kt b/features/home/src/main/java/com/smarttoolfactory/home/propertylist/PropertyListRxjava3Fragment.kt
@@ -2,13 +2,15 @@ package com.smarttoolfactory.home.propertylist
 
 import android.os.Bundle
 import androidx.core.os.bundleOf
+import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.smarttoolfactory.core.di.CoreModuleDependencies
 import com.smarttoolfactory.core.ui.fragment.DynamicNavigationFragment
 import com.smarttoolfactory.home.R
 import com.smarttoolfactory.home.adapter.PropertyItemListAdapter
 import com.smarttoolfactory.home.databinding.FragmentPropertyListBinding
 import com.smarttoolfactory.home.di.DaggerHomeComponent
+import com.smarttoolfactory.home.viewmodel.HomeToolbarVM
 import com.smarttoolfactory.home.viewmodel.PropertyListViewModelRxJava3
 import dagger.hilt.android.EntryPointAccessors
 import javax.inject.Inject
@@ -18,6 +20,11 @@ class PropertyListRxjava3Fragment : DynamicNavigationFragment<FragmentPropertyLi
     @Inject
     lateinit var viewModel: PropertyListViewModelRxJava3
 
+    /**
+     * ViewModel for setting sort filter on top menu and property list fragments
+     */
+    private val toolbarVM by activityViewModels<HomeToolbarVM>()
+
     override fun getLayoutRes(): Int = R.layout.fragment_property_list
 
     override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/features/home/src/main/java/com/smarttoolfactory/home/viewmodel/AbstractPropertyListVM.kt b/features/home/src/main/java/com/smarttoolfactory/home/viewmodel/AbstractPropertyListVM.kt
@@ -4,6 +4,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import com.smarttoolfactory.core.util.Event
 import com.smarttoolfactory.core.viewstate.ViewState
+import com.smarttoolfactory.domain.ORDER_BY_NONE
 import com.smarttoolfactory.domain.model.PropertyItem
 
 /**
@@ -20,9 +21,9 @@ abstract class AbstractPropertyListVM : ViewModel() {
 
     abstract val propertyListViewState: LiveData<ViewState<List<PropertyItem>>>
 
-    abstract fun getPropertyList()
+    abstract fun getPropertyList(orderBy: String = ORDER_BY_NONE)
 
-    abstract fun refreshPropertyList()
+    abstract fun refreshPropertyList(orderBy: String = ORDER_BY_NONE)
 
     abstract fun onClick(propertyItem: PropertyItem)
 }
diff --git a/features/home/src/main/java/com/smarttoolfactory/home/viewmodel/HomeToolbarVM.kt b/features/home/src/main/java/com/smarttoolfactory/home/viewmodel/HomeToolbarVM.kt
@@ -4,8 +4,23 @@ import androidx.hilt.lifecycle.ViewModelInject
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.smarttoolfactory.core.util.Event
+import com.smarttoolfactory.domain.ORDER_BY_BEDS_ASCENDING
+import com.smarttoolfactory.domain.ORDER_BY_DES_DESCENDING
+import com.smarttoolfactory.domain.ORDER_BY_NONE
+import com.smarttoolfactory.domain.ORDER_BY_PRICE_ASCENDING
+import com.smarttoolfactory.domain.ORDER_BY_PRICE_DESCENDING
 
 class HomeToolbarVM @ViewModelInject constructor() : ViewModel() {
 
-    val setFilter = MutableLiveData<Event<String>>()
+    var currentSortFilter = ORDER_BY_NONE
+
+    val sortPropertyList = listOf(
+        ORDER_BY_NONE,
+        ORDER_BY_PRICE_ASCENDING,
+        ORDER_BY_PRICE_DESCENDING,
+        ORDER_BY_BEDS_ASCENDING,
+        ORDER_BY_DES_DESCENDING
+    )
+
+    val queryBySort = MutableLiveData<Event<String>>()
 }
diff --git a/features/home/src/main/java/com/smarttoolfactory/home/viewmodel/PropertyListViewModelFlow.kt b/features/home/src/main/java/com/smarttoolfactory/home/viewmodel/PropertyListViewModelFlow.kt
@@ -9,7 +9,6 @@ import com.smarttoolfactory.core.viewstate.Status
 import com.smarttoolfactory.core.viewstate.ViewState
 import com.smarttoolfactory.domain.model.PropertyItem
 import com.smarttoolfactory.domain.usecase.GetPropertiesUseCaseFlow
-import com.smarttoolfactory.propertyfindar.ORDER_BY_NONE
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -41,9 +40,9 @@ class PropertyListViewModelFlow @ViewModelInject constructor(
      * * If both network and db don't have any data throw empty set exception
      *
      */
-    override fun getPropertyList() {
+    override fun getPropertyList(orderBy: String) {
 
-        getPropertiesUseCase.getPropertiesOfflineFirst(orderBy = ORDER_BY_NONE)
+        getPropertiesUseCase.getPropertiesOfflineFirst(orderBy)
             .convertToFlowViewState()
             .onStart {
                 _propertyViewState.value = ViewState(status = Status.LOADING)
@@ -54,8 +53,8 @@ class PropertyListViewModelFlow @ViewModelInject constructor(
             .launchIn(coroutineScope)
     }
 
-    override fun refreshPropertyList() {
-        getPropertiesUseCase.getPropertiesOfflineLast("")
+    override fun refreshPropertyList(orderBy: String) {
+        getPropertiesUseCase.getPropertiesOfflineLast(orderBy)
             .convertToFlowViewState()
             .onStart {
                 _propertyViewState.value = ViewState(status = Status.LOADING)
diff --git a/features/home/src/main/java/com/smarttoolfactory/home/viewmodel/PropertyListViewModelRxJava3.kt b/features/home/src/main/java/com/smarttoolfactory/home/viewmodel/PropertyListViewModelRxJava3.kt
@@ -9,7 +9,6 @@ import com.smarttoolfactory.core.viewstate.Status
 import com.smarttoolfactory.core.viewstate.ViewState
 import com.smarttoolfactory.domain.model.PropertyItem
 import com.smarttoolfactory.domain.usecase.GetPropertiesUseCaseRxJava3
-import com.smarttoolfactory.propertyfindar.ORDER_BY_NONE
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 
 class PropertyListViewModelRxJava3 @ViewModelInject constructor(
@@ -26,8 +25,8 @@ class PropertyListViewModelRxJava3 @ViewModelInject constructor(
     override val propertyListViewState: LiveData<ViewState<List<PropertyItem>>>
         get() = _propertyListViewState
 
-    override fun getPropertyList() {
-        getPropertiesUseCase.getPropertiesOfflineFirst((ORDER_BY_NONE))
+    override fun getPropertyList(orderBy: String) {
+        getPropertiesUseCase.getPropertiesOfflineFirst((orderBy))
             .convertFromSingleToObservableViewStateWithLoading()
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe(
@@ -40,8 +39,8 @@ class PropertyListViewModelRxJava3 @ViewModelInject constructor(
             )
     }
 
-    override fun refreshPropertyList() {
-        getPropertiesUseCase.getPropertiesOfflineLast(ORDER_BY_NONE)
+    override fun refreshPropertyList(orderBy: String) {
+        getPropertiesUseCase.getPropertiesOfflineLast(orderBy)
             .convertFromSingleToObservableViewStateWithLoading()
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe(
diff --git a/libraries/domain/src/main/java/com/smarttoolfactory/domain/Constants.kt b/libraries/domain/src/main/java/com/smarttoolfactory/domain/Constants.kt
@@ -1,4 +1,4 @@
-package com.smarttoolfactory.propertyfindar
+package com.smarttoolfactory.domain
 
 const val ORDER_BY_NONE = com.smarttoolfactory.data.constant.ORDER_BY_NONE
 const val ORDER_BY_PRICE_ASCENDING = com.smarttoolfactory.data.constant.ORDER_BY_PRICE_ASCENDING

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.smarttoolfactory.propertyfindar`
	`1`	`+package com.smarttoolfactory.domain`
`2`	`2`
`3`	`3`	`const val ORDER_BY_NONE = com.smarttoolfactory.data.constant.ORDER_BY_NONE`
`4`	`4`	`const val ORDER_BY_PRICE_ASCENDING = com.smarttoolfactory.data.constant.ORDER_BY_PRICE_ASCENDING`