Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

use system font scaling

Browse source
This commit is contained in:
sonora 2017-01-06 19:58:03 +01:00
parent 462226bffb
commit d9a25dabf8
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
OsmAnd/src/net/osmand/plus/views/POIMapLayer.java
View file

@ -4,7 +4,7 @@ import android.app.Dialog;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.res.Resources; import android.content.res.Resources;
//import android.content.res.Configuration; import android.content.res.Configuration;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
import android.graphics.Canvas; import android.graphics.Canvas;
@ -373,19 +373,16 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
settings.setDisplayZoomControls(false); settings.setDisplayZoomControls(false);
//Scale web view font size with system font size //Scale web view font size with system font size
float systemFontScaling = ctx.getResources().getDisplayMetrics().density;
//float systemFontScaling = ctx.getResources().getDisplayMetrics().density * android.content.res.Configuration.fontScale;
//float systemFontScaling = android.content.res.Configuration.fontScale;
if (android.os.Build.VERSION.SDK_INT >= 14) { if (android.os.Build.VERSION.SDK_INT >= 14) {
settings.setTextZoom((int) (systemFontScaling * 100f)); settings.setTextZoom((int) (getSystemFontScaling() * 100f));
} else { } else {
if (systemFontScaling <= 0.5f) { if (getSystemFontScaling() <= 0.5f) {
settings.setTextSize(WebSettings.TextSize.SMALLEST); settings.setTextSize(WebSettings.TextSize.SMALLEST);
} else if (systemFontScaling <= 0.75f) { } else if (getSystemFontScaling() <= 0.75f) {
settings.setTextSize(WebSettings.TextSize.SMALLER); settings.setTextSize(WebSettings.TextSize.SMALLER);
} else if (systemFontScaling <= 1.0f) { } else if (getSystemFontScaling() <= 1.0f) {
settings.setTextSize(WebSettings.TextSize.NORMAL); settings.setTextSize(WebSettings.TextSize.NORMAL);
} else if (systemFontScaling <= 1.5f) { } else if (getSystemFontScaling() <= 1.5f) {
settings.setTextSize(WebSettings.TextSize.LARGER); settings.setTextSize(WebSettings.TextSize.LARGER);
} else { } else {
settings.setTextSize(WebSettings.TextSize.LARGEST); settings.setTextSize(WebSettings.TextSize.LARGEST);
@ -424,6 +421,10 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
dialog.show(); dialog.show();
} }
private float getSystemFontScaling () {
return android.content.res.Configuration.fontScale;
}
private static void showText(final Context ctx, final OsmandApplication app, final String text, String title) { private static void showText(final Context ctx, final OsmandApplication app, final String text, String title) {
final Dialog dialog = new Dialog(ctx, final Dialog dialog = new Dialog(ctx,
app.getSettings().isLightContent() ? R.style.OsmandLightTheme : R.style.OsmandDarkTheme); app.getSettings().isLightContent() ? R.style.OsmandLightTheme : R.style.OsmandDarkTheme);