From 5f98b9a13935b62b06a489d3553922acd607752f Mon Sep 17 00:00:00 2001 From: Luna712 <142361265+Luna712@users.noreply.github.com> Date: Tue, 3 Oct 2023 11:02:08 -0600 Subject: [PATCH] Make homepage preferences account specific --- .../java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt | 4 ++-- .../com/lagradost/cloudstream3/ui/home/HomeViewModel.kt | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt index 0797e9a0..f8b426f7 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt @@ -377,13 +377,13 @@ class HomeFragment : Fragment() { var currentApiName = selectedApiName var currentValidApis: MutableList = mutableListOf() - val preSelectedTypes = this.getKey>(HOME_PREF_HOMEPAGE) + val preSelectedTypes = this.getKey>("${DataStoreHelper.currentAccount}/$HOME_PREF_HOMEPAGE") ?.mapNotNull { listName -> TvType.values().firstOrNull { it.name == listName } } ?.toMutableList() ?: mutableListOf(TvType.Movie, TvType.TvSeries) binding.cancelBtt.setOnClickListener { - dialog.dismissSafe() + dialog.dismissSafe() } binding.applyBtt.setOnClickListener { diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt index 13d34b59..a5ef2bb4 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt @@ -171,7 +171,7 @@ class HomeViewModel : ViewModel() { if (currentWatchTypes.size <= 0) { setKey( - HOME_BOOKMARK_VALUE_LIST, + "${DataStoreHelper.currentAccount}/$HOME_BOOKMARK_VALUE_LIST", intArrayOf() ) _availableWatchStatusTypes.postValue(setOf() to setOf()) @@ -182,7 +182,7 @@ class HomeViewModel : ViewModel() { val watchPrefNotNull = preferredWatchStatus ?: EnumSet.of(currentWatchTypes.first()) //if (currentWatchTypes.any { watchPrefNotNull.contains(it) }) watchPrefNotNull else listOf(currentWatchTypes.first()) setKey( - HOME_BOOKMARK_VALUE_LIST, + "${DataStoreHelper.currentAccount}/$HOME_BOOKMARK_VALUE_LIST", watchPrefNotNull.map { it.internalId }.toIntArray() ) _availableWatchStatusTypes.postValue( @@ -463,7 +463,7 @@ class HomeViewModel : ViewModel() { fun loadStoredData() { val list = EnumSet.noneOf(WatchType::class.java) - getKey(HOME_BOOKMARK_VALUE_LIST)?.map { WatchType.fromInternalId(it) }?.let { + getKey("${DataStoreHelper.currentAccount}/$HOME_BOOKMARK_VALUE_LIST")?.map { WatchType.fromInternalId(it) }?.let { list.addAll(it) } loadStoredData(list)