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

Fix #7138

Browse source
This commit is contained in:
crimean 2019-07-06 15:35:07 +03:00
parent 907b7667b9
commit 0da1a6d756
8 changed files with 59 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/res/drawable/btn_border_dark.xml
View file

@ -8,7 +8,7 @@
</item> </item>
<item android:state_enabled="false"> <item android:state_enabled="false">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/card_and_list_background_dark" /> <solid android:color="@color/inactive_buttons_and_links_bg_dark" />
<corners android:radius="4dp" /> <corners android:radius="4dp" />
</shape> </shape>
</item> </item>
@ -16,7 +16,7 @@
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@null" /> <solid android:color="@null" />
<corners android:radius="4dp" /> <corners android:radius="4dp" />
<stroke android:width="1dp" android:color="@color/inactive_pages_dark" /> <stroke android:width="1dp" android:color="@color/stroked_buttons_and_links_outline_dark" />
</shape> </shape>
</item> </item>
</selector> </selector>

4
OsmAnd/res/drawable/btn_border_light.xml
View file

@ -8,7 +8,7 @@
</item> </item>
<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/inactive_buttons_and_links_bg_light" />
<corners android:radius="4dp" /> <corners android:radius="4dp" />
</shape> </shape>
</item> </item>
@ -16,7 +16,7 @@
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@null" /> <solid android:color="@null" />
<corners android:radius="4dp" /> <corners android:radius="4dp" />
<stroke android:width="1dp" android:color="@color/profile_button_gray" /> <stroke android:width="1dp" android:color="@color/stroked_buttons_and_links_outline_light" />
</shape> </shape>
</item> </item>
</selector> </selector>

4
OsmAnd/res/drawable/btn_border_trans_dark.xml
View file

@ -9,7 +9,7 @@
</item> </item>
<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/inactive_buttons_and_links_bg_dark" />
<corners android:radius="4dp" /> <corners android:radius="4dp" />
</shape> </shape>
</item> </item>
@ -17,7 +17,7 @@
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@null" /> <solid android:color="@null" />
<corners android:radius="4dp" /> <corners android:radius="4dp" />
<stroke android:width="1dp" android:color="@color/divider_color_dark" /> <stroke android:width="1dp" android:color="@color/stroked_buttons_and_links_outline_dark" />
</shape> </shape>
</item> </item>
</selector> </selector>

4
OsmAnd/res/drawable/btn_border_trans_light.xml
View file

@ -9,7 +9,7 @@
</item> </item>
<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/inactive_buttons_and_links_bg_light" />
<corners android:radius="4dp" /> <corners android:radius="4dp" />
</shape> </shape>
</item> </item>
@ -17,7 +17,7 @@
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@null" /> <solid android:color="@null" />
<corners android:radius="4dp" /> <corners android:radius="4dp" />
<stroke android:width="1dp" android:color="@color/divider_color_light" /> <stroke android:width="1dp" android:color="@color/stroked_buttons_and_links_outline_light" />
</shape> </shape>
</item> </item>
</selector> </selector>

22
OsmAnd/res/drawable/btn_checked_border_dark.xml Normal file
View file

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape android:shape="rectangle">
<corners android:radius="4dp" />
<stroke android:width="1dp" android:color="@color/active_color_primary_dark" />
</shape>
</item>
<item android:state_enabled="false">
<shape android:shape="rectangle">
<solid android:color="@color/inactive_buttons_and_links_bg_dark" />
<corners android:radius="4dp" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<solid android:color="@null" />
<corners android:radius="4dp" />
<stroke android:width="1dp" android:color="@color/active_color_primary_dark" />
</shape>
</item>
</selector>

22
OsmAnd/res/drawable/btn_checked_border_light.xml Normal file
View file

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape android:shape="rectangle">
<corners android:radius="4dp" />
<stroke android:width="1dp" android:color="@color/active_color_primary_light" />
</shape>
</item>
<item android:state_enabled="false">
<shape android:shape="rectangle">
<solid android:color="@color/inactive_buttons_and_links_bg_light" />
<corners android:radius="4dp" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<solid android:color="@null" />
<corners android:radius="4dp" />
<stroke android:width="1dp" android:color="@color/active_color_primary_light" />
</shape>
</item>
</selector>

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

@ -29,7 +29,7 @@
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:lines="2" android:lines="2"
android:maxLines="2" android:maxLines="2"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorPrimary"
tools:text="Remove POI"/> tools:text="Remove POI"/>
</LinearLayout> </LinearLayout>

12
OsmAnd/src/net/osmand/plus/activities/actions/AppModeDialog.java
View file

@ -167,10 +167,10 @@ public class AppModeDialog {
iv.setImageDrawable(drawable); iv.setImageDrawable(drawable);
iv.setContentDescription(String.format("%s %s", mode.toHumanString(ctx), ctx.getString(R.string.item_checked))); iv.setContentDescription(String.format("%s %s", mode.toHumanString(ctx), ctx.getString(R.string.item_checked)));
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) { if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
AndroidUtils.setBackground(ctx, iv, nightMode, R.drawable.btn_border_light, R.drawable.btn_border_dark); AndroidUtils.setBackground(ctx, iv, nightMode, R.drawable.btn_checked_border_light, R.drawable.btn_checked_border_light);
AndroidUtils.setBackground(ctx, selection, nightMode, R.drawable.ripple_light, R.drawable.ripple_dark); AndroidUtils.setBackground(ctx, selection, nightMode, R.drawable.ripple_light, R.drawable.ripple_light);
} else { } else {
AndroidUtils.setBackground(ctx, selection, nightMode, R.drawable.btn_border_trans_light, R.drawable.btn_border_trans_dark); AndroidUtils.setBackground(ctx, selection, nightMode, R.drawable.btn_border_trans_light, R.drawable.btn_border_trans_light);
} }
} else { } else {
if (useMapTheme) { if (useMapTheme) {
@ -180,10 +180,10 @@ public class AppModeDialog {
} }
iv.setImageDrawable(drawable); iv.setImageDrawable(drawable);
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) { if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
AndroidUtils.setBackground(ctx, iv, nightMode, R.drawable.btn_border_pressed_light, R.drawable.btn_border_pressed_dark); AndroidUtils.setBackground(ctx, iv, nightMode, R.drawable.btn_border_pressed_light, R.drawable.btn_border_pressed_light);
AndroidUtils.setBackground(ctx, selection, nightMode, R.drawable.ripple_light, R.drawable.ripple_dark); AndroidUtils.setBackground(ctx, selection, nightMode, R.drawable.ripple_light, R.drawable.ripple_light);
} else { } else {
AndroidUtils.setBackground(ctx, selection, nightMode, R.drawable.btn_border_pressed_trans_light, R.drawable.btn_border_pressed_trans_dark); AndroidUtils.setBackground(ctx, selection, nightMode, R.drawable.btn_border_pressed_trans_light, R.drawable.btn_border_pressed_trans_light);
} }
} else { } else {
iv.setImageDrawable(ctx.getUIUtilities().getIcon(mode.getIconRes(), mode.getIconColorInfo().getColor(nightMode))); iv.setImageDrawable(ctx.getUIUtilities().getIcon(mode.getIconRes(), mode.getIconColorInfo().getColor(nightMode)));