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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2017-11-10 17:47:30 +01:00
commit 69835fdd94
14 changed files with 37 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/layout-land/fragment_direction_indication_dialog.xml
View file

@ -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"/>

2
OsmAnd/res/layout/fragment_direction_indication_dialog.xml
View file

@ -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"/>

2
OsmAnd/res/layout/fragment_marker_options_bottom_sheet_dialog.xml
View file

@ -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"/>
</LinearLayout>

2
OsmAnd/res/values/colors.xml
View file

@ -132,7 +132,7 @@
<color name="status_bar_light">#e58200</color>
<color name="status_bar_dark">#2f3a40</color>
<color name="status_bar_transparent_light">#33000000</color>
<color name="status_bar_transparent_light">#66000000</color>
<color name="status_bar_transparent_dark">#99000000</color>
<color name="status_bar_transparent_gradient">#CC000000</color>
<color name="status_bar_mapillary">#11ab51</color>

1
OsmAnd/res/values/strings.xml
View file

@ -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
-->
<string name="appearance_on_the_map">Appearance on the map</string>
<string name="add_track_to_markers_descr">Select track waypoints of which OsmAnd will add to markers</string>
<string name="add_favourites_group_to_markers_descr">Select which favourite group you want to add to markers</string>
<string name="track_waypoints">Track waypoints</string>

5
OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
View file

@ -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) {

5
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -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;

3
OsmAnd/src/net/osmand/plus/mapcontextmenu/other/TrackDetailsMenuFragment.java
View file

@ -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;
}

9
OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java
View file

@ -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", "-",

8
OsmAnd/src/net/osmand/plus/mapmarkers/DirectionIndicationDialogFragment.java
View file

@ -218,15 +218,15 @@ public class DirectionIndicationDialogFragment extends BaseOsmAndDialogFragment
LinkedList<Drawable> 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()) {

4
OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
View file

@ -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() {

5
OsmAnd/src/net/osmand/plus/myplaces/FavoritesActivity.java
View file

@ -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("*/*");

4
OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
View file

@ -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() {

1
OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
View file

@ -689,6 +689,7 @@ public class MapControlsLayer extends OsmandMapLayer {
} else {
showMapControls();
}
mapActivity.updateStatusBarColor();
}
public void startNavigation() {