Merge pull request #8810 from Isira-Seneviratne/Math_floorDiv

Use Math.floorDiv().
TeamNewPipe · Dec 4, 2022 · 9c4d552 · 9c4d552
2 parents 77737a5 + feb03f7
commit 9c4d552
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
@@ -215,8 +215,7 @@ protected RecyclerView.LayoutManager getGridLayoutManager() {
  final Resources resources = activity.getResources();
  int width = resources.getDimensionPixelSize(R.dimen.video_item_grid_thumbnail_image_width);
  width += (24 * resources.getDisplayMetrics().density);
- final int spanCount = (int) Math.floor(resources.getDisplayMetrics().widthPixels
- / (double) width);
+ final int spanCount = Math.floorDiv(resources.getDisplayMetrics().widthPixels, width);
  final GridLayoutManager lm = new GridLayoutManager(activity, spanCount);
  lm.setSpanSizeLookup(infoListAdapter.getSpanSizeLookup(spanCount));
  return lm;

diff --git a/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java b/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java
@@ -104,8 +104,7 @@ protected RecyclerView.LayoutManager getGridLayoutManager() {
  final Resources resources = activity.getResources();
  int width = resources.getDimensionPixelSize(R.dimen.video_item_grid_thumbnail_image_width);
  width += (24 * resources.getDisplayMetrics().density);
- final int spanCount = (int) Math.floor(resources.getDisplayMetrics().widthPixels
- / (double) width);
+ final int spanCount = Math.floorDiv(resources.getDisplayMetrics().widthPixels, width);
  final GridLayoutManager lm = new GridLayoutManager(activity, spanCount);
  lm.setSpanSizeLookup(itemListAdapter.getSpanSizeLookup(spanCount));
  return lm;

diff --git a/app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java b/app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java
@@ -652,7 +652,7 @@ private byte[] encode(final long number, final boolean withLength) {
 
  final int offset = withLength ? 1 : 0;
  final byte[] buffer = new byte[offset + length];
- final long marker = (long) Math.floor((length - 1f) / 8f);
+ final long marker = Math.floorDiv(length - 1, 8);
 
  int shift = 0;
  for (int i = length - 1; i >= 0; i--, shift += 8) {

diff --git a/app/src/main/java/us/shandian/giga/util/Utility.java b/app/src/main/java/us/shandian/giga/util/Utility.java
@@ -236,10 +236,10 @@ private static String pad(int number) {
  return number < 10 ? ("0" + number) : String.valueOf(number);
  }
 
- public static String stringifySeconds(double seconds) {
- int h = (int) Math.floor(seconds / 3600);
- int m = (int) Math.floor((seconds - (h * 3600)) / 60);
- int s = (int) (seconds - (h * 3600) - (m * 60));
+ public static String stringifySeconds(final long seconds) {
+ final int h = (int) Math.floorDiv(seconds, 3600);
+ final int m = (int) Math.floorDiv(seconds - (h * 3600L), 60);
+ final int s = (int) (seconds - (h * 3600) - (m * 60));
 
  String str = "";