kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-27 07:20:30 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #7276 from Bnyro/master

Browse Source 
chore: remove alternative videos layout option
This commit is contained in:
Bnyro 2025-04-02 15:38:59 +02:00 committed by GitHub
commit 83552325f8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 25 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/github/libretube/constants/PreferenceKeys.kt
View File

@ -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"

17
app/src/main/java/com/github/libretube/ui/adapters/VideosAdapter.kt
View File

@ -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

5
app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt
View File

@ -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<ChannelFragmentArgs>()
@ -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)

4
app/src/main/java/com/github/libretube/ui/fragments/SubscriptionsFragment.kt
View File

@ -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

3
app/src/main/java/com/github/libretube/ui/fragments/TrendsFragment.kt
View File

@ -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?) {

10
app/src/main/java/com/github/libretube/ui/preferences/AppearanceSettings.kt
View File

@ -62,16 +62,6 @@ class AppearanceSettings : BasePreferenceFragment() {
NavBarOptionsDialog().show(childFragmentManager, null)
true
}
val legacySubscriptionView =
findPreference<SwitchPreferenceCompat>(PreferenceKeys.LEGACY_SUBSCRIPTIONS)
val legacySubscriptionColumns =
findPreference<ListPreference>(PreferenceKeys.LEGACY_SUBSCRIPTIONS_COLUMNS)
legacySubscriptionColumns?.isVisible = legacySubscriptionView?.isChecked!!
legacySubscriptionView.setOnPreferenceChangeListener { _, newValue ->
legacySubscriptionColumns?.isVisible = newValue as Boolean
true
}
}
/**

41
app/src/main/res/xml/appearance_settings.xml
View File

@ -64,27 +64,6 @@
android:title="@string/home_tab_content"
app:defaultValue="@array/homeTabItemsValues" />
<SwitchPreferenceCompat
app:defaultValue="false"
app:icon="@drawable/ic_list"
app:key="legacy_subscriptions"
app:title="@string/legacy_subscriptions" />
<ListPreference
android:entries="@array/grid"
android:entryValues="@array/grid"
app:defaultValue="3"
app:icon="@drawable/ic_grid"
app:isPreferenceVisible="false"
app:key="legacy_subscriptions_columns"
app:title="@string/grid" />
<SwitchPreferenceCompat
android:icon="@drawable/ic_trending"
app:defaultValue="false"
app:key="alternative_videos_layout"
app:title="@string/alternative_videos_layout" />
<ListPreference
android:icon="@drawable/ic_grid"
app:defaultValue="@integer/grid_items"
@ -105,4 +84,24 @@
</PreferenceCategory>
<PreferenceCategory
app:title="@string/legacy_subscriptions">
<SwitchPreferenceCompat
app:defaultValue="false"
app:icon="@drawable/ic_list"
app:key="legacy_subscriptions"
app:title="@string/legacy_subscriptions" />
<ListPreference
android:entries="@array/grid"
android:entryValues="@array/grid"
app:defaultValue="3"
app:icon="@drawable/ic_grid"
app:dependency="legacy_subscriptions"
app:key="legacy_subscriptions_columns"
app:title="@string/grid" />
</PreferenceCategory>
</PreferenceScreen>