Extract :libs:core-ui module from :WordPress

WordPress/build.gradle

@@ -366,6 +366,10 @@ dependencies {
         }
     }
     implementation project(":libs:posttypes")
+    implementation project(":libs:core-ui")
+    implementation project(":libs:utils")
+    implementation project(":libs:reader-models")
+    implementation project(":libs:reader")
     implementation("$gradle.ext.aboutAutomatticBinaryPath:${libs.versions.automattic.about.get()}")
 
     implementation("$gradle.ext.gutenbergKitBinaryPath:${libs.versions.gutenberg.kit.get()}")
@@ -452,6 +456,7 @@ dependencies {
 
     implementation(libs.wordpress.rs.android)
 
+    testImplementation project(":libs:core-test")
     testImplementation(libs.androidx.arch.core.testing) {
         exclude group: 'com.android.support', module: 'support-compat'
         exclude group: 'com.android.support', module: 'support-annotations'

WordPress/src/androidTest/java/org/wordpress/android/util/UrlUtilsTest.java

@@ -2,11 +2,8 @@
 
 import org.junit.Test;
 
-import dagger.hilt.android.testing.HiltAndroidTest;
-
 import static junit.framework.TestCase.assertEquals;
 
-@HiltAndroidTest
 public class UrlUtilsTest {
     @Test
     public void testGetHost1() {

WordPress/src/androidTest/java/org/wordpress/android/util/WPUrlUtilsTest.java

@@ -7,12 +7,9 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 
-import dagger.hilt.android.testing.HiltAndroidTest;
-
 import static junit.framework.TestCase.assertFalse;
 import static junit.framework.TestCase.assertTrue;
 
-@HiltAndroidTest
 public class WPUrlUtilsTest {
     private static final String WPCOM_ADDRESS_1 = "http://wordpress.com/xmlrpc.php";
     private static final String WPCOM_ADDRESS_2 = "http://wordpress.com#.b.com/test";

WordPress/src/main/java/org/wordpress/android/AppInitializer.kt

@@ -307,6 +307,7 @@ class AppInitializer @Inject constructor(
 
         WordPress.versionName = PackageUtils.getVersionName(application)
         initWpDb()
+        ReaderDatabase.init(application)
         context?.let { enableHttpResponseCache(it) }
 
         AppReviewManager.init(application)

WordPress/src/main/java/org/wordpress/android/modules/ApplicationModule.java

@@ -56,7 +56,7 @@
 import kotlinx.coroutines.CoroutineScope;
 import rs.wordpress.api.kotlin.WpLoginClient;
 
-import static org.wordpress.android.modules.ThreadModuleKt.APPLICATION_SCOPE;
+import static org.wordpress.android.modules.CoroutineDispatchersKt.APPLICATION_SCOPE;
 
 @InstallIn(SingletonComponent.class)
 @Module(includes = AndroidInjectionModule.class)

WordPress/src/main/java/org/wordpress/android/modules/ReaderModule.kt

@@ -0,0 +1,29 @@
+package org.wordpress.android.modules
+
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import org.wordpress.android.ui.prefs.AppPrefsWrapper
+import org.wordpress.android.ui.reader.preferences.ReaderPreferences
+import org.wordpress.android.ui.reader.tracker.ReaderTracker
+import org.wordpress.android.ui.reader.tracker.ReaderTrackerImpl
+import org.wordpress.android.util.NetworkAvailability
+import org.wordpress.android.util.NetworkUtilsWrapper
+
+@InstallIn(SingletonComponent::class)
+@Module
+interface ReaderModule {
+    @Binds
+    fun bindReaderTracker(impl: ReaderTrackerImpl): ReaderTracker
+
+    @Binds
+    fun bindNetworkAvailability(
+        impl: NetworkUtilsWrapper
+    ): NetworkAvailability
+
+    @Binds
+    fun bindReaderPreferences(
+        impl: AppPrefsWrapper
+    ): ReaderPreferences
+}

WordPress/src/main/java/org/wordpress/android/modules/ThreadModule.kt

@@ -10,12 +10,6 @@ import kotlinx.coroutines.Dispatchers
 import org.wordpress.android.util.helpers.Debouncer
 import javax.inject.Named
 
-const val APPLICATION_SCOPE = "APPLICATION_SCOPE"
-
-const val UI_THREAD = "UI_THREAD"
-const val BG_THREAD = "BG_THREAD"
-const val IO_THREAD = "IO_THREAD"
-
 @InstallIn(SingletonComponent::class)
 @Module
 class ThreadModule {

WordPress/src/main/java/org/wordpress/android/reader/savedposts/resolver/ReaderSavedPostsHelper.kt

@@ -1,6 +1,6 @@
 package org.wordpress.android.reader.savedposts.resolver
 
-import org.wordpress.android.R
+import org.wordpress.android.reader.R as ReaderR
 import org.wordpress.android.datasets.wrappers.ReaderDatabaseWrapper
 import org.wordpress.android.datasets.wrappers.ReaderPostTableWrapper
 import org.wordpress.android.datasets.wrappers.ReaderTagTableWrapper
@@ -48,8 +48,8 @@ class ReaderSavedPostsHelper @Inject constructor(
             readerTagTableWrapper.addOrUpdateTag(
                 ReaderTag(
                     "",
-                    contextProvider.getContext().getString(R.string.reader_save_for_later_display_name),
-                    contextProvider.getContext().getString(R.string.reader_save_for_later_title),
+                    contextProvider.getContext().getString(ReaderR.string.reader_save_for_later_display_name),
+                    contextProvider.getContext().getString(ReaderR.string.reader_save_for_later_title),
                     "",
                     BOOKMARKED
                 )

WordPress/src/main/java/org/wordpress/android/ui/bloggingprompts/onboarding/BloggingPromptsOnboardingDialogFragment.kt

@@ -213,9 +213,9 @@ class BloggingPromptsOnboardingDialogFragment : FeatureIntroductionDialogFragmen
                         textRes = holder.message,
                         duration = Snackbar.LENGTH_LONG
                     ),
-                    holder.buttonTitle?.let {
+                    holder.buttonTitle?.let { buttonTitle ->
                         Action(
-                            textRes = holder.buttonTitle,
+                            textRes = buttonTitle,
                             clickListener = { holder.buttonAction() }
                         )
                     },

WordPress/src/main/java/org/wordpress/android/ui/comments/unified/UnifiedCommentListFragment.kt

@@ -137,9 +137,9 @@ class UnifiedCommentListFragment : Fragment(R.layout.unified_comment_list_fragme
                             textRes = snackbarMessage.message,
                             duration = Snackbar.LENGTH_LONG
                         ),
-                        snackbarMessage.buttonTitle?.let {
+                        snackbarMessage.buttonTitle?.let { buttonTitle ->
                             Action(
-                                textRes = snackbarMessage.buttonTitle,
+                                textRes = buttonTitle,
                                 clickListener = { snackbarMessage.buttonAction() }
                             )
                         },

WordPress/src/main/java/org/wordpress/android/ui/comments/unified/UnifiedCommentsEditFragment.kt

@@ -167,9 +167,9 @@ class UnifiedCommentsEditFragment : Fragment(R.layout.unified_comments_edit_frag
                     textRes = holder.message,
                     duration = Snackbar.LENGTH_LONG
                 ),
-                holder.buttonTitle?.let {
+                holder.buttonTitle?.let { buttonTitle ->
                     Action(
-                        textRes = holder.buttonTitle,
+                        textRes = buttonTitle,
                         clickListener = { holder.buttonAction() }
                     )
                 },

WordPress/src/main/java/org/wordpress/android/ui/engagement/EngagedPeopleListFragment.kt

@@ -257,9 +257,9 @@ class EngagedPeopleListFragment : Fragment() {
                     textRes = holder.message,
                     duration = Snackbar.LENGTH_LONG
                 ),
-                holder.buttonTitle?.let {
+                holder.buttonTitle?.let { buttonTitle ->
                     Action(
-                        textRes = holder.buttonTitle,
+                        textRes = buttonTitle,
                         clickListener = { holder.buttonAction() }
                     )
                 },

WordPress/src/main/java/org/wordpress/android/ui/jetpack/backup/download/BackupDownloadFragment.kt

@@ -170,11 +170,12 @@ class BackupDownloadFragment : Fragment(R.layout.jetpack_backup_restore_fragment
                 uiHelpers.getTextOfUiString(requireContext(), this.message),
                 Snackbar.LENGTH_LONG
             )
-            if (this.buttonTitle != null) {
+            val buttonTitle = this.buttonTitle
+            if (buttonTitle != null) {
                 snackbar.setAction(
                     uiHelpers.getTextOfUiString(
                         requireContext(),
-                        this.buttonTitle
+                        buttonTitle
                     )
                 ) {
                     this.buttonAction.invoke()

WordPress/src/main/java/org/wordpress/android/ui/jetpack/restore/RestoreFragment.kt

@@ -146,11 +146,12 @@ class RestoreFragment : Fragment(R.layout.jetpack_backup_restore_fragment) {
                 uiHelpers.getTextOfUiString(requireContext(), this.message),
                 Snackbar.LENGTH_LONG
             )
-            if (this.buttonTitle != null) {
+            val buttonTitle = this.buttonTitle
+            if (buttonTitle != null) {
                 snackbar.setAction(
                     uiHelpers.getTextOfUiString(
                         requireContext(),
-                        this.buttonTitle
+                        buttonTitle
                     )
                 ) {
                     this.buttonAction.invoke()

WordPress/src/main/java/org/wordpress/android/ui/media/MediaGridAdapter.java

@@ -55,7 +55,7 @@
 
 import kotlinx.coroutines.CoroutineScope;
 
-import static org.wordpress.android.modules.ThreadModuleKt.APPLICATION_SCOPE;
+import static org.wordpress.android.modules.CoroutineDispatchersKt.APPLICATION_SCOPE;
 
 /**
  * An adapter for the media gallery grid.

WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerFragment.kt

@@ -590,9 +590,9 @@ class MediaPickerFragment : Fragment(), MenuProvider {
                     textRes = holder.message,
                     duration = Snackbar.LENGTH_LONG
                 ),
-                holder.buttonTitle?.let {
+                holder.buttonTitle?.let { buttonTitle ->
                     Action(
-                        textRes = holder.buttonTitle,
+                        textRes = buttonTitle,
                         clickListener = { holder.buttonAction() }
                     )
                 },

WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerFragment.kt

@@ -26,6 +26,7 @@ import org.wordpress.android.ui.layoutpicker.LayoutPickerViewModel.DesignPreview
 import org.wordpress.android.ui.layoutpicker.LayoutPickerViewModel.DesignPreviewAction.Show
 import org.wordpress.android.ui.mlp.BlockLayoutPreviewFragment.Companion.BLOCK_LAYOUT_PREVIEW_TAG
 import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.ui.utils.fadeInfadeOutViews
 import org.wordpress.android.util.DisplayUtils
 import org.wordpress.android.util.extensions.setVisible
 import org.wordpress.android.viewmodel.mlp.ModalLayoutPickerViewModel

WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteFragment.kt

@@ -437,9 +437,9 @@ class MySiteFragment : Fragment(R.layout.my_site_fragment),
                         duration = holder.duration,
                         isImportant = holder.isImportant
                     ),
-                    action = holder.buttonTitle?.let {
+                    action = holder.buttonTitle?.let { buttonTitle ->
                         SnackbarItem.Action(
-                            textRes = holder.buttonTitle,
+                            textRes = buttonTitle,
                             clickListener = { holder.buttonAction() }
                         )
                     },

WordPress/src/main/java/org/wordpress/android/ui/mysite/menu/MenuActivity.kt

@@ -174,9 +174,9 @@ class MenuActivity : BaseAppCompatActivity() {
                         duration = holder.duration,
                         isImportant = holder.isImportant
                     ),
-                    action = holder.buttonTitle?.let {
+                    action = holder.buttonTitle?.let { buttonTitle ->
                         SnackbarItem.Action(
-                            textRes = holder.buttonTitle,
+                            textRes = buttonTitle,
                             clickListener = { holder.buttonAction() }
                         )
                     },

WordPress/src/main/java/org/wordpress/android/ui/pages/PagesFragment.kt

@@ -448,7 +448,8 @@ class PagesFragment : Fragment(R.layout.pages_fragment), ScrollableViewInitializ
     ) {
         val parent = activity.findViewById<View>(R.id.coordinatorLayout)
         if (holder != null && parent != null) {
-            if (holder.buttonTitle == null) {
+            val buttonTitle = holder.buttonTitle
+            if (buttonTitle == null) {
                 WPSnackbar.make(
                     parent,
                     uiHelpers.getTextOfUiString(requireContext(), holder.message),
@@ -463,7 +464,7 @@ class PagesFragment : Fragment(R.layout.pages_fragment), ScrollableViewInitializ
                 snackbar.setAction(
                     uiHelpers.getTextOfUiString(
                         requireContext(),
-                        holder.buttonTitle
+                        buttonTitle
                     )
                 ) {
                     holder.buttonAction()

WordPress/src/main/java/org/wordpress/android/ui/posts/PostListFragment.kt

@@ -12,6 +12,7 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import org.wordpress.android.R
+import org.wordpress.android.reader.R as ReaderR
 import org.wordpress.android.WordPress
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.ui.ActionableEmptyView
@@ -122,7 +123,7 @@ class PostListFragment : ViewPagerFragment() {
             postListViewModelConnector,
             mainViewModel.authorSelectionUpdated.value!!,
             photonWidth = displayWidth - contentSpacing * 2,
-            photonHeight = nonNullActivity.resources.getDimensionPixelSize(R.dimen.reader_featured_image_height)
+            photonHeight = nonNullActivity.resources.getDimensionPixelSize(ReaderR.dimen.reader_featured_image_height)
         )
 
         initObservers()

WordPress/src/main/java/org/wordpress/android/ui/posts/PostsListActivity.kt

@@ -398,9 +398,9 @@ class PostsListActivity : BaseAppCompatActivity(),
                         textRes = holder.message,
                         duration = Snackbar.LENGTH_LONG
                     ),
-                    holder.buttonTitle?.let {
+                    holder.buttonTitle?.let { buttonTitle ->
                         SnackbarItem.Action(
-                            textRes = holder.buttonTitle,
+                            textRes = buttonTitle,
                             clickListener = { holder.buttonAction() }
                         )
                     },