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

Merge branch 'r3.3'

Browse source
This commit is contained in:
crimean 2019-03-28 09:52:37 +03:00
commit d0bc750891
4 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd/res/layout/plan_route_info.xml
View file

@ -18,6 +18,7 @@
android:id="@+id/route_menu_top_shadow_all"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/card_and_list_background_basic"
android:orientation="vertical">
<FrameLayout
@ -29,7 +30,7 @@
android:id="@+id/modes_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/route_info_bg"
android:background="?attr/card_and_list_background_basic"
tools:ignore="UselessParent">
<LinearLayout

5
OsmAnd/src/net/osmand/plus/base/ContextMenuFragment.java
View file

@ -225,6 +225,7 @@ public abstract class ContextMenuFragment extends BaseOsmAndFragment {
MapActivity mapActivity = requireMapActivity();
OsmandApplication app = mapActivity.getMyApplication();
nightMode = app.getDaynightHelper().isNightModeForMapControls();
preferredMapLang = app.getSettings().MAP_PREFERRED_LOCALE.get();
transliterateNames = app.getSettings().MAP_TRANSLITERATE_NAMES.get();
@ -248,8 +249,6 @@ public abstract class ContextMenuFragment extends BaseOsmAndFragment {
topToolbarPosY = getMenuStatePosY(MenuState.FULL_SCREEN);
bottomToolbarPosY = topToolbarPosY + getToolbarHeight();
nightMode = app.getDaynightHelper().isNightModeForMapControls();
mainView = view.findViewById(getMainViewId());
topShadow = view.findViewById(getTopShadowViewId());
cardsContainer = (LinearLayout) view.findViewById(getCardsContainerViewId());
@ -259,7 +258,7 @@ public abstract class ContextMenuFragment extends BaseOsmAndFragment {
bottomScrollView.setScrollingEnabled(false);
if (getTopViewId() != 0) {
View topView = view.findViewById(getTopViewId());
AndroidUtils.setBackground(app, topView, nightMode, R.color.route_info_bg_light, R.color.route_info_bg_dark);
AndroidUtils.setBackground(app, topView, nightMode, R.color.card_and_list_background_light, R.color.card_and_list_background_dark);
}
if (!portrait) {
currentMenuState = MenuState.FULL_SCREEN;

1
OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java
View file

@ -1856,6 +1856,7 @@ public class MapRouteInfoMenu implements IRouteInformationListener, CardListener
if (mapActivity.getPointToNavigate() == null && !selectFromMapTouch) {
mapActivity.getMapActions().stopNavigationWithoutConfirm();
}
mapActivity.updateStatusBarColor();
}
if (onDismissListener != null) {
onDismissListener.onDismiss(null);

8
OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenuFragment.java
View file

@ -452,15 +452,7 @@ public class MapRouteInfoMenuFragment extends ContextMenuFragment {
return;
}
boolean portraitMode = AndroidUiHelper.isOrientationPortrait(ctx);
boolean landscapeLayout = !portraitMode;
boolean nightMode = isNightMode();
if (!landscapeLayout) {
View menuView = view.findViewById(R.id.route_menu_top_shadow_all);
AndroidUtils.setBackground(ctx, menuView, nightMode, R.color.card_and_list_background_light, R.color.card_and_list_background_dark);
} else {
AndroidUtils.setBackground(ctx, mainView, nightMode, R.drawable.route_info_menu_bg_left_light, R.drawable.route_info_menu_bg_left_dark);
}
AndroidUtils.setBackground(ctx, view.findViewById(R.id.modes_layout_toolbar_container), nightMode,
R.color.card_and_list_background_light, R.color.card_and_list_background_dark);
AndroidUtils.setBackground(ctx, mainView.findViewById(R.id.dividerFromDropDown), nightMode,