Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Format colors

Browse source
This commit is contained in:
Alex Sytnyk 2018-04-10 17:01:52 +03:00
parent 33f7718c31
commit d26f800c43
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/layout/fragment_wikivoyage_article_dialog.xml
View file

@ -78,7 +78,7 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/wikivoyage_bottom_bar_color"> android:background="?attr/wikivoyage_bottom_bar_bg_color">
<net.osmand.plus.widgets.TextViewEx <net.osmand.plus.widgets.TextViewEx
android:id="@+id/contents_button" android:id="@+id/contents_button"

2
OsmAnd/res/values/attrs.xml
View file

@ -71,7 +71,7 @@
<attr name="wikivoyage_app_bar_color" format="reference"/> <attr name="wikivoyage_app_bar_color" format="reference"/>
<attr name="wikivoyage_app_bar_text_color" format="reference"/> <attr name="wikivoyage_app_bar_text_color" format="reference"/>
<attr name="wikivoyage_active_color" format="reference"/> <attr name="wikivoyage_active_color" format="reference"/>
<attr name="wikivoyage_bottom_bar_color" format="reference"/> <attr name="wikivoyage_bottom_bar_bg_color" format="reference"/>
<attr name="wikivoyage_bottom_bar_divider_color" format="reference"/> <attr name="wikivoyage_bottom_bar_divider_color" format="reference"/>
</declare-styleable> </declare-styleable>

6
OsmAnd/res/values/colors.xml
View file

@ -146,8 +146,6 @@
<color name="status_bar_wikivoyage_dark">#101112</color> <color name="status_bar_wikivoyage_dark">#101112</color>
<color name="status_bar_wikivoyage_article_light">#f2f2f2</color> <color name="status_bar_wikivoyage_article_light">#f2f2f2</color>
<color name="status_bar_wikivoyage_article_dark">#222526</color> <color name="status_bar_wikivoyage_article_dark">#222526</color>
<color name="bottom_bar_wikivoyage_bg_light">#f5f5f5</color>
<color name="bottom_bar_wikivoyage_bg_dark">#222526</color>
<color name="color_transparent">#0000</color> <color name="color_transparent">#0000</color>
@ -402,8 +400,10 @@
<color name="wikivoyage_app_bar_dark">#222526</color> <color name="wikivoyage_app_bar_dark">#222526</color>
<color name="wikivoyage_app_bar_text_light">#454545</color> <color name="wikivoyage_app_bar_text_light">#454545</color>
<color name="wikivoyage_app_bar_text_dark">#ababab</color> <color name="wikivoyage_app_bar_text_dark">#ababab</color>
<color name="wikivoyage_contents_icon_dark">#d28521</color>
<color name="wikivoyage_contents_icon_light">#536dfe</color> <color name="wikivoyage_contents_icon_light">#536dfe</color>
<color name="wikivoyage_contents_icon_dark">#d28521</color>
<color name="wikivoyage_bottom_bar_bg_light">#f5f5f5</color>
<color name="wikivoyage_bottom_bar_bg_dark">#222526</color>
<color name="wikivoyage_bottom_bar_divider_light">#e3e3e3</color> <color name="wikivoyage_bottom_bar_divider_light">#e3e3e3</color>
<color name="wikivoyage_bottom_bar_divider_dark">#2d3133</color> <color name="wikivoyage_bottom_bar_divider_dark">#2d3133</color>

4
OsmAnd/res/values/styles.xml
View file

@ -203,7 +203,7 @@
<item name="wikivoyage_app_bar_color">@color/wikivoyage_app_bar_light</item> <item name="wikivoyage_app_bar_color">@color/wikivoyage_app_bar_light</item>
<item name="wikivoyage_app_bar_text_color">@color/wikivoyage_app_bar_text_light</item> <item name="wikivoyage_app_bar_text_color">@color/wikivoyage_app_bar_text_light</item>
<item name="wikivoyage_active_color">@color/wikivoyage_active_light</item> <item name="wikivoyage_active_color">@color/wikivoyage_active_light</item>
<item name="wikivoyage_bottom_bar_color">@color/bottom_bar_wikivoyage_bg_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_bottom_bar_divider_color">@color/wikivoyage_bottom_bar_divider_light</item>
</style> </style>
@ -396,7 +396,7 @@
<item name="wikivoyage_app_bar_color">@color/wikivoyage_app_bar_dark</item> <item name="wikivoyage_app_bar_color">@color/wikivoyage_app_bar_dark</item>
<item name="wikivoyage_app_bar_text_color">@color/wikivoyage_app_bar_text_dark</item> <item name="wikivoyage_app_bar_text_color">@color/wikivoyage_app_bar_text_dark</item>
<item name="wikivoyage_active_color">@color/wikivoyage_active_dark</item> <item name="wikivoyage_active_color">@color/wikivoyage_active_dark</item>
<item name="wikivoyage_bottom_bar_color">@color/bottom_bar_wikivoyage_bg_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_bottom_bar_divider_color">@color/wikivoyage_bottom_bar_divider_dark</item>
</style> </style>