From cee4b05644c904d33a71c3d2a59724c4c57e841d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?=
 =?UTF-8?q?=D0=97=D0=B0=D1=86=D0=B5=D0=BF=D0=B8=D0=BD?= <az@mapswithme.com>
Date: Fri, 30 Mar 2018 14:17:56 +0300
Subject: [android] Refactored bug button background style

---
 android/res/drawable-v21/button_primary.xml       | 29 +++++++++++++++++++++++
 android/res/drawable-v21/button_primary_night.xml | 29 +++++++++++++++++++++++
 android/res/drawable-v21/button_start.xml         | 29 -----------------------
 android/res/drawable-v21/button_start_night.xml   | 29 -----------------------
 android/res/drawable/button_primary.xml           | 23 ++++++++++++++++++
 android/res/drawable/button_primary_night.xml     | 23 ++++++++++++++++++
 android/res/drawable/button_start.xml             | 23 ------------------
 android/res/drawable/button_start_night.xml       | 23 ------------------
 android/res/layout/item_bookmark_backup.xml       |  2 +-
 android/res/layout/place_page_preview.xml         | 15 ++++++++++++
 android/res/layout/start_button.xml               |  2 +-
 android/res/values/dimens.xml                     |  7 +++---
 android/res/values/styles.xml                     |  5 ++--
 android/res/values/themes-attrs.xml               |  2 +-
 android/res/values/themes-base.xml                |  4 ++--
 15 files changed, 131 insertions(+), 114 deletions(-)
 create mode 100644 android/res/drawable-v21/button_primary.xml
 create mode 100644 android/res/drawable-v21/button_primary_night.xml
 delete mode 100644 android/res/drawable-v21/button_start.xml
 delete mode 100644 android/res/drawable-v21/button_start_night.xml
 create mode 100644 android/res/drawable/button_primary.xml
 create mode 100644 android/res/drawable/button_primary_night.xml
 delete mode 100644 android/res/drawable/button_start.xml
 delete mode 100644 android/res/drawable/button_start_night.xml

(limited to 'android/res')

diff --git a/android/res/drawable-v21/button_primary.xml b/android/res/drawable-v21/button_primary.xml
new file mode 100644
index 0000000000..cce279d055
--- /dev/null
+++ b/android/res/drawable-v21/button_primary.xml
@@ -0,0 +1,29 @@
+<?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_pressed="true">
+        <shape android:shape="rectangle">
+          <corners android:radius="@dimen/button_small_corner_radius"/>
+          <solid android:color="@color/button_accent_pressed"/>
+        </shape>
+      </item>
+
+      <item android:state_enabled="true">
+        <shape android:shape="rectangle">
+          <corners android:radius="@dimen/button_small_corner_radius"/>
+          <solid android:color="@color/button_accent"/>
+        </shape>
+      </item>
+
+      <item>
+        <shape android:shape="rectangle">
+          <corners android:radius="@dimen/button_small_corner_radius"/>
+          <solid android:color="@color/button_accent_disabled"/>
+        </shape>
+      </item>
+    </selector>
+  </item>
+</ripple>
diff --git a/android/res/drawable-v21/button_primary_night.xml b/android/res/drawable-v21/button_primary_night.xml
new file mode 100644
index 0000000000..2e1feab4f7
--- /dev/null
+++ b/android/res/drawable-v21/button_primary_night.xml
@@ -0,0 +1,29 @@
+<?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_pressed="true">
+        <shape android:shape="rectangle">
+          <corners android:radius="@dimen/button_small_corner_radius"/>
+          <solid android:color="@color/button_accent_pressed_night"/>
+        </shape>
+      </item>
+
+      <item android:state_enabled="true">
+        <shape android:shape="rectangle">
+          <corners android:radius="@dimen/button_small_corner_radius"/>
+          <solid android:color="@color/button_accent_night"/>
+        </shape>
+      </item>
+
+      <item>
+        <shape android:shape="rectangle">
+          <corners android:radius="@dimen/button_small_corner_radius"/>
+          <solid android:color="@color/button_accent_disabled_night"/>
+        </shape>
+      </item>
+    </selector>
+  </item>
+</ripple>
diff --git a/android/res/drawable-v21/button_start.xml b/android/res/drawable-v21/button_start.xml
deleted file mode 100644
index cce279d055..0000000000
--- a/android/res/drawable-v21/button_start.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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_pressed="true">
-        <shape android:shape="rectangle">
-          <corners android:radius="@dimen/button_small_corner_radius"/>
-          <solid android:color="@color/button_accent_pressed"/>
-        </shape>
-      </item>
-
-      <item android:state_enabled="true">
-        <shape android:shape="rectangle">
-          <corners android:radius="@dimen/button_small_corner_radius"/>
-          <solid android:color="@color/button_accent"/>
-        </shape>
-      </item>
-
-      <item>
-        <shape android:shape="rectangle">
-          <corners android:radius="@dimen/button_small_corner_radius"/>
-          <solid android:color="@color/button_accent_disabled"/>
-        </shape>
-      </item>
-    </selector>
-  </item>
-</ripple>
diff --git a/android/res/drawable-v21/button_start_night.xml b/android/res/drawable-v21/button_start_night.xml
deleted file mode 100644
index 2e1feab4f7..0000000000
--- a/android/res/drawable-v21/button_start_night.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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_pressed="true">
-        <shape android:shape="rectangle">
-          <corners android:radius="@dimen/button_small_corner_radius"/>
-          <solid android:color="@color/button_accent_pressed_night"/>
-        </shape>
-      </item>
-
-      <item android:state_enabled="true">
-        <shape android:shape="rectangle">
-          <corners android:radius="@dimen/button_small_corner_radius"/>
-          <solid android:color="@color/button_accent_night"/>
-        </shape>
-      </item>
-
-      <item>
-        <shape android:shape="rectangle">
-          <corners android:radius="@dimen/button_small_corner_radius"/>
-          <solid android:color="@color/button_accent_disabled_night"/>
-        </shape>
-      </item>
-    </selector>
-  </item>
-</ripple>
diff --git a/android/res/drawable/button_primary.xml b/android/res/drawable/button_primary.xml
new file mode 100644
index 0000000000..24ea19bbf6
--- /dev/null
+++ b/android/res/drawable/button_primary.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:state_pressed="true">
+    <shape android:shape="rectangle">
+      <corners android:radius="@dimen/button_small_corner_radius"/>
+      <solid android:color="@color/button_accent_pressed"/>
+    </shape>
+  </item>
+
+  <item android:state_enabled="true">
+    <shape android:shape="rectangle">
+      <corners android:radius="@dimen/button_small_corner_radius"/>
+      <solid android:color="@color/button_accent"/>
+    </shape>
+  </item>
+
+  <item>
+    <shape android:shape="rectangle">
+      <corners android:radius="@dimen/button_small_corner_radius"/>
+      <solid android:color="@color/button_accent_disabled"/>
+    </shape>
+  </item>
+</selector>
diff --git a/android/res/drawable/button_primary_night.xml b/android/res/drawable/button_primary_night.xml
new file mode 100644
index 0000000000..9db85b51b5
--- /dev/null
+++ b/android/res/drawable/button_primary_night.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:state_pressed="true">
+    <shape android:shape="rectangle">
+      <corners android:radius="@dimen/button_small_corner_radius"/>
+      <solid android:color="@color/button_accent_pressed_night"/>
+    </shape>
+  </item>
+
+  <item android:state_enabled="true">
+    <shape android:shape="rectangle">
+      <corners android:radius="@dimen/button_small_corner_radius"/>
+      <solid android:color="@color/button_accent_night"/>
+    </shape>
+  </item>
+
+  <item>
+    <shape android:shape="rectangle">
+      <corners android:radius="@dimen/button_small_corner_radius"/>
+      <solid android:color="@color/button_accent_disabled_night"/>
+    </shape>
+  </item>
+</selector>
diff --git a/android/res/drawable/button_start.xml b/android/res/drawable/button_start.xml
deleted file mode 100644
index 24ea19bbf6..0000000000
--- a/android/res/drawable/button_start.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:state_pressed="true">
-    <shape android:shape="rectangle">
-      <corners android:radius="@dimen/button_small_corner_radius"/>
-      <solid android:color="@color/button_accent_pressed"/>
-    </shape>
-  </item>
-
-  <item android:state_enabled="true">
-    <shape android:shape="rectangle">
-      <corners android:radius="@dimen/button_small_corner_radius"/>
-      <solid android:color="@color/button_accent"/>
-    </shape>
-  </item>
-
-  <item>
-    <shape android:shape="rectangle">
-      <corners android:radius="@dimen/button_small_corner_radius"/>
-      <solid android:color="@color/button_accent_disabled"/>
-    </shape>
-  </item>
-</selector>
diff --git a/android/res/drawable/button_start_night.xml b/android/res/drawable/button_start_night.xml
deleted file mode 100644
index 9db85b51b5..0000000000
--- a/android/res/drawable/button_start_night.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:state_pressed="true">
-    <shape android:shape="rectangle">
-      <corners android:radius="@dimen/button_small_corner_radius"/>
-      <solid android:color="@color/button_accent_pressed_night"/>
-    </shape>
-  </item>
-
-  <item android:state_enabled="true">
-    <shape android:shape="rectangle">
-      <corners android:radius="@dimen/button_small_corner_radius"/>
-      <solid android:color="@color/button_accent_night"/>
-    </shape>
-  </item>
-
-  <item>
-    <shape android:shape="rectangle">
-      <corners android:radius="@dimen/button_small_corner_radius"/>
-      <solid android:color="@color/button_accent_disabled_night"/>
-    </shape>
-  </item>
-</selector>
diff --git a/android/res/layout/item_bookmark_backup.xml b/android/res/layout/item_bookmark_backup.xml
index 5ab1b58337..a538ce87a0 100644
--- a/android/res/layout/item_bookmark_backup.xml
+++ b/android/res/layout/item_bookmark_backup.xml
@@ -48,7 +48,7 @@
       android:layout_gravity="center">
       <Button
         android:id="@+id/button"
-        style="@style/MwmWidget.Button.Start"
+        style="@style/MwmWidget.Button.Primary"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:minHeight="@dimen/nav_button_height"
diff --git a/android/res/layout/place_page_preview.xml b/android/res/layout/place_page_preview.xml
index 766d6a7e69..bd39366bf4 100644
--- a/android/res/layout/place_page_preview.xml
+++ b/android/res/layout/place_page_preview.xml
@@ -182,6 +182,21 @@
     tools:background="#60000000"
     tools:text="Lenina str, 10"/>
 
+  <Button
+    android:id="@+id/search_hotels_btn"
+    android:layout_below="@id/tv__address"
+    style="@style/MwmWidget.Button.Primary"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="@dimen/nav_button_height"
+    android:layout_marginTop="@dimen/margin_half_plus"
+    android:layout_marginStart="@dimen/margin_base"
+    android:layout_marginLeft="@dimen/margin_base"
+    android:layout_marginEnd="@dimen/margin_base"
+    android:layout_marginRight="@dimen/margin_base"
+    android:text="@string/place_page_search_similar_hotel"
+    tools:text="@string/authorization_button_sign_in"/>
+
   <include
     android:id="@+id/banner"
     layout="@layout/place_page_banner"
diff --git a/android/res/layout/start_button.xml b/android/res/layout/start_button.xml
index 7d0a02a3e4..e2fa8a20c6 100644
--- a/android/res/layout/start_button.xml
+++ b/android/res/layout/start_button.xml
@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
   android:id="@+id/start"
-  style="@style/MwmWidget.Button.Start"
+  style="@style/MwmWidget.Button.Primary"
   android:layout_width="wrap_content"
   android:layout_height="wrap_content"
   android:minWidth="@dimen/start_button_width"
diff --git a/android/res/values/dimens.xml b/android/res/values/dimens.xml
index 2b13036530..1fe1686860 100644
--- a/android/res/values/dimens.xml
+++ b/android/res/values/dimens.xml
@@ -34,6 +34,7 @@
   <dimen name="height_item_oneline">56dp</dimen>
   <dimen name="height_item_multiline">72dp</dimen>
   <dimen name="height_item_edit_bookmark">72dp</dimen>
+  <dimen name="height_primary_button">36dp</dimen>
 
   <dimen name="dialog_max_height">320dp</dimen>
   <dimen name="search_item_height">56dp</dimen>
@@ -115,7 +116,7 @@
   <dimen name="nav_toggle">40dp</dimen>
   <dimen name="nav_toggle_margin">8dp</dimen>
   <dimen name="nav_button_width">200dp</dimen>
-  <dimen name="nav_button_height">36dp</dimen>
+  <dimen name="nav_button_height">@dimen/height_primary_button</dimen>
   <dimen name="nav_icon_size">48dp</dimen>
   <dimen name="nav_bottom_gap">12dp</dimen>
   <dimen name="nav_menu_top_offset">0dp</dimen>
@@ -146,7 +147,7 @@
   <dimen name="editor_height_field">64dp</dimen>
   <dimen name="editor_margin_left">56dp</dimen>
   <dimen name="editor_margin_left_plus">72dp</dimen>
-  <dimen name="editor_auth_btn_height">36dp</dimen>
+  <dimen name="editor_auth_btn_height">@dimen/height_primary_button</dimen>
   <dimen name="editor_margin_timetable_left">50dp</dimen>
 
   <!-- Altitude chart -->
@@ -182,7 +183,7 @@
   <!-- Banner-->
   <dimen name="placepage_banner_height">64dp</dimen>
   <dimen name="placepage_banner_icon_size">40dp</dimen>
-  <dimen name="placepage_banner_button_height">36dp</dimen>
+  <dimen name="placepage_banner_button_height">@dimen/height_primary_button</dimen>
   <dimen name="placepage_banner_button_margin_top">5dp</dimen>
   <dimen name="placepage_banner_small_action_corner">20dp</dimen>
 
diff --git a/android/res/values/styles.xml b/android/res/values/styles.xml
index a6fda744fb..af662f2012 100644
--- a/android/res/values/styles.xml
+++ b/android/res/values/styles.xml
@@ -70,12 +70,13 @@
     <item name="android:textAppearance">@style/MwmTextAppearance.Body3</item>
   </style>
 
-  <style name="MwmWidget.Button.Start">
-    <item name="android:background">?startButtonBackground</item>
+  <style name="MwmWidget.Button.Primary">
+    <item name="android:background">?primaryButtonBackground</item>
     <item name="android:minWidth">0dp</item>
     <item name="android:minHeight">0dp</item>
     <item name="android:textColor">?accentButtonTextColor</item>
     <item name="android:textSize">@dimen/text_size_body_3</item>
+    <item name="textAllCaps">true</item>
   </style>
 
   <style name="MwmWidget.Button.LeaveReview">
diff --git a/android/res/values/themes-attrs.xml b/android/res/values/themes-attrs.xml
index 079ce471e5..b76405fd01 100644
--- a/android/res/values/themes-attrs.xml
+++ b/android/res/values/themes-attrs.xml
@@ -45,7 +45,7 @@
     <attr name="redButtonTextColor" format="color"/>
     <attr name="redButtonTextColorDisabled" format="color"/>
 
-    <attr name="startButtonBackground" format="reference"/>
+    <attr name="primaryButtonBackground" format="reference"/>
 
     <attr name="circleAccent" format="reference"/>
 
diff --git a/android/res/values/themes-base.xml b/android/res/values/themes-base.xml
index bd29f588a5..73d9dcc111 100644
--- a/android/res/values/themes-base.xml
+++ b/android/res/values/themes-base.xml
@@ -56,7 +56,7 @@
     <item name="redButtonTextColor">@color/button_red_text</item>
     <item name="redButtonTextColorDisabled">@color/button_red_text_disabled</item>
 
-    <item name="startButtonBackground">@drawable/button_start</item>
+    <item name="primaryButtonBackground">@drawable/button_primary</item>
     <item name="reviewButtonBackground">@drawable/button_leave_review</item>
 
     <item name="circleAccent">@drawable/circle_accent</item>
@@ -177,7 +177,7 @@
     <item name="redButtonTextColor">@color/button_red_text</item>
     <item name="redButtonTextColorDisabled">@color/button_red_text_disabled</item>
 
-    <item name="startButtonBackground">@drawable/button_start_night</item>
+    <item name="primaryButtonBackground">@drawable/button_primary_night</item>
     <item name="reviewButtonBackground">@drawable/button_leave_review_night</item>
 
     <item name="circleAccent">@drawable/circle_accent_night</item>
-- 
cgit v1.2.3