be-gay-do-crimes
/
NewPipe
mirror of https://github.com/TeamNewPipe/NewPipe
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3154 from B0pol/round 

Round at one place for Localization.shortCount()
This commit is contained in:
Tobias Groza 2020-02-29 00:08:20 +01:00 committed by GitHub
parent ab4e1819c1 22aa6d16a2
commit b1eaf5616a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/org/schabi/newpipe/util/Localization.java
View File

@ -18,6 +18,8 @@ import org.ocpsoft.prettytime.units.Decade;
import org.schabi.newpipe.R; import org.schabi.newpipe.R;
import org.schabi.newpipe.extractor.localization.ContentCountry; import org.schabi.newpipe.extractor.localization.ContentCountry;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.NumberFormat; import java.text.NumberFormat;
import java.util.Arrays; import java.util.Arrays;
@ -26,6 +28,7 @@ import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
/* /*
* Created by chschtsch on 12/29/15. * Created by chschtsch on 12/29/15.
* *
@ -110,7 +113,7 @@ public class Localization {
if (languageCode.length() == 2) { if (languageCode.length() == 2) {
return new Locale(languageCode); return new Locale(languageCode);
} else if (languageCode.contains("_")) { } else if (languageCode.contains("_")) {
String country = languageCode.substring(languageCode.indexOf("_"), languageCode.length()); String country = languageCode.substring(languageCode.indexOf("_"));
return new Locale(languageCode.substring(0, 2), country); return new Locale(languageCode.substring(0, 2), country);
} }
} catch (Exception ignored) { } catch (Exception ignored) {
@ -120,6 +123,10 @@ public class Localization {
} }
public static String localizeNumber(Context context, long number) { public static String localizeNumber(Context context, long number) {
return localizeNumber(context, (double) number);
}
public static String localizeNumber(Context context, double number) {
NumberFormat nf = NumberFormat.getInstance(getAppLocale(context)); NumberFormat nf = NumberFormat.getInstance(getAppLocale(context));
return nf.format(number); return nf.format(number);
} }
@ -146,14 +153,15 @@ public class Localization {
} }
public static String shortCount(Context context, long count) { public static String shortCount(Context context, long count) {
double value = (double) count;
if (count >= 1000000000) { if (count >= 1000000000) {
return Long.toString(count / 1000000000) + context.getString(R.string.short_billion); return localizeNumber(context, round(value / 1000000000, 1)) + context.getString(R.string.short_billion);
} else if (count >= 1000000) { } else if (count >= 1000000) {
return Long.toString(count / 1000000) + context.getString(R.string.short_million); return localizeNumber(context, round(value / 1000000, 1)) + context.getString(R.string.short_million);
} else if (count >= 1000) { } else if (count >= 1000) {
return Long.toString(count / 1000) + context.getString(R.string.short_thousand); return localizeNumber(context, round(value / 1000, 1)) + context.getString(R.string.short_thousand);
} else { } else {
return Long.toString(count); return localizeNumber(context, value);
} }
} }
@ -254,4 +262,8 @@ public class Localization {
public static void assureCorrectAppLanguage(Context c) { public static void assureCorrectAppLanguage(Context c) {
changeAppLanguage(getAppLocale(c), c.getResources()); changeAppLanguage(getAppLocale(c), c.getResources());
} }
private static double round(double value, int places) {
return new BigDecimal(value).setScale(places, RoundingMode.HALF_UP).doubleValue();
}
} }