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

Fix orientation, halo and settings in the second ruler mode

Browse source
This commit is contained in:
Alexander Sytnyk 2017-06-08 11:11:30 +03:00
parent ea8ba0ea99
commit 59f5b5ed24
3 changed files with 28 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd/src/net/osmand/plus/OsmandSettings.java
View file

@ -703,7 +703,7 @@ public class OsmandSettings {
return p;
}
public final CommonPreference<Integer> RULER_MODE = new IntPreference("ruler_mode", 0).makeGlobal();
public final CommonPreference<RulerMode> RULER_MODE = new EnumIntPreference<>("ruler_mode", RulerMode.FIRST, RulerMode.values()).makeGlobal();
public final CommonPreference<Boolean> USE_FAST_RECALCULATION = new BooleanPreference("use_fast_recalculation", true).makeGlobal().cache();
public final CommonPreference<Boolean> FORCE_PRIVATE_ACCESS_ROUTING_ASKED = new BooleanPreference("force_private_access_routing", false).makeProfile().cache();
@ -3029,4 +3029,8 @@ public class OsmandSettings {
}
}
public enum RulerMode {
FIRST,
SECOND
}
}

36
OsmAnd/src/net/osmand/plus/views/RulerControlLayer.java
View file

@ -15,16 +15,17 @@ import net.osmand.data.QuadPoint;
import net.osmand.data.RotatedTileBox;
import net.osmand.plus.OsmAndFormatter;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings.RulerMode;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;
import static android.content.res.Configuration.ORIENTATION_PORTRAIT;
import net.osmand.plus.helpers.AndroidUiHelper;
public class RulerControlLayer extends OsmandMapLayer {
private static final int TEXT_SIZE = 14;
private final MapActivity mapActivity;
private OsmandApplication app;
private boolean portrait;
private int maxRadius;
private int radius;
private int cacheZoom;
@ -45,6 +46,7 @@ public class RulerControlLayer extends OsmandMapLayer {
@Override
public void initLayer(OsmandMapTileView view) {
app = mapActivity.getMyApplication();
portrait = AndroidUiHelper.isOrientationPortrait(mapActivity);
cacheDistances = new String[3];
maxRadius = mapActivity.getResources().getDimensionPixelSize(R.dimen.map_ruler_width);
@ -68,26 +70,29 @@ public class RulerControlLayer extends OsmandMapLayer {
shadowPaint = new Paint();
shadowPaint.setAntiAlias(true);
shadowPaint.setStyle(Style.STROKE);
shadowPaint.setStrokeWidth(6);
shadowPaint.setTextSize(TEXT_SIZE * mapActivity.getResources().getDisplayMetrics().density);
shadowPaint.setColor(Color.WHITE);
textPaint = new TextPaint();
textPaint.setAntiAlias(true);
textPaint.setTextSize(14 * mapActivity.getResources().getDisplayMetrics().density);
textPaint.setTextSize(TEXT_SIZE * mapActivity.getResources().getDisplayMetrics().density);
}
@Override
public void onDraw(Canvas canvas, RotatedTileBox tb, DrawSettings settings) {
if (mapActivity.getMapLayers().getMapWidgetRegistry().isVisible("ruler")) {
final QuadPoint center = tb.getCenterPixelPoint();
final int mode = app.getSettings().RULER_MODE.get();
final RulerMode mode = app.getSettings().RULER_MODE.get();
drawCenterIcon(canvas, tb, center);
if (mode == 0) {
if (mode == RulerMode.FIRST) {
Location currentLoc = app.getLocationProvider().getLastKnownLocation();
if (currentLoc != null) {
drawDistance(canvas, tb, center, currentLoc);
}
} else if (mode == 1) {
} else if (mode == RulerMode.SECOND) {
for (int i = 1; i < 4; i++) {
drawCircle(canvas, tb, i, center);
}
@ -115,27 +120,22 @@ public class RulerControlLayer extends OsmandMapLayer {
String text = cacheDistances[circleNumber - 1];
textPaint.getTextBounds(text, 0, text.length(), bounds);
float left = 0;
float right = 0;
float top = 0;
float bottom = 0;
float left;
float bottom;
if (mapActivity.getResources().getConfiguration().orientation == ORIENTATION_PORTRAIT) {
if (portrait) {
left = center.x - bounds.width() / 2;
right = center.x + bounds.width() / 1.8f;
top = center.y - radius * circleNumber - bounds.height() / 2;
bottom = center.y - radius * circleNumber + bounds.height() / 2;
} else if (mapActivity.getResources().getConfiguration().orientation == ORIENTATION_LANDSCAPE) {
} else {
left = center.x + radius * circleNumber - bounds.width() / 2;
right = center.x + radius * circleNumber + bounds.width() / 1.8f;
top = center.y - bounds.height() / 2;
bottom = center.y + bounds.height() / 2;
}
if (!mapActivity.getMapView().isZooming()) {
canvas.rotate(-tb.getRotate(), center.x, center.y);
canvas.drawCircle(center.x, center.y, radius * circleNumber, shadowPaint);
canvas.drawCircle(center.x, center.y, radius * circleNumber, circlePaint);
canvas.drawRect(left, top, right, bottom, shadowPaint);
canvas.drawText(text, left, bottom, shadowPaint);
canvas.drawText(text, left, bottom, textPaint);
canvas.rotate(tb.getRotate(), center.x, center.y);
}

8
OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
View file

@ -17,6 +17,7 @@ import net.osmand.plus.OsmAndLocationProvider;
import net.osmand.plus.OsmAndLocationProvider.GPSInfo;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.OsmandSettings.RulerMode;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.activities.actions.StartGPSStatus;
@ -114,7 +115,7 @@ public class MapInfoWidgetsFactory {
final TextInfoWidget rulerControl = new TextInfoWidget(map) {
@Override
public boolean updateInfo(DrawSettings drawSettings) {
if (map.getMyApplication().getSettings().RULER_MODE.get() == 0) {
if (map.getMyApplication().getSettings().RULER_MODE.get() == RulerMode.FIRST) {
Location currentLoc = map.getMyApplication().getLocationProvider().getLastKnownLocation();
LatLon centerLoc = map.getMapLocation();
if (currentLoc != null && centerLoc != null) {
@ -137,8 +138,9 @@ public class MapInfoWidgetsFactory {
@Override
public void onClick(View view) {
rulerControl.setText(title, null);
int mode = map.getMyApplication().getSettings().RULER_MODE.get();
map.getMyApplication().getSettings().RULER_MODE.set(mode == 0 ? 1 : 0);
final RulerMode mode = map.getMyApplication().getSettings().RULER_MODE.get();
map.getMyApplication().getSettings().RULER_MODE
.set(mode == RulerMode.FIRST ? RulerMode.SECOND : RulerMode.FIRST);
map.refreshMap();
}
});