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

colors refactoring

Browse source
This commit is contained in:
Nazar 2019-07-27 13:55:29 +03:00
parent 222baee87f
commit f5776c078d
7 changed files with 11 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/drawable/btn_active_dark.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<item>
<shape android:shape="rectangle">
<corners android:radius="4dp" />
<solid android:color="@color/active_color_primary_dark" />

1
OsmAnd/res/layout/expandable_list.xml
View file

@ -17,7 +17,6 @@
<ExpandableListView
android:id="@android:id/list"
style="@style/OsmandListView"
android:layout_width="fill_parent"
android:layout_height="0dp"
android:layout_marginLeft="0dp"

1
OsmAnd/res/layout/fragment_help_screen.xml
View file

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<ListView
android:id="@android:id/list"
style="@style/OsmandListView"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"

1
OsmAnd/res/layout/maps_in_category_fragment.xml
View file

@ -30,7 +30,6 @@
<ExpandableListView
android:id="@android:id/list"
style="@style/OsmandListView"
android:layout_width="fill_parent"
android:layout_height="0dp"
android:layout_marginLeft="0dp"

6
OsmAnd/res/layout/quick_action_create_edit_dialog.xml
View file

@ -41,20 +41,20 @@
android:focusableInTouchMode="true"
android:background="?attr/actionModeBackground">
<ImageView
<android.support.v7.widget.AppCompatImageView
android:id="@+id/image"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="center_vertical"
android:layout_marginLeft="16dp"
android:scaleType="centerInside"
android:tint="?attr/wikivoyage_primary_btn_text_color"
app:tint="?attr/app_bar_primary_item_color"
android:layout_marginTop="24dp"
android:src="@drawable/ic_action_flag_dark" />
<android.support.v7.widget.AppCompatEditText
android:id="@+id/name"
android:theme="@style/WhiteControls"
android:theme="@style/AppBarControls"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"

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

@ -57,6 +57,7 @@
<attr name="search_tabbar_layout_theme" format="reference"/>
<attr name="toolbar_theme" format="reference"/>
<attr name="new_app_theme" format="reference"/>
<attr name="app_bar_primary_item_color" format="color"/>
<attr name="divider_color" format="reference" />
<attr name="contextMenuButtonColor" format="reference" />

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

@ -9,10 +9,6 @@
<item name="android:backgroundDimEnabled">false</item>
</style>
<style name="OsmandListView" parent="@android:style/Widget.ListView">
</style>
<!-- Dashboard styles -->
<style name="DashboardSubHeader">
<item name="android:layout_width">0dp</item>
@ -190,6 +186,7 @@
<item name="primary_icon_color">@color/icon_color_primary_light</item>
<item name="text_color_tab_active">@color/text_color_tab_active_light</item>
<item name="text_color_tab_active_white">@color/text_color_secondary_light</item>
<item name="app_bar_primary_item_color">@color/active_buttons_and_links_text_light</item>
<item name="appbar_layout_theme">@style/OsmandLightTheme.DarkActionbar</item>
<item name="search_tabbar_layout_theme">@style/OsmandLightTheme.SearchTabbar</item>
@ -290,8 +287,6 @@
<item name="android:textColorSecondary">@color/text_color_secondary_light</item>
<item name="android:listDivider">@color/divider_color_light</item>
<item name="android:dividerHeight">1dp</item>
<!--<item name="colorControlNormal">@color/icon_color_secondary_light</item>-->
<!--<item name="colorControlActivated">@color/active_color_primary_light</item>-->
</style>
<style name="OsmandLightTheme.DarkActionbar">
@ -362,8 +357,6 @@
<item name="android:textColorSecondary">@color/text_color_secondary_dark</item>
<item name="android:listDivider">@color/divider_color_dark</item>
<item name="android:dividerHeight">1dp</item>
<!--<item name="colorControlNormal">@color/icon_color_secondary_dark</item>-->
<!--<item name="colorControlActivated">@color/active_color_primary_dark</item>-->
</style>
<style name="OsmandDarkTheme.NoAnimation">
@ -450,6 +443,7 @@
<item name="primary_icon_color">@color/icon_color_primary_dark</item>
<item name="text_color_tab_active">@color/text_color_tab_active_dark</item>
<item name="text_color_tab_active_white">@color/text_color_tab_active_dark</item>
<item name="app_bar_primary_item_color">@color/active_buttons_and_links_text_dark</item>
<item name="appbar_layout_theme">@style/OsmandDarkTheme.DarkActionbar</item>
<item name="search_tabbar_layout_theme">@style/OsmandDarkTheme.SearchTabbar</item>
@ -738,10 +732,10 @@
<item name="bg_color">@color/list_background_color_dark</item>
</style>
<style name="WhiteControls" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="colorControlNormal">?attr/wikivoyage_primary_btn_text_color</item>
<item name="colorControlActivated">?attr/wikivoyage_primary_btn_text_color</item>
<item name="colorControlHighlight">?attr/wikivoyage_primary_btn_text_color</item>
<style name="AppBarControls" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="colorControlNormal">?attr/app_bar_primary_item_color</item>
<item name="colorControlActivated">?attr/app_bar_primary_item_color</item>
<item name="colorControlHighlight">?attr/app_bar_primary_item_color</item>
</style>
</resources>