Merge pull request #17282 from wordpress-mobile/Jetpack-Focus-Show-or-hide-Automattic-Family-section-on-About-screen

Jetpack focus show or hide automattic family section on about screen

Author: ravishanker

RELEASE-NOTES.txt

@@ -2,6 +2,7 @@
 
 21.0
 -----
+* [***] Updated About screen for WordPress and Jetpack apps to their respective urls. [https://github.com/wordpress-mobile/WordPress-Android/pull/17282]
 * [*] Updates splash screen for Android 12+ [https://github.com/wordpress-mobile/WordPress-Android/pull/17273]
 * [*] Fix text color of success messages in the QR code login flow [https://github.com/wordpress-mobile/WordPress-Android/pull/17286]
 * [*] Stats: Fix Western Arabic Numerals not being shown on every text of the stats screens in Arabic languages [https://github.com/wordpress-mobile/WordPress-Android/pull/17217]

WordPress/src/main/java/org/wordpress/android/ui/about/UnifiedAboutViewModel.kt

@@ -4,13 +4,16 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.automattic.about.model.AboutConfig
+import com.automattic.about.model.AboutFooterConfig
 import com.automattic.about.model.AnalyticsConfig
+import com.automattic.about.model.AutomatticConfig
 import com.automattic.about.model.HeaderConfig
 import com.automattic.about.model.ItemConfig
 import com.automattic.about.model.LegalConfig
 import com.automattic.about.model.RateUsConfig
 import com.automattic.about.model.ShareConfig
 import com.automattic.about.model.SocialsConfig
+import com.automattic.about.model.WorkWithUsConfig
 import org.wordpress.android.Constants
 import org.wordpress.android.R
 import org.wordpress.android.models.recommend.RecommendApiCallsProvider
@@ -49,7 +52,7 @@ class UnifiedAboutViewModel @Inject constructor(
             customItems = listOf(
                     ItemConfig(
                             name = BLOG_ITEM_NAME,
-                            title = contextProvider.getContext().getString(R.string.about_blog),
+                            title = blogTitle(),
                             onClick = ::onBlogClick
                     )
             ),
@@ -58,6 +61,13 @@ class UnifiedAboutViewModel @Inject constructor(
                     privacyPolicyUrl = Constants.URL_PRIVACY_POLICY,
                     acknowledgementsUrl = LICENSES_FILE_URL
             ),
+            automatticConfig = AutomatticConfig(isVisible = buildConfig.isJetpackApp),
+            workWithUsConfig = WorkWithUsConfig(
+                    title =  workWithUsTitle(),
+                    subtitle = workWithUsSubTitle(),
+                    url = if (buildConfig.isJetpackApp) JP_WORK_WITH_US_URL else WP_CONTRIBUTE_URL
+            ),
+            aboutFooterConfig = AboutFooterConfig(isVisible = buildConfig.isJetpackApp),
             analyticsConfig = AnalyticsConfig(
                     trackScreenShown = unifiedAboutTracker::trackScreenShown,
                     trackScreenDismissed = unifiedAboutTracker::trackScreenDismissed,
@@ -90,16 +100,36 @@ class UnifiedAboutViewModel @Inject constructor(
         _onNavigation.postValue(Event(OpenBlog(if (buildConfig.isJetpackApp) JP_BLOG_URL else WP_BLOG_URL)))
     }
 
+    private fun blogTitle() = if (buildConfig.isJetpackApp) {
+        contextProvider.getContext().getString(R.string.about_blog)
+    } else {
+        contextProvider.getContext().getString(R.string.about_news)
+    }
+
+    private fun workWithUsTitle() = if (buildConfig.isJetpackApp) {
+        contextProvider.getContext().getString(R.string.about_automattic_work_with_us_item_title)
+    } else {
+        contextProvider.getContext().getString(R.string.about_automattic_contribute_item_title)
+    }
+
+    private fun workWithUsSubTitle() = if (buildConfig.isJetpackApp) {
+        contextProvider.getContext().getString(R.string.about_automattic_work_with_us_item_subtitle)
+    } else {
+        null
+    }
+
     companion object {
         private const val BLOG_ITEM_NAME = "blog"
         private const val LICENSES_FILE_URL = "file:///android_asset/licenses.html"
 
-        private const val WP_SOCIAL_HANDLE = "wordpress"
+        private const val WP_SOCIAL_HANDLE = "WPAndroid"
         private const val WP_APPS_URL = "https://apps.wordpress.com"
-        private const val WP_BLOG_URL = "https://blog.wordpress.com"
+        private const val WP_BLOG_URL = "https://wordpress.org/news/"
+        private const val WP_CONTRIBUTE_URL = "https://make.wordpress.org/mobile/handbook/"
 
         private const val JP_SOCIAL_HANDLE = "jetpack"
         private const val JP_APPS_URL = "https://jetpack.com/app"
         private const val JP_BLOG_URL = "https://jetpack.com/blog"
+        private const val JP_WORK_WITH_US_URL = "https://automattic.com/work-with-us/"
     }
 }

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

@@ -4057,6 +4057,7 @@ translators: %s: Select control option value e.g: "Auto, 25%". -->
 
     <!-- About -->
     <string name="about_blog">Blog</string>
+    <string name="about_news">News</string>
     <string name="about_automattic_main_page_title" tools:ignore="UnusedResources" a8c-src-lib="about">About %1$s</string>
     <string name="about_automattic_legal_page_title" tools:ignore="UnusedResources" a8c-src-lib="about">Legal and More</string>
     <string name="about_automattic_acknowledgements_page_title" tools:ignore="UnusedResources" a8c-src-lib="about">Acknowledgements</string>
@@ -4068,6 +4069,7 @@ translators: %s: Select control option value e.g: "Auto, 25%". -->
     <string name="about_automattic_legal_and_more_item_title" tools:ignore="UnusedResources" a8c-src-lib="about">Legal and More</string>
     <string name="about_automattic_family_item_title" tools:ignore="UnusedResources" a8c-src-lib="about">Automattic Family</string>
     <string name="about_automattic_work_with_us_item_title" tools:ignore="UnusedResources" a8c-src-lib="about">Work With Us</string>
+    <string name="about_automattic_contribute_item_title" tools:ignore="UnusedResources" a8c-src-lib="about">Contribute</string>
     <string name="about_automattic_work_with_us_item_subtitle" tools:ignore="UnusedResources" a8c-src-lib="about">Work from Anywhere</string>
     <string name="about_automattic_terms_of_service_item_title" tools:ignore="UnusedResources" a8c-src-lib="about">Terms of Service</string>
     <string name="about_automattic_privacy_policy_item_title" tools:ignore="UnusedResources" a8c-src-lib="about">Privacy Policy</string>

build.gradle

@@ -15,7 +15,7 @@ ext {
     aztecVersion = 'v1.6.0'
     gutenbergMobileVersion = 'v1.83.0'
     storiesVersion = '1.4.0'
-    aboutAutomatticVersion = '0.0.6'
+    aboutAutomatticVersion = '0.0.7'
 
     minSdkVersion = 24
     compileSdkVersion = 31