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

[android] Refactored filter UI

Browse source
This commit is contained in:
Александр Зацепин 2018-01-29 20:35:23 +03:00 • committed by Arsentiy Milchakov
parent ff52dcc7a3
commit 815bf6d7fa
18 changed files with 197 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
android/res/drawable-v21/bg_tag_normal.xml
View file

@ -3,6 +3,7 @@
android:color="@color/button_pressed">
<item>
<shape android:shape="rectangle">
<solid android:color="@color/bg_cards"/>
<stroke android:color="@color/black_11" android:width="1dp"/>
<size android:height="@dimen/hotel_filters_tag_height"/>
<padding

1
android/res/drawable-v21/bg_tag_normal_night.xml
View file

@ -3,6 +3,7 @@
android:color="@color/button_pressed_night">
<item>
<shape android:shape="rectangle">
<solid android:color="@color/bg_cards_night"/>
<stroke android:color="@color/black_11" android:width="1dp"/>
<size android:height="@dimen/hotel_filters_tag_height"/>
<padding

22
android/res/drawable-v21/button_with_border.xml Normal file
View file

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<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="?windowBackgroundForced"/>
<stroke android:width="@dimen/divider_height" android:color="?dividerHorizontal"/>
</shape>
</item>
</selector>
</item>
</ripple>

22
android/res/drawable-v21/button_with_border_night.xml Normal file
View file

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<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="?windowBackgroundForced"/>
<stroke android:width="@dimen/divider_height" android:color="?dividerHorizontal"/>
</shape>
</item>
</selector>
</item>
</ripple>

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

@ -1,7 +1,7 @@
<?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:color="@color/black_11" android:width="1dp"/>
<size android:height="@dimen/hotel_filters_tag_height"/>
<padding

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

@ -1,7 +1,7 @@
<?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:color="@color/white_11" android:width="1dp"/>
<size android:height="@dimen/hotel_filters_tag_height"/>
<padding

16
android/res/drawable/button_with_border.xml Normal file
View file

@ -0,0 +1,16 @@
<?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/bg_window"/>
<stroke android:width="@dimen/divider_height" android:color="@color/divider"/>
</shape>
</item>
</selector>

16
android/res/drawable/button_with_border_night.xml Normal file
View file

@ -0,0 +1,16 @@
<?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/bg_window_night"/>
<stroke android:width="@dimen/divider_height" android:color="@color/divider_night"/>
</shape>
</item>
</selector>

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

@ -41,86 +41,123 @@
<android.support.v4.widget.NestedScrollView
android:id="@+id/scroll"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
android:background="?windowBackgroundForced"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="@dimen/hotels_filter_padding"
android:paddingBottom="@dimen/hotels_filter_padding"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/margin_base"
android:orientation="horizontal"
android:baselineAligned="false">
<LinearLayout
android:layout_width="0dp"
android:layout_weight="1"
android:layout_marginLeft="@dimen/margin_base"
android:layout_marginStart="@dimen/margin_base"
android:layout_marginRight="@dimen/margin_quarter"
android:layout_marginEnd="@dimen/margin_quarter"
android:orientation="vertical"
android:gravity="start"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_half"
android:textAppearance="@style/MwmTextAppearance.BookingFilter.Title"
android:text="@string/booking_filters_check_in"/>
<TextView
android:id="@+id/checkIn"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/MwmTextAppearance.BookingFilter.DateTextView"/>
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_weight="1"
android:layout_marginLeft="@dimen/margin_quarter"
android:layout_marginStart="@dimen/margin_quarter"
android:layout_marginRight="@dimen/margin_base"
android:layout_marginEnd="@dimen/margin_base"
android:orientation="vertical"
android:gravity="start"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_half"
android:textAppearance="@style/MwmTextAppearance.BookingFilter.Title"
android:text="@string/booking_filters_check_out"/>
<TextView
android:id="@+id/checkOut"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/MwmTextAppearance.BookingFilter.DateTextView"/>
</LinearLayout>
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/margin_base"
android:layout_marginRight="@dimen/margin_base"
android:layout_marginTop="@dimen/margin_base"
android:layout_marginBottom="@dimen/margin_half"
android:textAppearance="@style/MwmTextAppearance.BookingFilter.Title"
android:text="@string/booking_filters_check_in"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/margin_base"
android:layout_marginRight="@dimen/margin_base"
android:layout_marginTop="@dimen/margin_base"
android:layout_marginBottom="@dimen/margin_half"
android:layout_marginTop="@dimen/hotels_filter_margin_top"
android:textAppearance="@style/MwmTextAppearance.BookingFilter.Title"
android:text="@string/booking_filters_rating"/>
<include layout="@layout/divider_horizontal"/>
<com.mapswithme.maps.search.RatingFilterView
android:id="@+id/rating"
android:layout_marginLeft="@dimen/margin_base"
android:layout_marginRight="@dimen/margin_base"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<include layout="@layout/divider_horizontal"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/margin_base"
android:layout_marginRight="@dimen/margin_base"
android:layout_marginTop="@dimen/margin_base"
android:layout_marginTop="@dimen/hotels_filter_margin_top"
android:layout_marginBottom="@dimen/margin_half"
android:textAppearance="@style/MwmTextAppearance.BookingFilter.Title"
android:text="@string/booking_filters_price_category"/>
<include layout="@layout/divider_horizontal"/>
<com.mapswithme.maps.search.PriceFilterView
android:id="@+id/price"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<include layout="@layout/divider_horizontal"/>
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/margin_base"
android:layout_marginRight="@dimen/margin_base"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/margin_base"
android:layout_marginRight="@dimen/margin_base"
android:layout_marginTop="@dimen/margin_base"
android:layout_marginBottom="@dimen/margin_half"
android:layout_marginTop="@dimen/hotels_filter_margin_top"
android:textAppearance="@style/MwmTextAppearance.BookingFilter.Title"
android:text="@string/search_hotel_filters_type"/>
<android.support.v7.widget.RecyclerView
android:id="@+id/type"
android:layout_marginLeft="@dimen/margin_quarter"
android:layout_marginRight="@dimen/margin_quarter"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:listitem="@layout/item_tag"/>
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
<LinearLayout
android:id="@+id/buttons_frame"
<TextView
android:id="@+id/done"
android:layout_width="match_parent"
android:layout_height="@dimen/height_block_base"
android:orientation="vertical"
android:minHeight="@dimen/height_block_base"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:background="?cardBackground">
<include layout="@layout/divider_horizontal"/>
<TextView
android:id="@+id/done"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:textAppearance="@style/MwmTextAppearance.Button"
android:fontFamily="@string/robotoMedium"
android:text="@string/done"
android:background="?clickableBackground"
tools:targetApi="jelly_bean"/>
</LinearLayout>
android:gravity="center"
android:textAppearance="@style/MwmTextAppearance.Button"
android:fontFamily="@string/robotoMedium"
android:text="@string/done"
android:background="?filterPropertyBackground"
tools:targetApi="jelly_bean"/>
</android.support.design.widget.CoordinatorLayout>

3
android/res/layout/item_tag.xml
View file

@ -4,7 +4,8 @@
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="@dimen/hotel_filters_tag_height"
android:layout_height="wrap_content"
android:minHeight="@dimen/hotel_filters_tag_height"
android:background="?tagBackground"
android:gravity="center"
android:clickable="true">

20
android/res/layout/price_filter.xml
View file

@ -9,7 +9,9 @@
android:id="@+id/low"
android:layout_width="match_parent"
android:layout_height="72dp"
android:background="?clickableBackground"
android:layout_marginRight="@dimen/margin_half"
android:layout_marginEnd="@dimen/margin_half"
android:background="?filterPropertyBackground"
android:layout_weight="1"
tools:background="?colorAccent">
<TextView
@ -23,17 +25,14 @@
android:fontFamily="@string/robotoMedium"
tools:textColor="?accentButtonTextColor"
tools:targetApi="jelly_bean"/>
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:layout_gravity="end"
android:background="?dividerHorizontal"/>
</FrameLayout>
<FrameLayout
android:id="@+id/medium"
android:layout_width="match_parent"
android:layout_height="72dp"
android:background="?clickableBackground"
android:layout_marginRight="@dimen/margin_half"
android:layout_marginEnd="@dimen/margin_half"
android:background="?filterPropertyBackground"
android:layout_weight="1">
<TextView
android:id="@+id/medium_title"
@ -45,17 +44,12 @@
android:text="@string/booking_filter_price_medium"
android:fontFamily="@string/robotoMedium"
tools:targetApi="jelly_bean"/>
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:layout_gravity="end"
android:background="?dividerHorizontal"/>
</FrameLayout>
<FrameLayout
android:id="@+id/high"
android:layout_width="match_parent"
android:layout_height="72dp"
android:background="?clickableBackground"
android:background="?filterPropertyBackground"
android:layout_weight="1">
<TextView
android:id="@+id/high_title"

29
android/res/layout/rating_filter.xml
View file

@ -9,7 +9,9 @@
android:id="@+id/any"
android:layout_width="match_parent"
android:layout_height="72dp"
android:background="?clickableBackground"
android:layout_marginRight="@dimen/margin_half"
android:layout_marginEnd="@dimen/margin_half"
android:background="?filterPropertyBackground"
android:layout_weight="1"
tools:background="?colorAccent">
<TextView
@ -23,17 +25,14 @@
android:fontFamily="@string/robotoMedium"
tools:textColor="?accentButtonTextColor"
tools:targetApi="jelly_bean"/>
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:layout_gravity="end"
android:background="?dividerHorizontal"/>
</FrameLayout>
<FrameLayout
android:id="@+id/good"
android:layout_width="match_parent"
android:layout_height="72dp"
android:background="?clickableBackground"
android:layout_marginRight="@dimen/margin_half"
android:layout_marginEnd="@dimen/margin_half"
android:background="?filterPropertyBackground"
android:layout_weight="1">
<LinearLayout
android:layout_width="wrap_content"
@ -59,17 +58,14 @@
android:text="@string/booking_filters_ragting_good"
android:gravity="center"/>
</LinearLayout>
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:layout_gravity="end"
android:background="?dividerHorizontal"/>
</FrameLayout>
<FrameLayout
android:id="@+id/very_good"
android:layout_width="match_parent"
android:layout_height="72dp"
android:background="?clickableBackground"
android:layout_marginRight="@dimen/margin_half"
android:layout_marginEnd="@dimen/margin_half"
android:background="?filterPropertyBackground"
android:layout_weight="1">
<LinearLayout
android:layout_width="wrap_content"
@ -95,17 +91,12 @@
android:text="@string/booking_filters_rating_very_good"
android:gravity="center"/>
</LinearLayout>
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:layout_gravity="end"
android:background="?dividerHorizontal"/>
</FrameLayout>
<FrameLayout
android:id="@+id/excellent"
android:layout_width="match_parent"
android:layout_height="72dp"
android:background="?clickableBackground"
android:background="?filterPropertyBackground"
android:layout_weight="1">
<LinearLayout
android:layout_width="wrap_content"

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

@ -195,7 +195,7 @@
<!-- Hotel filters-->
<dimen name="hotel_filters_tag_height">32dp</dimen>
<dimen name="hotels_filter_padding">128dp</dimen>
<dimen name="hotels_filter_margin_top">28dp</dimen>
<dimen name="margin_dialog_title">20dp</dimen>
<dimen name="action_bar_extended_height">72dp</dimen>

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

@ -213,5 +213,17 @@
<style name="MwmTextAppearance.BookingFilter.Title" parent="MwmTextAppearance.Body3">
<item name="android:fontFamily" tools:targetApi="jelly_bean">@string/robotoMedium</item>
<item name="android:textAllCaps">true</item>
</style>
<style name="MwmTextAppearance.BookingFilter.DateTextView" parent="MwmTextAppearance.Body3">
<item name="android:singleLine">true</item>
<item name="android:ellipsize">end</item>
<item name="android:paddingLeft">@dimen/margin_half</item>
<item name="android:paddingRight">@dimen/margin_half</item>
<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:background">?filterPropertyBackground</item>
</style>
</resources>

1
android/res/values/themes-attrs.xml
View file

@ -94,6 +94,7 @@
<attr name="reviewButtonBackground" format="reference"/>
<attr name="transitPedestrianBackground" format="color"/>
<attr name="transitStepDivider" format="reference"/>
<attr name="filterPropertyBackground" format="reference"/>
</declare-styleable>
<declare-styleable name="ThemeAttrs.NavButtons">

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

@ -117,6 +117,7 @@
<item name="transitPedestrianBackground">@color/black_4</item>
<item name="transitStepDivider">@drawable/dot_divider</item>
<item name="filterPropertyBackground">@drawable/button_with_border</item>
</style>
<!-- Night theme -->
@ -234,5 +235,6 @@
<item name="transitPedestrianBackground">@color/white_4</item>
<item name="transitStepDivider">@drawable/dot_divider_night</item>
<item name="filterPropertyBackground">@drawable/button_with_border_night</item>
</style>
</resources>

2
android/src/com/mapswithme/maps/search/PriceFilterView.java
View file

@ -62,7 +62,7 @@ public class PriceFilterView extends LinearLayout implements View.OnClickListene
void update()
{
@DrawableRes
int background = UiUtils.getStyledResourceId(mFrame.getContext(), R.attr.clickableBackground);
int background = UiUtils.getStyledResourceId(mFrame.getContext(), R.attr.filterPropertyBackground);
@ColorRes
int titleColor =
mSelected ? UiUtils.getStyledResourceId(mFrame.getContext(), R.attr.accentButtonTextColor)

16
android/src/com/mapswithme/maps/search/RatingFilterView.java
View file

@ -45,7 +45,7 @@ public class RatingFilterView extends LinearLayout implements View.OnClickListen
public void select(boolean select)
{
@DrawableRes
int background = UiUtils.getStyledResourceId(mFrame.getContext(), R.attr.clickableBackground);
int background = UiUtils.getStyledResourceId(mFrame.getContext(), R.attr.filterPropertyBackground);
@ColorRes
int titleColor =
select ? UiUtils.getStyledResourceId(mFrame.getContext(), R.attr.accentButtonTextColor)
@ -105,19 +105,19 @@ public class RatingFilterView extends LinearLayout implements View.OnClickListen
{
View any = findViewById(R.id.any);
any.setOnClickListener(this);
mItems.append(R.id.any, new Item(any, (TextView) findViewById(R.id.any_title), null));
mItems.append(R.id.any, new Item(any, findViewById(R.id.any_title), null));
View good = findViewById(R.id.good);
good.setOnClickListener(this);
mItems.append(R.id.good, new Item(good, (TextView) findViewById(R.id.good_title),
(TextView) findViewById(R.id.good_subtitle)));
mItems.append(R.id.good, new Item(good, findViewById(R.id.good_title),
findViewById(R.id.good_subtitle)));
View veryGood = findViewById(R.id.very_good);
veryGood.setOnClickListener(this);
mItems.append(R.id.very_good, new Item(veryGood, (TextView) findViewById(R.id.very_good_title),
(TextView) findViewById(R.id.very_good_subtitle)));
mItems.append(R.id.very_good, new Item(veryGood, findViewById(R.id.very_good_title),
findViewById(R.id.very_good_subtitle)));
View excellent = findViewById(R.id.excellent);
excellent.setOnClickListener(this);
mItems.append(R.id.excellent, new Item(excellent, (TextView) findViewById(R.id.excellent_title),
(TextView) findViewById(R.id.excellent_subtitle)));
mItems.append(R.id.excellent, new Item(excellent, findViewById(R.id.excellent_title),
findViewById(R.id.excellent_subtitle)));
}
public void update(@Nullable HotelsFilter.RatingFilter filter)