added debugging stuff.

Jim Clermonts · Jim Clermonts · commit 802816ea6823 · 2023-08-09T22:23:36.000+02:00
diff --git a/app/src/main/java/eu/theappfactory/dailyrecipes/data/BootstrapItemDataSource.kt b/app/src/main/java/eu/theappfactory/dailyrecipes/data/BootstrapItemDataSource.kt
@@ -13,7 +13,7 @@ import javax.inject.Inject
 class BootstrapItemDataSource @Inject constructor(val context: Context) :
     ItemDataSource {
 
-    override fun getRemoteItemData(): ItemData? {
+    override fun getRemoteItemData(showHidden: Boolean): ItemData? {
         throw Exception("Bootstrap data source doesn't have remote data")
     }
 
diff --git a/app/src/main/java/eu/theappfactory/dailyrecipes/data/ItemDataDownloader.kt b/app/src/main/java/eu/theappfactory/dailyrecipes/data/ItemDataDownloader.kt
@@ -36,7 +36,7 @@ class ItemDataDownloader(private val firestore: FirebaseFirestore) {
     }
 
     @Throws(ExecutionException::class)
-    fun fetch(): ItemData {
+    fun fetch(showHidden: Boolean = false): ItemData {
         val items = ArrayList<ItemResponse>()
         val itemSnapshot = firestore.collection(ITEMS_COLLECTION).get()
         var currentId = ""
@@ -82,7 +82,9 @@ class ItemDataDownloader(private val firestore: FirebaseFirestore) {
                     showThumbnail = currentItem.data?.get(SHOW_THUMBNAIL) as Boolean? ?: false,
                 )
 
-                if (item.isHidden == "false" || item.isHidden == "") {
+                if (showHidden) {
+                    items.add(item)
+                } else if (showHidden.not() && (item.isHidden == "false" || item.isHidden == "")) {
                     items.add(item)
                 }
             }
diff --git a/app/src/main/java/eu/theappfactory/dailyrecipes/data/ItemDataSource.kt b/app/src/main/java/eu/theappfactory/dailyrecipes/data/ItemDataSource.kt
@@ -5,7 +5,7 @@ import eu.theappfactory.dailyrecipes.model.ItemResponse
 import eu.theappfactory.dailyrecipes.networking.Result
 
 interface ItemDataSource {
-    fun getRemoteItemData(): ItemData?
+    fun getRemoteItemData(showHidden: Boolean = false): ItemData?
     fun getOfflineItemData(): ItemData?
     suspend fun updateLikeCount(id: String, likeCount: Long) : Result<Any>
     suspend fun getItem(uri: String): Result<ItemResponse>
diff --git a/app/src/main/java/eu/theappfactory/dailyrecipes/data/ItemRepository.kt b/app/src/main/java/eu/theappfactory/dailyrecipes/data/ItemRepository.kt
@@ -21,7 +21,7 @@ interface ItemRepository {
     /**
      * Refresh the cache with data from a remote data source.
      */
-    fun retrieveRemoteItemData(): ItemData
+    fun retrieveRemoteItemData(showHidden: Boolean = false): ItemData
     /**
      * Get offline data for when no internet or first time use.
      */
@@ -55,13 +55,13 @@ open class DefaultItemRepository @Inject constructor(
     // Prevents multiple consumers requesting data at the same time
     private val loadConfDataLock = Any()
 
-    override fun retrieveRemoteItemData(): ItemData {
+    override fun retrieveRemoteItemData(showHidden: Boolean): ItemData {
         if (latestUpdateSource == UpdateSource.NETWORK && itemDataCache != null && itemDataCache?.items?.isNotEmpty() == true) {
             return itemDataCache as ItemData
         }
 
         val itemData = try {
-            remoteDataSource.getRemoteItemData()
+            remoteDataSource.getRemoteItemData(showHidden)
         } catch (e: IOException) {
             latestException = e
             throw e
@@ -231,7 +231,7 @@ open class DefaultItemRepository @Inject constructor(
     override suspend fun getItemForImageUri(uri: String): Result<ItemResponse> = remoteDataSource.getItem(uri)
 
     companion object {
-        // In-memory cache of the conference data
-        private var itemDataCache: ItemData? = null
+        // In-memory cache of the item data
+        var itemDataCache: ItemData? = null
     }
 }
diff --git a/app/src/main/java/eu/theappfactory/dailyrecipes/data/NetworkItemDataSource.kt b/app/src/main/java/eu/theappfactory/dailyrecipes/data/NetworkItemDataSource.kt
@@ -22,9 +22,7 @@ class NetworkItemDataSource @Inject constructor(
     private val firestore: FirebaseFirestore
 ) : ItemDataSource {
 
-    var responseSource: ItemData? = null
-
-    override fun getRemoteItemData(): ItemData? {
+    override fun getRemoteItemData(showHidden: Boolean): ItemData? {
         if (responseSource != null && responseSource?.items?.size ?: 0 > 0) {
             return responseSource
         }
@@ -38,7 +36,7 @@ class NetworkItemDataSource @Inject constructor(
 
         Timber.d("Trying to download data from network")
         responseSource = try {
-            ItemDataDownloader(firestore).fetch()
+            ItemDataDownloader(firestore).fetch(showHidden)
         } catch (e: Exception) {
             Timber.e(e)
             throw e
@@ -90,4 +88,8 @@ class NetworkItemDataSource @Inject constructor(
 
         return Result.Error(Exception("Couldn't find item"))
     }
+
+    companion object {
+        var responseSource: ItemData? = null
+    }
 }
diff --git a/app/src/main/java/eu/theappfactory/dailyrecipes/domain/home/GetItemsUseCase.kt b/app/src/main/java/eu/theappfactory/dailyrecipes/domain/home/GetItemsUseCase.kt
@@ -15,9 +15,9 @@ import javax.inject.Inject
 open class GetItemsUseCase @Inject constructor(
     private val repository: ItemRepository,
     @IoDispatcher ioDispatcher: CoroutineDispatcher
-) : UseCase<Unit, ItemData>(ioDispatcher) {
+) : UseCase<Boolean, ItemData>(ioDispatcher) {
 
-    override fun execute(parameters: Unit): ItemData {
-        return repository.retrieveRemoteItemData()
+    override fun execute(parameters: Boolean): ItemData {
+        return repository.retrieveRemoteItemData(parameters)
     }
 }
diff --git a/app/src/main/java/eu/theappfactory/dailyrecipes/persistence/PreferenceStorage.kt b/app/src/main/java/eu/theappfactory/dailyrecipes/persistence/PreferenceStorage.kt
@@ -14,6 +14,7 @@ import eu.theappfactory.dailyrecipes.persistence.PreferenceStorage.Companion.PRE
 import eu.theappfactory.dailyrecipes.persistence.PreferenceStorage.Companion.PREF_FIRST_TIME_USE
 import eu.theappfactory.dailyrecipes.persistence.PreferenceStorage.Companion.PREF_FOOD_CATEGORIES
 import eu.theappfactory.dailyrecipes.persistence.PreferenceStorage.Companion.PREF_ONBOARDING
+import eu.theappfactory.dailyrecipes.persistence.PreferenceStorage.Companion.PREF_SHUFFLE_VIDEOS
 import eu.theappfactory.dailyrecipes.persistence.PreferenceStorage.Companion.PREF_SKIP_REGISTER_FLOW
 import eu.theappfactory.dailyrecipes.persistence.PreferenceStorage.Companion.PREF_SNACKBAR_IS_STOPPED
 import eu.theappfactory.dailyrecipes.persistence.PreferenceStorage.Companion.USER_HAS_ADDED_FRIENDS
@@ -44,6 +45,7 @@ interface PreferenceStorage {
     var codeHasBeenSuccesfullyUsed: Boolean
     var userHasAddedFriends: Boolean
     var firstTimeSavingItem: Boolean
+    var shuffleVideos: Boolean
     fun clearLoggedInSession()
 
     companion object {
@@ -55,6 +57,7 @@ interface PreferenceStorage {
         const val PREF_DARK_MODE_ENABLED = "pref_dark_mode"
         const val PREF_SNACKBAR_IS_STOPPED = "pref_snackbar_is_stopped"
         const val PREF_FIRST_TIME_SAVE = "pref_first_time_save"
+        const val PREF_SHUFFLE_VIDEOS = "pref_shuffle_videos"
 
         const val FIRST_TIME_VIDEOS_ARE_SHOWN = "first_time_videos_are_shown"
         const val LAST_KNOWN_COOKIE = "last_known_cookie"
@@ -123,6 +126,7 @@ class SharedPreferenceStorage @Inject constructor(context: Context) : Preference
 
     override var firstTimeSavingItem by BooleanPreference(prefs, PREF_FIRST_TIME_SAVE, true)
 
+    override var shuffleVideos by BooleanPreference(prefs, PREF_SHUFFLE_VIDEOS, true)
 
     override var observableSelectedTheme: Flow<String?>
         get() = selectedThemeChannel.asFlow()
diff --git a/app/src/main/java/eu/theappfactory/dailyrecipes/ui/categories/CategoriesFragment.kt b/app/src/main/java/eu/theappfactory/dailyrecipes/ui/categories/CategoriesFragment.kt
@@ -79,11 +79,8 @@ class CategoriesFragment : DaggerFragment() {
         }
 
         viewModel.typesUpdate.observe(viewLifecycleOwner) {
-            if (viewModel.openedActivityFromSettings) {
-                requireActivity().finish()
-            } else {
-                PhoneNumberRegistrationActivity.start(requireActivity())
-            }
+            PhoneNumberRegistrationActivity.start(requireActivity())
+            requireActivity().finish()
         }
 
         viewModel.items.observe(viewLifecycleOwner) {
diff --git a/app/src/main/java/eu/theappfactory/dailyrecipes/ui/categories/CategoriesViewModel.kt b/app/src/main/java/eu/theappfactory/dailyrecipes/ui/categories/CategoriesViewModel.kt
@@ -59,7 +59,7 @@ class CategoriesViewModel @Inject constructor(
         viewModelScope.launch {
             currentFirebaseUser.collect {
                 getUserId().let {
-                    viewModelScope.launch { getItemsUseCase.invoke(Unit) }
+                    viewModelScope.launch { getItemsUseCase.invoke(false) }
                 }
             }
         }
diff --git a/app/src/main/java/eu/theappfactory/dailyrecipes/ui/debug/DebugActivity.kt b/app/src/main/java/eu/theappfactory/dailyrecipes/ui/debug/DebugActivity.kt
@@ -56,7 +56,7 @@ class DebugActivity : BaseActivity() {
         binding.dateCurrentVideoText.text =
             getString(R.string.settings_title_date_textview) + getDateString(timestamp.seconds)
 
-        viewModel = ViewModelProvider(this, viewModelFactory).get(DebugViewModel::class.java)
+        viewModel = ViewModelProvider(this, viewModelFactory)[DebugViewModel::class.java]
 
         viewModel.result.observe(this, EventObserver {
             runOnUiThread {
@@ -66,10 +66,14 @@ class DebugActivity : BaseActivity() {
                     Toast.LENGTH_LONG
                 ).show()
             }
+
+            finish()
         })
 
         viewModel.doneLoading.observe(this) {
-            binding.videoResetButton.setOnClickListener { viewModel.eraseAlreadySeen() }
+            binding.videoResetButton.setOnClickListener {
+                viewModel.eraseAlreadySeen()
+            }
             binding.userIdText.text = getString(R.string.settings_title_user_id_textview) + it
         }
 
@@ -81,11 +85,44 @@ class DebugActivity : BaseActivity() {
             binding.recycler.adapter = adapter
         }
 
+        viewModel.doneGettingItems.observe(this) {
+            finish()
+        }
+
         binding.checkIngredientsButton.setOnClickListener {
             showLoading(loading = true)
             viewModel.checkForMissingIngredients()
         }
 
+        binding.hideItemsButtons.setOnClickListener {
+            viewModel.showHiddenItems(false)
+        }
+
+        binding.showItemsButton.setOnClickListener {
+            viewModel.showHiddenItems(true)
+        }
+
+        binding.shuffleSwitch.isChecked = viewModel.getShufflePreference()
+        binding.shuffleSwitch.setOnCheckedChangeListener { _, isChecked ->
+            viewModel.setShufflePreference(isChecked)
+
+            val shuffleText = if (isChecked) {
+                "Videos worden geshuffled."
+            } else {
+                "Geen Shuffle"
+            }
+
+            runOnUiThread {
+                Toast.makeText(
+                    applicationContext,
+                    shuffleText,
+                    Toast.LENGTH_LONG
+                ).show()
+            }
+
+            finish()
+        }
+
         viewModel.load()
     }
 
diff --git a/app/src/main/java/eu/theappfactory/dailyrecipes/ui/debug/DebugViewModel.kt b/app/src/main/java/eu/theappfactory/dailyrecipes/ui/debug/DebugViewModel.kt
@@ -4,7 +4,10 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import eu.theappfactory.dailyrecipes.data.DefaultItemRepository
+import eu.theappfactory.dailyrecipes.data.NetworkItemDataSource
 import eu.theappfactory.dailyrecipes.domain.home.EraseAlreadySeenUseCase
+import eu.theappfactory.dailyrecipes.domain.home.GetItemsUseCase
 import eu.theappfactory.dailyrecipes.domain.ingredients.GetMissingIngredientsUseCase
 import eu.theappfactory.dailyrecipes.model.IngredientItemData
 import eu.theappfactory.dailyrecipes.networking.Result
@@ -13,14 +16,14 @@ import eu.theappfactory.dailyrecipes.persistence.PreferenceStorage
 import eu.theappfactory.dailyrecipes.ui.signin.SignInViewModelDelegate
 import eu.theappfactory.dailyrecipes.util.Event
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import timber.log.Timber
 
 @ExperimentalCoroutinesApi
 class DebugViewModel(
     private val eraseAlreadySeenUseCase: EraseAlreadySeenUseCase,
     private val getMissingIngredientsUseCase: GetMissingIngredientsUseCase,
+    private val getItemsUseCase: GetItemsUseCase,
     signInViewModelDelegate: SignInViewModelDelegate,
     private val preferenceStorage: PreferenceStorage
 ) : ViewModel(), SignInViewModelDelegate by signInViewModelDelegate {
@@ -34,6 +37,9 @@ class DebugViewModel(
     private val _doneLoadingMissingIngredients = MutableLiveData<List<IngredientItemData>>()
     val doneLoadingMissingIngredients: LiveData<List<IngredientItemData>> = _doneLoadingMissingIngredients
 
+    private val _doneGettingItems = MutableLiveData<Boolean>()
+    val doneGettingItems: LiveData<Boolean> = _doneGettingItems
+
     private var userId = ""
 
     fun load() {
@@ -69,4 +75,29 @@ class DebugViewModel(
             }
         }
     }
+
+    fun showHiddenItems(items: Boolean) {
+        DefaultItemRepository.itemDataCache = null
+        NetworkItemDataSource.responseSource = null
+
+        viewModelScope.launch {
+            val result = getItemsUseCase.invoke(items)
+
+            when (result) {
+                is Result.Success -> {
+                    _doneGettingItems.postValue(true)
+                }
+                is Result.Error -> {
+                    _doneGettingItems.postValue(false)
+                }
+                else -> { Timber.i("Something went wrong.") }
+            }
+        }
+    }
+
+    fun setShufflePreference(shuffle: Boolean) {
+        preferenceStorage.shuffleVideos = shuffle
+    }
+
+    fun getShufflePreference(): Boolean = preferenceStorage.shuffleVideos
 }
diff --git a/app/src/main/java/eu/theappfactory/dailyrecipes/ui/favorites/FavoritesViewModel.kt b/app/src/main/java/eu/theappfactory/dailyrecipes/ui/favorites/FavoritesViewModel.kt
@@ -102,7 +102,7 @@ class FavoritesViewModel @Inject constructor(
 
     private fun getAllItems() {
         viewModelScope.launch {
-            when (val allItemsResult = getItemsUseCase(Unit)) {
+            when (val allItemsResult = getItemsUseCase(false)) {
                 is Result.Success -> {
                     _allItemsList.postValue(
                         allItemsResult.data
diff --git a/app/src/main/java/eu/theappfactory/dailyrecipes/ui/home/pager/ItemFragment.kt b/app/src/main/java/eu/theappfactory/dailyrecipes/ui/home/pager/ItemFragment.kt
@@ -389,6 +389,7 @@ class ItemFragment : DaggerFragment(), ItemChatsFragmentListener {
     private fun handleArguments() {
         // need to reset player here as we continue to play in onResume and we may have interleaving of videos
         mediaPlayer.resetPlayer()
+
         when {
             args.itemType == ListItemType.FAVORITE -> {
                 viewModel.apply {
diff --git a/app/src/main/java/eu/theappfactory/dailyrecipes/ui/home/pager/ItemViewModel.kt b/app/src/main/java/eu/theappfactory/dailyrecipes/ui/home/pager/ItemViewModel.kt
@@ -170,7 +170,7 @@ class ItemViewModel @Inject constructor(
             /*
             *  Get all new items
             */
-            when (val allItemsResult = getItemsUseCase(Unit)) {
+            when (val allItemsResult = getItemsUseCase(false)) {
                 is Result.Success -> currentFirebaseUser.collect {
                     getUserId()?.let { userId ->
 
@@ -262,7 +262,7 @@ class ItemViewModel @Inject constructor(
             /*
             * Then get all new items
             */
-            when (val allItemsResult = getItemsUseCase(Unit)) {
+            when (val allItemsResult = getItemsUseCase(false)) {
                 is Result.Success -> currentFirebaseUser.collect {
                     getUserId()?.let {
                         /*
@@ -281,7 +281,12 @@ class ItemViewModel @Inject constructor(
                         val favorites = getFavoriteItemsUseCase(it).successOr(emptyList())
 
                         val list = itemsUserHasNotSeen.data.orEmpty().filterByFoodType(preferenceStorage.foodCategories)
-                        val itemsWithoutFavorites = makeListWithoutFavorites(list , favorites).shuffled()
+
+                        val itemsWithoutFavorites = if (preferenceStorage.shuffleVideos) {
+                            makeListWithoutFavorites(list , favorites).shuffled()
+                        } else {
+                            makeListWithoutFavorites(list , favorites).asReversed()
+                        }
 
                         if (itemsWithoutFavorites.size < 3) {
                             /*
@@ -316,7 +321,7 @@ class ItemViewModel @Inject constructor(
                     .successOr(emptyList())
                     .sortedByDescending { it.date }
                 //Get all items
-                val allItems = getItemsUseCase(Unit)
+                val allItems = getItemsUseCase(false)
                 val allItemsWithoutFavorites =
                     makeListWithoutFavorites(allItems.data?.items.orEmpty()
                         .filterByFoodType(preferenceStorage.foodCategories), favorites)
@@ -340,7 +345,7 @@ class ItemViewModel @Inject constructor(
                         .successOr(emptyList())
                         .sortedByDescending { it.date }
 
-                    when (val remoteItems = getItemsUseCase(Unit)) {
+                    when (val remoteItems = getItemsUseCase(false)) {
                         is Result.Success -> {
                             val result = makeListWithOnlyFavorites(
                                 remoteItems.data.items,
@@ -569,7 +574,7 @@ class ItemViewModel @Inject constructor(
             )
         )
 
-        // Delay for 1s because video content of current video should load first.
+        // Delay for 2s because video content of current video should load first.
         viewModelScope.launch {
             delay(2000)
             preloadTheNextFrames(currentList, position+6, 1)
@@ -659,7 +664,7 @@ class ItemViewModel @Inject constructor(
 
     fun getImageUriForToken(token: String) {
         viewModelScope.launch {
-            when (val allItemsResult = getItemsUseCase(Unit)) {
+            when (val allItemsResult = getItemsUseCase(false)) {
                 is Result.Success -> {
                     for (item in allItemsResult.data.items) {
                         if (item.imageUri.contains(token)) {
diff --git a/app/src/main/java/eu/theappfactory/dailyrecipes/ui/register/createuser/CreateUsernameViewModel.kt b/app/src/main/java/eu/theappfactory/dailyrecipes/ui/register/createuser/CreateUsernameViewModel.kt
diff --git a/app/src/main/java/eu/theappfactory/dailyrecipes/util/ViewModelFactory.kt b/app/src/main/java/eu/theappfactory/dailyrecipes/util/ViewModelFactory.kt
diff --git a/app/src/main/res/layout/activity_debug.xml b/app/src/main/res/layout/activity_debug.xml
diff --git a/build.gradle b/build.gradle

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import javax.inject.Inject`
`13`	`13`	`class BootstrapItemDataSource @Inject constructor(val context: Context) :`
`14`	`14`	`ItemDataSource {`
`15`	`15`
`16`		`- override fun getRemoteItemData(): ItemData? {`
	`16`	`+ override fun getRemoteItemData(showHidden: Boolean): ItemData? {`
`17`	`17`	`throw Exception("Bootstrap data source doesn't have remote data")`
`18`	`18`	`}`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class ItemDataDownloader(private val firestore: FirebaseFirestore) {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`@Throws(ExecutionException::class)`
`39`		`- fun fetch(): ItemData {`
	`39`	`+ fun fetch(showHidden: Boolean = false): ItemData {`
`40`	`40`	`val items = ArrayList<ItemResponse>()`
`41`	`41`	`val itemSnapshot = firestore.collection(ITEMS_COLLECTION).get()`
`42`	`42`	`var currentId = ""`
`@@ -82,7 +82,9 @@ class ItemDataDownloader(private val firestore: FirebaseFirestore) {`
`82`	`82`	`showThumbnail = currentItem.data?.get(SHOW_THUMBNAIL) as Boolean? ?: false,`
`83`	`83`	`)`
`84`	`84`
`85`		`- if (item.isHidden == "false" \|\| item.isHidden == "") {`
	`85`	`+ if (showHidden) {`
	`86`	`+ items.add(item)`
	`87`	`+ } else if (showHidden.not() && (item.isHidden == "false" \|\| item.isHidden == "")) {`
`86`	`88`	`items.add(item)`
`87`	`89`	`}`
`88`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,9 @@ import javax.inject.Inject`
`15`	`15`	`open class GetItemsUseCase @Inject constructor(`
`16`	`16`	`private val repository: ItemRepository,`
`17`	`17`	`@IoDispatcher ioDispatcher: CoroutineDispatcher`
`18`		`-) : UseCase<Unit, ItemData>(ioDispatcher) {`
	`18`	`+) : UseCase<Boolean, ItemData>(ioDispatcher) {`
`19`	`19`
`20`		`- override fun execute(parameters: Unit): ItemData {`
`21`		`- return repository.retrieveRemoteItemData()`
	`20`	`+ override fun execute(parameters: Boolean): ItemData {`
	`21`	`+ return repository.retrieveRemoteItemData(parameters)`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,11 +79,8 @@ class CategoriesFragment : DaggerFragment() {`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`viewModel.typesUpdate.observe(viewLifecycleOwner) {`
`82`		`- if (viewModel.openedActivityFromSettings) {`
`83`		`- requireActivity().finish()`
`84`		`- } else {`
`85`		`- PhoneNumberRegistrationActivity.start(requireActivity())`
`86`		`- }`
	`82`	`+ PhoneNumberRegistrationActivity.start(requireActivity())`
	`83`	`+ requireActivity().finish()`
`87`	`84`	`}`
`88`	`85`
`89`	`86`	`viewModel.items.observe(viewLifecycleOwner) {`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ class CategoriesViewModel @Inject constructor(`
`59`	`59`	`viewModelScope.launch {`
`60`	`60`	`currentFirebaseUser.collect {`
`61`	`61`	`getUserId().let {`
`62`		`- viewModelScope.launch { getItemsUseCase.invoke(Unit) }`
	`62`	`+ viewModelScope.launch { getItemsUseCase.invoke(false) }`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`	`}`