Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
3d431d8988
5 changed files with 23 additions and 0 deletions
9
OsmAnd/res/drawable/wikivoyage_primary_btn_bg.xml
Normal file
9
OsmAnd/res/drawable/wikivoyage_primary_btn_bg.xml
Normal file
|
@ -0,0 +1,9 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
|
||||
<solid android:color="?attr/wikivoyage_active_color"/>
|
||||
|
||||
<corners android:radius="3dp"/>
|
||||
|
||||
</shape>
|
9
OsmAnd/res/drawable/wikivoyage_secondary_btn_bg.xml
Normal file
9
OsmAnd/res/drawable/wikivoyage_secondary_btn_bg.xml
Normal file
|
@ -0,0 +1,9 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
|
||||
<solid android:color="?attr/wikivoyage_secondary_btn_bg_color"/>
|
||||
|
||||
<corners android:radius="3dp"/>
|
||||
|
||||
</shape>
|
|
@ -73,6 +73,7 @@
|
|||
<attr name="wikivoyage_active_color" format="reference"/>
|
||||
<attr name="wikivoyage_bottom_bar_bg_color" format="reference"/>
|
||||
<attr name="wikivoyage_bottom_bar_divider_color" format="reference"/>
|
||||
<attr name="wikivoyage_secondary_btn_bg_color" format="reference"/>
|
||||
</declare-styleable>
|
||||
|
||||
<declare-styleable name="PagerSlidingTabStrip">
|
||||
|
|
|
@ -408,5 +408,7 @@
|
|||
<color name="wikivoyage_bottom_bar_bg_dark">#222526</color>
|
||||
<color name="wikivoyage_bottom_bar_divider_light">#e3e3e3</color>
|
||||
<color name="wikivoyage_bottom_bar_divider_dark">#2d3133</color>
|
||||
<color name="wikivoyage_secondary_btn_bg_light">#f0f0f0</color>
|
||||
<color name="wikivoyage_secondary_btn_bg_dark">#2d3133</color>
|
||||
|
||||
</resources>
|
|
@ -205,6 +205,7 @@
|
|||
<item name="wikivoyage_active_color">@color/wikivoyage_active_light</item>
|
||||
<item name="wikivoyage_bottom_bar_bg_color">@color/wikivoyage_bottom_bar_bg_light</item>
|
||||
<item name="wikivoyage_bottom_bar_divider_color">@color/wikivoyage_bottom_bar_divider_light</item>
|
||||
<item name="wikivoyage_secondary_btn_bg_color">@color/wikivoyage_secondary_btn_bg_light</item>
|
||||
</style>
|
||||
|
||||
<style name="OverflowMenuButton" parent="@style/Widget.AppCompat.ActionButton.Overflow">
|
||||
|
@ -398,6 +399,7 @@
|
|||
<item name="wikivoyage_active_color">@color/wikivoyage_active_dark</item>
|
||||
<item name="wikivoyage_bottom_bar_bg_color">@color/wikivoyage_bottom_bar_bg_dark</item>
|
||||
<item name="wikivoyage_bottom_bar_divider_color">@color/wikivoyage_bottom_bar_divider_dark</item>
|
||||
<item name="wikivoyage_secondary_btn_bg_color">@color/wikivoyage_secondary_btn_bg_dark</item>
|
||||
</style>
|
||||
|
||||
<style name="FreeVersionBanner" parent="OsmandDarkTheme">
|
||||
|
|
Loading…
Reference in a new issue