diff options
author | Dmitry Yunitsky <yunik@mapswithme.com> | 2016-03-18 13:48:23 +0300 |
---|---|---|
committer | Sergey Yershov <yershov@corp.mail.ru> | 2016-03-23 16:56:58 +0300 |
commit | 5a375d768693ca5960ca73ef460c14becba7a986 (patch) | |
tree | c3f5225a552a14ffab9b0a71f19c0e53ccb71bd0 | |
parent | 98e71133ad1de8cde00fe49a1af317b6324f6919 (diff) |
[android] New icon for direction in PPP.
23 files changed, 11 insertions, 1 deletions
diff --git a/android/res/drawable-hdpi/ic_direction_pagepreview.png b/android/res/drawable-hdpi/ic_direction_pagepreview.png Binary files differindex eb58bebc3d..ee0a7bbdb8 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 differnew file mode 100644 index 0000000000..a6642ed681 --- /dev/null +++ b/android/res/drawable-hdpi/ic_direction_pagepreview_night.png diff --git a/android/res/drawable-hdpi/ic_direction_pagepreview_pressed.png b/android/res/drawable-hdpi/ic_direction_pagepreview_pressed.png Binary files differindex 01b1fe78cc..4f5ada1680 100644 --- a/android/res/drawable-hdpi/ic_direction_pagepreview_pressed.png +++ b/android/res/drawable-hdpi/ic_direction_pagepreview_pressed.png 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 differnew file mode 100644 index 0000000000..9bc2a61a93 --- /dev/null +++ b/android/res/drawable-hdpi/ic_direction_pagepreview_pressed_night.png diff --git a/android/res/drawable-mdpi/ic_direction_pagepreview.png b/android/res/drawable-mdpi/ic_direction_pagepreview.png Binary files differindex d26112be68..24de30f4ef 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 differnew file mode 100644 index 0000000000..551c1edfab --- /dev/null +++ b/android/res/drawable-mdpi/ic_direction_pagepreview_night.png diff --git a/android/res/drawable-mdpi/ic_direction_pagepreview_pressed.png b/android/res/drawable-mdpi/ic_direction_pagepreview_pressed.png Binary files differindex 8b3a89bb05..acca64b553 100644 --- a/android/res/drawable-mdpi/ic_direction_pagepreview_pressed.png +++ b/android/res/drawable-mdpi/ic_direction_pagepreview_pressed.png 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 differnew file mode 100644 index 0000000000..1716151099 --- /dev/null +++ b/android/res/drawable-mdpi/ic_direction_pagepreview_pressed_night.png diff --git a/android/res/drawable-xhdpi/ic_direction_pagepreview.png b/android/res/drawable-xhdpi/ic_direction_pagepreview.png Binary files differindex 407223299a..8ddd9aeb44 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 differnew file mode 100644 index 0000000000..76072ccedd --- /dev/null +++ b/android/res/drawable-xhdpi/ic_direction_pagepreview_night.png diff --git a/android/res/drawable-xhdpi/ic_direction_pagepreview_pressed.png b/android/res/drawable-xhdpi/ic_direction_pagepreview_pressed.png Binary files differindex 09627dd8dc..a8b701f82e 100644 --- a/android/res/drawable-xhdpi/ic_direction_pagepreview_pressed.png +++ b/android/res/drawable-xhdpi/ic_direction_pagepreview_pressed.png 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 differnew file mode 100644 index 0000000000..256a128dbc --- /dev/null +++ b/android/res/drawable-xhdpi/ic_direction_pagepreview_pressed_night.png diff --git a/android/res/drawable-xxhdpi/ic_direction_pagepreview.png b/android/res/drawable-xxhdpi/ic_direction_pagepreview.png Binary files differindex d3764081b2..ec58cf04a6 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 differnew file mode 100644 index 0000000000..1ac602074d --- /dev/null +++ b/android/res/drawable-xxhdpi/ic_direction_pagepreview_night.png diff --git a/android/res/drawable-xxhdpi/ic_direction_pagepreview_pressed.png b/android/res/drawable-xxhdpi/ic_direction_pagepreview_pressed.png Binary files differindex 92d4d8f7a8..626d8a5f97 100644 --- a/android/res/drawable-xxhdpi/ic_direction_pagepreview_pressed.png +++ b/android/res/drawable-xxhdpi/ic_direction_pagepreview_pressed.png 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 differnew file mode 100644 index 0000000000..78cc251d43 --- /dev/null +++ b/android/res/drawable-xxhdpi/ic_direction_pagepreview_pressed_night.png diff --git a/android/res/drawable-xxxhdpi/ic_direction_pagepreview.png b/android/res/drawable-xxxhdpi/ic_direction_pagepreview.png Binary files differnew file mode 100644 index 0000000000..b64018c643 --- /dev/null +++ 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 differnew file mode 100644 index 0000000000..4e82b56f1c --- /dev/null +++ b/android/res/drawable-xxxhdpi/ic_direction_pagepreview_night.png diff --git a/android/res/drawable-xxxhdpi/ic_direction_pagepreview_pressed.png b/android/res/drawable-xxxhdpi/ic_direction_pagepreview_pressed.png Binary files differnew file mode 100644 index 0000000000..d7f55c4f74 --- /dev/null +++ b/android/res/drawable-xxxhdpi/ic_direction_pagepreview_pressed.png 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 differnew file mode 100644 index 0000000000..b77b278275 --- /dev/null +++ b/android/res/drawable-xxxhdpi/ic_direction_pagepreview_pressed_night.png diff --git a/android/res/drawable/direction_night.xml b/android/res/drawable/direction_night.xml new file mode 100644 index 0000000000..6079b4ba00 --- /dev/null +++ b/android/res/drawable/direction_night.xml @@ -0,0 +1,7 @@ +<?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/values/themes-attrs.xml b/android/res/values/themes-attrs.xml index dfd27d0078..8a084b0f16 100644 --- a/android/res/values/themes-attrs.xml +++ b/android/res/values/themes-attrs.xml @@ -20,6 +20,7 @@ <attr name="ppBackground" format="color"/> <attr name="ppButtonsBackground" format="color"/> <attr name="ppPreviewHead" format="reference"/> + <attr name="ppArrowDrawable" format="reference"/> <attr name="routingSlot" format="reference"/> <attr name="routingSlotPressed" format="reference"/> diff --git a/android/res/values/themes-base.xml b/android/res/values/themes-base.xml index 6081e36972..85bb6d06ba 100644 --- a/android/res/values/themes-base.xml +++ b/android/res/values/themes-base.xml @@ -37,6 +37,7 @@ <item name="ppBackground">@color/bg_cards</item> <item name="ppButtonsBackground">?panel</item> <item name="ppPreviewHead">@drawable/bg_place_page_back</item> + <item name="ppArrowDrawable">@drawable/direction</item> <item name="routingSlot">@drawable/routing_slot_background</item> <item name="routingSlotPressed">@drawable/routing_slot_background_pressed</item> @@ -71,7 +72,7 @@ <item name="android:colorPrimaryDark" tools:targetApi="lollipop">?statusBar</item> <item name="android:windowDrawsSystemBarBackgrounds" tools:targetApi="lollipop">true</item> <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item> - <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/robotoRegular</item> + <item name="android:fontFamily"tools:targetApi="jelly_bean">@string/robotoRegular</item> <item name="android:colorBackgroundCacheHint">@null</item> <item name="clickableBackground">?selectableItemBackground</item> @@ -96,6 +97,7 @@ <item name="ppBackground">@color/bg_cards_night</item> <item name="ppButtonsBackground">@color/bg_window_night</item> <item name="ppPreviewHead">@drawable/bg_place_page_back_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> |