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 2016-04-11 11:51:45 +02:00
commit bda21bc6ee
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -47,6 +47,7 @@
<attr name="contextMenuButtonColor" format="reference" /> <attr name="contextMenuButtonColor" format="reference" />
<attr name="color_dialog_buttons" format="color"/> <attr name="color_dialog_buttons" format="color"/>
<attr name="secondary_icon_color" format="color"/>
</declare-styleable> </declare-styleable>
<declare-styleable name="PagerSlidingTabStrip"> <declare-styleable name="PagerSlidingTabStrip">

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

@ -111,6 +111,7 @@
<item name="android:actionMenuTextColor">@color/color_white</item> <item name="android:actionMenuTextColor">@color/color_white</item>
<item name="dialog_inactive_text_color">@color/icon_color_light</item> <item name="dialog_inactive_text_color">@color/icon_color_light</item>
<item name="secondary_icon_color">@color/icon_color_light</item>
<item name="appbar_layout_theme">@style/OsmandLightTheme.DarkActionbar</item> <item name="appbar_layout_theme">@style/OsmandLightTheme.DarkActionbar</item>
<item name="toolbar_theme">@style/OsmandLightTheme.Toolbar</item> <item name="toolbar_theme">@style/OsmandLightTheme.Toolbar</item>
<item name="new_app_theme">@style/OsmandLightTheme.NewAppTheme</item> <item name="new_app_theme">@style/OsmandLightTheme.NewAppTheme</item>
@ -242,6 +243,7 @@
<item name="android:actionBarStyle">@style/Widget.Styled.ActionBarDark</item> <item name="android:actionBarStyle">@style/Widget.Styled.ActionBarDark</item>
<item name="dialog_inactive_text_color">@color/dialog_inactive_text_color_dark</item> <item name="dialog_inactive_text_color">@color/dialog_inactive_text_color_dark</item>
<item name="secondary_icon_color">@color/dialog_inactive_text_color_dark</item>
<item name="appbar_layout_theme">@style/OsmandDarkTheme.DarkActionbar</item> <item name="appbar_layout_theme">@style/OsmandDarkTheme.DarkActionbar</item>
<item name="toolbar_theme">@style/OsmandDarkTheme</item> <item name="toolbar_theme">@style/OsmandDarkTheme</item>
<item name="new_app_theme">@style/OsmandDarkTheme</item> <item name="new_app_theme">@style/OsmandDarkTheme</item>

2
OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java
View file

@ -156,7 +156,7 @@ public class ContextMenuAdapter {
int secondaryDrawable = item.getSecondaryIcon(); int secondaryDrawable = item.getSecondaryIcon();
if (secondaryDrawable != ContextMenuItem.INVALID_ID) { if (secondaryDrawable != ContextMenuItem.INVALID_ID) {
@ColorRes @ColorRes
int colorRes = holoLight ? R.color.icon_color : R.color.dashboard_subheader_text_dark; int colorRes = holoLight ? R.color.icon_color_light : R.color.dialog_inactive_text_color_dark;
Drawable drawable = mIconsCache.getIcon(item.getSecondaryIcon(), colorRes); Drawable drawable = mIconsCache.getIcon(item.getSecondaryIcon(), colorRes);
ImageView imageView = (ImageView) convertView.findViewById(R.id.secondary_icon); ImageView imageView = (ImageView) convertView.findViewById(R.id.secondary_icon);
imageView.setImageDrawable(drawable); imageView.setImageDrawable(drawable);