Merge pull request #3288 from wordpress-mobile/issue/3257-move-the-help-icon

Fix #3257: move the help icon out of the LinearLayoutSizeBound

9 files changed, 54 insertions, 25 deletions

diff --git a/WordPress/src/main/res/drawable-v21/nux_flat_button_selector.xml b/WordPress/src/main/res/drawable-v21/nux_flat_button_selector.xml
new file mode 100644
index 000000000..ebbed3864
--- /dev/null
+++ b/WordPress/src/main/res/drawable-v21/nux_flat_button_selector.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="@color/color_control_activated">
+    <item>
+        <shape>
+            <solid android:color="@color/blue_wordpress"/>
+            <corners android:radius="2dp"/>
+        </shape>
+    </item>
+</ripple>
diff --git a/WordPress/src/main/res/drawable/nux_grey_button_nobg_selector.xml b/WordPress/src/main/res/drawable/nux_flat_button_grey_text_selector.xml
index ae88af5c0..ae88af5c0 100644
--- a/WordPress/src/main/res/drawable/nux_grey_button_nobg_selector.xml
+++ b/WordPress/src/main/res/drawable/nux_flat_button_grey_text_selector.xml
diff --git a/WordPress/src/main/res/drawable/nux_flat_button_selector.xml b/WordPress/src/main/res/drawable/nux_flat_button_selector.xml
new file mode 100644
index 000000000..89138d821
--- /dev/null
+++ b/WordPress/src/main/res/drawable/nux_flat_button_selector.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape>
+            <solid android:color="@color/translucent_grey_lighten_20" />
+            <corners android:radius="2dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/blue_wordpress" />
+            <corners android:radius="2dp" />
+        </shape>
+    </item>
+</selector>
diff --git a/WordPress/src/main/res/drawable/nux_white_button_nobg_selector.xml b/WordPress/src/main/res/drawable/nux_flat_button_text_selector.xml
index 55fe24bed..55fe24bed 100644
--- a/WordPress/src/main/res/drawable/nux_white_button_nobg_selector.xml
+++ b/WordPress/src/main/res/drawable/nux_flat_button_text_selector.xml
diff --git a/WordPress/src/main/res/layout/create_blog_fragment.xml b/WordPress/src/main/res/layout/create_blog_fragment.xml
index 36a34ec98..c1b442a75 100644
--- a/WordPress/src/main/res/layout/create_blog_fragment.xml
+++ b/WordPress/src/main/res/layout/create_blog_fragment.xml
@@ -113,7 +113,7 @@
 
             <RelativeLayout
                 android:layout_width="wrap_content"
-                android:layout_height="@dimen/nux_button_height"
+                android:layout_height="@dimen/nux_main_button_height"
                 android:layout_marginLeft="16dp"
                 android:layout_marginRight="16dp">
 
@@ -142,7 +142,7 @@
             </RelativeLayout>
 
             <org.wordpress.android.widgets.WPTextView
-                style="@style/WordPress.NUXWhiteButtonNoBg"
+                style="@style/WordPress.NUXFlatButton"
                 android:id="@+id/nux_sign_in_progress_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -159,7 +159,7 @@
             android:gravity="bottom">
 
             <org.wordpress.android.widgets.WPTextView
-                style="@style/WordPress.NUXWhiteButtonNoBg"
+                style="@style/WordPress.NUXFlatButton"
                 android:id="@+id/cancel_button"
                 android:layout_width="wrap_content"
                 android:layout_height="48dp"
diff --git a/WordPress/src/main/res/layout/new_account_user_fragment_screen.xml b/WordPress/src/main/res/layout/new_account_user_fragment_screen.xml
index e7e9310f2..914ce88a2 100644
--- a/WordPress/src/main/res/layout/new_account_user_fragment_screen.xml
+++ b/WordPress/src/main/res/layout/new_account_user_fragment_screen.xml
@@ -198,7 +198,7 @@
 
             <RelativeLayout
                 android:layout_width="wrap_content"
-                android:layout_height="@dimen/nux_button_height"
+                android:layout_height="@dimen/nux_main_button_height"
                 android:layout_marginLeft="16dp"
                 android:layout_marginRight="16dp">
 
@@ -228,7 +228,7 @@
             </RelativeLayout>
 
             <org.wordpress.android.widgets.WPTextView
-                style="@style/WordPress.NUXWhiteButtonNoBg"
+                style="@style/WordPress.NUXFlatButton"
                 android:id="@+id/nux_sign_in_progress_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/WordPress/src/main/res/layout/signin_fragment.xml b/WordPress/src/main/res/layout/signin_fragment.xml
index bf4d08d0e..ffac77019 100644
--- a/WordPress/src/main/res/layout/signin_fragment.xml
+++ b/WordPress/src/main/res/layout/signin_fragment.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -16,25 +17,24 @@
         android:gravity="center"
         android:orientation="vertical">
 
-        <org.wordpress.android.widgets.WPLinearLayoutSizeBound
+        <LinearLayout
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal|bottom"
             android:baselineAligned="true"
             android:gravity="right"
-            android:orientation="horizontal"
-            app:maxWidth="@dimen/nux_width">
+            android:orientation="horizontal">
 
             <ImageView
                 android:id="@+id/info_button"
+                style="@style/WordPress.NUXFlatButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="16dp"
-                android:layout_marginTop="16dp"
+                android:padding="16dp"
                 android:contentDescription="@string/help"
                 android:src="@drawable/dashicon_info"
                 android:tint="@color/blue_dark" />
-        </org.wordpress.android.widgets.WPLinearLayoutSizeBound>
+        </LinearLayout>
 
         <org.wordpress.android.widgets.WPLinearLayoutSizeBound
             android:layout_width="fill_parent"
@@ -59,6 +59,7 @@
 
                 <ImageView
                     android:id="@+id/info_button_secondary"
+                    style="@style/WordPress.NUXFlatButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
@@ -204,7 +205,7 @@
             </RelativeLayout>
             <RelativeLayout
                 android:layout_width="wrap_content"
-                android:layout_height="@dimen/nux_button_height"
+                android:layout_height="@dimen/nux_main_button_height"
                 android:layout_marginLeft="16dp"
                 android:layout_marginRight="16dp"
                 android:layout_marginTop="16dp">
@@ -276,7 +277,7 @@
 
             <org.wordpress.android.widgets.WPTextView
                 android:id="@+id/nux_sign_in_progress_text"
-                style="@style/WordPress.NUXWhiteButtonNoBg"
+                style="@style/WordPress.NUXFlatButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="center|top"
@@ -296,13 +297,13 @@
 
             <org.wordpress.android.widgets.WPTextView
                 android:id="@+id/nux_add_selfhosted_button"
-                style="@style/WordPress.NUXWhiteButtonNoBg"
+                style="@style/WordPress.NUXFlatButton"
                 android:layout_width="wrap_content"
-                android:layout_height="48dp"
+                android:layout_height="@dimen/nux_main_button_height"
                 android:layout_gravity="center"
                 android:layout_marginLeft="16dp"
                 android:layout_marginRight="16dp"
-                android:gravity="center|top"
+                android:gravity="center"
                 android:text="@string/nux_add_selfhosted_blog" />
 
             <LinearLayout
@@ -312,13 +313,13 @@
 
             <org.wordpress.android.widgets.WPTextView
                 android:id="@+id/nux_create_account_button"
-                style="@style/WordPress.NUXWhiteButtonNoBg"
+                style="@style/WordPress.NUXFlatButton"
                 android:layout_width="wrap_content"
-                android:layout_height="48dp"
+                android:layout_height="@dimen/nux_main_button_height"
                 android:layout_gravity="center"
                 android:layout_marginLeft="16dp"
                 android:layout_marginRight="16dp"
-                android:gravity="center|top"
+                android:gravity="center"
                 android:text="@string/nux_welcome_create_account" />
         </org.wordpress.android.widgets.WPLinearLayoutSizeBound>
     </LinearLayout>
diff --git a/WordPress/src/main/res/values/dimens.xml b/WordPress/src/main/res/values/dimens.xml
index 7507f846e..54606d06e 100644
--- a/WordPress/src/main/res/values/dimens.xml
+++ b/WordPress/src/main/res/values/dimens.xml
@@ -124,7 +124,9 @@
 
     <dimen name="nux_title_font_size">28sp</dimen>
     <dimen name="nux_edit_field_font_size">16sp</dimen>
-    <dimen name="nux_button_height">50dp</dimen>
+    <dimen name="nux_main_button_height">48dp</dimen>
+    <dimen name="nux_secondary_button_height">36dp</dimen>
+
     <dimen name="nux_width">600dp</dimen>
 
     <!-- notifications -->
diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml
index 09f5f79ea..b9cf616e3 100644
--- a/WordPress/src/main/res/values/styles.xml
+++ b/WordPress/src/main/res/values/styles.xml
@@ -141,7 +141,7 @@
     <!-- NUX Styles -->
     <style name="WordPress.NUXPrimaryButton">
         <item name="android:textColor">@color/nux_primary_button</item>
-        <item name="android:layout_height">@dimen/nux_button_height</item>
+        <item name="android:layout_height">@dimen/nux_main_button_height</item>
         <item name="android:layout_marginLeft">4dp</item>
         <item name="android:layout_marginRight">4dp</item>
         <item name="android:layout_marginBottom">8dp</item>
@@ -150,8 +150,9 @@
         <item name="android:stateListAnimator">@anim/raise</item>
     </style>
 
-    <style name="WordPress.NUXWhiteButtonNoBg">
-        <item name="android:textColor">@drawable/nux_white_button_nobg_selector</item>
+    <style name="WordPress.NUXFlatButton">
+        <item name="android:textColor">@drawable/nux_flat_button_text_selector</item>
+        <item name="android:background">@drawable/nux_flat_button_selector</item>
         <item name="android:padding">8dp</item>
         <item name="android:clickable">true</item>
     </style>
@@ -159,7 +160,7 @@
     <style name="WordPress.NUXGreyButtonNoBg">
         <item name="android:gravity">center_horizontal</item>
         <item name="android:textSize">14sp</item>
-        <item name="android:textColor">@drawable/nux_grey_button_nobg_selector</item>
+        <item name="android:textColor">@drawable/nux_flat_button_grey_text_selector</item>
     </style>
 
     <style name="WordPress.NUXEditText">