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

[android] Fixed review notes - bg and colors scheme

Browse source
This commit is contained in:
Dmitry Donskoy 2018-09-20 22:11:41 +03:00 • committed by Aleksandr Zatsepin
parent 82f79b2668
commit 284b4d1676
20 changed files with 75 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/res/color/booking_filter_title_color.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/text_dark_subtitle" android:state_enabled="false"/>
<item android:color="@color/black_56"/>
<item android:color="@color/black_16" android:state_enabled="false"/>
<item android:color="@color/text_dark_subtitle"/>
</selector>

4
android/res/color/booking_filter_title_color_night.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/text_light_subtitle" android:state_enabled="false"/>
<item android:color="@color/white_56"/>
<item android:color="@color/white_16" android:state_enabled="false"/>
<item android:color="@color/text_light_subtitle"/>
</selector>

5
android/res/color/filter_date_property_color.xml Normal file
View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/black_40" android:state_enabled="false"/>
<item android:color="@color/text_dark_subtitle"/>
</selector>

5
android/res/color/filter_date_property_color_night.xml Normal file
View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/white_40" android:state_enabled="false"/>
<item android:color="@color/text_light_subtitle"/>
</selector>

18
android/res/drawable-v21/button_with_border.xml
View file

@ -2,21 +2,5 @@
<ripple
xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/colorControlHighlight">
<item>
<selector>
<item android:state_enabled="true">
<shape android:shape="rectangle">
<solid android:color="?cardBackground"/>
<stroke android:width="@dimen/divider_height" android:color="?dividerHorizontal"/>
</shape>
</item>
<item android:state_enabled="false">
<shape android:shape="rectangle">
<solid android:color="?borderedBtnBgDisabled"/>
<stroke android:width="@dimen/divider_height" android:color="?dividerHorizontal"/>
</shape>
</item>
</selector>
</item>
<item android:drawable="@drawable/button_with_border_internal"/>
</ripple>

18
android/res/drawable-v21/button_with_border_night.xml
View file

@ -2,21 +2,5 @@
<ripple
xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/colorControlHighlight">
<item>
<selector>
<item android:state_enabled="true">
<shape android:shape="rectangle">
<solid android:color="?cardBackground"/>
<stroke android:width="@dimen/divider_height" android:color="?dividerHorizontal"/>
</shape>
</item>
<item android:state_enabled="false">
<shape android:shape="rectangle">
<solid android:color="?borderedBtnBgDisabled"/>
<stroke android:width="@dimen/divider_height" android:color="?dividerHorizontal"/>
</shape>
</item>
</selector>
</item>
<item android:drawable="@drawable/button_with_border_night_internal"/>
</ripple>

18
android/res/drawable/button_with_border.xml
View file

@ -1,16 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true">
<shape android:shape="rectangle">
<solid android:color="@color/bg_cards"/>
<stroke android:width="@dimen/divider_height" android:color="@color/divider"/>
</shape>
</item>
<item android:state_enabled="false">
<shape android:shape="rectangle">
<solid android:color="@color/white_40"/>
<stroke android:width="@dimen/divider_height" android:color="@color/divider"/>
</shape>
</item>
</selector>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/button_with_border_internal"/>
</layer-list>

8
android/res/drawable/button_with_border_default.xml Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="@color/bg_cards"/>
<stroke
android:width="@dimen/divider_height"
android:color="@color/divider"/>
</shape>

9
android/res/drawable/button_with_border_disabled.xml Normal file
View 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="@color/white_40"/>
<stroke
android:width="@dimen/divider_height"
android:color="@color/divider"/>
</shape>

5
android/res/drawable/button_with_border_internal.xml Normal file
View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/button_with_border_disabled" android:state_enabled="false"/>
<item android:drawable="@drawable/button_with_border_default"/>
</selector>

18
android/res/drawable/button_with_border_night.xml
View file

@ -1,16 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true">
<shape android:shape="rectangle">
<solid android:color="@color/bg_cards_night"/>
<stroke android:width="@dimen/divider_height" android:color="@color/divider_night"/>
</shape>
</item>
<item android:state_enabled="false">
<shape android:shape="rectangle">
<solid android:color="@color/black_40"/>
<stroke android:width="@dimen/divider_height" android:color="@color/divider_night"/>
</shape>
</item>
</selector>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/button_with_border_night_internal"/>
</layer-list>

8
android/res/drawable/button_with_border_night_default.xml Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="@color/bg_cards_night"/>
<stroke
android:width="@dimen/divider_height"
android:color="@color/divider_night"/>
</shape>

8
android/res/drawable/button_with_border_night_disabled.xml Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="@color/black_40"/>
<stroke
android:width="@dimen/divider_height"
android:color="@color/divider_night"/>
</shape>

5
android/res/drawable/button_with_border_night_internal.xml Normal file
View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/button_with_border_night_disabled" android:state_enabled="false"/>
<item android:drawable="@drawable/button_with_border_night_default"/>
</selector>

4
android/res/layout/fragment_search_filter.xml
View file

@ -67,7 +67,7 @@
android:gravity="start"
android:layout_height="wrap_content">
<TextView
android:id="@+id/checkIn_title"
android:id="@+id/checkin_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_half"
@ -91,7 +91,7 @@
android:gravity="start"
android:layout_height="wrap_content">
<TextView
android:id="@+id/checkOut_title"
android:id="@+id/checkout_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_half"

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

@ -98,6 +98,6 @@
<attr name="subwayMenuDisabled" format="reference"/>
<attr name="accentTextColorSelector" format="color"/>
<attr name="accentDot" format="reference"/>
<attr name="borderedBtnBgDisabled" format="color"/>
<attr name="bookingFilterTitleColor" format="color"/>
<attr name="filterPropertyTextColor" format="color"/>
</resources>

4
android/res/values/colors.xml
View file

@ -23,11 +23,11 @@
<color name="black_8">#14000000</color> <!-- 8% black -->
<color name="black_11">#1C000000</color> <!-- 11% black -->
<color name="black_12">#1E000000</color> <!-- 12% black -->
<color name="black_16">#29000000</color> <!-- 16% black -->
<color name="black_20">#33000000</color> <!-- 20% black -->
<color name="black_24">#3D000000</color> <!-- 24% black -->
<color name="black_38">#61000000</color> <!-- 38% black -->
<color name="black_40">#66000000</color> <!-- 40% black -->
<color name="black_56">#8F000000</color> <!-- 56% black -->
<color name="black_60">#99000000</color> <!-- 60% black -->
<color name="white_primary">#FFFFFFFF</color> <!-- 100% white -->
<color name="white_secondary">#B3FFFFFF</color> <!-- 70% white -->
@ -36,11 +36,11 @@
<color name="white_8">#14FFFFFF</color> <!-- 8% white -->
<color name="white_11">#1CFFFFFF</color> <!-- 11% white -->
<color name="white_12">#1EFFFFFF</color> <!-- 12% white -->
<color name="white_16">#29FFFFFF</color> <!-- 16% white -->
<color name="white_20">#33FFFFFF</color> <!-- 20% white -->
<color name="white_24">#3DFFFFFF</color> <!-- 24% white -->
<color name="white_38">#61FFFFFF</color> <!-- 38% white -->
<color name="white_40">#66FFFFFF</color> <!-- 40% white -->
<color name="white_56">#8FFFFFFF</color> <!-- 56% white -->
<color name="white_60">#99FFFFFF</color> <!-- 60% white -->
<color name="warm_gray">#FF999691</color>
<color name="warm_gray_night">#FF999691</color>

1
android/res/values/styles-text.xml
View file

@ -233,6 +233,7 @@
<item name="android:paddingTop">@dimen/margin_half_plus_eight</item>
<item name="android:paddingBottom">@dimen/margin_half_plus_eight</item>
<item name="android:gravity">start|center_vertical</item>
<item name="android:textColor">?attr/filterPropertyTextColor</item>
<item name="android:background">?filterPropertyBackground</item>
</style>
</resources>

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

@ -18,7 +18,6 @@
<item name="android:statusBarColor" tools:targetApi="lollipop">@android:color/transparent</item>
<item name="alertDialogTheme">@style/MwmTheme.AlertDialog</item>
<item name="windowBackgroundForced">@color/bg_window</item>
<item name="borderedBtnBgDisabled">@color/white_40</item>
<item name="cardFrame">@drawable/card_frame</item>
<item name="cardBackground">@color/bg_cards</item>
<item name="fullscreenDialogTheme">@style/MwmTheme.DialogFragment.Fullscreen</item>
@ -139,6 +138,7 @@
<item name="tipsPrimaryTextColor">@color/tips_and_triks_primary_text</item>
<item name="tipsSecondaryTextColor">@color/tips_and_triks_secondary_text</item>
<item name="accentDot">@drawable/dot</item>
<item name="filterPropertyTextColor">@color/filter_date_property_color</item>
</style>
<!-- Night theme -->
@ -160,7 +160,6 @@
<item name="alertDialogTheme">@style/MwmTheme.Night.AlertDialog</item>
<item name="windowBackgroundForced">@color/bg_window_night</item>
<item name="borderedBtnBgDisabled">@color/black_40</item>
<item name="cardFrame">@drawable/card_frame_night</item>
<item name="cardBackground">@color/bg_cards_night</item>
<item name="fullscreenDialogTheme">@style/MwmTheme.DialogFragment.Fullscreen.Night</item>
@ -281,5 +280,6 @@
<item name="tipsPrimaryTextColor">@color/tips_and_triks_primary_text_night</item>
<item name="tipsSecondaryTextColor">@color/tips_and_triks_secondary_text_night</item>
<item name="accentDot">@drawable/dot_night</item>
<item name="filterPropertyTextColor">@color/filter_date_property_color_night</item>
</style>
</resources>

4
android/src/com/mapswithme/maps/search/FilterFragment.java
View file

@ -248,10 +248,10 @@ public class FilterFragment extends BaseMwmToolbarFragment
{
mCheckIn = root.findViewById(R.id.checkIn);
mCheckIn.setOnClickListener(v -> onCheckInClicked());
mCheckInTitle = root.findViewById(R.id.checkIn_title);
mCheckInTitle = root.findViewById(R.id.checkin_title);
mCheckOut = root.findViewById(R.id.checkOut);
mCheckOut.setOnClickListener(v -> onCheckOutClicked());
mCheckOutTitle = root.findViewById(R.id.checkOut_title);
mCheckOutTitle = root.findViewById(R.id.checkout_title);
mOfflineWarning = root.findViewById(R.id.offlineWarning);