diff --git a/OsmAnd/res/layout-land/fragment_direction_indication_dialog.xml b/OsmAnd/res/layout-land/fragment_direction_indication_dialog.xml
index c31d3c99ff..f5424bf6a1 100644
--- a/OsmAnd/res/layout-land/fragment_direction_indication_dialog.xml
+++ b/OsmAnd/res/layout-land/fragment_direction_indication_dialog.xml
@@ -33,7 +33,7 @@
android:ellipsize="end"
android:gravity="center_vertical"
android:maxLines="1"
- android:text="@string/shared_string_settings"
+ android:text="@string/appearance_on_the_map"
android:textColor="@color/color_white"
android:textSize="@dimen/dialog_header_text_size"
osmand:typeface="@string/font_roboto_medium"/>
diff --git a/OsmAnd/res/layout/fragment_direction_indication_dialog.xml b/OsmAnd/res/layout/fragment_direction_indication_dialog.xml
index d8f301029f..cd7759273e 100644
--- a/OsmAnd/res/layout/fragment_direction_indication_dialog.xml
+++ b/OsmAnd/res/layout/fragment_direction_indication_dialog.xml
@@ -29,7 +29,7 @@
android:ellipsize="end"
android:gravity="center_vertical"
android:maxLines="1"
- android:text="@string/shared_string_settings"
+ android:text="@string/appearance_on_the_map"
android:textColor="@color/color_white"
android:textSize="@dimen/dialog_header_text_size"
osmand:typeface="@string/font_roboto_medium"/>
diff --git a/OsmAnd/res/layout/fragment_marker_options_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_marker_options_bottom_sheet_dialog.xml
index a2341f32ed..ab860d3077 100644
--- a/OsmAnd/res/layout/fragment_marker_options_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_marker_options_bottom_sheet_dialog.xml
@@ -87,7 +87,7 @@
android:layout_weight="1"
android:ellipsize="end"
android:maxLines="1"
- android:text="@string/show_direction"
+ android:text="@string/appearance_on_the_map"
android:textAppearance="@style/TextAppearance.ListItemTitle"/>
diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml
index b9e838e9d0..c95e62c66f 100644
--- a/OsmAnd/res/values/colors.xml
+++ b/OsmAnd/res/values/colors.xml
@@ -132,7 +132,7 @@
#e58200
#2f3a40
- #33000000
+ #66000000
#99000000
#CC000000
#11ab51
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 2d4fa740ac..1d152d6a89 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -9,6 +9,7 @@
3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy
-->
+ Appearance on the map
Select track waypoints of which OsmAnd will add to markers
Select which favourite group you want to add to markers
Track waypoints
diff --git a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
index 0f0c1523ff..3dd0cdb6ec 100644
--- a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
@@ -8,6 +8,7 @@ import android.graphics.PorterDuff;
import android.graphics.Typeface;
import android.graphics.drawable.Drawable;
import android.os.AsyncTask;
+import android.os.Build;
import android.os.Bundle;
import android.support.v4.content.ContextCompat;
import android.support.v4.content.FileProvider;
@@ -535,7 +536,9 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
}
private void importFavourites() {
- ((FavoritesActivity) getActivity()).importFavourites();
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+ ((FavoritesActivity) getActivity()).importFavourites();
+ }
}
public void shareFavorites(final FavoriteGroup group) {
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index 630b53d7b4..5634ce622f 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -832,12 +832,13 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
getWindow().setStatusBarColor(ContextCompat.getColor(this, colorId));
return;
}
+ boolean mapControlsVisible = findViewById(R.id.MapHudButtonsOverlay).getVisibility() == View.VISIBLE;
boolean night = app.getDaynightHelper().isNightModeForMapControls();
boolean mapTopBar = findViewById(R.id.map_top_bar).getVisibility() == View.VISIBLE;
boolean markerTopBar = findViewById(R.id.map_markers_top_bar).getVisibility() == View.VISIBLE;
- if (mapTopBar) {
+ if (mapTopBar && mapControlsVisible) {
colorId = night ? R.color.status_bar_route_dark : R.color.status_bar_route_light;
- } else if (markerTopBar) {
+ } else if (markerTopBar && mapControlsVisible) {
colorId = R.color.status_bar_dark;
} else {
colorId = night ? R.color.status_bar_transparent_dark : R.color.status_bar_transparent_light;
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/TrackDetailsMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/TrackDetailsMenuFragment.java
index c2c3850d8b..fd7743bff8 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/TrackDetailsMenuFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/TrackDetailsMenuFragment.java
@@ -35,6 +35,9 @@ public class TrackDetailsMenuFragment extends BaseOsmAndFragment {
menu = mapActivity.getMapLayers().getMapControlsLayer().getTrackDetailsMenu();
View view = inflater.inflate(R.layout.track_details, container, false);
+ if (!AndroidUiHelper.isOrientationPortrait(getActivity())) {
+ AndroidUtils.addStatusBarPadding21v(getActivity(), view);
+ }
if (menu == null || menu.getGpxItem() == null) {
return view;
}
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java
index 449577d25b..977fbe466c 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java
@@ -265,9 +265,16 @@ public class CoordinateInputDialogFragment extends DialogFragment implements Osm
});
View keyboardLayout = mainView.findViewById(R.id.keyboard_layout);
+ int lightResId;
+ int darkResId;
if (orientationPortrait) {
- AndroidUtils.setBackground(mapActivity, keyboardLayout, !lightTheme, R.drawable.bg_bottom_menu_light, R.drawable.bg_bottom_menu_dark);
+ lightResId = R.drawable.bg_bottom_menu_light;
+ darkResId = R.drawable.bg_bottom_menu_dark;
+ } else {
+ lightResId = rightHand ? R.drawable.bg_contextmenu_shadow_left_light : R.drawable.bg_contextmenu_shadow_right_light;
+ darkResId = lightResId;
}
+ AndroidUtils.setBackground(mapActivity, keyboardLayout, !lightTheme, lightResId, darkResId);
Object[] keyboardItems = new Object[] { "1", "2", "3", R.drawable.ic_keyboard_next_field,
"4", "5", "6", "-",
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/DirectionIndicationDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/DirectionIndicationDialogFragment.java
index 5346b74308..c46d56625b 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/DirectionIndicationDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/DirectionIndicationDialogFragment.java
@@ -218,15 +218,15 @@ public class DirectionIndicationDialogFragment extends BaseOsmAndDialogFragment
LinkedList imgList = new LinkedList<>();
imgList.add(getDeviceImg());
if (settings.SHOW_LINES_TO_FIRST_MARKERS.get()) {
- imgList.add(getGuideLineTwoImg());
+ imgList.add(getGuideLineOneImg());
if (count == 2) {
- imgList.add(getGuideLineOneImg());
+ imgList.add(getGuideLineTwoImg());
}
}
if (settings.SHOW_ARROWS_TO_FIRST_MARKERS.get()) {
- imgList.add(getArrowTwoImg());
+ imgList.add(getArrowOneImg());
if (count == 2) {
- imgList.add(getArrowOneImg());
+ imgList.add(getArrowTwoImg());
}
}
if (settings.MARKERS_DISTANCE_INDICATION_ENABLED.get()) {
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
index d487fe6961..f2f09c3519 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
@@ -529,7 +529,9 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
}
private void addTrack() {
- ((FavoritesActivity) getActivity()).addTrack();
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+ ((FavoritesActivity) getActivity()).addTrack();
+ }
}
public void showProgressBar() {
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/FavoritesActivity.java b/OsmAnd/src/net/osmand/plus/myplaces/FavoritesActivity.java
index f58fb91504..7dbafa94be 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/FavoritesActivity.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/FavoritesActivity.java
@@ -10,6 +10,7 @@ import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
+import android.support.annotation.RequiresApi;
import android.support.v4.app.Fragment;
import android.support.v4.view.ViewPager;
import android.support.v7.widget.SearchView;
@@ -83,14 +84,14 @@ public class FavoritesActivity extends TabActivity {
}
}
- @TargetApi(Build.VERSION_CODES.KITKAT)
+ @RequiresApi(Build.VERSION_CODES.KITKAT)
public void addTrack() {
Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
intent.setType("*/*");
startActivityForResult(intent, OPEN_GPX_DOCUMENT_REQUEST);
}
- @TargetApi(Build.VERSION_CODES.KITKAT)
+ @RequiresApi(Build.VERSION_CODES.KITKAT)
public void importFavourites() {
Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
intent.setType("*/*");
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
index c2c640eefd..f3be9c14bf 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
@@ -587,7 +587,9 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
private void enterMapMarkersMode() {
if (getSettings().USE_MAP_MARKERS.get()) {
- addMapMarkersSyncGroup();
+ if (getGpxDataItem() != null) {
+ addMapMarkersSyncGroup();
+ }
} else {
actionMode = getActionBarActivity().startSupportActionMode(new ActionMode.Callback() {
diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
index e6e75926a6..cbc21d5c21 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
@@ -689,6 +689,7 @@ public class MapControlsLayer extends OsmandMapLayer {
} else {
showMapControls();
}
+ mapActivity.updateStatusBarColor();
}
public void startNavigation() {