From 55e4014036a559f50a941bb6cc5505d20a6fa127 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Thu, 21 Nov 2024 12:24:11 +0100
Subject: [PATCH] Use custom EmptyStateSpec for bookmark fragment

---
 .../newpipe/local/bookmark/BookmarkFragment.java |  6 +++++-
 .../newpipe/settings/SelectPlaylistFragment.java |  4 +++-
 .../ui/emptystate/EmptyStateComposable.kt        |  7 +++++++
 .../newpipe/ui/emptystate/EmptyStateUtil.kt      | 16 ----------------
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java b/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java
index bff6f63de..4f60e36ae 100644
--- a/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java
@@ -38,6 +38,7 @@ import org.schabi.newpipe.local.holder.LocalBookmarkPlaylistItemHolder;
 import org.schabi.newpipe.local.holder.RemoteBookmarkPlaylistItemHolder;
 import org.schabi.newpipe.local.playlist.LocalPlaylistManager;
 import org.schabi.newpipe.local.playlist.RemotePlaylistManager;
+import org.schabi.newpipe.ui.emptystate.EmptyStateSpec;
 import org.schabi.newpipe.ui.emptystate.EmptyStateUtil;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.OnClickGesture;
@@ -124,7 +125,10 @@ public final class BookmarkFragment extends BaseLocalListFragment<List<PlaylistL
         super.initViews(rootView, savedInstanceState);
 
         itemListAdapter.setUseItemHandle(true);
-        EmptyStateUtil.setEmptyStateComposable(rootView.findViewById(R.id.empty_state_view));
+        EmptyStateUtil.setEmptyStateComposable(
+                rootView.findViewById(R.id.empty_state_view),
+                EmptyStateSpec.Companion.getNoBookmarkedPlaylist()
+        );
     }
 
     @Override
diff --git a/app/src/main/java/org/schabi/newpipe/settings/SelectPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/settings/SelectPlaylistFragment.java
index efe3c4f66..6227d95a9 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/SelectPlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/SelectPlaylistFragment.java
@@ -28,6 +28,7 @@ import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.error.UserAction;
 import org.schabi.newpipe.local.playlist.LocalPlaylistManager;
 import org.schabi.newpipe.local.playlist.RemotePlaylistManager;
+import org.schabi.newpipe.ui.emptystate.EmptyStateSpec;
 import org.schabi.newpipe.ui.emptystate.EmptyStateUtil;
 import org.schabi.newpipe.util.image.CoilHelper;
 
@@ -64,7 +65,8 @@ public class SelectPlaylistFragment extends DialogFragment {
         recyclerView = v.findViewById(R.id.items_list);
         emptyView = v.findViewById(R.id.empty_state_view);
 
-        EmptyStateUtil.setEmptyStateText(emptyView, R.string.no_playlist_bookmarked_yet);
+        EmptyStateUtil.setEmptyStateComposable(emptyView,
+                EmptyStateSpec.Companion.getNoBookmarkedPlaylist());
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
         final SelectPlaylistAdapter playlistAdapter = new SelectPlaylistAdapter();
         recyclerView.setAdapter(playlistAdapter);
diff --git a/app/src/main/java/org/schabi/newpipe/ui/emptystate/EmptyStateComposable.kt b/app/src/main/java/org/schabi/newpipe/ui/emptystate/EmptyStateComposable.kt
index ff0f888ed..c76dac38c 100644
--- a/app/src/main/java/org/schabi/newpipe/ui/emptystate/EmptyStateComposable.kt
+++ b/app/src/main/java/org/schabi/newpipe/ui/emptystate/EmptyStateComposable.kt
@@ -113,5 +113,12 @@ data class EmptyStateSpec(
                 emojiText = { "(︶︹︺)" },
                 descriptionText = { stringResource(id = R.string.content_not_supported) },
             )
+
+        val NoBookmarkedPlaylist =
+            EmptyStateSpec(
+                modifier = { it },
+                emojiText = { "(╥﹏╥)" },
+                descriptionText = { stringResource(id = R.string.no_playlist_bookmarked_yet) },
+            )
     }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/ui/emptystate/EmptyStateUtil.kt b/app/src/main/java/org/schabi/newpipe/ui/emptystate/EmptyStateUtil.kt
index 85ed3697e..765ef2e6b 100644
--- a/app/src/main/java/org/schabi/newpipe/ui/emptystate/EmptyStateUtil.kt
+++ b/app/src/main/java/org/schabi/newpipe/ui/emptystate/EmptyStateUtil.kt
@@ -3,7 +3,6 @@
 package org.schabi.newpipe.ui.emptystate
 
 import androidx.annotation.StringRes
-import androidx.compose.material3.Text
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.State
 import androidx.compose.ui.platform.ComposeView
@@ -12,21 +11,6 @@ import androidx.compose.ui.res.stringResource
 import org.schabi.newpipe.ui.theme.AppTheme
 import androidx.compose.runtime.mutableStateOf as composeRuntimeMutableStateOf
 
-@JvmOverloads
-fun ComposeView.setEmptyStateText(
-    @StringRes stringRes: Int,
-    strategy: ViewCompositionStrategy = ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed,
-) = apply {
-    setViewCompositionStrategy(strategy)
-    setContent {
-        AppTheme {
-            Text(
-                text = stringResource(id = stringRes),
-            )
-        }
-    }
-}
-
 @JvmOverloads
 fun ComposeView.setEmptyStateComposable(
     spec: EmptyStateSpec = EmptyStateSpec.GenericError,