pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Fixed btn highlight color, bookmarks list item size, section color

Browse source
This commit is contained in:
Dmitry Donskoy 2018-07-03 20:28:44 +03:00 • committed by Vlad Mihaylenko
parent 572065f10c
commit 079ad0997a
8 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/res/drawable-v21/button.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/colorControlHighlight">
android:color="?attr/colorBtnHighlight">
<item android:id="@android:id/mask">
<shape android:shape="rectangle">
<solid android:color="@android:color/white"/>

2
android/res/drawable-v21/button_accent.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple
xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/colorControlHighlight">
android:color="?attr/colorBtnHighlight">
<item android:drawable="@drawable/ripple_mask"/>
<item android:drawable="@drawable/button_accent_internal"/>
</ripple>

2
android/res/drawable-v21/button_accent_night.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple
xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/colorControlHighlight">
android:color="?attr/colorBtnHighlight">
<item android:drawable="@drawable/ripple_mask"/>
<item android:drawable="@drawable/button_accent_night_internal"/>
</ripple>

2
android/res/drawable-v21/button_megafon.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple
xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/colorControlHighlight">
android:color="?attr/colorBtnHighlight">
<item android:id="@android:id/mask" android:drawable="@drawable/ripple_mask_big_corner_radius"/>
<item android:drawable="@drawable/button_megafon_internal"/>
</ripple>

2
android/res/layout/item_bookmark.xml
View file

@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="@dimen/height_item_oneline"
android:minHeight="@dimen/height_item_multiline"
android:background="?clickableBackground"
android:paddingRight="@dimen/margin_base"
android:paddingEnd="@dimen/margin_base"

2
android/res/layout/item_category_title.xml
View file

@ -11,7 +11,7 @@
android:fontFamily="@string/robotoMedium"
android:text="@string/bookmarks"
tools:targetApi="jelly_bean"
android:background="@color/black_12"
android:background="?windowBackgroundForced"
android:paddingEnd="@dimen/margin_base"
android:paddingRight="@dimen/margin_base"
android:paddingStart="@dimen/margin_base"

1
android/res/values/themes-attrs.xml
View file

@ -97,6 +97,7 @@
<attr name="ratingButtonBackground" format="reference"/>
<attr name="reviewButtonBackground" format="reference"/>
<attr name="transitPedestrianBackground" format="color"/>
<attr name="colorBtnHighlight" format="color"/>
<attr name="transitStepDivider" format="reference"/>
<attr name="filterPropertyBackground" format="reference"/>
<attr name="adChoicesIcon" format="reference"/>

4
android/res/values/themes-base.xml
View file

@ -24,7 +24,7 @@
<item name="colorPrimary">@color/bg_primary</item>
<item name="colorControlNormal">?secondary</item>
<item name="colorAccent">@color/base_accent</item>
<item name="colorControlHighlight">@color/white_38</item>
<item name="colorBtnHighlight">@color/white_38</item>
<item name="panel">@color/bg_panel</item>
<item name="sidePanel">@color/bg_side_panel</item>
<item name="iconTint">@color/icon_tint</item>
@ -158,7 +158,7 @@
<item name="colorPrimary">@color/bg_primary_night</item>
<item name="colorControlNormal">?secondary</item>
<item name="colorAccent">@color/base_accent_night</item>
<item name="colorControlHighlight">@color/white_24</item>
<item name="colorBtnHighlight">@color/white_24</item>
<item name="panel">@color/bg_panel_night</item>
<item name="sidePanel">@color/bg_side_panel_night</item>
<item name="iconTint">@color/icon_tint_night</item>