Skip to content

Commit a7dd3af

Browse files
StypoxStypox
committed
Fix grid span count calculation; remove duplicate methods
1 parent b795c5f commit a7dd3af

5 files changed

Lines changed: 52 additions & 84 deletions

File tree

‎app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.schabi.newpipe.local;
22

33
import android.content.SharedPreferences;
4-
import android.content.res.Configuration;
54
import android.content.res.Resources;
65
import android.os.Bundle;
76
import android.util.Log;
@@ -26,6 +25,7 @@
2625

2726
import static org.schabi.newpipe.ktx.ViewUtils.animate;
2827
import static org.schabi.newpipe.ktx.ViewUtils.animateHideRecyclerViewAllowingScrolling;
28+
import static org.schabi.newpipe.util.ThemeHelper.shouldUseGridLayout;
2929

3030
/**
3131
* This fragment is design to be used with persistent data such as
@@ -77,7 +77,7 @@ public void onResume() {
7777
super.onResume();
7878
if (updateFlags != 0) {
7979
if ((updateFlags & LIST_MODE_UPDATE_FLAG) != 0) {
80-
final boolean useGrid = isGridLayout();
80+
final boolean useGrid = shouldUseGridLayout(requireContext());
8181
itemsList.setLayoutManager(
8282
useGrid ? getGridLayoutManager() : getListLayoutManager());
8383
itemListAdapter.setUseGridVariant(useGrid);
@@ -121,7 +121,7 @@ protected void initViews(final View rootView, final Bundle savedInstanceState) {
121121

122122
itemListAdapter = new LocalItemListAdapter(activity);
123123

124-
final boolean useGrid = isGridLayout();
124+
final boolean useGrid = shouldUseGridLayout(requireContext());
125125
itemsList = rootView.findViewById(R.id.items_list);
126126
itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());
127127

@@ -260,17 +260,4 @@ public void onSharedPreferenceChanged(final SharedPreferences sharedPreferences,
260260
updateFlags |= LIST_MODE_UPDATE_FLAG;
261261
}
262262
}
263-
264-
protected boolean isGridLayout() {
265-
final String listMode = PreferenceManager.getDefaultSharedPreferences(activity)
266-
.getString(getString(R.string.list_view_mode_key),
267-
getString(R.string.list_view_mode_value));
268-
if ("auto".equals(listMode)) {
269-
final Configuration configuration = getResources().getConfiguration();
270-
return configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
271-
&& configuration.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE);
272-
} else {
273-
return "grid".equals(listMode);
274-
}
275-
}
276263
}

‎app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt‎

Lines changed: 4 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import android.annotation.SuppressLint
2323
import android.app.Activity
2424
import android.content.Intent
2525
import android.content.SharedPreferences
26-
import android.content.res.Configuration
2726
import android.os.Bundle
2827
import android.os.Parcelable
2928
import android.view.LayoutInflater
@@ -74,10 +73,10 @@ import org.schabi.newpipe.player.helper.PlayerHolder
7473
import org.schabi.newpipe.util.Localization
7574
import org.schabi.newpipe.util.NavigationHelper
7675
import org.schabi.newpipe.util.StreamDialogEntry
76+
import org.schabi.newpipe.util.ThemeHelper.getGridSpanCount
77+
import org.schabi.newpipe.util.ThemeHelper.shouldUseGridLayout
7778
import java.time.OffsetDateTime
7879
import java.util.ArrayList
79-
import kotlin.math.floor
80-
import kotlin.math.max
8180

8281
class FeedFragment : BaseStateFragment<FeedState>() {
8382
private var _feedBinding: FragmentFeedBinding? = null
@@ -161,7 +160,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
161160

162161
fun setupListViewMode() {
163162
// does everything needed to setup the layouts for grid or list modes
164-
groupAdapter.spanCount = if (shouldUseGridLayout()) getGridSpanCount() else 1
163+
groupAdapter.spanCount = if (shouldUseGridLayout(context)) getGridSpanCount(context) else 1
165164
feedBinding.itemsList.layoutManager = GridLayoutManager(requireContext(), groupAdapter.spanCount).apply {
166165
spanSizeLookup = groupAdapter.spanSizeLookup
167166
}
@@ -384,7 +383,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
384383
@SuppressLint("StringFormatMatches")
385384
private fun handleLoadedState(loadedState: FeedState.LoadedState) {
386385

387-
val itemVersion = if (shouldUseGridLayout()) {
386+
val itemVersion = if (shouldUseGridLayout(context)) {
388387
StreamItem.ItemVersion.GRID
389388
} else {
390389
StreamItem.ItemVersion.NORMAL
@@ -528,35 +527,6 @@ class FeedFragment : BaseStateFragment<FeedState>() {
528527
listState = null
529528
}
530529

531-
// /////////////////////////////////////////////////////////////////////////
532-
// Grid Mode
533-
// /////////////////////////////////////////////////////////////////////////
534-
535-
// TODO: Move these out of this class, as it can be reused
536-
537-
private fun shouldUseGridLayout(): Boolean {
538-
val listMode = PreferenceManager.getDefaultSharedPreferences(requireContext())
539-
.getString(getString(R.string.list_view_mode_key), getString(R.string.list_view_mode_value))
540-
541-
return when (listMode) {
542-
getString(R.string.list_view_mode_auto_key) -> {
543-
val configuration = resources.configuration
544-
545-
(
546-
configuration.orientation == Configuration.ORIENTATION_LANDSCAPE &&
547-
configuration.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE)
548-
)
549-
}
550-
getString(R.string.list_view_mode_grid_key) -> true
551-
else -> false
552-
}
553-
}
554-
555-
private fun getGridSpanCount(): Int {
556-
val minWidth = resources.getDimensionPixelSize(R.dimen.video_item_grid_thumbnail_image_width)
557-
return max(1, floor(resources.displayMetrics.widthPixels / minWidth.toDouble()).toInt())
558-
}
559-
560530
companion object {
561531
const val KEY_GROUP_ID = "ARG_GROUP_ID"
562532
const val KEY_GROUP_NAME = "ARG_GROUP_NAME"

‎app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868

6969
import static org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty;
7070
import static org.schabi.newpipe.ktx.ViewUtils.animate;
71+
import static org.schabi.newpipe.util.ThemeHelper.shouldUseGridLayout;
7172

7273
public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistStreamEntry>, Void> {
7374
// Save the list 10 seconds after the last change occurred
@@ -678,7 +679,7 @@ private void saveImmediate() {
678679

679680
private ItemTouchHelper.SimpleCallback getItemTouchCallback() {
680681
int directions = ItemTouchHelper.UP | ItemTouchHelper.DOWN;
681-
if (isGridLayout()) {
682+
if (shouldUseGridLayout(requireContext())) {
682683
directions |= ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT;
683684
}
684685
return new ItemTouchHelper.SimpleCallback(directions,

‎app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt‎

Lines changed: 4 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import android.content.Context
66
import android.content.DialogInterface
77
import android.content.Intent
88
import android.content.IntentFilter
9-
import android.content.res.Configuration
109
import android.os.Bundle
1110
import android.os.Parcelable
1211
import android.view.LayoutInflater
@@ -20,7 +19,6 @@ import androidx.activity.result.contract.ActivityResultContracts.StartActivityFo
2019
import androidx.appcompat.app.AlertDialog
2120
import androidx.lifecycle.ViewModelProvider
2221
import androidx.localbroadcastmanager.content.LocalBroadcastManager
23-
import androidx.preference.PreferenceManager
2422
import androidx.recyclerview.widget.GridLayoutManager
2523
import com.xwray.groupie.Group
2624
import com.xwray.groupie.GroupAdapter
@@ -60,12 +58,12 @@ import org.schabi.newpipe.local.subscription.services.SubscriptionsImportService
6058
import org.schabi.newpipe.streams.io.StoredFileHelper
6159
import org.schabi.newpipe.util.NavigationHelper
6260
import org.schabi.newpipe.util.OnClickGesture
61+
import org.schabi.newpipe.util.ThemeHelper.getGridSpanCount
62+
import org.schabi.newpipe.util.ThemeHelper.shouldUseGridLayout
6363
import org.schabi.newpipe.util.external_communication.ShareUtils
6464
import java.text.SimpleDateFormat
6565
import java.util.Date
6666
import java.util.Locale
67-
import kotlin.math.floor
68-
import kotlin.math.max
6967

7068
class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
7169
private var _binding: FragmentSubscriptionBinding? = null
@@ -279,8 +277,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
279277
super.initViews(rootView, savedInstanceState)
280278
_binding = FragmentSubscriptionBinding.bind(rootView)
281279

282-
val shouldUseGridLayout = shouldUseGridLayout()
283-
groupAdapter.spanCount = if (shouldUseGridLayout) getGridSpanCount() else 1
280+
groupAdapter.spanCount = if (shouldUseGridLayout(context)) getGridSpanCount(context) else 1
284281
binding.itemsList.layoutManager = GridLayoutManager(requireContext(), groupAdapter.spanCount).apply {
285282
spanSizeLookup = groupAdapter.spanSizeLookup
286283
}
@@ -359,7 +356,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
359356
override fun handleResult(result: SubscriptionState) {
360357
super.handleResult(result)
361358

362-
val shouldUseGridLayout = shouldUseGridLayout()
359+
val shouldUseGridLayout = shouldUseGridLayout(context)
363360
when (result) {
364361
is SubscriptionState.LoadedState -> {
365362
result.subscriptions.forEach {
@@ -420,30 +417,4 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
420417
super.hideLoading()
421418
binding.itemsList.animate(true, 200)
422419
}
423-
424-
// /////////////////////////////////////////////////////////////////////////
425-
// Grid Mode
426-
// /////////////////////////////////////////////////////////////////////////
427-
428-
// TODO: Move these out of this class, as it can be reused
429-
430-
private fun shouldUseGridLayout(): Boolean {
431-
val listMode = PreferenceManager.getDefaultSharedPreferences(requireContext())
432-
.getString(getString(R.string.list_view_mode_key), getString(R.string.list_view_mode_value))
433-
434-
return when (listMode) {
435-
getString(R.string.list_view_mode_auto_key) -> {
436-
val configuration = resources.configuration
437-
configuration.orientation == Configuration.ORIENTATION_LANDSCAPE &&
438-
configuration.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE)
439-
}
440-
getString(R.string.list_view_mode_grid_key) -> true
441-
else -> false
442-
}
443-
}
444-
445-
private fun getGridSpanCount(): Int {
446-
val minWidth = resources.getDimensionPixelSize(R.dimen.channel_item_grid_min_width)
447-
return max(1, floor(resources.displayMetrics.widthPixels / minWidth.toDouble()).toInt())
448-
}
449420
}

‎app/src/main/java/org/schabi/newpipe/util/ThemeHelper.java‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,4 +298,43 @@ public static void setDayNightMode(final Context context, final String selectedT
298298
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
299299
}
300300
}
301+
302+
303+
/**
304+
* Returns whether the grid layout or the list layout should be used. If the user set "auto"
305+
* mode in settings, decides based on screen orientation (landscape) and size.
306+
*
307+
* @param context the context to use
308+
* @return true:use grid layout, false:use list layout
309+
*/
310+
public static boolean shouldUseGridLayout(final Context context) {
311+
final String listMode = PreferenceManager.getDefaultSharedPreferences(context)
312+
.getString(context.getString(R.string.list_view_mode_key),
313+
context.getString(R.string.list_view_mode_value));
314+
315+
if (listMode.equals(context.getString(R.string.list_view_mode_list_key))) {
316+
return false;
317+
} else if (listMode.equals(context.getString(R.string.list_view_mode_grid_key))) {
318+
return true;
319+
} else {
320+
final Configuration configuration = context.getResources().getConfiguration();
321+
return configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
322+
&& configuration.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE);
323+
}
324+
}
325+
326+
/**
327+
* Calculates the number of grid items that can fit horizontally on the screen. The width of a
328+
* grid item is obtained from the thumbnail width plus the right and left paddings.
329+
*
330+
* @param context the context to use
331+
* @return the span count of grid list items
332+
*/
333+
public static int getGridSpanCount(final Context context) {
334+
final Resources res = context.getResources();
335+
final int minWidth
336+
= res.getDimensionPixelSize(R.dimen.video_item_grid_thumbnail_image_width)
337+
+ res.getDimensionPixelSize(R.dimen.video_item_search_padding) * 2;
338+
return Math.max(1, res.getDisplayMetrics().widthPixels / minWidth);
339+
}
301340
}

0 commit comments

Comments
 (0)