Integrate gutenberg-mobile release 1.78.1

WordPress/build.gradle

@@ -463,11 +463,11 @@ dependencies {
         }
     }
 
-    implementation (project(path:':libs:networking:WordPressNetworking')) {
+    implementation (project(path:':libs:networking')) {
         exclude group: "com.android.volley"
         exclude group: 'org.wordpress', module: 'utils'
     }
-    implementation (project(path:':libs:analytics:WordPressAnalytics')) {
+    implementation (project(path:':libs:analytics')) {
         exclude group: 'org.wordpress', module: 'utils'
     }
     implementation (project(path:':libs:editor:WordPressEditor')) {

WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java

@@ -118,6 +118,7 @@
 import org.wordpress.android.ui.reader.tracker.ReaderTracker;
 import org.wordpress.android.ui.sitecreation.misc.SiteCreationSource;
 import org.wordpress.android.ui.stats.StatsTimeframe;
+import org.wordpress.android.ui.stats.intro.StatsNewFeaturesIntroDialogFragment;
 import org.wordpress.android.ui.stories.intro.StoriesIntroDialogFragment;
 import org.wordpress.android.ui.uploads.UploadActionUseCase;
 import org.wordpress.android.ui.uploads.UploadUtils;
@@ -143,6 +144,7 @@
 import org.wordpress.android.util.analytics.service.InstallationReferrerServiceStarter;
 import org.wordpress.android.util.config.BloggingPromptsFeatureConfig;
 import org.wordpress.android.util.config.MySiteDashboardTodaysStatsCardFeatureConfig;
+import org.wordpress.android.util.config.StatsRevampV2FeatureConfig;
 import org.wordpress.android.util.extensions.ViewExtensionsKt;
 import org.wordpress.android.viewmodel.main.WPMainActivityViewModel;
 import org.wordpress.android.viewmodel.main.WPMainActivityViewModel.FocusPointInfo;
@@ -164,9 +166,12 @@
 import static org.wordpress.android.push.NotificationsProcessingService.ARG_NOTIFICATION_TYPE;
 import static org.wordpress.android.ui.JetpackConnectionSource.NOTIFICATIONS;
 
+import dagger.hilt.android.AndroidEntryPoint;
+
 /**
  * Main activity which hosts sites, reader, me and notifications pages
  */
+@AndroidEntryPoint
 public class WPMainActivity extends LocaleAwareActivity implements
         OnPageListener,
         BottomNavController,
@@ -250,6 +255,7 @@ public class WPMainActivity extends LocaleAwareActivity implements
     @Inject WeeklyRoundupScheduler mWeeklyRoundupScheduler;
     @Inject MySiteDashboardTodaysStatsCardFeatureConfig mTodaysStatsCardFeatureConfig;
     @Inject QuickStartTracker mQuickStartTracker;
+    @Inject StatsRevampV2FeatureConfig mStatsRevampV2FeatureConfig;
     @Inject BloggingPromptsFeatureConfig mBloggingPromptsFeatureConfig;
 
     @Inject BuildConfigWrapper mBuildConfigWrapper;
@@ -449,6 +455,13 @@ && getIntent().getExtras().getBoolean(ARG_CONTINUE_JETPACK_CONNECT, false)) {
         if (getIntent().getBooleanExtra(ARG_OPEN_BLOGGING_REMINDERS, false)) {
             onSetPromptReminderClick(getIntent().getIntExtra(ARG_OPEN_BLOGGING_REMINDERS, 0));
         }
+
+        // TODO: Confirm what would invoke this and what should happen when remind me later
+        if (mStatsRevampV2FeatureConfig.isEnabled()) {
+            StatsNewFeaturesIntroDialogFragment.newInstance().show(
+                    getSupportFragmentManager(), StatsNewFeaturesIntroDialogFragment.TAG
+            );
+        }
     }
 
     private void showBloggingPromptsOnboarding() {

WordPress/src/main/java/org/wordpress/android/ui/prefs/PreferenceFragmentLifeCycleOwner.kt

@@ -0,0 +1,60 @@
+package org.wordpress.android.ui.prefs
+
+import android.os.Bundle
+import android.preference.PreferenceFragment
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.Lifecycle.Event.ON_CREATE
+import androidx.lifecycle.Lifecycle.Event.ON_DESTROY
+import androidx.lifecycle.Lifecycle.Event.ON_PAUSE
+import androidx.lifecycle.Lifecycle.Event.ON_START
+import androidx.lifecycle.Lifecycle.Event.ON_STOP
+import androidx.lifecycle.LifecycleCoroutineScope
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleRegistry
+import androidx.lifecycle.coroutineScope
+
+/**
+ * LifecycleOwner is a single method interface that denotes that the class has a Lifecycle.
+ * android.preference.PreferenceFragment doesn't implement android.app.Fragment.LifecycleOwner interface.
+ * Fragments and Activities in Support Library 26.1.0 and later already implement the LifecycleOwner interface.
+ * Until we migrate to androidx Preference Library, we can use this class instead of deprecated PreferenceFragment,
+ * which supports the use of lifecycleCoroutineScope for observing Live data or Flows.
+ * https://developer.android.com/topic/libraries/architecture/lifecycle#implementing-lco
+ */
+@SuppressWarnings("deprecation")
+open class PreferenceFragmentLifeCycleOwner : PreferenceFragment(), LifecycleOwner {
+    private lateinit var lifecycleRegistry: LifecycleRegistry
+
+    val lifecycleScope: LifecycleCoroutineScope
+        get() = lifecycle.coroutineScope
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        lifecycleRegistry = LifecycleRegistry(this)
+        lifecycleRegistry.handleLifecycleEvent(ON_CREATE)
+    }
+
+    override fun onStart() {
+        super.onStart()
+        lifecycleRegistry.handleLifecycleEvent(ON_START)
+    }
+
+    override fun onPause() {
+        super.onPause()
+        lifecycleRegistry.handleLifecycleEvent(ON_PAUSE)
+    }
+
+    override fun onStop() {
+        super.onStop()
+        lifecycleRegistry.handleLifecycleEvent(ON_STOP)
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        lifecycleRegistry.handleLifecycleEvent(ON_DESTROY)
+    }
+
+    override fun getLifecycle(): Lifecycle {
+        return lifecycleRegistry
+    }
+}

WordPress/src/main/java/org/wordpress/android/ui/stats/intro/StatsNewFeatureIntroViewModel.kt

@@ -0,0 +1,35 @@
+package org.wordpress.android.ui.stats.intro
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.CoroutineDispatcher
+import org.wordpress.android.analytics.AnalyticsTracker.Stat
+import org.wordpress.android.modules.UI_THREAD
+import org.wordpress.android.ui.stats.intro.StatsNewFeaturesIntroAction.DismissDialog
+import org.wordpress.android.ui.stats.intro.StatsNewFeaturesIntroAction.OpenStats
+import org.wordpress.android.ui.stats.refresh.utils.StatsSiteProvider
+import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
+import org.wordpress.android.viewmodel.ScopedViewModel
+import javax.inject.Inject
+import javax.inject.Named
+
+@HiltViewModel
+class StatsNewFeatureIntroViewModel @Inject constructor(
+    @Named(UI_THREAD) mainDispatcher: CoroutineDispatcher,
+    private val statsSiteProvider: StatsSiteProvider,
+    private val analyticsTracker: AnalyticsTrackerWrapper
+) : ScopedViewModel(mainDispatcher) {
+    private val _action = MutableLiveData<StatsNewFeaturesIntroAction>()
+    val action: LiveData<StatsNewFeaturesIntroAction> = _action
+
+    fun onPrimaryButtonClick() = launch {
+        analyticsTracker.track(Stat.STATS_REVAMP_V2_INTRO_TRY_IT_NOW_CLICKED)
+        _action.postValue(OpenStats(statsSiteProvider.siteModel))
+    }
+
+    fun onSecondaryButtonClick() {
+        analyticsTracker.track(Stat.STATS_REVAMP_V2_INTRO_REMIND_ME_CLICKED)
+        _action.value = DismissDialog
+    }
+}

WordPress/src/main/java/org/wordpress/android/ui/stats/intro/StatsNewFeaturesIntroAction.kt

@@ -0,0 +1,8 @@
+package org.wordpress.android.ui.stats.intro
+
+import org.wordpress.android.fluxc.model.SiteModel
+
+sealed class StatsNewFeaturesIntroAction {
+    data class OpenStats(val site: SiteModel) : StatsNewFeaturesIntroAction()
+    object DismissDialog : StatsNewFeaturesIntroAction()
+}

WordPress/src/main/java/org/wordpress/android/ui/stats/intro/StatsNewFeaturesIntroDialogFragment.kt

@@ -0,0 +1,61 @@
+package org.wordpress.android.ui.stats.intro
+
+import android.os.Bundle
+import android.view.View
+import androidx.fragment.app.viewModels
+import dagger.hilt.android.AndroidEntryPoint
+import org.wordpress.android.R
+import org.wordpress.android.databinding.StatsRevampV2FeaturesIntroContentViewBinding
+import org.wordpress.android.ui.ActivityLauncher
+import org.wordpress.android.ui.featureintroduction.FeatureIntroductionDialogFragment
+import org.wordpress.android.ui.stats.intro.StatsNewFeaturesIntroAction.DismissDialog
+import org.wordpress.android.ui.stats.intro.StatsNewFeaturesIntroAction.OpenStats
+import org.wordpress.android.util.extensions.exhaustive
+
+@AndroidEntryPoint
+class StatsNewFeaturesIntroDialogFragment : FeatureIntroductionDialogFragment() {
+    private val viewModel: StatsNewFeatureIntroViewModel by viewModels()
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        initializeViews()
+        setupObservers()
+    }
+
+    private fun initializeViews() {
+        setHeaderIcon(R.drawable.ic_outline_lightbulb_orange_gradient_40dp)
+        setHeaderTitle(R.string.stats_revamp_v2_intro_header_title)
+
+        val contentBinding = StatsRevampV2FeaturesIntroContentViewBinding.inflate(layoutInflater)
+        setContent(contentBinding.root)
+
+        setPrimaryButtonText(R.string.stats_revamp_v2_intro_primary_button_text)
+        setPrimaryButtonListener { viewModel.onPrimaryButtonClick() }
+
+        setSecondaryButtonText(R.string.stats_revamp_v2_intro_secondary_button_text)
+        setSecondaryButtonListener { viewModel.onSecondaryButtonClick() }
+    }
+
+    private fun setupObservers() {
+        viewModel.action.observe(viewLifecycleOwner) { action ->
+            when (action) {
+                is OpenStats -> {
+                    activity?.let {
+                        ActivityLauncher.viewBlogStats(it, action.site)
+                    }
+                }
+                is DismissDialog -> {
+                    dismiss()
+                }
+            }.exhaustive
+        }
+    }
+
+    companion object {
+        const val TAG = "STATS_NEW_FEATURES_INTRO_DIALOG_FRAGMENT"
+
+        @JvmStatic
+        fun newInstance(): StatsNewFeaturesIntroDialogFragment =
+                StatsNewFeaturesIntroDialogFragment()
+    }
+}

WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/ViewsAndVisitorsMapper.kt

@@ -123,8 +123,9 @@ class ViewsAndVisitorsMapper
                 Visitors -> it.visitors
                 else -> 0L
             }
+            val date = statsDateFormatter.parseStatsDate(statsGranularity, it.period)
             Line(
-                    statsDateFormatter.printGranularDate(it.period, statsGranularity),
+                    statsDateFormatter.printDayWithoutYear(date),
                     it.period,
                     value.toInt()
             )

WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/LineChartLabelFormatter.kt

@@ -3,10 +3,6 @@ package org.wordpress.android.ui.stats.refresh.utils
 import com.github.mikephil.charting.components.AxisBase
 import com.github.mikephil.charting.formatter.ValueFormatter
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.LineChartItem.Line
-import java.text.ParseException
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
 import javax.inject.Inject
 
 class LineChartLabelFormatter @Inject constructor(
@@ -15,27 +11,9 @@ class LineChartLabelFormatter @Inject constructor(
     override fun getAxisLabel(value: Float, axis: AxisBase?): String {
         val index = value.toInt()
         return if (index < entries.size) {
-            formatLabelDate(parseLabelDate(entries[index].label))
+            entries[index].label
         } else {
             ""
         }
     }
-
-    // 12 Apr 2022
-    private fun parseLabelDate(label: String): Date? {
-        var labelDate: Date? = null
-        val labelParser = SimpleDateFormat("dd MMM yyyy", Locale.getDefault())
-        try {
-            labelDate = labelParser.parse(label)
-        } catch (e: ParseException) {
-            e.printStackTrace()
-        }
-        return labelDate
-    }
-
-    // Apr 12
-    private fun formatLabelDate(date: Date?): String {
-        val labelFormatter = SimpleDateFormat("MMM d", Locale.getDefault())
-        return date?.let { labelFormatter.format(it) }.toString()
-    }
 }

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

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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">
+
+    <com.google.android.material.imageview.ShapeableImageView
+        android:id="@+id/cover_image"
+        android:src="@drawable/stats_feature_intro"
+        android:scaleType="center"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin_extra_medium_large"
+        android:layout_marginStart="@dimen/margin_extra_medium_large"
+        android:layout_marginEnd="@dimen/margin_extra_medium_large"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/content_bottom"
+        app:layout_constraintVertical_chainStyle="packed"/>
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/content_bottom"
+        android:text="@string/stats_revamp_v2_intro_content"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin_extra_medium_large"
+        android:layout_marginStart="@dimen/margin_extra_extra_medium_large"
+        android:layout_marginEnd="@dimen/margin_extra_extra_medium_large"
+        android:gravity="center"
+        android:maxEms="70"
+        android:textAppearance="?attr/textAppearanceBody1"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/cover_image"
+        app:layout_constraintBottom_toTopOf="@+id/content_note" />
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/content_note"
+        android:text="@string/stats_revamp_v2_intro_content_note"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin_extra_medium_large"
+        android:background="@drawable/bg_rectangle_black_60_radius_2dp"
+        android:gravity="start"
+        android:padding="@dimen/margin_large"
+        android:textAppearance="?attr/textAppearanceCaption"
+        android:textSize="@dimen/text_sz_small"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/content_bottom" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1373,6 +1373,14 @@
     <string name="stats_insights_comments_guide_card">💡See your top contributors by tapping VIEW MORE.</string>
     <string name="stats_insights_followers_guide_card">💡You can try leaving a comment as a gesture to encourage blog engagement in return to gain more followers.</string>
 
+    <!-- Stats Revamp v2 Feature Introduction -->
+    <string name="stats_revamp_v2_intro_header_title">Insights update</string>
+    <string name="stats_revamp_v2_intro_content">Insights help you understand how your content resonates with your audience with an overview of how it is performing and guidance to your next steps.</string>
+    <string name="stats_revamp_v2_intro_content_note">Note: You can learn more about Insights at any time in My Site > Stats > Insights</string>
+    <string name="stats_revamp_v2_intro_primary_button_text">Try it now</string>
+    <string name="stats_revamp_v2_intro_secondary_button_text">Remind me later</string>
+
+
     <!-- Stats refreshed widgets -->
     <string name="stats_widget_log_in_message">Please log in to the WordPress app to add a widget.</string>
     <string name="stats_widget_weekly_views_name">Views this week</string>

build.gradle

@@ -10,7 +10,7 @@ plugins {
 ext {
     wordPressUtilsVersion = '2.5.0'
     wordPressLoginVersion = '0.14.0'
-    gutenbergMobileVersion = 'v1.78.0'
+    gutenbergMobileVersion = '4961-db8bfd958151567f30f451f1cfc9482885dbeaaf'
     storiesVersion = '1.3.0'
     aboutAutomatticVersion = '0.0.5'