Improve scale display

Author: Isira-Seneviratne

app/src/main/java/org/schabi/newpipe/util/Localization.java

@@ -191,14 +191,20 @@ public static String shortCount(@NonNull final Context context, final long count
 
         final double value = (double) count;
         if (count >= 1000000000) {
+            final double shortenedValue = value / 1000000000;
+            final int scale = shortenedValue >= 100 ? 0 : 1;
             return context.getString(R.string.short_billion,
-                    localizeNumber(round(value / 1000000000)));
+                    localizeNumber(round(shortenedValue, scale)));
         } else if (count >= 1000000) {
+            final double shortenedValue = value / 1000000;
+            final int scale = shortenedValue >= 100 ? 0 : 1;
             return context.getString(R.string.short_million,
-                    localizeNumber(round(value / 1000000)));
+                    localizeNumber(round(shortenedValue, scale)));
         } else if (count >= 1000) {
+            final double shortenedValue = value / 1000;
+            final int scale = shortenedValue >= 100 ? 0 : 1;
             return context.getString(R.string.short_thousand,
-                    localizeNumber(round(value / 1000, 0)));
+                    localizeNumber(round(shortenedValue, scale)));
         } else {
             return localizeNumber(value);
         }
@@ -416,10 +422,6 @@ private static Locale getLocaleFromPrefs(@NonNull final Context context,
         }
     }
 
-    private static double round(final double value) {
-        return round(value, 1);
-    }
-
     private static double round(final double value, final int scale) {
         return new BigDecimal(value).setScale(scale, RoundingMode.HALF_UP).doubleValue();
     }