diff --git a/android/res/drawable/bg_circle_green.xml b/android/res/drawable/bg_circle_green.xml index 31d0db282b..8d3ca03796 100644 --- a/android/res/drawable/bg_circle_green.xml +++ b/android/res/drawable/bg_circle_green.xml @@ -2,6 +2,6 @@ + android:height="@dimen/placepage_margin_rating" + android:width="@dimen/placepage_margin_rating"/> \ No newline at end of file diff --git a/android/res/drawable/bg_circle_green_night.xml b/android/res/drawable/bg_circle_green_night.xml new file mode 100644 index 0000000000..59127c39ac --- /dev/null +++ b/android/res/drawable/bg_circle_green_night.xml @@ -0,0 +1,8 @@ + + + + + diff --git a/android/res/drawable/bg_circle_red.xml b/android/res/drawable/bg_circle_red.xml index 3de65a6bc3..a3c80e6627 100644 --- a/android/res/drawable/bg_circle_red.xml +++ b/android/res/drawable/bg_circle_red.xml @@ -2,6 +2,6 @@ + android:height="@dimen/placepage_margin_rating" + android:width="@dimen/placepage_margin_rating"/> \ No newline at end of file diff --git a/android/res/drawable/bg_circle_red_night.xml b/android/res/drawable/bg_circle_red_night.xml new file mode 100644 index 0000000000..61cb40cf65 --- /dev/null +++ b/android/res/drawable/bg_circle_red_night.xml @@ -0,0 +1,8 @@ + + + + + diff --git a/android/res/drawable/ic_negative_review_night.xml b/android/res/drawable/ic_negative_review_night.xml new file mode 100644 index 0000000000..475fd403dc --- /dev/null +++ b/android/res/drawable/ic_negative_review_night.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/android/res/drawable/ic_positive_review_night.xml b/android/res/drawable/ic_positive_review_night.xml new file mode 100644 index 0000000000..317ce7719c --- /dev/null +++ b/android/res/drawable/ic_positive_review_night.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/android/res/layout/item_comment.xml b/android/res/layout/item_comment.xml index 6718f94d4c..5d193788a8 100644 --- a/android/res/layout/item_comment.xml +++ b/android/res/layout/item_comment.xml @@ -70,11 +70,11 @@ android:layout_height="wrap_content" android:layout_below="@id/tv__comment_date"> + android:layout_width="@dimen/margin_base_plus" + android:layout_height="@dimen/margin_base_plus" + android:layout_marginLeft="@dimen/margin_base" + android:layout_marginStart="@dimen/margin_base" + android:src="?ppPositive"/> + android:id="@+id/iv__negative_review" + android:layout_width="@dimen/margin_base_plus" + android:layout_height="@dimen/margin_base_plus" + android:layout_marginBottom="@dimen/margin_base" + android:layout_marginLeft="@dimen/margin_base" + android:layout_marginStart="@dimen/margin_base" + android:src="?ppNegative"/> - \ No newline at end of file + diff --git a/android/res/layout/item_rating.xml b/android/res/layout/item_rating.xml index 29b625fcd3..f426782160 100644 --- a/android/res/layout/item_rating.xml +++ b/android/res/layout/item_rating.xml @@ -1,22 +1,23 @@ + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="@dimen/placepage_margin_rating" + android:paddingBottom="@dimen/margin_base" + android:paddingLeft="@dimen/margin_base" + android:paddingRight="@dimen/margin_base" + android:background="?ppRatingBackground"> + android:id="@+id/tv__place_hotel_rating" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textAppearance="@style/MwmTextAppearance.Body1" + android:textColor="?ppRatingText" + tools:text="Rating: 8.7 (Excellent)"/> - \ No newline at end of file + diff --git a/android/res/layout/place_page_hotel_rating.xml b/android/res/layout/place_page_hotel_rating.xml index 2b47b9da2a..be2c248f85 100644 --- a/android/res/layout/place_page_hotel_rating.xml +++ b/android/res/layout/place_page_hotel_rating.xml @@ -9,22 +9,22 @@ tools:visibility="visible"> + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="@dimen/placepage_margin_rating" + android:paddingBottom="@dimen/margin_base" + android:paddingLeft="@dimen/margin_base" + android:paddingRight="@dimen/margin_base" + android:background="?ppRatingBackground"> + android:id="@+id/tv__place_hotel_rating" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textAppearance="@style/MwmTextAppearance.Body1" + android:textColor="?ppRatingText" + tools:text="Rating: 8.7 (Excellent)"/> - \ No newline at end of file + diff --git a/android/res/values/colors.xml b/android/res/values/colors.xml index 4a0e25c9ea..0e9f2bfe07 100644 --- a/android/res/values/colors.xml +++ b/android/res/values/colors.xml @@ -35,6 +35,7 @@ #66FFFFFF #568B2E + #46A046 #FFEEEEEE @@ -63,8 +64,11 @@ #FFFFFFFF #F1F8E9 + #1EF0FAEB #DCEDC8 + #1EF0FAEB #FFCDD2 + #1EFFEBF0 @color/button_normal diff --git a/android/res/values/dimens.xml b/android/res/values/dimens.xml index a7cdd8663d..5b0b11489f 100644 --- a/android/res/values/dimens.xml +++ b/android/res/values/dimens.xml @@ -154,6 +154,6 @@ 24dp - 20dp + 20dp diff --git a/android/res/values/themes-attrs.xml b/android/res/values/themes-attrs.xml index da4c68bd8e..ea638e55b7 100644 --- a/android/res/values/themes-attrs.xml +++ b/android/res/values/themes-attrs.xml @@ -24,6 +24,10 @@ + + + + diff --git a/android/res/values/themes-base.xml b/android/res/values/themes-base.xml index be39a44486..bc57ba64b7 100644 --- a/android/res/values/themes-base.xml +++ b/android/res/values/themes-base.xml @@ -75,6 +75,11 @@ @color/routing_button_tint @color/routing_button_pressed_tint + + @color/bg_placepage_rating + @color/text_placepage_rating + @drawable/ic_positive_review + @drawable/ic_negative_review @@ -152,5 +157,10 @@ @color/routing_button_tint @color/routing_button_pressed_tint + + @color/bg_placepage_rating_night + @color/text_placepage_rating_night + @drawable/ic_positive_review_night + @drawable/ic_negative_review_night \ No newline at end of file