Merge pull request #221 from hieuwu/feature/wipe-out-xml

Get rid of unused class & files
hieuwu · Oct 12, 2023 · 130c13b · 130c13b
2 parents 22b65e8 + 1fd6e6e
commit 130c13b
Show file tree

Hide file tree

Showing 21 changed files with 20 additions and 657 deletions.
diff --git a/app/src/main/java/com/hieuwu/groceriesstore/presentation/account/AccountViewModel.kt b/app/src/main/java/com/hieuwu/groceriesstore/presentation/account/AccountViewModel.kt
@@ -1,22 +1,20 @@
 package com.hieuwu.groceriesstore.presentation.account
 
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.hieuwu.groceriesstore.domain.models.UserModel
 import com.hieuwu.groceriesstore.domain.usecases.GetProfileUseCase
 import com.hieuwu.groceriesstore.domain.usecases.SignOutUseCase
-import com.hieuwu.groceriesstore.presentation.utils.ObservableViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
-import javax.inject.Inject
 import kotlinx.coroutines.launch
+import javax.inject.Inject
 
 @HiltViewModel
 class AccountViewModel @Inject constructor(
     private val getProfileUseCase: GetProfileUseCase,
     private val signOutUseCase: SignOutUseCase
-) : ObservableViewModel() {
+) : ViewModel() {
 
     private val _user: MutableStateFlow<UserModel?> = MutableStateFlow(null)
     val user: MutableStateFlow<UserModel?>

diff --git a/app/src/main/java/com/hieuwu/groceriesstore/presentation/adapters/LineListItemAdapter.kt b/app/src/main/java/com/hieuwu/groceriesstore/presentation/adapters/LineListItemAdapter.kt
diff --git a/app/src/main/java/com/hieuwu/groceriesstore/presentation/adapters/RecipeItemAdapter.kt b/app/src/main/java/com/hieuwu/groceriesstore/presentation/adapters/RecipeItemAdapter.kt
diff --git a/app/src/main/java/com/hieuwu/groceriesstore/presentation/cart/CartViewModel.kt b/app/src/main/java/com/hieuwu/groceriesstore/presentation/cart/CartViewModel.kt
@@ -1,10 +1,10 @@
 package com.hieuwu.groceriesstore.presentation.cart
 
+import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.hieuwu.groceriesstore.domain.models.LineItemModel
 import com.hieuwu.groceriesstore.domain.models.OrderModel
 import com.hieuwu.groceriesstore.domain.usecases.UpdateCartItemUseCase
-import com.hieuwu.groceriesstore.presentation.utils.ObservableViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
@@ -16,7 +16,7 @@ import timber.log.Timber
 @HiltViewModel
 class CartViewModel @Inject constructor(
     private val updateCartItemUseCase: UpdateCartItemUseCase
-) : ObservableViewModel() {
+) : ViewModel() {
 
     val order: StateFlow<OrderModel?> =
         updateCartItemUseCase.getCurrentCart()

diff --git a/app/src/main/java/com/hieuwu/groceriesstore/presentation/checkout/CheckOutViewModel.kt b/app/src/main/java/com/hieuwu/groceriesstore/presentation/checkout/CheckOutViewModel.kt
@@ -1,12 +1,12 @@
 package com.hieuwu.groceriesstore.presentation.checkout
 
+import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.hieuwu.groceriesstore.domain.models.OrderModel
 import com.hieuwu.groceriesstore.domain.models.UserModel
 import com.hieuwu.groceriesstore.domain.usecases.GetCurrentCartUseCase
 import com.hieuwu.groceriesstore.domain.usecases.GetProfileUseCase
 import com.hieuwu.groceriesstore.domain.usecases.SubmitOrderUseCase
-import com.hieuwu.groceriesstore.presentation.utils.ObservableViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -22,8 +22,7 @@ class CheckOutViewModel @Inject constructor(
     private val getCurrentCartUseCase: GetCurrentCartUseCase,
     private val getProfileUseCase: GetProfileUseCase,
     private val submitOrderUseCase: SubmitOrderUseCase
-) :
-    ObservableViewModel() {
+) : ViewModel() {
     private val _user =
         getCurrentUser()!!.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), null)
     val user: StateFlow<UserModel?>

diff --git a/app/src/main/java/com/hieuwu/groceriesstore/presentation/explore/ExploreViewModel.kt b/app/src/main/java/com/hieuwu/groceriesstore/presentation/explore/ExploreViewModel.kt
@@ -1,5 +1,6 @@
 package com.hieuwu.groceriesstore.presentation.explore
 
+import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.hieuwu.groceriesstore.data.database.entities.LineItem
 import com.hieuwu.groceriesstore.data.database.entities.Order
@@ -11,7 +12,6 @@ import com.hieuwu.groceriesstore.domain.usecases.CreateNewOrderUseCase
 import com.hieuwu.groceriesstore.domain.usecases.GetCategoriesListUseCase
 import com.hieuwu.groceriesstore.domain.usecases.GetCurrentCartUseCase
 import com.hieuwu.groceriesstore.domain.usecases.SearchProductUseCase
-import com.hieuwu.groceriesstore.presentation.utils.ObservableViewModel
 import com.hieuwu.groceriesstore.utilities.OrderStatus
 import dagger.hilt.android.lifecycle.HiltViewModel
 import java.util.*
@@ -30,7 +30,7 @@ class ExploreViewModel @Inject constructor(
     private val searchProductUseCase: SearchProductUseCase,
     private val createNewOrderUseCase: CreateNewOrderUseCase,
     private val addToCartUseCase: AddToCartUseCase
-) : ObservableViewModel() {
+) : ViewModel() {
 
     private val _currentCart: StateFlow<OrderModel?> =
         getCurrentCard()!!

diff --git a/app/src/main/java/com/hieuwu/groceriesstore/presentation/favourite/FavouriteViewModel.kt b/app/src/main/java/com/hieuwu/groceriesstore/presentation/favourite/FavouriteViewModel.kt
@@ -2,19 +2,19 @@ package com.hieuwu.groceriesstore.presentation.favourite
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
 import androidx.lifecycle.asLiveData
 import androidx.lifecycle.viewModelScope
 import com.hieuwu.groceriesstore.data.repository.RecipeRepository
 import com.hieuwu.groceriesstore.domain.models.RecipeModel
-import com.hieuwu.groceriesstore.presentation.utils.ObservableViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.stateIn
 import javax.inject.Inject
 
 @HiltViewModel
 class FavouriteViewModel @Inject constructor(private val recipeRepository: RecipeRepository) :
-    ObservableViewModel() {
+    ViewModel() {
 
     private var _recipesList: MutableLiveData<List<RecipeModel>> =
         recipeRepository.getFromLocal().stateIn(

diff --git a/.../hieuwu/groceriesstore/presentation/notificationsettings/NotificationSettingsViewModel.kt b/.../hieuwu/groceriesstore/presentation/notificationsettings/NotificationSettingsViewModel.kt
@@ -1,11 +1,11 @@
 package com.hieuwu.groceriesstore.presentation.notificationsettings
 
 import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.hieuwu.groceriesstore.domain.models.UserModel
 import com.hieuwu.groceriesstore.domain.usecases.GetProfileUseCase
 import com.hieuwu.groceriesstore.domain.usecases.UserSettingsUseCase
-import com.hieuwu.groceriesstore.presentation.utils.ObservableViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch
@@ -16,8 +16,7 @@ import javax.inject.Inject
 class NotificationSettingsViewModel @Inject constructor(
     private val userSettingsUseCase: UserSettingsUseCase,
     private val getProfileUseCase: GetProfileUseCase,
-) :
-    ObservableViewModel() {
+) : ViewModel() {
     private val _user: MutableStateFlow<UserModel?> = MutableStateFlow(null)
     val user: MutableStateFlow<UserModel?>
         get() = _user

diff --git a/app/src/main/java/com/hieuwu/groceriesstore/presentation/onboarding/OnboardingViewModel.kt b/app/src/main/java/com/hieuwu/groceriesstore/presentation/onboarding/OnboardingViewModel.kt
@@ -1,9 +1,9 @@
 package com.hieuwu.groceriesstore.presentation.onboarding
 
 import android.content.SharedPreferences
+import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.hieuwu.groceriesstore.domain.usecases.RefreshAppDataUseCase
-import com.hieuwu.groceriesstore.presentation.utils.ObservableViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -15,7 +15,7 @@ import javax.inject.Inject
 class OnboardingViewModel @Inject constructor(
     private val refreshAppDataUseCase: RefreshAppDataUseCase,
     private val sharedPreferences: SharedPreferences
-) : ObservableViewModel() {
+) : ViewModel() {
 
     private val _isSyncedSuccessful = MutableStateFlow(false)
     val isSyncedSuccessful: StateFlow<Boolean>

diff --git a/.../main/java/com/hieuwu/groceriesstore/presentation/productdetail/ProductDetailViewModel.kt b/.../main/java/com/hieuwu/groceriesstore/presentation/productdetail/ProductDetailViewModel.kt
@@ -1,13 +1,13 @@
 package com.hieuwu.groceriesstore.presentation.productdetail
 
 import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.hieuwu.groceriesstore.data.database.entities.LineItem
 import com.hieuwu.groceriesstore.data.database.entities.Order
 import com.hieuwu.groceriesstore.data.repository.OrderRepository
 import com.hieuwu.groceriesstore.domain.models.OrderModel
 import com.hieuwu.groceriesstore.domain.usecases.GetProductDetailUseCase
-import com.hieuwu.groceriesstore.presentation.utils.ObservableViewModel
 import com.hieuwu.groceriesstore.utilities.OrderStatus
 import dagger.hilt.android.lifecycle.HiltViewModel
 import java.util.*
@@ -23,7 +23,7 @@ class ProductDetailViewModel @Inject constructor(
     savedStateHandle: SavedStateHandle,
     getProductDetailUseCase: GetProductDetailUseCase,
     private val orderRepository: OrderRepository
-) : ObservableViewModel() {
+) : ViewModel() {
 
     private val args = ProductDetailFragmentArgs.fromSavedStateHandle(savedStateHandle)
 

diff --git a/app/src/main/java/com/hieuwu/groceriesstore/presentation/productlist/FilterFragment.kt b/app/src/main/java/com/hieuwu/groceriesstore/presentation/productlist/FilterFragment.kt
diff --git a/app/src/main/java/com/hieuwu/groceriesstore/presentation/productlist/ProductListFragment.kt b/app/src/main/java/com/hieuwu/groceriesstore/presentation/productlist/ProductListFragment.kt
@@ -53,10 +53,6 @@ class ProductListFragment : Fragment() {
     }
 
     private fun showFilterDialog() {
-        val bottomSheetDialogFragment = FilterFragment()
-        bottomSheetDialogFragment.show(
-            activity?.supportFragmentManager!!,
-            bottomSheetDialogFragment.tag
-        )
+        // Do nothing. Add filter feature later
     }
 }
diff --git a/.../main/java/com/hieuwu/groceriesstore/presentation/updateprofile/UpdateProfileViewModel.kt b/.../main/java/com/hieuwu/groceriesstore/presentation/updateprofile/UpdateProfileViewModel.kt
@@ -2,11 +2,11 @@ package com.hieuwu.groceriesstore.presentation.updateprofile
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.hieuwu.groceriesstore.domain.models.UserModel
 import com.hieuwu.groceriesstore.domain.usecases.GetProfileUseCase
 import com.hieuwu.groceriesstore.domain.usecases.UpdateProfileUseCase
-import com.hieuwu.groceriesstore.presentation.utils.ObservableViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch
@@ -16,8 +16,7 @@ import javax.inject.Inject
 class UpdateProfileViewModel @Inject constructor(
     private val updateProfileUseCase: UpdateProfileUseCase,
     private val getProfileUseCase: GetProfileUseCase,
-) :
-    ObservableViewModel() {
+) : ViewModel() {
     private val _user: MutableStateFlow<UserModel?> = MutableStateFlow(null)
     val user: MutableStateFlow<UserModel?>
         get() = _user