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

[android] Improved filter hotels

Browse source
This commit is contained in:
Dmitry Donskoy 2018-09-19 18:59:35 +03:00 • committed by Aleksandr Zatsepin
parent df74ac10a0
commit 6d29224966
12 changed files with 48 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
android/res/color/booking_filter_title_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/text_dark_subtitle" android:state_enabled="false"/>
<item android:color="@color/black_56"/>
</selector>

5
android/res/color/booking_filter_title_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/text_light_subtitle" android:state_enabled="false"/>
<item android:color="@color/white_56"/>
</selector>

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

@ -13,7 +13,7 @@
<item android:state_enabled="false">
<shape android:shape="rectangle">
<solid android:color="?windowBackgroundForced"/>
<solid android:color="?borderedBtnBgDisabled"/>
<stroke android:width="@dimen/divider_height" android:color="?dividerHorizontal"/>
</shape>
</item>

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

@ -13,7 +13,7 @@
<item android:state_enabled="false">
<shape android:shape="rectangle">
<solid android:color="?windowBackgroundForced"/>
<solid android:color="?borderedBtnBgDisabled"/>
<stroke android:width="@dimen/divider_height" android:color="?dividerHorizontal"/>
</shape>
</item>

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

@ -9,7 +9,7 @@
<item android:state_enabled="false">
<shape android:shape="rectangle">
<solid android:color="@color/bg_window"/>
<solid android:color="@color/white_40"/>
<stroke android:width="@dimen/divider_height" android:color="@color/divider"/>
</shape>
</item>

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

@ -9,7 +9,7 @@
<item android:state_enabled="false">
<shape android:shape="rectangle">
<solid android:color="@color/bg_window_night"/>
<solid android:color="@color/black_40"/>
<stroke android:width="@dimen/divider_height" android:color="@color/divider_night"/>
</shape>
</item>

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

@ -67,9 +67,11 @@
android:gravity="start"
android:layout_height="wrap_content">
<TextView
android:id="@+id/checkIn_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_half"
android:textColor="?attr/bookingFilterTitleColor"
android:textAppearance="@style/MwmTextAppearance.BookingFilter.Title"
android:text="@string/booking_filters_check_in"/>
<TextView
@ -89,9 +91,11 @@
android:gravity="start"
android:layout_height="wrap_content">
<TextView
android:id="@+id/checkOut_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_half"
android:textColor="?attr/bookingFilterTitleColor"
android:textAppearance="@style/MwmTextAppearance.BookingFilter.Title"
android:text="@string/booking_filters_check_out"/>
<TextView

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

@ -98,4 +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"/>
</resources>

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

@ -26,6 +26,8 @@
<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 -->
@ -37,10 +39,13 @@
<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>
<color name="dark_gray">#8B000000</color>
<color name="light_gray">#F5F5F5</color>
<color name="icon_tint">#FF757575</color>
<color name="icon_tint_night">#FFC4C6C7</color>
@ -185,10 +190,10 @@
<color name="rating_none">#FF888A82</color>
<color name="rating_coming_soon">#FF1E96F0</color>
<color name="tips_and_triks_bg_night">#B8000000</color>
<color name="tips_and_triks_bg_night">@color/dark_gray</color>
<color name="tips_and_triks_bg">#B8FFFFFF</color>
<color name="tips_and_triks_primary_text">#FFFFFF</color>
<color name="tips_and_triks_primary_text_night">#000000</color>
<color name="tips_and_triks_secondary_text">#B3FFFFFF</color>
<color name="tips_and_triks_secondary_text_night">#B8000000</color>
<color name="tips_and_triks_secondary_text_night">@color/dark_gray</color>
</resources>

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

@ -221,8 +221,8 @@
</style>
<style name="MwmTextAppearance.BookingFilter.Warning" parent="MwmTextAppearance.Body3">
<item name="android:fontFamily" tools:ignore="NewApi">@string/robotoMedium</item>
<item name="android:textColor">@color/button_red</item>
<item name="android:fontFamily" tools:ignore="NewApi">@string/robotoRegular</item>
<item name="android:textColor">@color/dark_gray</item>
</style>
<style name="MwmTextAppearance.BookingFilter.DateTextView" parent="MwmTextAppearance.Body3">

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

@ -18,6 +18,7 @@
<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>
@ -126,6 +127,7 @@
<item name="transitPedestrianBackground">@color/black_4</item>
<item name="transitStepDivider">@drawable/dot_divider</item>
<item name="filterPropertyBackground">@drawable/button_with_border</item>
<item name="bookingFilterTitleColor">@color/booking_filter_title_color</item>
<item name="adChoicesIcon">@drawable/ic_ad_light</item>
<item name="saleIcon">@drawable/ic_deal_light</item>
<item name="nav_bg_subway">@drawable/bg_subway_light</item>
@ -158,6 +160,7 @@
<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>
@ -266,6 +269,7 @@
<item name="transitPedestrianBackground">@color/white_4</item>
<item name="transitStepDivider">@drawable/dot_divider_night</item>
<item name="filterPropertyBackground">@drawable/button_with_border_night</item>
<item name="bookingFilterTitleColor">@color/booking_filter_title_color_night</item>
<item name="adChoicesIcon">@drawable/ic_ad_dark</item>
<item name="saleIcon">@drawable/ic_deal_dark</item>
<item name="nav_bg_subway">@drawable/bg_subway_night</item>

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

@ -70,6 +70,12 @@ public class FilterFragment extends BaseMwmToolbarFragment
private TextView mCheckOut;
@SuppressWarnings("NullableProblems")
@NonNull
private TextView mCheckInTitle;
@SuppressWarnings("NullableProblems")
@NonNull
private TextView mCheckOutTitle;
@SuppressWarnings("NullableProblems")
@NonNull
private TextView mOfflineWarning;
@NonNull
private final Drawable mTagsDecorator
@ -242,8 +248,10 @@ public class FilterFragment extends BaseMwmToolbarFragment
{
mCheckIn = root.findViewById(R.id.checkIn);
mCheckIn.setOnClickListener(v -> onCheckInClicked());
mCheckInTitle = root.findViewById(R.id.checkIn_title);
mCheckOut = root.findViewById(R.id.checkOut);
mCheckOut.setOnClickListener(v -> onCheckOutClicked());
mCheckOutTitle = root.findViewById(R.id.checkOut_title);
mOfflineWarning = root.findViewById(R.id.offlineWarning);
@ -282,9 +290,12 @@ public class FilterFragment extends BaseMwmToolbarFragment
private void enableDateViewsIfConnected()
{
UiUtils.showIf(!ConnectionState.isConnected(), mOfflineWarning);
mCheckIn.setEnabled(ConnectionState.isConnected());
mCheckOut.setEnabled(ConnectionState.isConnected());
boolean connected = ConnectionState.isConnected();
UiUtils.showIf(!connected, mOfflineWarning);
mCheckIn.setEnabled(connected);
mCheckOut.setEnabled(connected);
mCheckInTitle.setEnabled(connected);
mCheckOutTitle.setEnabled(connected);
}
@NonNull