From 871637ac22df98faa774d8951d7f7f77b14bf878 Mon Sep 17 00:00:00 2001 From: Luna712 <142361265+Luna712@users.noreply.github.com> Date: Mon, 13 Jan 2025 18:50:29 -0700 Subject: [PATCH 1/7] Add Not Interested WatchType --- .../lagradost/cloudstream3/ui/WatchType.kt | 25 +++++++++++-------- .../ui/home/HomeParentItemAdapterPreview.kt | 1 + .../ui/result/ResultFragmentPhone.kt | 22 ++++++++-------- .../main/res/layout/fragment_home_head.xml | 14 +++++++++-- .../main/res/layout/fragment_home_head_tv.xml | 16 ++++++++++-- app/src/main/res/values/strings.xml | 1 + 6 files changed, 54 insertions(+), 25 deletions(-) diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/WatchType.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/WatchType.kt index b778ba5a75..d51cd27c6d 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/WatchType.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/WatchType.kt @@ -10,7 +10,8 @@ enum class WatchType(val internalId: Int, @StringRes val stringRes: Int, @Drawab ONHOLD(2, R.string.type_on_hold, R.drawable.ic_baseline_bookmark_24), DROPPED(3, R.string.type_dropped, R.drawable.ic_baseline_bookmark_24), PLANTOWATCH(4, R.string.type_plan_to_watch, R.drawable.ic_baseline_bookmark_24), - NONE(5, R.string.type_none, R.drawable.ic_baseline_add_24); + NONE(5, R.string.type_none, R.drawable.ic_baseline_add_24), + NOTINTERESTED(6, R.string.type_not_interested, R.drawable.ic_baseline_bookmark_24); companion object { fun fromInternalId(id: Int?) = entries.find { value -> value.internalId == id } ?: NONE @@ -18,22 +19,24 @@ enum class WatchType(val internalId: Int, @StringRes val stringRes: Int, @Drawab } enum class SyncWatchType(val internalId: Int, @StringRes val stringRes: Int, @DrawableRes val iconRes: Int) { - /* - -1 -> None - 0 -> Watching - 1 -> Completed - 2 -> OnHold - 3 -> Dropped - 4 -> PlanToWatch - 5 -> ReWatching - */ + /** + * -1 -> None + * 0 -> Watching + * 1 -> Completed + * 2 -> OnHold + * 3 -> Dropped + * 4 -> PlanToWatch + * 5 -> ReWatching + * 6 -> NotInterested + */ NONE(-1, R.string.type_none, R.drawable.ic_baseline_add_24), WATCHING(0, R.string.type_watching, R.drawable.ic_baseline_bookmark_24), COMPLETED(1, R.string.type_completed, R.drawable.ic_baseline_bookmark_24), ONHOLD(2, R.string.type_on_hold, R.drawable.ic_baseline_bookmark_24), DROPPED(3, R.string.type_dropped, R.drawable.ic_baseline_bookmark_24), PLANTOWATCH(4, R.string.type_plan_to_watch, R.drawable.ic_baseline_bookmark_24), - REWATCHING(5, R.string.type_re_watching, R.drawable.ic_baseline_bookmark_24); + REWATCHING(5, R.string.type_re_watching, R.drawable.ic_baseline_bookmark_24), + NOTINTERESTED(6, R.string.type_not_interested, R.drawable.ic_baseline_bookmark_24); companion object { fun fromInternalId(id: Int?) = entries.find { value -> value.internalId == id } ?: NONE diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt index 361ca0b317..d5b13b8c68 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt @@ -402,6 +402,7 @@ class HomeParentItemAdapterPreview( Pair(itemView.findViewById(R.id.home_type_dropped_btt), WatchType.DROPPED), Pair(itemView.findViewById(R.id.home_type_on_hold_btt), WatchType.ONHOLD), Pair(itemView.findViewById(R.id.home_plan_to_watch_btt), WatchType.PLANTOWATCH), + Pair(itemView.findViewById(R.id.home_not_interested_btt), WatchType.NOTINTERESTED), ) private val toggleListHolder: ChipGroup? = itemView.findViewById(R.id.home_type_holder) diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt index 60f9c5ad05..e1b20f4fc4 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt @@ -928,15 +928,16 @@ open class ResultFragmentPhone : FullScreenPlayer() { } context?.let { ctx -> val arrayAdapter = ArrayAdapter(ctx, R.layout.sort_bottom_single_choice) - /* - -1 -> None - 0 -> Watching - 1 -> Completed - 2 -> OnHold - 3 -> Dropped - 4 -> PlanToWatch - 5 -> ReWatching - */ + /** + * -1 -> None + * 0 -> Watching + * 1 -> Completed + * 2 -> OnHold + * 3 -> Dropped + * 4 -> PlanToWatch + * 5 -> ReWatching + * 6 -> NotInterested + */ val items = listOf( R.string.none, R.string.type_watching, @@ -944,7 +945,8 @@ open class ResultFragmentPhone : FullScreenPlayer() { R.string.type_on_hold, R.string.type_dropped, R.string.type_plan_to_watch, - R.string.type_re_watching + R.string.type_re_watching, + R.string.type_not_interested ).map { ctx.getString(it) } arrayAdapter.addAll(items) syncBinding?.apply { diff --git a/app/src/main/res/layout/fragment_home_head.xml b/app/src/main/res/layout/fragment_home_head.xml index 1014c20fa9..2a90c5a28a 100644 --- a/app/src/main/res/layout/fragment_home_head.xml +++ b/app/src/main/res/layout/fragment_home_head.xml @@ -263,16 +263,26 @@ android:layout_height="wrap_content" android:nextFocusLeft="@id/home_type_on_hold_btt" - android:nextFocusRight="@id/home_type_completed_btt" + android:nextFocusRight="@id/home_type_not_interested_btt" android:text="@string/type_dropped" /> + + diff --git a/app/src/main/res/layout/fragment_home_head_tv.xml b/app/src/main/res/layout/fragment_home_head_tv.xml index caebef0d70..b49260bb6f 100644 --- a/app/src/main/res/layout/fragment_home_head_tv.xml +++ b/app/src/main/res/layout/fragment_home_head_tv.xml @@ -339,18 +339,30 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:nextFocusLeft="@id/home_type_on_hold_btt" - android:nextFocusRight="@id/home_type_completed_btt" + android:nextFocusRight="@id/home_type_not_interested_btt" android:nextFocusUp="@id/home_watch_child_recyclerview" android:nextFocusDown="@id/home_bookmarked_child_recyclerview" android:text="@string/type_dropped" /> + + Plan to Watch @string/none Rewatching + Not Interested Play Movie Play Trailer Play Livestream From b423e39008048bdbfc6b769ce16c96950d9a0b94 Mon Sep 17 00:00:00 2001 From: Luna712 <142361265+Luna712@users.noreply.github.com> Date: Tue, 14 Jan 2025 10:23:53 -0700 Subject: [PATCH 2/7] Update some things --- .../main/java/com/lagradost/cloudstream3/ui/WatchType.kt | 6 +++--- .../cloudstream3/ui/home/HomeParentItemAdapterPreview.kt | 4 ++-- .../lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt | 4 ++-- app/src/main/res/layout/fragment_home_head.xml | 6 +++--- app/src/main/res/layout/fragment_home_head_tv.xml | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/WatchType.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/WatchType.kt index d51cd27c6d..f73e6bf7d9 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/WatchType.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/WatchType.kt @@ -5,13 +5,13 @@ import androidx.annotation.StringRes import com.lagradost.cloudstream3.R enum class WatchType(val internalId: Int, @StringRes val stringRes: Int, @DrawableRes val iconRes: Int) { + NONE(-1, R.string.type_none, R.drawable.ic_baseline_add_24), WATCHING(0, R.string.type_watching, R.drawable.ic_baseline_bookmark_24), COMPLETED(1, R.string.type_completed, R.drawable.ic_baseline_bookmark_24), ONHOLD(2, R.string.type_on_hold, R.drawable.ic_baseline_bookmark_24), DROPPED(3, R.string.type_dropped, R.drawable.ic_baseline_bookmark_24), PLANTOWATCH(4, R.string.type_plan_to_watch, R.drawable.ic_baseline_bookmark_24), - NONE(5, R.string.type_none, R.drawable.ic_baseline_add_24), - NOTINTERESTED(6, R.string.type_not_interested, R.drawable.ic_baseline_bookmark_24); + NOTINTERESTED(5, R.string.type_not_interested, R.drawable.ic_baseline_bookmark_24); companion object { fun fromInternalId(id: Int?) = entries.find { value -> value.internalId == id } ?: NONE @@ -41,4 +41,4 @@ enum class SyncWatchType(val internalId: Int, @StringRes val stringRes: Int, @Dr companion object { fun fromInternalId(id: Int?) = entries.find { value -> value.internalId == id } ?: NONE } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt index d5b13b8c68..9f551a4e99 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt @@ -401,8 +401,8 @@ class HomeParentItemAdapterPreview( Pair(itemView.findViewById(R.id.home_type_completed_btt), WatchType.COMPLETED), Pair(itemView.findViewById(R.id.home_type_dropped_btt), WatchType.DROPPED), Pair(itemView.findViewById(R.id.home_type_on_hold_btt), WatchType.ONHOLD), - Pair(itemView.findViewById(R.id.home_plan_to_watch_btt), WatchType.PLANTOWATCH), - Pair(itemView.findViewById(R.id.home_not_interested_btt), WatchType.NOTINTERESTED), + Pair(itemView.findViewById(R.id.home_type_plan_to_watch_btt), WatchType.PLANTOWATCH), + Pair(itemView.findViewById(R.id.home_type_not_interested_btt), WatchType.NOTINTERESTED), ) private val toggleListHolder: ChipGroup? = itemView.findViewById(R.id.home_type_holder) diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt index e1b20f4fc4..3baa28c031 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt @@ -945,8 +945,8 @@ open class ResultFragmentPhone : FullScreenPlayer() { R.string.type_on_hold, R.string.type_dropped, R.string.type_plan_to_watch, - R.string.type_re_watching, - R.string.type_not_interested + R.string.type_not_interested, + R.string.type_re_watching ).map { ctx.getString(it) } arrayAdapter.addAll(items) syncBinding?.apply { diff --git a/app/src/main/res/layout/fragment_home_head.xml b/app/src/main/res/layout/fragment_home_head.xml index 2a90c5a28a..ccb6c9e498 100644 --- a/app/src/main/res/layout/fragment_home_head.xml +++ b/app/src/main/res/layout/fragment_home_head.xml @@ -233,11 +233,11 @@ android:layout_height="wrap_content" android:nextFocusLeft="@id/nav_rail_view" - android:nextFocusRight="@id/home_plan_to_watch_btt" + android:nextFocusRight="@id/home_type_plan_to_watch_btt" android:text="@string/type_watching" /> diff --git a/app/src/main/res/layout/fragment_home_head_tv.xml b/app/src/main/res/layout/fragment_home_head_tv.xml index b49260bb6f..e34f277123 100644 --- a/app/src/main/res/layout/fragment_home_head_tv.xml +++ b/app/src/main/res/layout/fragment_home_head_tv.xml @@ -303,14 +303,14 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:nextFocusLeft="@id/nav_rail_view" - android:nextFocusRight="@id/home_plan_to_watch_btt" + android:nextFocusRight="@id/home_type_plan_to_watch_btt" android:nextFocusUp="@id/home_watch_child_recyclerview" android:nextFocusDown="@id/home_bookmarked_child_recyclerview" android:text="@string/type_watching" /> Date: Tue, 14 Jan 2025 12:18:21 -0700 Subject: [PATCH 3/7] Fix order, cleanup, and add docs to WatchType --- .../lagradost/cloudstream3/ui/WatchType.kt | 75 ++++++++++++------- .../main/res/layout/fragment_home_head.xml | 16 ++-- .../main/res/layout/fragment_home_head_tv.xml | 14 ++-- 3 files changed, 65 insertions(+), 40 deletions(-) diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/WatchType.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/WatchType.kt index f73e6bf7d9..8be1160ba4 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/WatchType.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/WatchType.kt @@ -3,42 +3,67 @@ package com.lagradost.cloudstream3.ui import androidx.annotation.DrawableRes import androidx.annotation.StringRes import com.lagradost.cloudstream3.R +import com.lagradost.cloudstream3.syncproviders.SyncAPI +/** + * Enum class representing watch states for library. + * + * @property internalId The unique ID used internally to identify the watch type and to store data. This value must never be changed. + * @property stringRes The string resource ID representing the watch type name. + * @property iconRes The drawable resource ID representing the watch type icon. + */ enum class WatchType(val internalId: Int, @StringRes val stringRes: Int, @DrawableRes val iconRes: Int) { - NONE(-1, R.string.type_none, R.drawable.ic_baseline_add_24), - WATCHING(0, R.string.type_watching, R.drawable.ic_baseline_bookmark_24), - COMPLETED(1, R.string.type_completed, R.drawable.ic_baseline_bookmark_24), - ONHOLD(2, R.string.type_on_hold, R.drawable.ic_baseline_bookmark_24), - DROPPED(3, R.string.type_dropped, R.drawable.ic_baseline_bookmark_24), - PLANTOWATCH(4, R.string.type_plan_to_watch, R.drawable.ic_baseline_bookmark_24), - NOTINTERESTED(5, R.string.type_not_interested, R.drawable.ic_baseline_bookmark_24); + WATCHING(internalId = 0, R.string.type_watching, R.drawable.ic_baseline_bookmark_24), + COMPLETED(internalId = 1, R.string.type_completed, R.drawable.ic_baseline_bookmark_24), + ONHOLD(internalId = 2, R.string.type_on_hold, R.drawable.ic_baseline_bookmark_24), + DROPPED(internalId = 3, R.string.type_dropped, R.drawable.ic_baseline_bookmark_24), + PLANTOWATCH(internalId = 4, R.string.type_plan_to_watch, R.drawable.ic_baseline_bookmark_24), + + // Any types with negative internal IDs, or those for which the order is important, + // should be placed at the bottom. This ensures that we don't need to worry about + // their internal IDs when adding new types in the future. + NOTINTERESTED(internalId = -2, R.string.type_not_interested, R.drawable.ic_baseline_bookmark_24), + NONE(internalId = -1, R.string.type_none, R.drawable.ic_baseline_add_24); companion object { + /** + * Finds a [WatchType] corresponding to the given [internalId]. + * + * @param id The internal ID to search for. + * @return The corresponding [WatchType], or [NONE] if no match is found. + */ fun fromInternalId(id: Int?) = entries.find { value -> value.internalId == id } ?: NONE } } +/** + * Enum class representing various watch states for when using a remote library in [SyncAPI]. + * + * @property internalId The unique ID used internally to identify the watch type and to store data locally. This value must never be changed. + * @property stringRes The string resource ID representing the watch type name. + * @property iconRes The drawable resource ID representing the watch type icon. + */ enum class SyncWatchType(val internalId: Int, @StringRes val stringRes: Int, @DrawableRes val iconRes: Int) { - /** - * -1 -> None - * 0 -> Watching - * 1 -> Completed - * 2 -> OnHold - * 3 -> Dropped - * 4 -> PlanToWatch - * 5 -> ReWatching - * 6 -> NotInterested - */ - NONE(-1, R.string.type_none, R.drawable.ic_baseline_add_24), - WATCHING(0, R.string.type_watching, R.drawable.ic_baseline_bookmark_24), - COMPLETED(1, R.string.type_completed, R.drawable.ic_baseline_bookmark_24), - ONHOLD(2, R.string.type_on_hold, R.drawable.ic_baseline_bookmark_24), - DROPPED(3, R.string.type_dropped, R.drawable.ic_baseline_bookmark_24), - PLANTOWATCH(4, R.string.type_plan_to_watch, R.drawable.ic_baseline_bookmark_24), - REWATCHING(5, R.string.type_re_watching, R.drawable.ic_baseline_bookmark_24), - NOTINTERESTED(6, R.string.type_not_interested, R.drawable.ic_baseline_bookmark_24); + NONE(internalId = -1, R.string.type_none, R.drawable.ic_baseline_add_24), + WATCHING(internalId = 0, R.string.type_watching, R.drawable.ic_baseline_bookmark_24), + COMPLETED(internalId = 1, R.string.type_completed, R.drawable.ic_baseline_bookmark_24), + ONHOLD(internalId = 2, R.string.type_on_hold, R.drawable.ic_baseline_bookmark_24), + DROPPED(internalId = 3, R.string.type_dropped, R.drawable.ic_baseline_bookmark_24), + PLANTOWATCH(internalId = 4, R.string.type_plan_to_watch, R.drawable.ic_baseline_bookmark_24), + REWATCHING(internalId = 5, R.string.type_re_watching, R.drawable.ic_baseline_bookmark_24), + + // Any types with negative internal IDs, or those for which the order is important, + // should be placed at the bottom, except for "NONE", which has a negative ID but is + // placed at the top for UI reasons. + NOTINTERESTED(internalId = -2, R.string.type_not_interested, R.drawable.ic_baseline_bookmark_24); companion object { + /** + * Finds a [SyncWatchType] corresponding to the given [internalId]. + * + * @param id The internal ID to search for. + * @return The corresponding [SyncWatchType], or [NONE] if no match is found. + */ fun fromInternalId(id: Int?) = entries.find { value -> value.internalId == id } ?: NONE } } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home_head.xml b/app/src/main/res/layout/fragment_home_head.xml index ccb6c9e498..5efe35cc3c 100644 --- a/app/src/main/res/layout/fragment_home_head.xml +++ b/app/src/main/res/layout/fragment_home_head.xml @@ -263,27 +263,27 @@ android:layout_height="wrap_content" android:nextFocusLeft="@id/home_type_on_hold_btt" - android:nextFocusRight="@id/home_type_not_interested_btt" + android:nextFocusRight="@id/home_type_completed_btt" android:text="@string/type_dropped" /> + android:nextFocusRight="@id/home_type_not_interested_btt" + android:text="@string/type_completed" /> + android:nextFocusLeft="@id/home_type_completed_btt" + android:text="@string/type_not_interested" /> @@ -309,4 +309,4 @@ app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" tools:listitem="@layout/home_result_grid" /> - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home_head_tv.xml b/app/src/main/res/layout/fragment_home_head_tv.xml index e34f277123..2e35e6d7dc 100644 --- a/app/src/main/res/layout/fragment_home_head_tv.xml +++ b/app/src/main/res/layout/fragment_home_head_tv.xml @@ -339,34 +339,34 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:nextFocusLeft="@id/home_type_on_hold_btt" - android:nextFocusRight="@id/home_type_not_interested_btt" + android:nextFocusRight="@id/home_type_completed_btt" android:nextFocusUp="@id/home_watch_child_recyclerview" android:nextFocusDown="@id/home_bookmarked_child_recyclerview" android:text="@string/type_dropped" /> + android:text="@string/type_completed" /> + android:text="@string/type_not_interested" /> From 4f96f29f96dbbdf8aa5b776a718e81fd395bafd3 Mon Sep 17 00:00:00 2001 From: Luna712 <142361265+Luna712@users.noreply.github.com> Date: Tue, 14 Jan 2025 12:31:17 -0700 Subject: [PATCH 4/7] Update comment --- .../cloudstream3/ui/result/ResultFragmentPhone.kt | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt index 3baa28c031..e4da40e03e 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt @@ -46,6 +46,7 @@ import com.lagradost.cloudstream3.mvvm.normalSafeApiCall import com.lagradost.cloudstream3.mvvm.observe import com.lagradost.cloudstream3.mvvm.observeNullable import com.lagradost.cloudstream3.services.SubscriptionWorkManager +import com.lagradost.cloudstream3.ui.SyncWatchType import com.lagradost.cloudstream3.ui.WatchType import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_DOWNLOAD import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_LONG_CLICK @@ -929,14 +930,8 @@ open class ResultFragmentPhone : FullScreenPlayer() { context?.let { ctx -> val arrayAdapter = ArrayAdapter(ctx, R.layout.sort_bottom_single_choice) /** - * -1 -> None - * 0 -> Watching - * 1 -> Completed - * 2 -> OnHold - * 3 -> Dropped - * 4 -> PlanToWatch - * 5 -> ReWatching - * 6 -> NotInterested + * @see SyncWatchType.internalId + * For the corresponding values. */ val items = listOf( R.string.none, From d5b036a06f96152c49e32bb8940539599a161ef4 Mon Sep 17 00:00:00 2001 From: Luna712 <142361265+Luna712@users.noreply.github.com> Date: Tue, 14 Jan 2025 12:34:51 -0700 Subject: [PATCH 5/7] Fix order --- .../lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt index e4da40e03e..6151454070 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt @@ -940,8 +940,8 @@ open class ResultFragmentPhone : FullScreenPlayer() { R.string.type_on_hold, R.string.type_dropped, R.string.type_plan_to_watch, - R.string.type_not_interested, - R.string.type_re_watching + R.string.type_re_watching, + R.string.type_not_interested ).map { ctx.getString(it) } arrayAdapter.addAll(items) syncBinding?.apply { From cc28af225839a81da243e4e55498301b9d82e6cd Mon Sep 17 00:00:00 2001 From: Luna712 <142361265+Luna712@users.noreply.github.com> Date: Sat, 25 Oct 2025 12:34:04 -0600 Subject: [PATCH 6/7] Fix --- app/src/main/java/com/lagradost/cloudstream3/ui/WatchType.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/WatchType.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/WatchType.kt index 84d2630164..8be1160ba4 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/WatchType.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/WatchType.kt @@ -50,7 +50,7 @@ enum class SyncWatchType(val internalId: Int, @StringRes val stringRes: Int, @Dr ONHOLD(internalId = 2, R.string.type_on_hold, R.drawable.ic_baseline_bookmark_24), DROPPED(internalId = 3, R.string.type_dropped, R.drawable.ic_baseline_bookmark_24), PLANTOWATCH(internalId = 4, R.string.type_plan_to_watch, R.drawable.ic_baseline_bookmark_24), - REWATCHING(internalId = 5, R.string.type_re_watching, R.drawable.ic_baseline_bookmark_24); + REWATCHING(internalId = 5, R.string.type_re_watching, R.drawable.ic_baseline_bookmark_24), // Any types with negative internal IDs, or those for which the order is important, // should be placed at the bottom, except for "NONE", which has a negative ID but is From 62119e9da939785df6c5b987d86d234fac24af3e Mon Sep 17 00:00:00 2001 From: Luna712 <142361265+Luna712@users.noreply.github.com> Date: Sat, 25 Oct 2025 12:38:28 -0600 Subject: [PATCH 7/7] Fix --- .../com/lagradost/cloudstream3/syncproviders/providers/MALApi.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/MALApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/MALApi.kt index e8c343519b..be4ce90062 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/MALApi.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/MALApi.kt @@ -326,6 +326,7 @@ class MALApi : SyncAPI() { SyncWatchType.DROPPED -> MalStatusType.Dropped SyncWatchType.PLANTOWATCH -> MalStatusType.PlanToWatch SyncWatchType.REWATCHING -> MalStatusType.Watching + else -> MalStatusType.None } }