From 5cb0e7b76c4508d50757ec33bdd34124f2da83c1 Mon Sep 17 00:00:00 2001 From: Bnyro Date: Wed, 2 Apr 2025 15:36:30 +0200 Subject: [PATCH] chore: remove alternative videos layout option --- .../libretube/constants/PreferenceKeys.kt | 1 - .../libretube/ui/adapters/VideosAdapter.kt | 17 -------- .../libretube/ui/fragments/ChannelFragment.kt | 5 +-- .../ui/fragments/SubscriptionsFragment.kt | 4 +- .../libretube/ui/fragments/TrendsFragment.kt | 3 +- .../ui/preferences/AppearanceSettings.kt | 10 ----- app/src/main/res/xml/appearance_settings.xml | 41 +++++++++---------- 7 files changed, 25 insertions(+), 56 deletions(-) diff --git a/app/src/main/java/com/github/libretube/constants/PreferenceKeys.kt b/app/src/main/java/com/github/libretube/constants/PreferenceKeys.kt index dfd3251b7..7f12a0dcf 100644 --- a/app/src/main/java/com/github/libretube/constants/PreferenceKeys.kt +++ b/app/src/main/java/com/github/libretube/constants/PreferenceKeys.kt @@ -28,7 +28,6 @@ object PreferenceKeys { const val APP_ICON = "icon_change" const val LEGACY_SUBSCRIPTIONS = "legacy_subscriptions" const val LEGACY_SUBSCRIPTIONS_COLUMNS = "legacy_subscriptions_columns" - const val ALTERNATIVE_VIDEOS_LAYOUT = "alternative_videos_layout" const val NEW_VIDEOS_BADGE = "new_videos_badge" const val PLAYLISTS_ORDER = "playlists_order" const val PLAYLIST_SORT_ORDER = "playlist_sort_order" diff --git a/app/src/main/java/com/github/libretube/ui/adapters/VideosAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/VideosAdapter.kt index fc9b4a994..7280e1240 100644 --- a/app/src/main/java/com/github/libretube/ui/adapters/VideosAdapter.kt +++ b/app/src/main/java/com/github/libretube/ui/adapters/VideosAdapter.kt @@ -81,11 +81,6 @@ class VideosAdapter( VideoRowBinding.inflate(layoutInflater, parent, false) ) - PreferenceHelper.getBoolean( - PreferenceKeys.ALTERNATIVE_VIDEOS_LAYOUT, - false - ) -> VideosViewHolder(VideoRowBinding.inflate(layoutInflater, parent, false)) - else -> VideosViewHolder(TrendingRowBinding.inflate(layoutInflater, parent, false)) } } @@ -195,18 +190,6 @@ class VideosAdapter( RELATED_COLUMN } - fun getLayout(context: Context, gridItems: Int): LayoutManager { - return if (PreferenceHelper.getBoolean( - PreferenceKeys.ALTERNATIVE_VIDEOS_LAYOUT, - false - ) - ) { - GridLayoutManager(context, gridItems.ceilHalf()) - } else { - GridLayoutManager(context, gridItems) - } - } - private const val NORMAL_TYPE = 0 private const val CAUGHT_UP_TYPE = 1 diff --git a/app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt index 7660f7816..59ff76352 100644 --- a/app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt +++ b/app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt @@ -27,7 +27,6 @@ import com.github.libretube.helpers.ImageHelper import com.github.libretube.helpers.NavigationHelper import com.github.libretube.obj.ShareData import com.github.libretube.ui.adapters.VideosAdapter -import com.github.libretube.ui.base.DynamicLayoutManagerFragment import com.github.libretube.ui.dialogs.ShareDialog import com.github.libretube.ui.extensions.setupFragmentAnimation import com.github.libretube.ui.extensions.setupSubscriptionButton @@ -40,7 +39,7 @@ import kotlinx.coroutines.withContext import retrofit2.HttpException import java.io.IOException -class ChannelFragment : DynamicLayoutManagerFragment(R.layout.fragment_channel) { +class ChannelFragment : Fragment(R.layout.fragment_channel) { private var _binding: FragmentChannelBinding? = null private val binding get() = _binding!! private val args by navArgs() @@ -72,8 +71,6 @@ class ChannelFragment : DynamicLayoutManagerFragment(R.layout.fragment_channel) channelId = args.channelId } - override fun setLayoutManagers(gridItems: Int) {} - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { _binding = FragmentChannelBinding.bind(view) super.onViewCreated(view, savedInstanceState) diff --git a/app/src/main/java/com/github/libretube/ui/fragments/SubscriptionsFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/SubscriptionsFragment.kt index 4d7892c68..74ed2a416 100644 --- a/app/src/main/java/com/github/libretube/ui/fragments/SubscriptionsFragment.kt +++ b/app/src/main/java/com/github/libretube/ui/fragments/SubscriptionsFragment.kt @@ -87,7 +87,7 @@ class SubscriptionsFragment : DynamicLayoutManagerFragment(R.layout.fragment_sub private val channelsAdapter = SubscriptionChannelAdapter() override fun setLayoutManagers(gridItems: Int) { - _binding?.subFeed?.layoutManager = VideosAdapter.getLayout(requireContext(), gridItems) + _binding?.subFeed?.layoutManager = GridLayoutManager(context, gridItems) } @SuppressLint("SetTextI18n") @@ -109,7 +109,7 @@ class SubscriptionsFragment : DynamicLayoutManagerFragment(R.layout.fragment_sub context, PreferenceHelper.getString( PreferenceKeys.LEGACY_SUBSCRIPTIONS_COLUMNS, - "4" + "3" ).toInt() ) binding.subChannels.adapter = legacySubscriptionsAdapter diff --git a/app/src/main/java/com/github/libretube/ui/fragments/TrendsFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/TrendsFragment.kt index 441c02b19..4d38e0c12 100644 --- a/app/src/main/java/com/github/libretube/ui/fragments/TrendsFragment.kt +++ b/app/src/main/java/com/github/libretube/ui/fragments/TrendsFragment.kt @@ -6,6 +6,7 @@ import android.os.Bundle import android.view.View import androidx.core.view.isGone import androidx.fragment.app.activityViewModels +import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView import com.github.libretube.R import com.github.libretube.databinding.FragmentTrendsBinding @@ -23,7 +24,7 @@ class TrendsFragment : DynamicLayoutManagerFragment(R.layout.fragment_trends) { private val viewModel: TrendsViewModel by activityViewModels() override fun setLayoutManagers(gridItems: Int) { - _binding?.recview?.layoutManager = VideosAdapter.getLayout(requireContext(), gridItems) + _binding?.recview?.layoutManager = GridLayoutManager(context, gridItems) } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/github/libretube/ui/preferences/AppearanceSettings.kt b/app/src/main/java/com/github/libretube/ui/preferences/AppearanceSettings.kt index 6d89f07aa..7e3988f04 100644 --- a/app/src/main/java/com/github/libretube/ui/preferences/AppearanceSettings.kt +++ b/app/src/main/java/com/github/libretube/ui/preferences/AppearanceSettings.kt @@ -62,16 +62,6 @@ class AppearanceSettings : BasePreferenceFragment() { NavBarOptionsDialog().show(childFragmentManager, null) true } - - val legacySubscriptionView = - findPreference(PreferenceKeys.LEGACY_SUBSCRIPTIONS) - val legacySubscriptionColumns = - findPreference(PreferenceKeys.LEGACY_SUBSCRIPTIONS_COLUMNS) - legacySubscriptionColumns?.isVisible = legacySubscriptionView?.isChecked!! - legacySubscriptionView.setOnPreferenceChangeListener { _, newValue -> - legacySubscriptionColumns?.isVisible = newValue as Boolean - true - } } /** diff --git a/app/src/main/res/xml/appearance_settings.xml b/app/src/main/res/xml/appearance_settings.xml index 9edc93256..11c0ba651 100644 --- a/app/src/main/res/xml/appearance_settings.xml +++ b/app/src/main/res/xml/appearance_settings.xml @@ -64,27 +64,6 @@ android:title="@string/home_tab_content" app:defaultValue="@array/homeTabItemsValues" /> - - - - - - + + + + + + + + \ No newline at end of file