Migrate LoginSiteCheckErrorFragment to Hilt

Author: irfano

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

@@ -17,7 +17,6 @@
 import org.wordpress.android.ui.accounts.HelpActivity;
 import org.wordpress.android.ui.accounts.PostSignupInterstitialActivity;
 import org.wordpress.android.ui.accounts.SignupEpilogueActivity;
-import org.wordpress.android.ui.accounts.login.jetpack.LoginSiteCheckErrorFragment;
 import org.wordpress.android.ui.accounts.signup.SignupEpilogueFragment;
 import org.wordpress.android.ui.activitylog.detail.ActivityLogDetailFragment;
 import org.wordpress.android.ui.activitylog.list.ActivityLogListFragment;
@@ -595,8 +594,6 @@ public interface AppComponent {
 
     void inject(SiteSettingsTimezoneBottomSheet object);
 
-    void inject(LoginSiteCheckErrorFragment object);
-
     void inject(UserProfileBottomSheetFragment object);
 
     void inject(EngagedPeopleListActivity object);

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

@@ -5,7 +5,6 @@
 
 import org.wordpress.android.ui.JetpackRemoteInstallViewModel;
 import org.wordpress.android.ui.accounts.LoginViewModel;
-import org.wordpress.android.ui.accounts.login.jetpack.LoginSiteCheckErrorViewModel;
 import org.wordpress.android.ui.activitylog.list.filter.ActivityLogTypeFilterViewModel;
 import org.wordpress.android.ui.bloggingprompts.onboarding.BloggingPromptsOnboardingViewModel;
 import org.wordpress.android.ui.bloggingreminders.BloggingRemindersViewModel;
@@ -492,11 +491,6 @@ abstract class ViewModelModule {
     @ViewModelKey(DeepLinkingIntentReceiverViewModel.class)
     abstract ViewModel deepLinkingIntentReceiverViewModel(DeepLinkingIntentReceiverViewModel viewModel);
 
-    @Binds
-    @IntoMap
-    @ViewModelKey(LoginSiteCheckErrorViewModel.class)
-    abstract ViewModel loginSiteCheckErrorViewModel(LoginSiteCheckErrorViewModel viewModel);
-
     @Binds
     @IntoMap
     @ViewModelKey(StorageUtilsViewModel.class)

WordPress/src/main/java/org/wordpress/android/ui/accounts/login/jetpack/LoginSiteCheckErrorFragment.kt

@@ -5,9 +5,9 @@ import android.os.Bundle
 import android.view.View
 import androidx.activity.OnBackPressedCallback
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProvider
+import androidx.fragment.app.viewModels
+import dagger.hilt.android.AndroidEntryPoint
 import org.wordpress.android.R
-import org.wordpress.android.WordPress
 import org.wordpress.android.databinding.JetpackLoginEmptyViewBinding
 import org.wordpress.android.login.LoginListener
 import org.wordpress.android.ui.ActivityLauncher
@@ -19,6 +19,7 @@ import org.wordpress.android.ui.utils.HtmlMessageUtils
 import org.wordpress.android.util.ActivityUtils
 import javax.inject.Inject
 
+@AndroidEntryPoint
 class LoginSiteCheckErrorFragment : Fragment(R.layout.jetpack_login_empty_view) {
     companion object {
         const val TAG = "LoginSiteCheckErrorFragment"
@@ -33,12 +34,11 @@ class LoginSiteCheckErrorFragment : Fragment(R.layout.jetpack_login_empty_view)
         }
     }
 
-    @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
     @Inject lateinit var unifiedLoginTracker: UnifiedLoginTracker
     @Inject lateinit var htmlMessageUtils: HtmlMessageUtils
     private var loginListener: LoginListener? = null
     private var siteAddress: String? = null
-    private lateinit var viewModel: LoginSiteCheckErrorViewModel
+    private val viewModel: LoginSiteCheckErrorViewModel by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -51,9 +51,7 @@ class LoginSiteCheckErrorFragment : Fragment(R.layout.jetpack_login_empty_view)
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        initDagger()
         initBackPressHandler()
-        initViewModel()
         with(JetpackLoginEmptyViewBinding.bind(view)) {
             ActivityUtils.hideKeyboardForced(view)
             initErrorMessageView()
@@ -62,15 +60,6 @@ class LoginSiteCheckErrorFragment : Fragment(R.layout.jetpack_login_empty_view)
         initObservers()
     }
 
-    private fun initDagger() {
-        (requireActivity().application as WordPress).component().inject(this)
-    }
-
-    private fun initViewModel() {
-        viewModel = ViewModelProvider(this@LoginSiteCheckErrorFragment, viewModelFactory)
-                .get(LoginSiteCheckErrorViewModel::class.java)
-    }
-
     private fun JetpackLoginEmptyViewBinding.initErrorMessageView() {
         loginErrorMessageText.text = htmlMessageUtils.getHtmlMessageFromStringFormatResId(
                 R.string.login_not_a_jetpack_site,

WordPress/src/main/java/org/wordpress/android/ui/accounts/login/jetpack/LoginSiteCheckErrorViewModel.kt

@@ -2,6 +2,7 @@ package org.wordpress.android.ui.accounts.login.jetpack
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
+import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineDispatcher
 import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.accounts.LoginNavigationEvents
@@ -12,6 +13,7 @@ import org.wordpress.android.viewmodel.ScopedViewModel
 import javax.inject.Inject
 import javax.inject.Named
 
+@HiltViewModel
 class LoginSiteCheckErrorViewModel @Inject constructor(
     @Named(UI_THREAD) mainDispatcher: CoroutineDispatcher
 ) : ScopedViewModel(mainDispatcher) {