Merge pull request #16994 from wordpress-mobile/issue/16874-site-creation-skip-buttons-green

Color site creation skip buttons green in Jetpack App

Author: ovitrif

RELEASE-NOTES.txt

@@ -3,7 +3,7 @@
 20.5
 -----
 * [*] Use larger thumbnail previews for recommended themes during site creation [https://github.com/wordpress-mobile/WordPress-Android/pull/16848]
-
+* [*] Jetpack App: Use the Jetpack green color for the skip buttons text in site creation [https://github.com/wordpress-mobile/WordPress-Android/pull/16994]
 
 20.4
 -----

WordPress/src/jetpack/res/values/colors.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources">
+
+    <!-- Site creation -->
+    <color name="site_creation_skip_button_text">@color/jetpack_green_40</color>
+</resources>

WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsFragment.kt

@@ -86,7 +86,7 @@ class SiteCreationDomainsFragment : SiteCreationBaseFormFragment() {
                 searchInputWithHeader?.updateSearchInput(requireActivity(), uiState.searchInputUiState)
                 updateContentUiState(uiState.contentState)
                 uiHelpers.updateVisibility(createSiteButtonContainer, uiState.createSiteButtonContainerVisibility)
-                uiHelpers.updateVisibility(createSiteButtonShaddow, uiState.createSiteButtonContainerVisibility)
+                uiHelpers.updateVisibility(createSiteButtonShadow, uiState.createSiteButtonContainerVisibility)
                 updateTitleVisibility(uiState.headerUiState == null)
             }
         })

WordPress/src/main/res/layout/home_page_picker_titlebar.xml

@@ -25,7 +25,7 @@
 
     <Button
         android:id="@+id/skipButton"
-        style="@style/HomePagePickerSkipButton"
+        style="@style/SiteCreationSkipButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end"

WordPress/src/main/res/layout/site_creation_domains_screen.xml

@@ -57,7 +57,7 @@
         app:layout_constraintTop_toBottomOf="@id/site_creation_search_input_item" />
 
     <View
-        android:id="@+id/create_site_button_shaddow"
+        android:id="@+id/create_site_button_shadow"
         android:layout_width="match_parent"
         android:layout_height="@dimen/mlp_bottom_shadow_height"
         android:background="@drawable/modal_layout_picker_bottom_shadow"

WordPress/src/main/res/layout/site_creation_intents_titlebar.xml

@@ -23,9 +23,7 @@
 
     <Button
         android:id="@+id/skipButton"
-        style="@style/Widget.MaterialComponents.Button.TextButton"
-        android:textColor="@color/blue_50"
-        android:textSize="@dimen/text_sz_medium"
+        style="@style/SiteCreationSkipButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end"

WordPress/src/main/res/values/colors.xml

@@ -123,5 +123,6 @@
     <color name="grey_900">#ff212121</color>
 
     <!-- Site creation  -->
+    <color name="site_creation_skip_button_text">@color/blue_50</color>
     <color name="site_creation_intent_item_emoji_bg">@color/grey_lighten_30</color>
 </resources>

WordPress/src/main/res/values/styles.xml

@@ -1512,7 +1512,11 @@
         <item name="android:paddingBottom">@dimen/margin_small_medium</item>
     </style>
 
-    <!-- Site Creation Header Styles -->
+    <!-- Site Creation Styles -->
+    <style name="SiteCreationSkipButton" parent="Widget.MaterialComponents.Button.TextButton">
+        <item name="android:textColor">@color/site_creation_skip_button_text</item>
+        <item name="android:textSize">@dimen/text_sz_medium</item>
+    </style>
 
     <style name="SiteCreationHeaderV2Text">
         <item name="android:layout_width">match_parent</item>
@@ -1647,12 +1651,6 @@
         <item name="android:textAllCaps">true</item>
     </style>
 
-    <!-- Home Page Picker Styles -->
-    <style name="HomePagePickerSkipButton" parent="Widget.MaterialComponents.Button.TextButton">
-        <item name="android:textColor">@color/blue_50</item>
-        <item name="android:textSize">@dimen/text_sz_medium</item>
-    </style>
-
     <!-- Invite Links -->
     <style name="WordPress.Invite.Button.Primary" parent="Widget.MaterialComponents.Button.UnelevatedButton">
         <item name="materialThemeOverlay">@style/ThemeOverlay.Invite.Button.Secondary</item>