diff options
53 files changed, 89 insertions, 31 deletions
diff --git a/android/res/drawable-hdpi/ic_bookmark_hide.png b/android/res/drawable-hdpi/ic_bookmark_hide.png Binary files differindex a1c947d85f..514453bc47 100644 --- a/android/res/drawable-hdpi/ic_bookmark_hide.png +++ b/android/res/drawable-hdpi/ic_bookmark_hide.png diff --git a/android/res/drawable-hdpi/ic_bookmark_hide_night.png b/android/res/drawable-hdpi/ic_bookmark_hide_night.png Binary files differdeleted file mode 100644 index 961eebd0c7..0000000000 --- a/android/res/drawable-hdpi/ic_bookmark_hide_night.png +++ /dev/null diff --git a/android/res/drawable-hdpi/ic_bookmark_show.png b/android/res/drawable-hdpi/ic_bookmark_show.png Binary files differindex bd81cd0c23..afdd01cf9f 100644 --- a/android/res/drawable-hdpi/ic_bookmark_show.png +++ b/android/res/drawable-hdpi/ic_bookmark_show.png diff --git a/android/res/drawable-hdpi/ic_bookmark_show_night.png b/android/res/drawable-hdpi/ic_bookmark_show_night.png Binary files differdeleted file mode 100644 index 68b38ec896..0000000000 --- a/android/res/drawable-hdpi/ic_bookmark_show_night.png +++ /dev/null diff --git a/android/res/drawable-hdpi/ic_direction_pagepreview.png b/android/res/drawable-hdpi/ic_direction_pagepreview.png Binary files differindex ee0a7bbdb8..7e298e2072 100644 --- a/android/res/drawable-hdpi/ic_direction_pagepreview.png +++ b/android/res/drawable-hdpi/ic_direction_pagepreview.png diff --git a/android/res/drawable-hdpi/ic_direction_pagepreview_night.png b/android/res/drawable-hdpi/ic_direction_pagepreview_night.png Binary files differdeleted file mode 100644 index a6642ed681..0000000000 --- a/android/res/drawable-hdpi/ic_direction_pagepreview_night.png +++ /dev/null diff --git a/android/res/drawable-hdpi/ic_direction_pagepreview_pressed.png b/android/res/drawable-hdpi/ic_direction_pagepreview_pressed.png Binary files differdeleted file mode 100644 index 4f5ada1680..0000000000 --- a/android/res/drawable-hdpi/ic_direction_pagepreview_pressed.png +++ /dev/null diff --git a/android/res/drawable-hdpi/ic_direction_pagepreview_pressed_night.png b/android/res/drawable-hdpi/ic_direction_pagepreview_pressed_night.png Binary files differdeleted file mode 100644 index 9bc2a61a93..0000000000 --- a/android/res/drawable-hdpi/ic_direction_pagepreview_pressed_night.png +++ /dev/null diff --git a/android/res/drawable-mdpi/ic_bookmark_hide.png b/android/res/drawable-mdpi/ic_bookmark_hide.png Binary files differindex bbb2ccb93e..70efa01700 100644 --- a/android/res/drawable-mdpi/ic_bookmark_hide.png +++ b/android/res/drawable-mdpi/ic_bookmark_hide.png diff --git a/android/res/drawable-mdpi/ic_bookmark_hide_night.png b/android/res/drawable-mdpi/ic_bookmark_hide_night.png Binary files differdeleted file mode 100644 index f34c651720..0000000000 --- a/android/res/drawable-mdpi/ic_bookmark_hide_night.png +++ /dev/null diff --git a/android/res/drawable-mdpi/ic_bookmark_show.png b/android/res/drawable-mdpi/ic_bookmark_show.png Binary files differindex bf0c5714ad..b1649a2fdd 100644 --- a/android/res/drawable-mdpi/ic_bookmark_show.png +++ b/android/res/drawable-mdpi/ic_bookmark_show.png diff --git a/android/res/drawable-mdpi/ic_bookmark_show_night.png b/android/res/drawable-mdpi/ic_bookmark_show_night.png Binary files differdeleted file mode 100644 index 7194fb8013..0000000000 --- a/android/res/drawable-mdpi/ic_bookmark_show_night.png +++ /dev/null diff --git a/android/res/drawable-mdpi/ic_direction_pagepreview.png b/android/res/drawable-mdpi/ic_direction_pagepreview.png Binary files differindex 24de30f4ef..537bf94d22 100644 --- a/android/res/drawable-mdpi/ic_direction_pagepreview.png +++ b/android/res/drawable-mdpi/ic_direction_pagepreview.png diff --git a/android/res/drawable-mdpi/ic_direction_pagepreview_night.png b/android/res/drawable-mdpi/ic_direction_pagepreview_night.png Binary files differdeleted file mode 100644 index 551c1edfab..0000000000 --- a/android/res/drawable-mdpi/ic_direction_pagepreview_night.png +++ /dev/null diff --git a/android/res/drawable-mdpi/ic_direction_pagepreview_pressed.png b/android/res/drawable-mdpi/ic_direction_pagepreview_pressed.png Binary files differdeleted file mode 100644 index acca64b553..0000000000 --- a/android/res/drawable-mdpi/ic_direction_pagepreview_pressed.png +++ /dev/null diff --git a/android/res/drawable-mdpi/ic_direction_pagepreview_pressed_night.png b/android/res/drawable-mdpi/ic_direction_pagepreview_pressed_night.png Binary files differdeleted file mode 100644 index 1716151099..0000000000 --- a/android/res/drawable-mdpi/ic_direction_pagepreview_pressed_night.png +++ /dev/null diff --git a/android/res/drawable-v21/bg_active_icon.xml b/android/res/drawable-v21/bg_active_icon.xml new file mode 100644 index 0000000000..ff27258423 --- /dev/null +++ b/android/res/drawable-v21/bg_active_icon.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8"?> +<ripple + xmlns:android="http://schemas.android.com/apk/res/android" + android:color="?attr/colorControlHighlight"> + <item> + <shape + xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="oval"> + <solid android:color="?activeIconBackground"/> + <size + android:height="40dp" + android:width="40dp"/> + </shape> + </item> +</ripple> diff --git a/android/res/drawable-v21/bg_steady_icon.xml b/android/res/drawable-v21/bg_steady_icon.xml new file mode 100644 index 0000000000..41ae40fa0f --- /dev/null +++ b/android/res/drawable-v21/bg_steady_icon.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8"?> +<ripple + xmlns:android="http://schemas.android.com/apk/res/android" + android:color="?attr/colorControlHighlight"> + <item> + <shape + xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="oval"> + <solid android:color="?steadyIconBackground"/> + <size + android:height="40dp" + android:width="40dp"/> + </shape> + </item> +</ripple> diff --git a/android/res/drawable-xhdpi/ic_bookmark_hide.png b/android/res/drawable-xhdpi/ic_bookmark_hide.png Binary files differindex 4f8a791c6f..bcddc30fc5 100644 --- a/android/res/drawable-xhdpi/ic_bookmark_hide.png +++ b/android/res/drawable-xhdpi/ic_bookmark_hide.png diff --git a/android/res/drawable-xhdpi/ic_bookmark_hide_night.png b/android/res/drawable-xhdpi/ic_bookmark_hide_night.png Binary files differdeleted file mode 100644 index 5ff19fd65e..0000000000 --- a/android/res/drawable-xhdpi/ic_bookmark_hide_night.png +++ /dev/null diff --git a/android/res/drawable-xhdpi/ic_bookmark_show.png b/android/res/drawable-xhdpi/ic_bookmark_show.png Binary files differindex 5fd362703e..fc1c970353 100644 --- a/android/res/drawable-xhdpi/ic_bookmark_show.png +++ b/android/res/drawable-xhdpi/ic_bookmark_show.png diff --git a/android/res/drawable-xhdpi/ic_bookmark_show_night.png b/android/res/drawable-xhdpi/ic_bookmark_show_night.png Binary files differdeleted file mode 100644 index c74472f3ac..0000000000 --- a/android/res/drawable-xhdpi/ic_bookmark_show_night.png +++ /dev/null diff --git a/android/res/drawable-xhdpi/ic_direction_pagepreview.png b/android/res/drawable-xhdpi/ic_direction_pagepreview.png Binary files differindex 8ddd9aeb44..e30458fd0c 100644 --- a/android/res/drawable-xhdpi/ic_direction_pagepreview.png +++ b/android/res/drawable-xhdpi/ic_direction_pagepreview.png diff --git a/android/res/drawable-xhdpi/ic_direction_pagepreview_night.png b/android/res/drawable-xhdpi/ic_direction_pagepreview_night.png Binary files differdeleted file mode 100644 index 76072ccedd..0000000000 --- a/android/res/drawable-xhdpi/ic_direction_pagepreview_night.png +++ /dev/null diff --git a/android/res/drawable-xhdpi/ic_direction_pagepreview_pressed.png b/android/res/drawable-xhdpi/ic_direction_pagepreview_pressed.png Binary files differdeleted file mode 100644 index a8b701f82e..0000000000 --- a/android/res/drawable-xhdpi/ic_direction_pagepreview_pressed.png +++ /dev/null diff --git a/android/res/drawable-xhdpi/ic_direction_pagepreview_pressed_night.png b/android/res/drawable-xhdpi/ic_direction_pagepreview_pressed_night.png Binary files differdeleted file mode 100644 index 256a128dbc..0000000000 --- a/android/res/drawable-xhdpi/ic_direction_pagepreview_pressed_night.png +++ /dev/null diff --git a/android/res/drawable-xxhdpi/ic_bookmark_hide.png b/android/res/drawable-xxhdpi/ic_bookmark_hide.png Binary files differindex f6e0877f25..1f51ae3c1a 100644 --- a/android/res/drawable-xxhdpi/ic_bookmark_hide.png +++ b/android/res/drawable-xxhdpi/ic_bookmark_hide.png diff --git a/android/res/drawable-xxhdpi/ic_bookmark_hide_night.png b/android/res/drawable-xxhdpi/ic_bookmark_hide_night.png Binary files differdeleted file mode 100644 index 474965d04e..0000000000 --- a/android/res/drawable-xxhdpi/ic_bookmark_hide_night.png +++ /dev/null diff --git a/android/res/drawable-xxhdpi/ic_bookmark_show.png b/android/res/drawable-xxhdpi/ic_bookmark_show.png Binary files differindex c20f603457..a7a88fed41 100644 --- a/android/res/drawable-xxhdpi/ic_bookmark_show.png +++ b/android/res/drawable-xxhdpi/ic_bookmark_show.png diff --git a/android/res/drawable-xxhdpi/ic_bookmark_show_night.png b/android/res/drawable-xxhdpi/ic_bookmark_show_night.png Binary files differdeleted file mode 100644 index d1d7397264..0000000000 --- a/android/res/drawable-xxhdpi/ic_bookmark_show_night.png +++ /dev/null diff --git a/android/res/drawable-xxhdpi/ic_direction_pagepreview.png b/android/res/drawable-xxhdpi/ic_direction_pagepreview.png Binary files differindex ec58cf04a6..652de995c5 100644 --- a/android/res/drawable-xxhdpi/ic_direction_pagepreview.png +++ b/android/res/drawable-xxhdpi/ic_direction_pagepreview.png diff --git a/android/res/drawable-xxhdpi/ic_direction_pagepreview_night.png b/android/res/drawable-xxhdpi/ic_direction_pagepreview_night.png Binary files differdeleted file mode 100644 index 1ac602074d..0000000000 --- a/android/res/drawable-xxhdpi/ic_direction_pagepreview_night.png +++ /dev/null diff --git a/android/res/drawable-xxhdpi/ic_direction_pagepreview_pressed.png b/android/res/drawable-xxhdpi/ic_direction_pagepreview_pressed.png Binary files differdeleted file mode 100644 index 626d8a5f97..0000000000 --- a/android/res/drawable-xxhdpi/ic_direction_pagepreview_pressed.png +++ /dev/null diff --git a/android/res/drawable-xxhdpi/ic_direction_pagepreview_pressed_night.png b/android/res/drawable-xxhdpi/ic_direction_pagepreview_pressed_night.png Binary files differdeleted file mode 100644 index 78cc251d43..0000000000 --- a/android/res/drawable-xxhdpi/ic_direction_pagepreview_pressed_night.png +++ /dev/null diff --git a/android/res/drawable-xxxhdpi/ic_bookmark_hide.png b/android/res/drawable-xxxhdpi/ic_bookmark_hide.png Binary files differindex 9248774c7e..57520e4218 100644 --- a/android/res/drawable-xxxhdpi/ic_bookmark_hide.png +++ b/android/res/drawable-xxxhdpi/ic_bookmark_hide.png diff --git a/android/res/drawable-xxxhdpi/ic_bookmark_hide_night.png b/android/res/drawable-xxxhdpi/ic_bookmark_hide_night.png Binary files differdeleted file mode 100644 index aeb747b2fb..0000000000 --- a/android/res/drawable-xxxhdpi/ic_bookmark_hide_night.png +++ /dev/null diff --git a/android/res/drawable-xxxhdpi/ic_bookmark_show.png b/android/res/drawable-xxxhdpi/ic_bookmark_show.png Binary files differindex 85ae143ef5..1877875519 100644 --- a/android/res/drawable-xxxhdpi/ic_bookmark_show.png +++ b/android/res/drawable-xxxhdpi/ic_bookmark_show.png diff --git a/android/res/drawable-xxxhdpi/ic_bookmark_show_night.png b/android/res/drawable-xxxhdpi/ic_bookmark_show_night.png Binary files differdeleted file mode 100644 index 9c1f5ce31d..0000000000 --- a/android/res/drawable-xxxhdpi/ic_bookmark_show_night.png +++ /dev/null diff --git a/android/res/drawable-xxxhdpi/ic_direction_pagepreview.png b/android/res/drawable-xxxhdpi/ic_direction_pagepreview.png Binary files differindex b64018c643..42c1b77177 100644 --- a/android/res/drawable-xxxhdpi/ic_direction_pagepreview.png +++ b/android/res/drawable-xxxhdpi/ic_direction_pagepreview.png diff --git a/android/res/drawable-xxxhdpi/ic_direction_pagepreview_night.png b/android/res/drawable-xxxhdpi/ic_direction_pagepreview_night.png Binary files differdeleted file mode 100644 index 4e82b56f1c..0000000000 --- a/android/res/drawable-xxxhdpi/ic_direction_pagepreview_night.png +++ /dev/null diff --git a/android/res/drawable-xxxhdpi/ic_direction_pagepreview_pressed.png b/android/res/drawable-xxxhdpi/ic_direction_pagepreview_pressed.png Binary files differdeleted file mode 100644 index d7f55c4f74..0000000000 --- a/android/res/drawable-xxxhdpi/ic_direction_pagepreview_pressed.png +++ /dev/null diff --git a/android/res/drawable-xxxhdpi/ic_direction_pagepreview_pressed_night.png b/android/res/drawable-xxxhdpi/ic_direction_pagepreview_pressed_night.png Binary files differdeleted file mode 100644 index b77b278275..0000000000 --- a/android/res/drawable-xxxhdpi/ic_direction_pagepreview_pressed_night.png +++ /dev/null diff --git a/android/res/drawable/bg_active_icon.xml b/android/res/drawable/bg_active_icon.xml new file mode 100644 index 0000000000..e828fa93ed --- /dev/null +++ b/android/res/drawable/bg_active_icon.xml @@ -0,0 +1,7 @@ +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="oval"> + <solid android:color="?activeIconBackground"/> + <size + android:height="40dp" + android:width="40dp"/> +</shape> diff --git a/android/res/drawable/bg_steady_icon.xml b/android/res/drawable/bg_steady_icon.xml new file mode 100644 index 0000000000..f12692cde9 --- /dev/null +++ b/android/res/drawable/bg_steady_icon.xml @@ -0,0 +1,7 @@ +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="oval"> + <solid android:color="?steadyIconBackground"/> + <size + android:height="40dp" + android:width="40dp"/> +</shape> diff --git a/android/res/drawable/direction.xml b/android/res/drawable/direction.xml deleted file mode 100644 index 6cdd457cd6..0000000000 --- a/android/res/drawable/direction.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@drawable/ic_direction_pagepreview_pressed" - android:state_pressed="true"/> - - <item android:drawable="@drawable/ic_direction_pagepreview"/> -</selector>
\ No newline at end of file diff --git a/android/res/drawable/direction_night.xml b/android/res/drawable/direction_night.xml deleted file mode 100644 index 6079b4ba00..0000000000 --- a/android/res/drawable/direction_night.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@drawable/ic_direction_pagepreview_pressed_night" - android:state_pressed="true"/> - - <item android:drawable="@drawable/ic_direction_pagepreview_night"/> -</selector>
\ No newline at end of file diff --git a/android/res/layout-land/place_page_preview.xml b/android/res/layout-land/place_page_preview.xml index 3fa1f7aeef..b3aa0bd3d7 100644 --- a/android/res/layout-land/place_page_preview.xml +++ b/android/res/layout-land/place_page_preview.xml @@ -71,8 +71,9 @@ android:layout_height="wrap_content" android:layout_marginEnd="@dimen/margin_half" android:layout_marginRight="@dimen/margin_half" + android:tint="?colorAccent" android:scaleType="center" - android:src="?ppArrowDrawable"/> + android:src="@drawable/ic_direction_pagepreview"/> <TextView android:id="@+id/tv__straight_distance" diff --git a/android/res/layout/item_bookmark_category.xml b/android/res/layout/item_bookmark_category.xml index 8af9b9cdb7..4b2bf3ff60 100644 --- a/android/res/layout/item_bookmark_category.xml +++ b/android/res/layout/item_bookmark_category.xml @@ -14,8 +14,10 @@ <ImageView android:id="@+id/iv__set_visible" - android:layout_width="@dimen/height_item_oneline" - android:layout_height="@dimen/height_item_oneline" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="@dimen/margin_half" + android:layout_marginStart="@dimen/margin_half" android:layout_weight="0" android:background="?clickableBackground" android:scaleType="center" @@ -41,4 +43,4 @@ android:textAppearance="@style/MwmTextAppearance.Body2" tools:text="42000000"/> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/android/res/layout/place_page_preview.xml b/android/res/layout/place_page_preview.xml index 1b529b7126..eeb5e18966 100644 --- a/android/res/layout/place_page_preview.xml +++ b/android/res/layout/place_page_preview.xml @@ -79,8 +79,9 @@ android:layout_height="wrap_content" android:layout_marginEnd="@dimen/margin_half" android:layout_marginRight="@dimen/margin_half" + android:tint="?colorAccent" android:scaleType="center" - android:src="?ppArrowDrawable"/> + android:src="@drawable/ic_direction_pagepreview"/> <TextView android:id="@+id/tv__straight_distance" diff --git a/android/res/values/colors.xml b/android/res/values/colors.xml index 0c5c9d7d38..c62683f07f 100644 --- a/android/res/values/colors.xml +++ b/android/res/values/colors.xml @@ -9,9 +9,9 @@ <color name="text_light_hint">@color/white_lightest</color> <color name="base_accent">#FF1E96F0</color> - <color name="base_accent_night">#FFFFE68C</color> + <color name="base_accent_night">#FF4BB9E6</color> <color name="base_accent_pressed">#FF1C85D6</color> - <color name="base_accent_pressed_night">#FFCCB870</color> + <color name="base_accent_pressed_night">#FF3C9BBE</color> <color name="base_red">#FFF54137</color> <color name="base_yellow">#FFFFC30A</color> @@ -20,9 +20,12 @@ <color name="black_primary">#DE000000</color> <!-- 87% black --> <color name="black_secondary">#8A000000</color> <!-- 54% black --> <color name="black_lightest">#61000000</color> <!-- 38% black --> + <color name="black_8">#14000000</color> <!-- 8% black --> <color name="white_primary">#FFFFFFFF</color> <!-- 100% white --> <color name="white_secondary">#B3FFFFFF</color> <!-- 70% white --> <color name="white_lightest">#4CFFFFFF</color> <!-- 50% white --> + <color name="white_8">#14FFFFFF</color> <!-- 8% white --> + <color name="icon_tint">#FF757575</color> <color name="icon_tint_night">#FFC4C6C7</color> diff --git a/android/res/values/themes-attrs.xml b/android/res/values/themes-attrs.xml index a0d24e5703..d2583421b2 100644 --- a/android/res/values/themes-attrs.xml +++ b/android/res/values/themes-attrs.xml @@ -23,7 +23,6 @@ <attr name="ppButtonsBackground" format="color"/> <attr name="ppPreviewHeadOpen" format="reference"/> <attr name="ppPreviewHeadClosed" format="reference"/> - <attr name="ppArrowDrawable" format="reference"/> <attr name="ppRatingBackground" format="color"/> <attr name="ppRatingText" format="color"/> <attr name="ppPositive" format="reference"/> @@ -70,6 +69,11 @@ <attr name="bannerText" format="color"/> <attr name="bannerBackground" format="color"/> + + <attr name="steadyIconTint" format="color"/> + <attr name="steadyIconBackground" format="color"/> + <attr name="activeIconTint" format="color"/> + <attr name="activeIconBackground" format="color"/> </declare-styleable> <declare-styleable name="ThemeAttrs.NavButtons"> @@ -89,4 +93,4 @@ <attr name="newsMarker" format="reference"/> <attr name="searchLayoutBackground" format="reference"/> </declare-styleable> -</resources>
\ No newline at end of file +</resources> diff --git a/android/res/values/themes-base.xml b/android/res/values/themes-base.xml index 1abf42b6b8..f1d192ac25 100644 --- a/android/res/values/themes-base.xml +++ b/android/res/values/themes-base.xml @@ -38,7 +38,6 @@ <item name="ppButtonsBackground">?panel</item> <item name="ppPreviewHeadOpen">@drawable/bg_place_page_head_open</item> <item name="ppPreviewHeadClosed">@drawable/bg_place_page_head_closed</item> - <item name="ppArrowDrawable">@drawable/direction</item> <item name="routingSlot">@drawable/routing_slot_background</item> <item name="routingSlotPressed">@drawable/routing_slot_background_pressed</item> @@ -86,6 +85,11 @@ <item name="bannerText">@color/text_banner_color</item> <item name="bannerBackground">@color/bg_banner_color</item> + + <item name="steadyIconTint">@color/black_secondary</item> + <item name="steadyIconBackground">@color/black_8</item> + <item name="activeIconTint">@color/bg_cards</item> + <item name="activeIconBackground">?colorAccent</item> </style> <!-- Night theme --> @@ -127,7 +131,6 @@ <item name="ppButtonsBackground">@color/bg_window_night</item> <item name="ppPreviewHeadOpen">@drawable/bg_place_page_head_open_night</item> <item name="ppPreviewHeadClosed">@drawable/bg_place_page_head_closed_night</item> - <item name="ppArrowDrawable">@drawable/direction_night</item> <item name="routingSlot">@drawable/routing_slot_background_night</item> <item name="routingSlotPressed">@drawable/routing_slot_background_pressed_night</item> @@ -175,5 +178,9 @@ <item name="bannerText">@color/text_banner_color_night</item> <item name="bannerBackground">@color/bg_banner_color_night</item> + + <item name="steadyIconTint">@color/white_secondary</item> + <item name="steadyIconBackground">@color/white_8</item> + <item name="activeIconTint">@color/bg_cards_night</item> </style> -</resources>
\ No newline at end of file +</resources> diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesAdapter.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesAdapter.java index d2c35c915b..f4c413a0ad 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesAdapter.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesAdapter.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.bookmarks; import android.content.Context; +import android.graphics.drawable.Drawable; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; @@ -13,7 +14,7 @@ import com.mapswithme.maps.bookmarks.data.BookmarkCategory; import com.mapswithme.maps.bookmarks.data.BookmarkManager; import com.mapswithme.maps.widget.recycler.RecyclerClickListener; import com.mapswithme.maps.widget.recycler.RecyclerLongClickListener; -import com.mapswithme.util.ThemeUtils; +import com.mapswithme.util.Graphics; public class BookmarkCategoriesAdapter extends BaseBookmarkCategoryAdapter<BookmarkCategoriesAdapter.ViewHolder> { @@ -130,10 +131,19 @@ public class BookmarkCategoriesAdapter extends BaseBookmarkCategoryAdapter<Bookm void setVisibilityState(boolean visible) { - visibilityMarker.setImageResource(ThemeUtils.isNightTheme() ? visible ? R.drawable.ic_bookmark_show_night - : R.drawable.ic_bookmark_hide_night - : visible ? R.drawable.ic_bookmark_show - : R.drawable.ic_bookmark_hide); + Drawable drawable; + if (visible) + { + visibilityMarker.setBackgroundResource(R.drawable.bg_active_icon); + drawable = Graphics.tint(visibilityMarker.getContext(), R.drawable.ic_bookmark_show, R.attr.activeIconTint); + } + else + { + visibilityMarker.setBackgroundResource(R.drawable.bg_steady_icon); + drawable = Graphics.tint(visibilityMarker.getContext(), R.drawable.ic_bookmark_hide, + R.attr.steadyIconTint); + } + visibilityMarker.setImageDrawable(drawable); } } } |
