Migrate LoginNoSitesFragment 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.LoginNoSitesFragment;
 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;
@@ -598,8 +597,6 @@ public interface AppComponent {
 
     void inject(LoginSiteCheckErrorFragment object);
 
-    void inject(LoginNoSitesFragment 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.LoginNoSitesViewModel;
 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;
@@ -483,11 +482,6 @@ abstract class ViewModelModule {
     @ViewModelKey(SiteSettingsTimezoneViewModel.class)
     abstract ViewModel siteSettingsTimezoneViewModel(SiteSettingsTimezoneViewModel viewModel);
 
-    @Binds
-    @IntoMap
-    @ViewModelKey(LoginNoSitesViewModel.class)
-    abstract ViewModel loginNoSitesErrorViewModel(LoginNoSitesViewModel viewModel);
-
     @Binds
     @IntoMap
     @ViewModelKey(LoginViewModel.class)

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

@@ -5,7 +5,8 @@ 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
@@ -21,6 +22,7 @@ import org.wordpress.android.ui.main.utils.MeGravatarLoader
 import org.wordpress.android.ui.utils.UiHelpers
 import javax.inject.Inject
 
+@AndroidEntryPoint
 class LoginNoSitesFragment : Fragment(R.layout.jetpack_login_empty_view) {
     companion object {
         const val TAG = "LoginNoSitesFragment"
@@ -30,15 +32,13 @@ class LoginNoSitesFragment : Fragment(R.layout.jetpack_login_empty_view) {
         }
     }
 
-    @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
     @Inject lateinit var meGravatarLoader: MeGravatarLoader
     @Inject lateinit var uiHelpers: UiHelpers
     private var loginListener: LoginListener? = null
-    private lateinit var viewModel: LoginNoSitesViewModel
+    private val viewModel: LoginNoSitesViewModel by viewModels()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        initDagger()
         initBackPressHandler()
         with(JetpackLoginEmptyViewBinding.bind(view)) {
             initContentViews()
@@ -47,10 +47,6 @@ class LoginNoSitesFragment : Fragment(R.layout.jetpack_login_empty_view) {
         }
     }
 
-    private fun initDagger() {
-        (requireActivity().application as WordPress).component().inject(this)
-    }
-
     private fun JetpackLoginEmptyViewBinding.initContentViews() {
         uiHelpers.setTextOrHide(loginErrorMessageTitle, R.string.login_no_jetpack_sites)
         uiHelpers.setTextOrHide(loginErrorMessageText, R.string.login_no_jetpack_sites_error_message)
@@ -62,9 +58,6 @@ class LoginNoSitesFragment : Fragment(R.layout.jetpack_login_empty_view) {
     }
 
     private fun JetpackLoginEmptyViewBinding.initViewModel(savedInstanceState: Bundle?) {
-        viewModel = ViewModelProvider(this@LoginNoSitesFragment, viewModelFactory)
-                .get(LoginNoSitesViewModel::class.java)
-
         initObservers()
 
         viewModel.start(

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

@@ -3,6 +3,7 @@ package org.wordpress.android.ui.accounts.login.jetpack
 import android.os.Bundle
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
+import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 import org.wordpress.android.WordPress
@@ -24,6 +25,7 @@ import javax.inject.Named
 
 const val KEY_STATE = "key_state"
 
+@HiltViewModel
 class LoginNoSitesViewModel @Inject constructor(
     private val unifiedLoginTracker: UnifiedLoginTracker,
     private val accountStore: AccountStore,