From 8b79d0ee2944eb47232ed5eba4d44b48865ed57a Mon Sep 17 00:00:00 2001 From: toliuweijing Date: Mon, 19 Aug 2024 15:11:51 +0800 Subject: [PATCH 01/10] Migrate empty_state_view to Jetpack Compose --- .../newpipe/fragments/EmptyFragment.java | 8 +- .../list/channel/ChannelFragment.java | 19 +- .../list/channel/ChannelTabFragment.java | 7 + .../fragments/list/search/SearchFragment.java | 6 + .../local/bookmark/BookmarkFragment.java | 2 + .../schabi/newpipe/local/feed/FeedFragment.kt | 2 + .../subscription/SubscriptionFragment.kt | 3 + .../settings/SelectPlaylistFragment.java | 5 +- .../PreferenceSearchFragment.java | 5 + .../ui/emptystate/EmptyStateComposable.kt | 168 ++++++++++++++++++ .../newpipe/ui/emptystate/EmptyStateUtil.kt | 87 +++++++++ .../newpipe/ui/theme/ColorExtensions.kt | 21 +++ .../main/res/layout/fragment_bookmarks.xml | 6 +- app/src/main/res/layout/fragment_channel.xml | 29 +-- .../main/res/layout/fragment_channel_tab.xml | 6 +- .../res/layout/fragment_channel_videos.xml | 28 +-- app/src/main/res/layout/fragment_empty.xml | 7 +- app/src/main/res/layout/fragment_feed.xml | 6 +- app/src/main/res/layout/fragment_search.xml | 25 +-- .../main/res/layout/fragment_subscription.xml | 6 +- .../res/layout/select_playlist_fragment.xml | 6 +- .../settings_preferencesearch_fragment.xml | 25 +-- 22 files changed, 356 insertions(+), 121 deletions(-) create mode 100644 app/src/main/java/org/schabi/newpipe/ui/emptystate/EmptyStateComposable.kt create mode 100644 app/src/main/java/org/schabi/newpipe/ui/emptystate/EmptyStateUtil.kt create mode 100644 app/src/main/java/org/schabi/newpipe/ui/theme/ColorExtensions.kt diff --git a/app/src/main/java/org/schabi/newpipe/fragments/EmptyFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/EmptyFragment.java index d4e73bcac..8c939a3e8 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/EmptyFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/EmptyFragment.java @@ -6,9 +6,11 @@ import android.view.View; import android.view.ViewGroup; import androidx.annotation.Nullable; +import androidx.compose.ui.platform.ComposeView; import org.schabi.newpipe.BaseFragment; import org.schabi.newpipe.R; +import org.schabi.newpipe.ui.emptystate.EmptyStateUtil; public class EmptyFragment extends BaseFragment { private static final String SHOW_MESSAGE = "SHOW_MESSAGE"; @@ -26,8 +28,10 @@ public class EmptyFragment extends BaseFragment { final Bundle savedInstanceState) { final boolean showMessage = getArguments().getBoolean(SHOW_MESSAGE); final View view = inflater.inflate(R.layout.fragment_empty, container, false); - view.findViewById(R.id.empty_state_view).setVisibility( - showMessage ? View.VISIBLE : View.GONE); + + final ComposeView composeView = view.findViewById(R.id.empty_state_view); + EmptyStateUtil.setEmptyStateComposable(composeView); + composeView.setVisibility(showMessage ? View.VISIBLE : View.GONE); return view; } } diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java index 55e3ae52a..394d97f12 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java @@ -10,7 +10,6 @@ import android.graphics.Color; import android.os.Bundle; import android.text.TextUtils; import android.util.Log; -import android.util.TypedValue; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -20,6 +19,7 @@ import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.compose.runtime.MutableState; import androidx.core.content.ContextCompat; import androidx.core.graphics.ColorUtils; import androidx.core.view.MenuProvider; @@ -45,6 +45,9 @@ import org.schabi.newpipe.fragments.detail.TabAdapter; import org.schabi.newpipe.ktx.AnimationType; import org.schabi.newpipe.local.feed.notifications.NotificationHelper; import org.schabi.newpipe.local.subscription.SubscriptionManager; +import org.schabi.newpipe.ui.emptystate.EmptyStateSpec; +import org.schabi.newpipe.ui.emptystate.EmptyStateSpecBuilder; +import org.schabi.newpipe.ui.emptystate.EmptyStateUtil; import org.schabi.newpipe.util.ChannelTabHelper; import org.schabi.newpipe.util.Constants; import org.schabi.newpipe.util.ExtractorHelper; @@ -102,6 +105,8 @@ public class ChannelFragment extends BaseStateFragment private SubscriptionEntity channelSubscription; private MenuProvider menuProvider; + private MutableState emptyStateSpec; + public static ChannelFragment getInstance(final int serviceId, final String url, final String name) { final ChannelFragment instance = new ChannelFragment(); @@ -199,6 +204,10 @@ public class ChannelFragment extends BaseStateFragment protected void initViews(final View rootView, final Bundle savedInstanceState) { super.initViews(rootView, savedInstanceState); + emptyStateSpec = EmptyStateUtil.mutableStateOf( + EmptyStateSpec.Companion.getContentNotSupported()); + EmptyStateUtil.setEmptyStateComposable(binding.emptyStateView, emptyStateSpec); + tabAdapter = new TabAdapter(getChildFragmentManager()); binding.viewPager.setAdapter(tabAdapter); binding.tabLayout.setupWithViewPager(binding.viewPager); @@ -645,8 +654,10 @@ public class ChannelFragment extends BaseStateFragment return; } - binding.errorContentNotSupported.setVisibility(View.VISIBLE); - binding.channelKaomoji.setText("(︶︹︺)"); - binding.channelKaomoji.setTextSize(TypedValue.COMPLEX_UNIT_SP, 45f); + emptyStateSpec.setValue( + new EmptyStateSpecBuilder(emptyStateSpec.getValue()) + .descriptionVisibility(true) + .build() + ); } } diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelTabFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelTabFragment.java index 5d398821a..feb23b6ac 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelTabFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelTabFragment.java @@ -26,6 +26,7 @@ import org.schabi.newpipe.fragments.list.BaseListInfoFragment; import org.schabi.newpipe.fragments.list.playlist.PlaylistControlViewHolder; import org.schabi.newpipe.player.playqueue.ChannelTabPlayQueue; import org.schabi.newpipe.player.playqueue.PlayQueue; +import org.schabi.newpipe.ui.emptystate.EmptyStateUtil; import org.schabi.newpipe.util.ChannelTabHelper; import org.schabi.newpipe.util.ExtractorHelper; import org.schabi.newpipe.util.PlayButtonHelper; @@ -79,6 +80,12 @@ public class ChannelTabFragment extends BaseListInfoFragment() { override fun onViewCreated(rootView: View, savedInstanceState: Bundle?) { // super.onViewCreated() calls initListeners() which require the binding to be initialized _feedBinding = FragmentFeedBinding.bind(rootView) + feedBinding.emptyStateView.setEmptyStateComposable() super.onViewCreated(rootView, savedInstanceState) val factory = FeedViewModel.getFactory(requireContext(), groupId) diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt index 5583a2c4a..e4a9b79a2 100644 --- a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt @@ -56,6 +56,7 @@ import org.schabi.newpipe.local.subscription.services.SubscriptionsImportService import org.schabi.newpipe.local.subscription.services.SubscriptionsImportService.PREVIOUS_EXPORT_MODE import org.schabi.newpipe.streams.io.NoFileManagerSafeGuard import org.schabi.newpipe.streams.io.StoredFileHelper +import org.schabi.newpipe.ui.emptystate.setEmptyStateComposable import org.schabi.newpipe.util.NavigationHelper import org.schabi.newpipe.util.OnClickGesture import org.schabi.newpipe.util.ServiceHelper @@ -257,6 +258,8 @@ class SubscriptionFragment : BaseStateFragment() { binding.itemsList.adapter = groupAdapter binding.itemsList.itemAnimator = null + binding.emptyStateView.setEmptyStateComposable() + viewModel = ViewModelProvider(this)[SubscriptionViewModel::class.java] viewModel.stateLiveData.observe(viewLifecycleOwner) { it?.let(this::handleResult) } viewModel.feedGroupsLiveData.observe(viewLifecycleOwner) { 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 c340dca22..efe3c4f66 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/SelectPlaylistFragment.java +++ b/app/src/main/java/org/schabi/newpipe/settings/SelectPlaylistFragment.java @@ -11,6 +11,7 @@ import android.widget.ProgressBar; import android.widget.TextView; import androidx.annotation.NonNull; +import androidx.compose.ui.platform.ComposeView; import androidx.fragment.app.DialogFragment; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -27,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.EmptyStateUtil; import org.schabi.newpipe.util.image.CoilHelper; import java.util.List; @@ -40,7 +42,7 @@ public class SelectPlaylistFragment extends DialogFragment { private OnSelectedListener onSelectedListener = null; private ProgressBar progressBar; - private TextView emptyView; + private ComposeView emptyView; private RecyclerView recyclerView; private Disposable disposable = null; @@ -62,6 +64,7 @@ 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); recyclerView.setLayoutManager(new LinearLayoutManager(getContext())); final SelectPlaylistAdapter playlistAdapter = new SelectPlaylistAdapter(); recyclerView.setAdapter(playlistAdapter); diff --git a/app/src/main/java/org/schabi/newpipe/settings/preferencesearch/PreferenceSearchFragment.java b/app/src/main/java/org/schabi/newpipe/settings/preferencesearch/PreferenceSearchFragment.java index 9d169d660..f667bb900 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/preferencesearch/PreferenceSearchFragment.java +++ b/app/src/main/java/org/schabi/newpipe/settings/preferencesearch/PreferenceSearchFragment.java @@ -11,6 +11,8 @@ import androidx.fragment.app.Fragment; import androidx.recyclerview.widget.LinearLayoutManager; import org.schabi.newpipe.databinding.SettingsPreferencesearchFragmentBinding; +import org.schabi.newpipe.ui.emptystate.EmptyStateSpec; +import org.schabi.newpipe.ui.emptystate.EmptyStateUtil; import java.util.List; @@ -39,6 +41,9 @@ public class PreferenceSearchFragment extends Fragment { binding = SettingsPreferencesearchFragmentBinding.inflate(inflater, container, false); binding.searchResults.setLayoutManager(new LinearLayoutManager(getContext())); + EmptyStateUtil.setEmptyStateComposable( + binding.emptyStateView, + EmptyStateSpec.Companion.getNoSearchMaxSizeResult()); adapter = new PreferenceSearchAdapter(); adapter.setOnItemClickListener(this::onItemClicked); 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 new file mode 100644 index 000000000..3af217a9c --- /dev/null +++ b/app/src/main/java/org/schabi/newpipe/ui/emptystate/EmptyStateComposable.kt @@ -0,0 +1,168 @@ +package org.schabi.newpipe.ui.emptystate + +import android.graphics.Color +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.LocalContentColor +import androidx.compose.material3.LocalTextStyle +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import org.schabi.newpipe.R +import org.schabi.newpipe.ui.theme.AppTheme +import org.schabi.newpipe.ui.theme.errorHint + +@Composable +fun EmptyStateComposable( + spec: EmptyStateSpec, + modifier: Modifier = Modifier, +) = EmptyStateComposable( + modifier = spec.modifier(modifier), + emojiModifier = spec.emojiModifier(), + emojiText = spec.emojiText(), + emojiTextStyle = spec.emojiTextStyle(), + descriptionModifier = spec.descriptionModifier(), + descriptionText = spec.descriptionText(), + descriptionTextStyle = spec.descriptionTextStyle(), + descriptionTextVisibility = spec.descriptionVisibility(), +) + +@Composable +private fun EmptyStateComposable( + modifier: Modifier, + emojiModifier: Modifier, + emojiText: String, + emojiTextStyle: TextStyle, + descriptionModifier: Modifier, + descriptionText: String, + descriptionTextStyle: TextStyle, + descriptionTextVisibility: Boolean, +) { + CompositionLocalProvider( + LocalContentColor provides MaterialTheme.colorScheme.errorHint + ) { + Column( + modifier = modifier, + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center + ) { + Text( + modifier = emojiModifier, + text = emojiText, + style = emojiTextStyle, + ) + + if (descriptionTextVisibility) { + Text( + modifier = descriptionModifier, + text = descriptionText, + style = descriptionTextStyle, + ) + } + } + } +} + +@Preview(showBackground = true, backgroundColor = Color.WHITE.toLong()) +@Composable +fun EmptyStateComposableGenericErrorPreview() { + AppTheme { + EmptyStateComposable(EmptyStateSpec.GenericError) + } +} + +@Preview(showBackground = true, backgroundColor = Color.WHITE.toLong()) +@Composable +fun EmptyStateComposableNoCommentPreview() { + AppTheme { + EmptyStateComposable(EmptyStateSpec.NoComment) + } +} + +data class EmptyStateSpec( + val modifier: (Modifier) -> Modifier, + val emojiModifier: () -> Modifier, + val emojiText: @Composable () -> String, + val emojiTextStyle: @Composable () -> TextStyle, + val descriptionText: @Composable () -> String, + val descriptionModifier: () -> Modifier, + val descriptionTextStyle: @Composable () -> TextStyle, + val descriptionVisibility: () -> Boolean = { true }, +) { + + companion object { + + val GenericError = + EmptyStateSpec( + modifier = { + it + .fillMaxWidth() + .heightIn(min = 128.dp) + }, + emojiModifier = { Modifier }, + emojiText = { "¯\\_(ツ)_/¯" }, + emojiTextStyle = { MaterialTheme.typography.titleLarge }, + descriptionModifier = { + Modifier + .padding(top = 6.dp) + .padding(horizontal = 16.dp) + }, + descriptionText = { stringResource(id = R.string.empty_list_subtitle) }, + descriptionTextStyle = { MaterialTheme.typography.bodyMedium } + ) + + val NoComment = + EmptyStateSpec( + modifier = { it.padding(top = 85.dp) }, + emojiModifier = { Modifier.padding(bottom = 10.dp) }, + emojiText = { "(╯°-°)╯" }, + emojiTextStyle = { + LocalTextStyle.current.merge( + fontFamily = FontFamily.Monospace, + fontSize = 35.sp, + ) + }, + descriptionModifier = { Modifier }, + descriptionText = { stringResource(id = R.string.no_comments) }, + descriptionTextStyle = { + LocalTextStyle.current.merge(fontSize = 24.sp) + } + ) + + val NoSearchResult = + NoComment.copy( + modifier = { it }, + emojiText = { "╰(°●°╰)" }, + descriptionText = { stringResource(id = R.string.search_no_results) } + ) + + val NoSearchMaxSizeResult = + NoSearchResult.copy( + modifier = { it.fillMaxSize() }, + ) + + val ContentNotSupported = + NoComment.copy( + modifier = { it.padding(top = 90.dp) }, + emojiText = { "(︶︹︺)" }, + emojiTextStyle = { LocalTextStyle.current.merge(fontSize = 45.sp) }, + descriptionModifier = { Modifier.padding(top = 20.dp) }, + descriptionText = { stringResource(id = R.string.content_not_supported) }, + descriptionTextStyle = { LocalTextStyle.current.merge(fontSize = 15.sp) }, + descriptionVisibility = { false }, + ) + } +} 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 new file mode 100644 index 000000000..b025bdc5b --- /dev/null +++ b/app/src/main/java/org/schabi/newpipe/ui/emptystate/EmptyStateUtil.kt @@ -0,0 +1,87 @@ +@file:JvmName("EmptyStateUtil") + +package org.schabi.newpipe.ui.emptystate + +import androidx.annotation.StringRes +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.MutableState +import androidx.compose.runtime.State +import androidx.compose.ui.platform.ComposeView +import androidx.compose.ui.platform.ViewCompositionStrategy +import androidx.compose.ui.res.stringResource +import org.schabi.newpipe.ui.theme.AppTheme +import org.schabi.newpipe.ui.theme.errorHint +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), + color = MaterialTheme.colorScheme.errorHint, + ) + } + } +} + +@JvmOverloads +fun ComposeView.setEmptyStateComposable( + spec: EmptyStateSpec = EmptyStateSpec.GenericError, + strategy: ViewCompositionStrategy = ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed, +) = apply { + setViewCompositionStrategy(strategy) + setContent { + AppTheme { + EmptyStateComposable( + spec = spec + ) + } + } +} + +@JvmOverloads +fun ComposeView.setEmptyStateComposable( + spec: State, + strategy: ViewCompositionStrategy = ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed, +) = apply { + setViewCompositionStrategy(strategy) + setContent { + AppTheme { + EmptyStateComposable( + spec = spec.value, + ) + } + } +} + +/** + * Used in Java land to bridge the [MutableState] API. + */ +fun mutableStateOf(param: T): MutableState { + return composeRuntimeMutableStateOf(param) +} + +/** + * Used in Java land to modify [EmptyStateSpec] properties. + * TODO: remove after Kotlin migration + */ +class EmptyStateSpecBuilder(var spec: EmptyStateSpec) { + + fun descriptionText(@StringRes stringRes: Int) = apply { + spec = spec.copy( + descriptionText = { stringResource(id = stringRes) } + ) + } + + fun descriptionVisibility(descriptionTextVisibility: Boolean) = apply { + spec = spec.copy(descriptionVisibility = { descriptionTextVisibility }) + } + + fun build() = spec +} diff --git a/app/src/main/java/org/schabi/newpipe/ui/theme/ColorExtensions.kt b/app/src/main/java/org/schabi/newpipe/ui/theme/ColorExtensions.kt new file mode 100644 index 000000000..8e9118c6e --- /dev/null +++ b/app/src/main/java/org/schabi/newpipe/ui/theme/ColorExtensions.kt @@ -0,0 +1,21 @@ +package org.schabi.newpipe.ui.theme + +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.ColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color + +/** + * Extended color for error hint. + * See [specification](https://m1.material.io/patterns/errors.html#errors-user-input-errors) + */ +val md_theme_light_error_hint = Color(0x61000000) + +val md_theme_dark_error_hint = Color(0x80FFFFFF) + +val ColorScheme.errorHint: Color + @Composable get() = if (isSystemInDarkTheme()) { + Color(0x80FFFFFF) + } else { + Color(0x61000000) + } diff --git a/app/src/main/res/layout/fragment_bookmarks.xml b/app/src/main/res/layout/fragment_bookmarks.xml index 418c11964..9767a1081 100644 --- a/app/src/main/res/layout/fragment_bookmarks.xml +++ b/app/src/main/res/layout/fragment_bookmarks.xml @@ -24,15 +24,15 @@ android:visibility="gone" tools:visibility="visible" /> - + tools:visibility="visible" + /> - - - - - - - + tools:visibility="visible" + /> - + tools:visibility="visible" + /> - - - - - - - + tools:visibility="visible" + /> - + android:layout_marginTop="90dp" + /> + diff --git a/app/src/main/res/layout/fragment_feed.xml b/app/src/main/res/layout/fragment_feed.xml index de2096605..3c61c824f 100644 --- a/app/src/main/res/layout/fragment_feed.xml +++ b/app/src/main/res/layout/fragment_feed.xml @@ -140,15 +140,15 @@ android:visibility="gone" tools:visibility="visible" /> - + tools:visibility="visible" + /> - - - - - - - + tools:visibility="visible" + /> - + tools:visibility="visible" + /> - - + /> - - - - - - - + tools:visibility="gone" + /> Date: Mon, 19 Aug 2024 16:11:31 +0800 Subject: [PATCH 02/10] boost error hint color --- .../org/schabi/newpipe/ui/theme/ColorExtensions.kt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/ui/theme/ColorExtensions.kt b/app/src/main/java/org/schabi/newpipe/ui/theme/ColorExtensions.kt index 8e9118c6e..3c057b16a 100644 --- a/app/src/main/java/org/schabi/newpipe/ui/theme/ColorExtensions.kt +++ b/app/src/main/java/org/schabi/newpipe/ui/theme/ColorExtensions.kt @@ -7,15 +7,13 @@ import androidx.compose.ui.graphics.Color /** * Extended color for error hint. - * See [specification](https://m1.material.io/patterns/errors.html#errors-user-input-errors) */ -val md_theme_light_error_hint = Color(0x61000000) - -val md_theme_dark_error_hint = Color(0x80FFFFFF) +val md_theme_light_error_hint = Color(0xCC000000) +val md_theme_dark_error_hint = Color(0xCCFFFFFF) val ColorScheme.errorHint: Color @Composable get() = if (isSystemInDarkTheme()) { - Color(0x80FFFFFF) + md_theme_dark_error_hint } else { - Color(0x61000000) + md_theme_light_error_hint } From 46b9243661a6dcbafd59a4a91f6d562cdb4cbe2a Mon Sep 17 00:00:00 2001 From: Stypox Date: Thu, 21 Nov 2024 11:53:01 +0100 Subject: [PATCH 03/10] Remove unneeded empty state changes in ChannelFragment --- .../fragments/list/channel/ChannelFragment.java | 17 +++++------------ .../ui/emptystate/EmptyStateComposable.kt | 17 +++++------------ .../newpipe/ui/emptystate/EmptyStateUtil.kt | 6 +----- 3 files changed, 11 insertions(+), 29 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java index 394d97f12..2d5873e3f 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java @@ -19,7 +19,6 @@ import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.compose.runtime.MutableState; import androidx.core.content.ContextCompat; import androidx.core.graphics.ColorUtils; import androidx.core.view.MenuProvider; @@ -46,7 +45,6 @@ import org.schabi.newpipe.ktx.AnimationType; import org.schabi.newpipe.local.feed.notifications.NotificationHelper; import org.schabi.newpipe.local.subscription.SubscriptionManager; import org.schabi.newpipe.ui.emptystate.EmptyStateSpec; -import org.schabi.newpipe.ui.emptystate.EmptyStateSpecBuilder; import org.schabi.newpipe.ui.emptystate.EmptyStateUtil; import org.schabi.newpipe.util.ChannelTabHelper; import org.schabi.newpipe.util.Constants; @@ -105,8 +103,6 @@ public class ChannelFragment extends BaseStateFragment private SubscriptionEntity channelSubscription; private MenuProvider menuProvider; - private MutableState emptyStateSpec; - public static ChannelFragment getInstance(final int serviceId, final String url, final String name) { final ChannelFragment instance = new ChannelFragment(); @@ -204,9 +200,10 @@ public class ChannelFragment extends BaseStateFragment protected void initViews(final View rootView, final Bundle savedInstanceState) { super.initViews(rootView, savedInstanceState); - emptyStateSpec = EmptyStateUtil.mutableStateOf( - EmptyStateSpec.Companion.getContentNotSupported()); - EmptyStateUtil.setEmptyStateComposable(binding.emptyStateView, emptyStateSpec); + EmptyStateUtil.setEmptyStateComposable( + binding.emptyStateView, + EmptyStateSpec.Companion.getContentNotSupported() + ); tabAdapter = new TabAdapter(getChildFragmentManager()); binding.viewPager.setAdapter(tabAdapter); @@ -654,10 +651,6 @@ public class ChannelFragment extends BaseStateFragment return; } - emptyStateSpec.setValue( - new EmptyStateSpecBuilder(emptyStateSpec.getValue()) - .descriptionVisibility(true) - .build() - ); + binding.emptyStateView.setVisibility(View.VISIBLE); } } 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 3af217a9c..d67aed898 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 @@ -37,7 +37,6 @@ fun EmptyStateComposable( descriptionModifier = spec.descriptionModifier(), descriptionText = spec.descriptionText(), descriptionTextStyle = spec.descriptionTextStyle(), - descriptionTextVisibility = spec.descriptionVisibility(), ) @Composable @@ -49,7 +48,6 @@ private fun EmptyStateComposable( descriptionModifier: Modifier, descriptionText: String, descriptionTextStyle: TextStyle, - descriptionTextVisibility: Boolean, ) { CompositionLocalProvider( LocalContentColor provides MaterialTheme.colorScheme.errorHint @@ -65,13 +63,11 @@ private fun EmptyStateComposable( style = emojiTextStyle, ) - if (descriptionTextVisibility) { - Text( - modifier = descriptionModifier, - text = descriptionText, - style = descriptionTextStyle, - ) - } + Text( + modifier = descriptionModifier, + text = descriptionText, + style = descriptionTextStyle, + ) } } } @@ -100,9 +96,7 @@ data class EmptyStateSpec( val descriptionText: @Composable () -> String, val descriptionModifier: () -> Modifier, val descriptionTextStyle: @Composable () -> TextStyle, - val descriptionVisibility: () -> Boolean = { true }, ) { - companion object { val GenericError = @@ -162,7 +156,6 @@ data class EmptyStateSpec( descriptionModifier = { Modifier.padding(top = 20.dp) }, descriptionText = { stringResource(id = R.string.content_not_supported) }, descriptionTextStyle = { LocalTextStyle.current.merge(fontSize = 15.sp) }, - descriptionVisibility = { false }, ) } } 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 b025bdc5b..526a33850 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 @@ -71,7 +71,7 @@ fun mutableStateOf(param: T): MutableState { * Used in Java land to modify [EmptyStateSpec] properties. * TODO: remove after Kotlin migration */ -class EmptyStateSpecBuilder(var spec: EmptyStateSpec) { +class EmptyStateSpecBuilder(private var spec: EmptyStateSpec) { fun descriptionText(@StringRes stringRes: Int) = apply { spec = spec.copy( @@ -79,9 +79,5 @@ class EmptyStateSpecBuilder(var spec: EmptyStateSpec) { ) } - fun descriptionVisibility(descriptionTextVisibility: Boolean) = apply { - spec = spec.copy(descriptionVisibility = { descriptionTextVisibility }) - } - fun build() = spec } From 1abced992bc09deef0f1c82c9a02e518a521984d Mon Sep 17 00:00:00 2001 From: Stypox Date: Thu, 21 Nov 2024 12:07:03 +0100 Subject: [PATCH 04/10] Use normal colors for empty state view --- .../ui/emptystate/EmptyStateComposable.kt | 35 ++++++++----------- .../newpipe/ui/emptystate/EmptyStateUtil.kt | 3 -- .../newpipe/ui/theme/ColorExtensions.kt | 19 ---------- 3 files changed, 14 insertions(+), 43 deletions(-) delete mode 100644 app/src/main/java/org/schabi/newpipe/ui/theme/ColorExtensions.kt 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 d67aed898..797b2cd66 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 @@ -7,12 +7,10 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding -import androidx.compose.material3.LocalContentColor import androidx.compose.material3.LocalTextStyle import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable -import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource @@ -23,7 +21,6 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import org.schabi.newpipe.R import org.schabi.newpipe.ui.theme.AppTheme -import org.schabi.newpipe.ui.theme.errorHint @Composable fun EmptyStateComposable( @@ -49,26 +46,22 @@ private fun EmptyStateComposable( descriptionText: String, descriptionTextStyle: TextStyle, ) { - CompositionLocalProvider( - LocalContentColor provides MaterialTheme.colorScheme.errorHint + Column( + modifier = modifier, + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center ) { - Column( - modifier = modifier, - horizontalAlignment = Alignment.CenterHorizontally, - verticalArrangement = Arrangement.Center - ) { - Text( - modifier = emojiModifier, - text = emojiText, - style = emojiTextStyle, - ) + Text( + modifier = emojiModifier, + text = emojiText, + style = emojiTextStyle, + ) - Text( - modifier = descriptionModifier, - text = descriptionText, - style = descriptionTextStyle, - ) - } + Text( + modifier = descriptionModifier, + text = descriptionText, + style = descriptionTextStyle, + ) } } 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 526a33850..85ed3697e 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.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.MutableState import androidx.compose.runtime.State @@ -11,7 +10,6 @@ import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.platform.ViewCompositionStrategy import androidx.compose.ui.res.stringResource import org.schabi.newpipe.ui.theme.AppTheme -import org.schabi.newpipe.ui.theme.errorHint import androidx.compose.runtime.mutableStateOf as composeRuntimeMutableStateOf @JvmOverloads @@ -24,7 +22,6 @@ fun ComposeView.setEmptyStateText( AppTheme { Text( text = stringResource(id = stringRes), - color = MaterialTheme.colorScheme.errorHint, ) } } diff --git a/app/src/main/java/org/schabi/newpipe/ui/theme/ColorExtensions.kt b/app/src/main/java/org/schabi/newpipe/ui/theme/ColorExtensions.kt deleted file mode 100644 index 3c057b16a..000000000 --- a/app/src/main/java/org/schabi/newpipe/ui/theme/ColorExtensions.kt +++ /dev/null @@ -1,19 +0,0 @@ -package org.schabi.newpipe.ui.theme - -import androidx.compose.foundation.isSystemInDarkTheme -import androidx.compose.material3.ColorScheme -import androidx.compose.runtime.Composable -import androidx.compose.ui.graphics.Color - -/** - * Extended color for error hint. - */ -val md_theme_light_error_hint = Color(0xCC000000) -val md_theme_dark_error_hint = Color(0xCCFFFFFF) - -val ColorScheme.errorHint: Color - @Composable get() = if (isSystemInDarkTheme()) { - md_theme_dark_error_hint - } else { - md_theme_light_error_hint - } From 1cd5563b271d8d8ff6281153d4cfe06e59c89419 Mon Sep 17 00:00:00 2001 From: Stypox Date: Thu, 21 Nov 2024 12:14:40 +0100 Subject: [PATCH 05/10] All empty states now have the same style --- .../ui/emptystate/EmptyStateComposable.kt | 49 +++---------------- 1 file changed, 6 insertions(+), 43 deletions(-) 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 797b2cd66..ff0f888ed 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 @@ -7,18 +7,14 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding -import androidx.compose.material3.LocalTextStyle import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource -import androidx.compose.ui.text.TextStyle -import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp import org.schabi.newpipe.R import org.schabi.newpipe.ui.theme.AppTheme @@ -28,23 +24,15 @@ fun EmptyStateComposable( modifier: Modifier = Modifier, ) = EmptyStateComposable( modifier = spec.modifier(modifier), - emojiModifier = spec.emojiModifier(), emojiText = spec.emojiText(), - emojiTextStyle = spec.emojiTextStyle(), - descriptionModifier = spec.descriptionModifier(), descriptionText = spec.descriptionText(), - descriptionTextStyle = spec.descriptionTextStyle(), ) @Composable private fun EmptyStateComposable( - modifier: Modifier, - emojiModifier: Modifier, emojiText: String, - emojiTextStyle: TextStyle, - descriptionModifier: Modifier, descriptionText: String, - descriptionTextStyle: TextStyle, + modifier: Modifier = Modifier, ) { Column( modifier = modifier, @@ -52,15 +40,16 @@ private fun EmptyStateComposable( verticalArrangement = Arrangement.Center ) { Text( - modifier = emojiModifier, text = emojiText, - style = emojiTextStyle, + style = MaterialTheme.typography.titleLarge, ) Text( - modifier = descriptionModifier, + modifier = Modifier + .padding(top = 6.dp) + .padding(horizontal = 16.dp), text = descriptionText, - style = descriptionTextStyle, + style = MaterialTheme.typography.bodyMedium, ) } } @@ -83,12 +72,8 @@ fun EmptyStateComposableNoCommentPreview() { data class EmptyStateSpec( val modifier: (Modifier) -> Modifier, - val emojiModifier: () -> Modifier, val emojiText: @Composable () -> String, - val emojiTextStyle: @Composable () -> TextStyle, val descriptionText: @Composable () -> String, - val descriptionModifier: () -> Modifier, - val descriptionTextStyle: @Composable () -> TextStyle, ) { companion object { @@ -99,34 +84,15 @@ data class EmptyStateSpec( .fillMaxWidth() .heightIn(min = 128.dp) }, - emojiModifier = { Modifier }, emojiText = { "¯\\_(ツ)_/¯" }, - emojiTextStyle = { MaterialTheme.typography.titleLarge }, - descriptionModifier = { - Modifier - .padding(top = 6.dp) - .padding(horizontal = 16.dp) - }, descriptionText = { stringResource(id = R.string.empty_list_subtitle) }, - descriptionTextStyle = { MaterialTheme.typography.bodyMedium } ) val NoComment = EmptyStateSpec( modifier = { it.padding(top = 85.dp) }, - emojiModifier = { Modifier.padding(bottom = 10.dp) }, emojiText = { "(╯°-°)╯" }, - emojiTextStyle = { - LocalTextStyle.current.merge( - fontFamily = FontFamily.Monospace, - fontSize = 35.sp, - ) - }, - descriptionModifier = { Modifier }, descriptionText = { stringResource(id = R.string.no_comments) }, - descriptionTextStyle = { - LocalTextStyle.current.merge(fontSize = 24.sp) - } ) val NoSearchResult = @@ -145,10 +111,7 @@ data class EmptyStateSpec( NoComment.copy( modifier = { it.padding(top = 90.dp) }, emojiText = { "(︶︹︺)" }, - emojiTextStyle = { LocalTextStyle.current.merge(fontSize = 45.sp) }, - descriptionModifier = { Modifier.padding(top = 20.dp) }, descriptionText = { stringResource(id = R.string.content_not_supported) }, - descriptionTextStyle = { LocalTextStyle.current.merge(fontSize = 15.sp) }, ) } } From 55e4014036a559f50a941bb6cc5505d20a6fa127 Mon Sep 17 00:00:00 2001 From: Stypox Date: Thu, 21 Nov 2024 12:24:11 +0100 Subject: [PATCH 06/10] 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 Date: Thu, 21 Nov 2024 12:42:58 +0100 Subject: [PATCH 07/10] Use empty state view in a few more places --- .../ImportSubscriptionsHintPlaceholderItem.kt | 12 ++++++--- .../settings/SelectChannelFragment.java | 8 +++++- .../ui/emptystate/EmptyStateComposable.kt | 15 +++++++++++ .../giga/ui/fragment/MissionsFragment.java | 5 +++- app/src/main/res/layout/list_empty_view.xml | 25 ------------------- .../layout/list_empty_view_subscriptions.xml | 23 ++--------------- app/src/main/res/layout/missions.xml | 9 ++++--- .../res/layout/select_channel_fragment.xml | 7 ++---- .../res/layout/select_playlist_fragment.xml | 3 +-- 9 files changed, 44 insertions(+), 63 deletions(-) delete mode 100644 app/src/main/res/layout/list_empty_view.xml diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/item/ImportSubscriptionsHintPlaceholderItem.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/item/ImportSubscriptionsHintPlaceholderItem.kt index 93b551895..cf0b8c3ff 100644 --- a/app/src/main/java/org/schabi/newpipe/local/subscription/item/ImportSubscriptionsHintPlaceholderItem.kt +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/item/ImportSubscriptionsHintPlaceholderItem.kt @@ -3,14 +3,18 @@ package org.schabi.newpipe.local.subscription.item import android.view.View import com.xwray.groupie.viewbinding.BindableItem import org.schabi.newpipe.R -import org.schabi.newpipe.databinding.ListEmptyViewBinding +import org.schabi.newpipe.databinding.ListEmptyViewSubscriptionsBinding +import org.schabi.newpipe.ui.emptystate.EmptyStateSpec +import org.schabi.newpipe.ui.emptystate.setEmptyStateComposable /** * When there are no subscriptions, show a hint to the user about how to import subscriptions */ -class ImportSubscriptionsHintPlaceholderItem : BindableItem() { +class ImportSubscriptionsHintPlaceholderItem : BindableItem() { override fun getLayout(): Int = R.layout.list_empty_view_subscriptions - override fun bind(viewBinding: ListEmptyViewBinding, position: Int) {} + override fun bind(viewBinding: ListEmptyViewSubscriptionsBinding, position: Int) { + viewBinding.root.setEmptyStateComposable(EmptyStateSpec.NoSubscriptionsHint) + } override fun getSpanSize(spanCount: Int, position: Int): Int = spanCount - override fun initializeViewBinding(view: View) = ListEmptyViewBinding.bind(view) + override fun initializeViewBinding(view: View) = ListEmptyViewSubscriptionsBinding.bind(view) } diff --git a/app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java b/app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java index c566313e3..cbd6b0656 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java +++ b/app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java @@ -11,6 +11,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.compose.ui.platform.ComposeView; import androidx.fragment.app.DialogFragment; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -19,6 +20,8 @@ import org.schabi.newpipe.R; import org.schabi.newpipe.database.subscription.SubscriptionEntity; import org.schabi.newpipe.error.ErrorUtil; import org.schabi.newpipe.local.subscription.SubscriptionManager; +import org.schabi.newpipe.ui.emptystate.EmptyStateSpec; +import org.schabi.newpipe.ui.emptystate.EmptyStateUtil; import org.schabi.newpipe.util.ThemeHelper; import org.schabi.newpipe.util.image.CoilHelper; @@ -57,7 +60,7 @@ public class SelectChannelFragment extends DialogFragment { private OnCancelListener onCancelListener = null; private ProgressBar progressBar; - private TextView emptyView; + private ComposeView emptyView; private RecyclerView recyclerView; private List subscriptions = new Vector<>(); @@ -91,6 +94,9 @@ public class SelectChannelFragment extends DialogFragment { progressBar = v.findViewById(R.id.progressBar); emptyView = v.findViewById(R.id.empty_state_view); + + EmptyStateUtil.setEmptyStateComposable(emptyView, + EmptyStateSpec.Companion.getNoSubscriptions()); progressBar.setVisibility(View.VISIBLE); recyclerView.setVisibility(View.GONE); emptyView.setVisibility(View.GONE); 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 c76dac38c..3e101d760 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 @@ -13,6 +13,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import org.schabi.newpipe.R @@ -42,6 +43,7 @@ private fun EmptyStateComposable( Text( text = emojiText, style = MaterialTheme.typography.titleLarge, + textAlign = TextAlign.Center, ) Text( @@ -50,6 +52,7 @@ private fun EmptyStateComposable( .padding(horizontal = 16.dp), text = descriptionText, style = MaterialTheme.typography.bodyMedium, + textAlign = TextAlign.Center, ) } } @@ -120,5 +123,17 @@ data class EmptyStateSpec( emojiText = { "(╥﹏╥)" }, descriptionText = { stringResource(id = R.string.no_playlist_bookmarked_yet) }, ) + + val NoSubscriptionsHint = + EmptyStateSpec( + modifier = { it }, + emojiText = { "(꩜ᯅ꩜)" }, + descriptionText = { stringResource(id = R.string.import_subscriptions_hint) }, + ) + + val NoSubscriptions = + NoSubscriptionsHint.copy( + descriptionText = { stringResource(id = R.string.no_channel_subscribed_yet) }, + ) } } diff --git a/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java b/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java index 690ed4a97..ad9a3b7cd 100644 --- a/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java +++ b/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java @@ -22,6 +22,7 @@ import androidx.activity.result.ActivityResultLauncher; import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult; import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; +import androidx.compose.ui.platform.ComposeView; import androidx.fragment.app.Fragment; import androidx.preference.PreferenceManager; import androidx.recyclerview.widget.GridLayoutManager; @@ -34,6 +35,7 @@ import org.schabi.newpipe.R; import org.schabi.newpipe.settings.NewPipeSettings; import org.schabi.newpipe.streams.io.NoFileManagerSafeGuard; import org.schabi.newpipe.streams.io.StoredFileHelper; +import org.schabi.newpipe.ui.emptystate.EmptyStateUtil; import org.schabi.newpipe.util.FilePickerActivityHelper; import java.io.File; @@ -108,7 +110,8 @@ public class MissionsFragment extends Fragment { mContext.bindService(new Intent(mContext, DownloadManagerService.class), mConnection, Context.BIND_AUTO_CREATE); // Views - mEmpty = v.findViewById(R.id.list_empty_view); + mEmpty = v.findViewById(R.id.empty_state_view); + EmptyStateUtil.setEmptyStateComposable((ComposeView) mEmpty); mList = v.findViewById(R.id.mission_recycler); // Init layouts managers diff --git a/app/src/main/res/layout/list_empty_view.xml b/app/src/main/res/layout/list_empty_view.xml deleted file mode 100644 index a25042aed..000000000 --- a/app/src/main/res/layout/list_empty_view.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/layout/list_empty_view_subscriptions.xml b/app/src/main/res/layout/list_empty_view_subscriptions.xml index 74a5eced4..ad1820199 100644 --- a/app/src/main/res/layout/list_empty_view_subscriptions.xml +++ b/app/src/main/res/layout/list_empty_view_subscriptions.xml @@ -1,25 +1,6 @@ - - - - - - + xmlns:android="http://schemas.android.com/apk/res/android" /> diff --git a/app/src/main/res/layout/missions.xml b/app/src/main/res/layout/missions.xml index 641e28693..291d19306 100644 --- a/app/src/main/res/layout/missions.xml +++ b/app/src/main/res/layout/missions.xml @@ -3,10 +3,11 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - - + android:layout_margin="10dp" /> + android:layout_margin="10dp" /> Date: Thu, 21 Nov 2024 13:14:19 +0100 Subject: [PATCH 08/10] Remove unused methods in EmptyStateUtil --- .../newpipe/ui/emptystate/EmptyStateUtil.kt | 42 ------------------- 1 file changed, 42 deletions(-) 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 765ef2e6b..422fb69fc 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 @@ -2,14 +2,9 @@ package org.schabi.newpipe.ui.emptystate -import androidx.annotation.StringRes -import androidx.compose.runtime.MutableState -import androidx.compose.runtime.State import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.platform.ViewCompositionStrategy -import androidx.compose.ui.res.stringResource import org.schabi.newpipe.ui.theme.AppTheme -import androidx.compose.runtime.mutableStateOf as composeRuntimeMutableStateOf @JvmOverloads fun ComposeView.setEmptyStateComposable( @@ -25,40 +20,3 @@ fun ComposeView.setEmptyStateComposable( } } } - -@JvmOverloads -fun ComposeView.setEmptyStateComposable( - spec: State, - strategy: ViewCompositionStrategy = ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed, -) = apply { - setViewCompositionStrategy(strategy) - setContent { - AppTheme { - EmptyStateComposable( - spec = spec.value, - ) - } - } -} - -/** - * Used in Java land to bridge the [MutableState] API. - */ -fun mutableStateOf(param: T): MutableState { - return composeRuntimeMutableStateOf(param) -} - -/** - * Used in Java land to modify [EmptyStateSpec] properties. - * TODO: remove after Kotlin migration - */ -class EmptyStateSpecBuilder(private var spec: EmptyStateSpec) { - - fun descriptionText(@StringRes stringRes: Int) = apply { - spec = spec.copy( - descriptionText = { stringResource(id = stringRes) } - ) - } - - fun build() = spec -} From c8b01a06b0caa92907b94b12248e415159caad57 Mon Sep 17 00:00:00 2001 From: Stypox Date: Thu, 21 Nov 2024 13:14:23 +0100 Subject: [PATCH 09/10] Use empty state view in compose --- .../ui/components/common/NoItemsMessage.kt | 42 ------------ .../ui/components/video/RelatedItems.kt | 68 ++++++++++--------- .../video/comment/CommentRepliesDialog.kt | 20 ++++-- .../video/comment/CommentSection.kt | 26 +++++-- .../ui/emptystate/EmptyStateComposable.kt | 30 ++++++-- 5 files changed, 94 insertions(+), 92 deletions(-) delete mode 100644 app/src/main/java/org/schabi/newpipe/ui/components/common/NoItemsMessage.kt diff --git a/app/src/main/java/org/schabi/newpipe/ui/components/common/NoItemsMessage.kt b/app/src/main/java/org/schabi/newpipe/ui/components/common/NoItemsMessage.kt deleted file mode 100644 index afb53fdf4..000000000 --- a/app/src/main/java/org/schabi/newpipe/ui/components/common/NoItemsMessage.kt +++ /dev/null @@ -1,42 +0,0 @@ -package org.schabi.newpipe.ui.components.common - -import android.content.res.Configuration -import androidx.annotation.StringRes -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.wrapContentSize -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Surface -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.res.stringResource -import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.sp -import org.schabi.newpipe.R -import org.schabi.newpipe.ui.theme.AppTheme - -@Composable -fun NoItemsMessage(@StringRes message: Int) { - Column( - modifier = Modifier - .fillMaxWidth() - .wrapContentSize(Alignment.Center), - horizontalAlignment = Alignment.CenterHorizontally - ) { - Text(text = "(╯°-°)╯", fontSize = 35.sp) - Text(text = stringResource(id = message), fontSize = 24.sp) - } -} - -@Preview(name = "Light mode", uiMode = Configuration.UI_MODE_NIGHT_NO) -@Preview(name = "Dark mode", uiMode = Configuration.UI_MODE_NIGHT_YES) -@Composable -private fun NoItemsMessagePreview() { - AppTheme { - Surface(color = MaterialTheme.colorScheme.background) { - NoItemsMessage(message = R.string.no_videos) - } - } -} diff --git a/app/src/main/java/org/schabi/newpipe/ui/components/video/RelatedItems.kt b/app/src/main/java/org/schabi/newpipe/ui/components/video/RelatedItems.kt index 6eee01bc0..3c6c49d35 100644 --- a/app/src/main/java/org/schabi/newpipe/ui/components/video/RelatedItems.kt +++ b/app/src/main/java/org/schabi/newpipe/ui/components/video/RelatedItems.kt @@ -26,9 +26,10 @@ import org.schabi.newpipe.R import org.schabi.newpipe.extractor.stream.StreamInfo import org.schabi.newpipe.extractor.stream.StreamType import org.schabi.newpipe.info_list.ItemViewMode -import org.schabi.newpipe.ui.components.common.NoItemsMessage import org.schabi.newpipe.ui.components.items.ItemList import org.schabi.newpipe.ui.components.items.stream.StreamInfoItem +import org.schabi.newpipe.ui.emptystate.EmptyStateComposable +import org.schabi.newpipe.ui.emptystate.EmptyStateSpec import org.schabi.newpipe.ui.theme.AppTheme import org.schabi.newpipe.util.NO_SERVICE_ID @@ -41,43 +42,44 @@ fun RelatedItems(info: StreamInfo) { mutableStateOf(sharedPreferences.getBoolean(key, false)) } - if (info.relatedItems.isEmpty()) { - NoItemsMessage(message = R.string.no_videos) - } else { - ItemList( - items = info.relatedItems, - mode = ItemViewMode.LIST, - listHeader = { - item { - Row( - modifier = Modifier - .fillMaxWidth() - .padding(start = 12.dp, end = 12.dp), - horizontalArrangement = Arrangement.SpaceBetween, - verticalAlignment = Alignment.CenterVertically, - ) { - Text(text = stringResource(R.string.auto_queue_description)) + ItemList( + items = info.relatedItems, + mode = ItemViewMode.LIST, + listHeader = { + item { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(start = 12.dp, end = 12.dp), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically, + ) { + Text(text = stringResource(R.string.auto_queue_description)) - Row( - horizontalArrangement = Arrangement.spacedBy(4.dp), - verticalAlignment = Alignment.CenterVertically - ) { - Text(text = stringResource(R.string.auto_queue_toggle)) - Switch( - checked = isAutoQueueEnabled, - onCheckedChange = { - isAutoQueueEnabled = it - sharedPreferences.edit { - putBoolean(key, it) - } + Row( + horizontalArrangement = Arrangement.spacedBy(4.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Text(text = stringResource(R.string.auto_queue_toggle)) + Switch( + checked = isAutoQueueEnabled, + onCheckedChange = { + isAutoQueueEnabled = it + sharedPreferences.edit { + putBoolean(key, it) } - ) - } + } + ) } } } - ) - } + if (info.relatedItems.isEmpty()) { + item { + EmptyStateComposable(EmptyStateSpec.NoVideos) + } + } + } + ) } @Preview(name = "Light mode", uiMode = Configuration.UI_MODE_NIGHT_NO) diff --git a/app/src/main/java/org/schabi/newpipe/ui/components/video/comment/CommentRepliesDialog.kt b/app/src/main/java/org/schabi/newpipe/ui/components/video/comment/CommentRepliesDialog.kt index 17ea900a5..d6d00b28c 100644 --- a/app/src/main/java/org/schabi/newpipe/ui/components/video/comment/CommentRepliesDialog.kt +++ b/app/src/main/java/org/schabi/newpipe/ui/components/video/comment/CommentRepliesDialog.kt @@ -20,6 +20,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.platform.rememberNestedScrollInteropConnection import androidx.compose.ui.res.pluralStringResource +import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.datasource.LoremIpsum import androidx.compose.ui.unit.dp @@ -38,7 +39,8 @@ import org.schabi.newpipe.extractor.stream.Description import org.schabi.newpipe.paging.CommentRepliesSource import org.schabi.newpipe.ui.components.common.LazyColumnThemedScrollbar import org.schabi.newpipe.ui.components.common.LoadingIndicator -import org.schabi.newpipe.ui.components.common.NoItemsMessage +import org.schabi.newpipe.ui.emptystate.EmptyStateComposable +import org.schabi.newpipe.ui.emptystate.EmptyStateSpec import org.schabi.newpipe.ui.theme.AppTheme @Composable @@ -130,13 +132,17 @@ private fun CommentRepliesDialog( val refresh = comments.loadState.refresh if (refresh is LoadState.Loading) { LoadingIndicator(modifier = Modifier.padding(top = 8.dp)) + } else if (refresh is LoadState.Error) { + // TODO use error panel instead + EmptyStateComposable( + EmptyStateSpec.DisabledComments.copy( + descriptionText = { + stringResource(R.string.error_unable_to_load_comments) + } + ) + ) } else { - val message = if (refresh is LoadState.Error) { - R.string.error_unable_to_load_comments - } else { - R.string.no_comments - } - NoItemsMessage(message) + EmptyStateComposable(EmptyStateSpec.NoComments) } } } else { diff --git a/app/src/main/java/org/schabi/newpipe/ui/components/video/comment/CommentSection.kt b/app/src/main/java/org/schabi/newpipe/ui/components/video/comment/CommentSection.kt index 33c4e2139..d603c4a6f 100644 --- a/app/src/main/java/org/schabi/newpipe/ui/components/video/comment/CommentSection.kt +++ b/app/src/main/java/org/schabi/newpipe/ui/components/video/comment/CommentSection.kt @@ -13,6 +13,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.platform.rememberNestedScrollInteropConnection import androidx.compose.ui.res.pluralStringResource +import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle @@ -28,7 +29,8 @@ import org.schabi.newpipe.extractor.comments.CommentsInfoItem import org.schabi.newpipe.extractor.stream.Description import org.schabi.newpipe.ui.components.common.LazyColumnThemedScrollbar import org.schabi.newpipe.ui.components.common.LoadingIndicator -import org.schabi.newpipe.ui.components.common.NoItemsMessage +import org.schabi.newpipe.ui.emptystate.EmptyStateComposable +import org.schabi.newpipe.ui.emptystate.EmptyStateSpec import org.schabi.newpipe.ui.theme.AppTheme import org.schabi.newpipe.viewmodels.CommentsViewModel import org.schabi.newpipe.viewmodels.util.Resource @@ -66,11 +68,11 @@ private fun CommentSection( if (commentInfo.isCommentsDisabled) { item { - NoItemsMessage(R.string.comments_are_disabled) + EmptyStateComposable(EmptyStateSpec.DisabledComments) } } else if (count == 0) { item { - NoItemsMessage(R.string.no_comments) + EmptyStateComposable(EmptyStateSpec.NoComments) } } else { // do not show anything if the comment count is unknown @@ -95,7 +97,14 @@ private fun CommentSection( is LoadState.Error -> { item { - NoItemsMessage(R.string.error_unable_to_load_comments) + // TODO use error panel instead + EmptyStateComposable( + EmptyStateSpec.DisabledComments.copy( + descriptionText = { + stringResource(R.string.error_unable_to_load_comments) + } + ) + ) } } @@ -110,7 +119,14 @@ private fun CommentSection( is Resource.Error -> { item { - NoItemsMessage(R.string.error_unable_to_load_comments) + // TODO use error panel instead + EmptyStateComposable( + EmptyStateSpec.DisabledComments.copy( + descriptionText = { + stringResource(R.string.error_unable_to_load_comments) + } + ) + ) } } } 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 3e101d760..ab9bf6336 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 @@ -69,7 +69,7 @@ fun EmptyStateComposableGenericErrorPreview() { @Composable fun EmptyStateComposableNoCommentPreview() { AppTheme { - EmptyStateComposable(EmptyStateSpec.NoComment) + EmptyStateComposable(EmptyStateSpec.NoComments) } } @@ -91,15 +91,35 @@ data class EmptyStateSpec( descriptionText = { stringResource(id = R.string.empty_list_subtitle) }, ) - val NoComment = + val NoVideos = EmptyStateSpec( - modifier = { it.padding(top = 85.dp) }, + modifier = { + it + .fillMaxWidth() + .heightIn(min = 128.dp) + }, emojiText = { "(╯°-°)╯" }, + descriptionText = { stringResource(id = R.string.no_videos) }, + ) + + val NoComments = + EmptyStateSpec( + modifier = { + it + .fillMaxWidth() + .heightIn(min = 128.dp) + }, + emojiText = { "¯\\_(╹x╹)_/¯" }, descriptionText = { stringResource(id = R.string.no_comments) }, ) + val DisabledComments = + NoComments.copy( + descriptionText = { stringResource(id = R.string.comments_are_disabled) }, + ) + val NoSearchResult = - NoComment.copy( + NoComments.copy( modifier = { it }, emojiText = { "╰(°●°╰)" }, descriptionText = { stringResource(id = R.string.search_no_results) } @@ -111,7 +131,7 @@ data class EmptyStateSpec( ) val ContentNotSupported = - NoComment.copy( + NoComments.copy( modifier = { it.padding(top = 90.dp) }, emojiText = { "(︶︹︺)" }, descriptionText = { stringResource(id = R.string.content_not_supported) }, From cff3834fded2a6043cc5ab87159dda413b204ac1 Mon Sep 17 00:00:00 2001 From: Stypox Date: Thu, 21 Nov 2024 13:17:33 +0100 Subject: [PATCH 10/10] Fix setEmptyStateComposable dark theme --- .../schabi/newpipe/ui/emptystate/EmptyStateUtil.kt | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) 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 422fb69fc..2fced431f 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 @@ -2,6 +2,10 @@ package org.schabi.newpipe.ui.emptystate +import androidx.compose.material3.LocalContentColor +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.contentColorFor +import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.platform.ViewCompositionStrategy import org.schabi.newpipe.ui.theme.AppTheme @@ -14,9 +18,13 @@ fun ComposeView.setEmptyStateComposable( setViewCompositionStrategy(strategy) setContent { AppTheme { - EmptyStateComposable( - spec = spec - ) + CompositionLocalProvider( + LocalContentColor provides contentColorFor(MaterialTheme.colorScheme.background) + ) { + EmptyStateComposable( + spec = spec + ) + } } } }