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

Fix button padding and night mode colors in route preparation

Browse source
This commit is contained in:
Chumva 2019-06-20 18:49:25 +03:00
parent 28b3589bbc
commit 43040ddbb8
3 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/res/layout/route_option_btn.xml
View file

@ -36,9 +36,9 @@
android:letterSpacing="@dimen/text_button_letter_spacing"
android:maxLines="1"
android:paddingBottom="3dp"
android:paddingEnd="4dp"
android:paddingEnd="16dp"
android:paddingLeft="3dp"
android:paddingRight="4dp"
android:paddingRight="16dp"
android:paddingStart="3dp"
android:paddingTop="3dp"
android:text="@string/routing_attr_avoid_motorway_name"

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

@ -442,24 +442,15 @@ public class MapRouteInfoMenuFragment extends ContextMenuFragment {
R.drawable.route_info_trans_gradient_light, R.drawable.route_info_trans_gradient_dark);
AndroidUtils.setBackground(ctx, view.findViewById(R.id.app_modes_fold_container), isNightMode(),
R.drawable.route_info_trans_gradient_left_light, R.drawable.route_info_trans_gradient_left_dark);
AndroidUtils.setBackground(ctx, getBottomScrollView(), isNightMode(),
R.color.activity_background_light, R.color.activity_background_dark);
AndroidUtils.setBackground(ctx, getCardsContainer(), isNightMode(),
R.color.activity_background_light, R.color.activity_background_dark);
if (getTopViewId() != 0) {
View topView = view.findViewById(getTopViewId());
AndroidUtils.setBackground(ctx, topView, isNightMode(), R.color.card_and_list_background_light, R.color.card_and_list_background_dark);
}
if (!isPortrait() && isSingleFragment()) {
final TypedValue typedValueAttr = new TypedValue();
ctx.getTheme().resolveAttribute(R.attr.left_menu_view_bg, typedValueAttr, true);
mainView.setBackgroundResource(typedValueAttr.resourceId);
}
View bottomScrollView = getBottomScrollView();
if (bottomScrollView != null) {
AndroidUtils.setBackground(ctx, bottomScrollView, isNightMode(), R.color.card_and_list_background_light, R.color.card_and_list_background_dark);
}
View cardsContainer = getCardsContainer();
if (cardsContainer != null) {
AndroidUtils.setBackground(ctx, cardsContainer, isNightMode(), R.color.card_and_list_background_light, R.color.card_and_list_background_dark);
}
int activeColor = ContextCompat.getColor(ctx, isNightMode() ? R.color.active_buttons_and_links_dark : R.color.active_buttons_and_links_light);
((TextView) view.findViewById(R.id.cancel_button_descr)).setTextColor(activeColor);

2
OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteOptionsBottomSheet.java
View file

@ -173,7 +173,7 @@ public class RouteOptionsBottomSheet extends MenuBottomSheetDialogFragment {
}
Bundle args = new Bundle();
ShowAlongTheRouteBottomSheet fragment = new ShowAlongTheRouteBottomSheet();
fragment.setUsedOnMap(false);
fragment.setUsedOnMap(true);
fragment.setArguments(args);
fragment.setTargetFragment(RouteOptionsBottomSheet.this, ShowAlongTheRouteBottomSheet.REQUEST_CODE);
fragment.show(fm, ShowAlongTheRouteBottomSheet.TAG);