diff options
| author | Dmitry Yunitsky <yunik@mapswithme.com> | 2014-12-08 13:02:24 +0300 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:34:35 +0300 |
| commit | fafbed758ea44016e8bcb6706339d505849ceb1b (patch) | |
| tree | 2e06b94dd23238888167a156df7b90567fbab35c /android/res/values | |
| parent | c9599292187af77cd789bd9a5d22888ee444d6ee (diff) | |
New selectors and backrounds for clickable items.
Diffstat (limited to 'android/res/values')
| -rw-r--r-- | android/res/values/attrs.xml | 2 | ||||
| -rw-r--r-- | android/res/values/colors.xml | 1 | ||||
| -rw-r--r-- | android/res/values/dimens.xml | 1 | ||||
| -rw-r--r-- | android/res/values/styles.xml | 11 |
4 files changed, 14 insertions, 1 deletions
diff --git a/android/res/values/attrs.xml b/android/res/values/attrs.xml index fa1093117d..5407870d92 100644 --- a/android/res/values/attrs.xml +++ b/android/res/values/attrs.xml @@ -4,5 +4,7 @@ <attr name="progressColor" format="color"/> <attr name="secondaryColor" format="color"/> <attr name="wheelThickness" format="dimension"/> + + <attr name="clickableBackground" format="reference"/> </declare-styleable> </resources>
\ No newline at end of file diff --git a/android/res/values/colors.xml b/android/res/values/colors.xml index dfbadcc712..632537d4f6 100644 --- a/android/res/values/colors.xml +++ b/android/res/values/colors.xml @@ -32,6 +32,7 @@ <!-- search --> <color name="text_search_box">@android:color/white</color> + <color name="text_hint_search_box">#bdffffff</color> <color name="text_search_item">@android:color/black</color> <color name="text_search_item_greyed">@android:color/darker_gray</color> <color name="text_search_category">@android:color/black</color> diff --git a/android/res/values/dimens.xml b/android/res/values/dimens.xml index a1cf30fcb3..f71a5274b7 100644 --- a/android/res/values/dimens.xml +++ b/android/res/values/dimens.xml @@ -15,6 +15,7 @@ <dimen name="margin_small_and_half">12dp</dimen> <dimen name="margin_medium">16dp</dimen> <dimen name="margin_large">32dp</dimen> + <dimen name="margin_large_and_half">48dp</dimen> <dimen name="neg_margin_micro">-2dp</dimen> <dimen name="neg_margin_tiny">-4dp</dimen> diff --git a/android/res/values/styles.xml b/android/res/values/styles.xml index ca5bd736ec..3ad715f7bb 100644 --- a/android/res/values/styles.xml +++ b/android/res/values/styles.xml @@ -48,10 +48,13 @@ <item name="colorAccent">@color/downloader_red</item> </style> - <style name="MWMMain" parent="@style/AppTheme"/> + <style name="MWMMain" parent="@style/AppTheme"> + <item name="clickableBackground">@drawable/default_selector</item> + </style> <style name="MWMMain.NoBar" parent="Theme.AppCompat.Light.NoActionBar"> <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item> + <item name="clickableBackground">@drawable/default_selector</item> </style> <style name="MwmSearch" parent="@style/MWMMain"> @@ -61,6 +64,7 @@ <item name="android:colorBackgroundCacheHint">@null</item> <item name="android:windowIsTranslucent">true</item> <item name="android:windowAnimationStyle">@android:style/Animation</item> + <item name="clickableBackground">@drawable/default_selector</item> </style> <style name="MWMTheme.Dialog.Light" parent="@style/MWMMain"> @@ -124,9 +128,14 @@ </style> <style name="bookmarkToggleButton" parent="Widget.AppCompat.CompoundButton.Switch"> + <item name="android:paddingTop">14dp</item> + <item name="android:drawableTop">@drawable/ic_bookmarks_selector</item> + <item name="android:layout_width">@dimen/ppp_button_size</item> + <item name="android:layout_height">@dimen/ppp_button_size</item> <item name="android:buttonStyleToggle">@style/Widget.Button.Toggle</item> <item name="android:textOn"/> <item name="android:textOff"/> + <item name="android:background">?attr/clickableBackground</item> </style> <style name="MyActionBar" parent="ThemeOverlay.AppCompat.Dark.ActionBar"> |