Update login theme and styles

wordpress-mobile · May 28, 2020 · 308d98c · 308d98c
1 parent 1f84879
commit 308d98c
Show file tree

Hide file tree

Showing 50 changed files with 373 additions and 253 deletions.
diff --git a/WordPress/src/main/AndroidManifest.xml b/WordPress/src/main/AndroidManifest.xml
@@ -96,7 +96,7 @@
             android:label="@string/me_section_screen_title" />
         <activity
             android:name=".ui.accounts.LoginActivity"
-            android:theme="@style/LoginTheme"
+            android:theme="@style/Theme.LoginFlow"
             android:windowSoftInputMode="adjustResize" />
 
         <activity
@@ -116,22 +116,22 @@
         <activity
             android:name=".ui.accounts.LoginEpilogueActivity"
             android:label="@string/login_epilogue_screen_title"
-            android:theme="@style/LoginTheme" />
+            android:theme="@style/Theme.LoginFlow" />
 
         <activity
             android:name=".ui.accounts.SignupEpilogueActivity"
             android:label="@string/signup_epilogue_screen_title"
-            android:theme="@style/LoginTheme" />
+            android:theme="@style/Theme.LoginFlow" />
 
         <activity
             android:name=".ui.accounts.PostSignupInterstitialActivity"
             android:label="@string/post_signup_interstitial_title"
-            android:theme="@style/LoginTheme"
+            android:theme="@style/Theme.LoginFlow"
             />
 
         <activity
             android:name=".ui.sitecreation.SiteCreationActivity"
-            android:theme="@style/LoginTheme"
+            android:theme="@style/Theme.LoginFlow"
             android:windowSoftInputMode="adjustResize" />
 
         <activity

diff --git a/WordPress/src/main/res/layout-land/login_prologue_bottom_buttons_container_default.xml b/WordPress/src/main/res/layout-land/login_prologue_bottom_buttons_container_default.xml
@@ -12,7 +12,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/second_button"
-        style="@style/LoginTheme.Button.Primary"
+        style="@style/Widget.LoginFlow.Button.Primary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/margin_medium"
@@ -21,7 +21,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/first_button"
-        style="@style/LoginTheme.Button.SignUp"
+        style="@style/Widget.LoginFlow.Button.Secondary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/margin_medium"

diff --git a/WordPress/src/main/res/layout-land/login_prologue_bottom_buttons_container_unified.xml b/WordPress/src/main/res/layout-land/login_prologue_bottom_buttons_container_unified.xml
@@ -12,7 +12,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/first_button"
-        style="@style/LoginTheme.Button.Primary"
+        style="@style/Widget.LoginFlow.Button.Primary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/margin_medium"
@@ -21,7 +21,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/second_button"
-        style="@style/LoginTheme.Button.SignUp"
+        style="@style/Widget.LoginFlow.Button.Secondary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/margin_medium"

diff --git a/WordPress/src/main/res/layout-sw600dp/login_prologue_bottom_buttons_container_default.xml b/WordPress/src/main/res/layout-sw600dp/login_prologue_bottom_buttons_container_default.xml
@@ -12,15 +12,15 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/first_button"
-        style="@style/LoginTheme.Button.SignUp"
+        style="@style/Widget.LoginFlow.Button.Secondary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/margin_extra_small"
         android:text="@string/log_in" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/second_button"
-        style="@style/LoginTheme.Button.Primary"
+        style="@style/Widget.LoginFlow.Button.Primary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin_extra_small"

diff --git a/WordPress/src/main/res/layout-sw600dp/login_prologue_bottom_buttons_container_unified.xml b/WordPress/src/main/res/layout-sw600dp/login_prologue_bottom_buttons_container_unified.xml
@@ -12,15 +12,15 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/first_button"
-        style="@style/LoginTheme.Button.Primary"
+        style="@style/Widget.LoginFlow.Button.Primary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/margin_extra_small"
         android:text="@string/continue_with_wpcom" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/second_button"
-        style="@style/LoginTheme.Button.SignUp"
+        style="@style/Widget.LoginFlow.Button.Secondary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin_extra_small"

diff --git a/WordPress/src/main/res/layout/base_site_listitem.xml b/WordPress/src/main/res/layout/base_site_listitem.xml
@@ -21,7 +21,7 @@
 
         <org.wordpress.android.widgets.WPTextView
             android:id="@+id/text_title"
-            style="@style/LoginTheme.Subhead"
+            style="@style/Widget.LoginFlow.TextView.List.Line1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:ellipsize="end"
@@ -30,7 +30,7 @@
 
         <org.wordpress.android.widgets.WPTextView
             android:id="@+id/text_domain"
-            style="@style/LoginTheme.Subhead2"
+            style="@style/Widget.LoginFlow.TextView.List.Line2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:ellipsize="end"

diff --git a/WordPress/src/main/res/layout/login_activity.xml b/WordPress/src/main/res/layout/login_activity.xml
@@ -2,8 +2,7 @@
     android:id="@+id/main_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:baselineAligned="true">
+    android:orientation="vertical">
 
     <FrameLayout
         android:id="@+id/fragment_container"

diff --git a/WordPress/src/main/res/layout/login_epilogue_screen.xml b/WordPress/src/main/res/layout/login_epilogue_screen.xml
@@ -9,8 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_above="@+id/primary_button"
-        android:scrollbars="vertical"
-        android:theme="@style/LoginEpilogueSitesList" />
+        android:scrollbars="vertical" />
 
     <ProgressBar
         android:id="@+id/sites_progress"
@@ -30,7 +29,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/primary_button"
-        style="@style/LoginTheme.Button.Primary"
+        style="@style/Widget.LoginFlow.Button.Primary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"

diff --git a/WordPress/src/main/res/layout/login_include_epilogue_header.xml b/WordPress/src/main/res/layout/login_include_epilogue_header.xml
@@ -38,15 +38,15 @@
 
     <org.wordpress.android.widgets.WPTextView
         android:id="@+id/login_epilogue_header_title"
-        style="@style/LoginTheme.Headline"
+        style="@style/Widget.LoginFlow.TextView.Headline"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin_large"
         tools:text="Pamela Nguyen" />
 
     <org.wordpress.android.widgets.WPTextView
         android:id="@+id/login_epilogue_header_subtitle"
-        style="@style/LoginTheme.Username"
+        style="@style/Widget.LoginFlow.TextView.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin_extra_small"

diff --git a/WordPress/src/main/res/layout/login_include_epilogue_sites_subheader.xml b/WordPress/src/main/res/layout/login_include_epilogue_sites_subheader.xml
@@ -2,7 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/login_epilogue_header_sites_subheader"
-    style="@style/LoginTheme.Heading"
+    style="@style/Widget.LoginFlow.TextView.List.Subheader"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingTop="@dimen/margin_extra_large"

diff --git a/WordPress/src/main/res/layout/login_intro_template_view.xml b/WordPress/src/main/res/layout/login_intro_template_view.xml
@@ -41,7 +41,7 @@
 
     <org.wordpress.android.widgets.WPTextView
         android:id="@+id/promo_title"
-        style="@style/LoginTheme.PromoTitle"
+        style="@style/Widget.LoginFlow.TextView.PromoTitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/prologue_promo_title_margin_vertical"
@@ -56,7 +56,7 @@
 
     <org.wordpress.android.widgets.WPTextView
         android:id="@+id/promo_text"
-        style="@style/LoginTheme.PromoText"
+        style="@style/Widget.LoginFlow.TextView.PromoSubtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/prologue_promo_text_margin_vertical"

diff --git a/WordPress/src/main/res/layout/login_prologue_bottom_buttons_container_default.xml b/WordPress/src/main/res/layout/login_prologue_bottom_buttons_container_default.xml
@@ -11,15 +11,15 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/first_button"
-        style="@style/LoginTheme.Button.SignUp"
+        style="@style/Widget.LoginFlow.Button.Secondary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/margin_extra_small"
         android:text="@string/log_in" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/second_button"
-        style="@style/LoginTheme.Button.Primary"
+        style="@style/Widget.LoginFlow.Button.Primary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin_extra_small"

diff --git a/WordPress/src/main/res/layout/login_prologue_bottom_buttons_container_unified.xml b/WordPress/src/main/res/layout/login_prologue_bottom_buttons_container_unified.xml
@@ -11,15 +11,15 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/first_button"
-        style="@style/LoginTheme.Button.Primary"
+        style="@style/Widget.LoginFlow.Button.Primary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/margin_extra_small"
         android:text="@string/continue_with_wpcom" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/second_button"
-        style="@style/LoginTheme.Button.SignUp"
+        style="@style/Widget.LoginFlow.Button.Secondary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin_extra_small"

diff --git a/WordPress/src/main/res/layout/login_signup_screen.xml b/WordPress/src/main/res/layout/login_signup_screen.xml
@@ -32,7 +32,7 @@
 
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/bottom_buttons"
-        style="@style/LoginTheme.BottomBar"
+        style="@style/Widget.LoginFlow.CardView.BottomBar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"

diff --git a/WordPress/src/main/res/layout/share_intent_receiver_fragment.xml b/WordPress/src/main/res/layout/share_intent_receiver_fragment.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -10,8 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_above="@+id/bottom_buttons"
-        android:scrollbars="vertical"
-        android:theme="@style/LoginEpilogueSitesList" />
+        android:scrollbars="vertical" />
 
     <ProgressBar
         android:id="@+id/sites_progress"
@@ -43,15 +41,15 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/secondary_button"
-            style="@style/LoginTheme.Button.SignUp"
+            style="@style/Widget.LoginFlow.Button.Secondary"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/margin_small"
             android:text="@string/share_action_media" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/primary_button"
-            style="@style/LoginTheme.Button.Primary"
+            style="@style/Widget.LoginFlow.Button.Primary"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/share_action_post" />

diff --git a/WordPress/src/main/res/layout/signup_epilogue.xml b/WordPress/src/main/res/layout/signup_epilogue.xml
@@ -55,7 +55,7 @@
 
                 <org.wordpress.android.widgets.WPTextView
                     android:id="@+id/signup_epilogue_input_password_detail"
-                    style="@style/LoginTheme.Footnote"
+                    style="@style/Widget.LoginFlow.TextView.Footnote"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/margin_extra_large"
@@ -78,7 +78,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/primary_button"
-        style="@style/LoginTheme.Button.Primary"
+        style="@style/Widget.LoginFlow.Button.Primary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/margin_medium_large"

diff --git a/WordPress/src/main/res/layout/site_creation_domains_screen.xml b/WordPress/src/main/res/layout/site_creation_domains_screen.xml
@@ -45,7 +45,7 @@
 
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/create_site_button_container"
-        style="@style/LoginTheme.BottomBar"
+        style="@style/Widget.LoginFlow.CardView.BottomBar"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -56,7 +56,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/create_site_button"
-            style="@style/LoginTheme.Button.Primary"
+            style="@style/Widget.LoginFlow.Button.Primary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end"

diff --git a/WordPress/src/main/res/values-night/styles.xml b/WordPress/src/main/res/values-night/styles.xml
@@ -136,7 +136,4 @@
         <item name="android:background">?android:attr/listDivider</item>
     </style>
 
-    <!-- Overload of Login Theme -->
-    <style name="Base.LoginTheme" parent="WordPress.NoActionBar"/>
-
 </resources>