Skip to content

Commit 5cb0e7b

Browse files
BnyroBnyro
committed
chore: remove alternative videos layout option
1 parent bf07874 commit 5cb0e7b

7 files changed

Lines changed: 25 additions & 56 deletions

File tree

‎app/src/main/java/com/github/libretube/constants/PreferenceKeys.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ object PreferenceKeys {
2828
const val APP_ICON = "icon_change"
2929
const val LEGACY_SUBSCRIPTIONS = "legacy_subscriptions"
3030
const val LEGACY_SUBSCRIPTIONS_COLUMNS = "legacy_subscriptions_columns"
31-
const val ALTERNATIVE_VIDEOS_LAYOUT = "alternative_videos_layout"
3231
const val NEW_VIDEOS_BADGE = "new_videos_badge"
3332
const val PLAYLISTS_ORDER = "playlists_order"
3433
const val PLAYLIST_SORT_ORDER = "playlist_sort_order"

‎app/src/main/java/com/github/libretube/ui/adapters/VideosAdapter.kt‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,6 @@ class VideosAdapter(
8181
VideoRowBinding.inflate(layoutInflater, parent, false)
8282
)
8383

84-
PreferenceHelper.getBoolean(
85-
PreferenceKeys.ALTERNATIVE_VIDEOS_LAYOUT,
86-
false
87-
) -> VideosViewHolder(VideoRowBinding.inflate(layoutInflater, parent, false))
88-
8984
else -> VideosViewHolder(TrendingRowBinding.inflate(layoutInflater, parent, false))
9085
}
9186
}
@@ -195,18 +190,6 @@ class VideosAdapter(
195190
RELATED_COLUMN
196191
}
197192

198-
fun getLayout(context: Context, gridItems: Int): LayoutManager {
199-
return if (PreferenceHelper.getBoolean(
200-
PreferenceKeys.ALTERNATIVE_VIDEOS_LAYOUT,
201-
false
202-
)
203-
) {
204-
GridLayoutManager(context, gridItems.ceilHalf())
205-
} else {
206-
GridLayoutManager(context, gridItems)
207-
}
208-
}
209-
210193
private const val NORMAL_TYPE = 0
211194
private const val CAUGHT_UP_TYPE = 1
212195

‎app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import com.github.libretube.helpers.ImageHelper
2727
import com.github.libretube.helpers.NavigationHelper
2828
import com.github.libretube.obj.ShareData
2929
import com.github.libretube.ui.adapters.VideosAdapter
30-
import com.github.libretube.ui.base.DynamicLayoutManagerFragment
3130
import com.github.libretube.ui.dialogs.ShareDialog
3231
import com.github.libretube.ui.extensions.setupFragmentAnimation
3332
import com.github.libretube.ui.extensions.setupSubscriptionButton
@@ -40,7 +39,7 @@ import kotlinx.coroutines.withContext
4039
import retrofit2.HttpException
4140
import java.io.IOException
4241

43-
class ChannelFragment : DynamicLayoutManagerFragment(R.layout.fragment_channel) {
42+
class ChannelFragment : Fragment(R.layout.fragment_channel) {
4443
private var _binding: FragmentChannelBinding? = null
4544
private val binding get() = _binding!!
4645
private val args by navArgs<ChannelFragmentArgs>()
@@ -72,8 +71,6 @@ class ChannelFragment : DynamicLayoutManagerFragment(R.layout.fragment_channel)
7271
channelId = args.channelId
7372
}
7473

75-
override fun setLayoutManagers(gridItems: Int) {}
76-
7774
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
7875
_binding = FragmentChannelBinding.bind(view)
7976
super.onViewCreated(view, savedInstanceState)

‎app/src/main/java/com/github/libretube/ui/fragments/SubscriptionsFragment.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class SubscriptionsFragment : DynamicLayoutManagerFragment(R.layout.fragment_sub
8787
private val channelsAdapter = SubscriptionChannelAdapter()
8888

8989
override fun setLayoutManagers(gridItems: Int) {
90-
_binding?.subFeed?.layoutManager = VideosAdapter.getLayout(requireContext(), gridItems)
90+
_binding?.subFeed?.layoutManager = GridLayoutManager(context, gridItems)
9191
}
9292

9393
@SuppressLint("SetTextI18n")
@@ -109,7 +109,7 @@ class SubscriptionsFragment : DynamicLayoutManagerFragment(R.layout.fragment_sub
109109
context,
110110
PreferenceHelper.getString(
111111
PreferenceKeys.LEGACY_SUBSCRIPTIONS_COLUMNS,
112-
"4"
112+
"3"
113113
).toInt()
114114
)
115115
binding.subChannels.adapter = legacySubscriptionsAdapter

‎app/src/main/java/com/github/libretube/ui/fragments/TrendsFragment.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import android.os.Bundle
66
import android.view.View
77
import androidx.core.view.isGone
88
import androidx.fragment.app.activityViewModels
9+
import androidx.recyclerview.widget.GridLayoutManager
910
import androidx.recyclerview.widget.RecyclerView
1011
import com.github.libretube.R
1112
import com.github.libretube.databinding.FragmentTrendsBinding
@@ -23,7 +24,7 @@ class TrendsFragment : DynamicLayoutManagerFragment(R.layout.fragment_trends) {
2324
private val viewModel: TrendsViewModel by activityViewModels()
2425

2526
override fun setLayoutManagers(gridItems: Int) {
26-
_binding?.recview?.layoutManager = VideosAdapter.getLayout(requireContext(), gridItems)
27+
_binding?.recview?.layoutManager = GridLayoutManager(context, gridItems)
2728
}
2829

2930
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

‎app/src/main/java/com/github/libretube/ui/preferences/AppearanceSettings.kt‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,6 @@ class AppearanceSettings : BasePreferenceFragment() {
6262
NavBarOptionsDialog().show(childFragmentManager, null)
6363
true
6464
}
65-
66-
val legacySubscriptionView =
67-
findPreference<SwitchPreferenceCompat>(PreferenceKeys.LEGACY_SUBSCRIPTIONS)
68-
val legacySubscriptionColumns =
69-
findPreference<ListPreference>(PreferenceKeys.LEGACY_SUBSCRIPTIONS_COLUMNS)
70-
legacySubscriptionColumns?.isVisible = legacySubscriptionView?.isChecked!!
71-
legacySubscriptionView.setOnPreferenceChangeListener { _, newValue ->
72-
legacySubscriptionColumns?.isVisible = newValue as Boolean
73-
true
74-
}
7565
}
7666

7767
/**

‎app/src/main/res/xml/appearance_settings.xml‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -64,27 +64,6 @@
6464
android:title="@string/home_tab_content"
6565
app:defaultValue="@array/homeTabItemsValues" />
6666

67-
<SwitchPreferenceCompat
68-
app:defaultValue="false"
69-
app:icon="@drawable/ic_list"
70-
app:key="legacy_subscriptions"
71-
app:title="@string/legacy_subscriptions" />
72-
73-
<ListPreference
74-
android:entries="@array/grid"
75-
android:entryValues="@array/grid"
76-
app:defaultValue="3"
77-
app:icon="@drawable/ic_grid"
78-
app:isPreferenceVisible="false"
79-
app:key="legacy_subscriptions_columns"
80-
app:title="@string/grid" />
81-
82-
<SwitchPreferenceCompat
83-
android:icon="@drawable/ic_trending"
84-
app:defaultValue="false"
85-
app:key="alternative_videos_layout"
86-
app:title="@string/alternative_videos_layout" />
87-
8867
<ListPreference
8968
android:icon="@drawable/ic_grid"
9069
app:defaultValue="@integer/grid_items"
@@ -105,4 +84,24 @@
10584

10685
</PreferenceCategory>
10786

87+
<PreferenceCategory
88+
app:title="@string/legacy_subscriptions">
89+
90+
<SwitchPreferenceCompat
91+
app:defaultValue="false"
92+
app:icon="@drawable/ic_list"
93+
app:key="legacy_subscriptions"
94+
app:title="@string/legacy_subscriptions" />
95+
96+
<ListPreference
97+
android:entries="@array/grid"
98+
android:entryValues="@array/grid"
99+
app:defaultValue="3"
100+
app:icon="@drawable/ic_grid"
101+
app:dependency="legacy_subscriptions"
102+
app:key="legacy_subscriptions_columns"
103+
app:title="@string/grid" />
104+
105+
</PreferenceCategory>
106+
108107
</PreferenceScreen>

0 commit comments

Comments
 (0)