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:
Chumva 2019-03-29 18:06:52 +02:00
commit 6c57ba7087
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd/res/drawable/btn_border_trans_rounded_dark.xml → OsmAnd/res/drawable/btn_trans_rounded_dark.xml
View file

@ -2,7 +2,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"> <item android:state_pressed="true">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<corners android:radius="18dp" /> <corners android:radius="@dimen/route_info_button_bg_line_radius" />
<solid android:color="@color/active_buttons_and_links_trans_dark" /> <solid android:color="@color/active_buttons_and_links_trans_dark" />
<stroke android:width="1dp" android:color="@color/active_buttons_and_links_dark" /> <stroke android:width="1dp" android:color="@color/active_buttons_and_links_dark" />
</shape> </shape>
@ -10,13 +10,13 @@
<item android:state_enabled="false"> <item android:state_enabled="false">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/activity_background_dark" /> <solid android:color="@color/activity_background_dark" />
<corners android:radius="18dp" /> <corners android:radius="@dimen/route_info_button_bg_line_radius" />
</shape> </shape>
</item> </item>
<item> <item>
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@null" /> <solid android:color="@color/card_and_list_background_dark" />
<corners android:radius="18dp" /> <corners android:radius="@dimen/route_info_button_bg_line_radius" />
<stroke android:width="1dp" android:color="@color/divider_dark" /> <stroke android:width="1dp" android:color="@color/divider_dark" />
</shape> </shape>
</item> </item>

8
OsmAnd/res/drawable/btn_border_trans_rounded_light.xml → OsmAnd/res/drawable/btn_trans_rounded_light.xml
View file

@ -2,7 +2,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"> <item android:state_pressed="true">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<corners android:radius="18dp" /> <corners android:radius="@dimen/route_info_button_bg_line_radius" />
<solid android:color="@color/active_buttons_and_links_trans_light" /> <solid android:color="@color/active_buttons_and_links_trans_light" />
<stroke android:width="1dp" android:color="@color/active_buttons_and_links_light" /> <stroke android:width="1dp" android:color="@color/active_buttons_and_links_light" />
</shape> </shape>
@ -10,13 +10,13 @@
<item android:state_enabled="false"> <item android:state_enabled="false">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/activity_background_light" /> <solid android:color="@color/activity_background_light" />
<corners android:radius="18dp" /> <corners android:radius="@dimen/route_info_button_bg_line_radius" />
</shape> </shape>
</item> </item>
<item> <item>
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@null" /> <solid android:color="@color/card_and_list_background_light" />
<corners android:radius="18dp" /> <corners android:radius="@dimen/route_info_button_bg_line_radius" />
<stroke android:width="1dp" android:color="@color/divider_light" /> <stroke android:width="1dp" android:color="@color/divider_light" />
</shape> </shape>
</item> </item>

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

@ -1363,7 +1363,7 @@ public class MapRouteInfoMenu implements IRouteInformationListener, CardListener
AndroidUtils.setBackground(app, viaButton, nightMode, R.drawable.btn_rounded_light, R.drawable.btn_rounded_dark); AndroidUtils.setBackground(app, viaButton, nightMode, R.drawable.btn_rounded_light, R.drawable.btn_rounded_dark);
AndroidUtils.setBackground(app, viaButtonContainer, nightMode, R.drawable.ripple_rounded_light, R.drawable.ripple_rounded_dark); AndroidUtils.setBackground(app, viaButtonContainer, nightMode, R.drawable.ripple_rounded_light, R.drawable.ripple_rounded_dark);
} else { } else {
AndroidUtils.setBackground(app, viaButtonContainer, nightMode, R.drawable.btn_border_trans_rounded_light, R.drawable.btn_border_trans_rounded_dark); AndroidUtils.setBackground(app, viaButtonContainer, nightMode, R.drawable.btn_trans_rounded_light, R.drawable.btn_trans_rounded_dark);
} }
ImageView viaButtonImageView = (ImageView) mainView.findViewById(R.id.via_button_image_view); ImageView viaButtonImageView = (ImageView) mainView.findViewById(R.id.via_button_image_view);
@ -1423,7 +1423,7 @@ public class MapRouteInfoMenu implements IRouteInformationListener, CardListener
AndroidUtils.setBackground(app, toButton, nightMode, R.drawable.btn_rounded_light, R.drawable.btn_rounded_dark); AndroidUtils.setBackground(app, toButton, nightMode, R.drawable.btn_rounded_light, R.drawable.btn_rounded_dark);
AndroidUtils.setBackground(app, toButtonContainer, nightMode, R.drawable.ripple_rounded_light, R.drawable.ripple_rounded_dark); AndroidUtils.setBackground(app, toButtonContainer, nightMode, R.drawable.ripple_rounded_light, R.drawable.ripple_rounded_dark);
} else { } else {
AndroidUtils.setBackground(app, toButtonContainer, nightMode, R.drawable.btn_border_trans_rounded_light, R.drawable.btn_border_trans_rounded_dark); AndroidUtils.setBackground(app, toButtonContainer, nightMode, R.drawable.btn_trans_rounded_light, R.drawable.btn_trans_rounded_dark);
} }
ImageView toButtonImageView = (ImageView) mainView.findViewById(R.id.to_button_image_view); ImageView toButtonImageView = (ImageView) mainView.findViewById(R.id.to_button_image_view);
@ -1495,7 +1495,7 @@ public class MapRouteInfoMenu implements IRouteInformationListener, CardListener
AndroidUtils.setBackground(app, fromButton, nightMode, R.drawable.btn_rounded_light, R.drawable.btn_rounded_dark); AndroidUtils.setBackground(app, fromButton, nightMode, R.drawable.btn_rounded_light, R.drawable.btn_rounded_dark);
AndroidUtils.setBackground(app, fromButtonContainer, nightMode, R.drawable.ripple_rounded_light, R.drawable.ripple_rounded_dark); AndroidUtils.setBackground(app, fromButtonContainer, nightMode, R.drawable.ripple_rounded_light, R.drawable.ripple_rounded_dark);
} else { } else {
AndroidUtils.setBackground(app, fromButtonContainer, nightMode, R.drawable.btn_border_trans_rounded_light, R.drawable.btn_border_trans_rounded_dark); AndroidUtils.setBackground(app, fromButtonContainer, nightMode, R.drawable.btn_trans_rounded_light, R.drawable.btn_trans_rounded_dark);
} }
ImageView swapDirectionView = (ImageView) mainView.findViewById(R.id.from_button_image_view); ImageView swapDirectionView = (ImageView) mainView.findViewById(R.id.from_button_image_view);