Migrate LoginEpilogueActivity, LoginEpilogueFragment to Hilt

Author: irfano

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

@@ -15,11 +15,9 @@
 import org.wordpress.android.ui.WPWebViewActivity;
 import org.wordpress.android.ui.about.UnifiedAboutActivity;
 import org.wordpress.android.ui.accounts.HelpActivity;
-import org.wordpress.android.ui.accounts.LoginEpilogueActivity;
 import org.wordpress.android.ui.accounts.LoginMagicLinkInterceptActivity;
 import org.wordpress.android.ui.accounts.PostSignupInterstitialActivity;
 import org.wordpress.android.ui.accounts.SignupEpilogueActivity;
-import org.wordpress.android.ui.accounts.login.LoginEpilogueFragment;
 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;
@@ -237,10 +235,6 @@ public interface AppComponent {
 
     void inject(PostUploadHandler object);
 
-    void inject(LoginEpilogueActivity object);
-
-    void inject(LoginEpilogueFragment object);
-
     void inject(LoginMagicLinkInterceptActivity object);
 
     void inject(SignupEpilogueActivity object);

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

@@ -4,7 +4,6 @@
 import androidx.lifecycle.ViewModelProvider;
 
 import org.wordpress.android.ui.JetpackRemoteInstallViewModel;
-import org.wordpress.android.ui.accounts.LoginEpilogueViewModel;
 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;
@@ -489,11 +488,6 @@ abstract class ViewModelModule {
     @ViewModelKey(LoginNoSitesViewModel.class)
     abstract ViewModel loginNoSitesErrorViewModel(LoginNoSitesViewModel viewModel);
 
-    @Binds
-    @IntoMap
-    @ViewModelKey(LoginEpilogueViewModel.class)
-    abstract ViewModel loginEpilogueViewModel(LoginEpilogueViewModel viewModel);
-
     @Binds
     @IntoMap
     @ViewModelKey(LoginViewModel.class)

WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginEpilogueActivity.java

@@ -8,7 +8,6 @@
 import androidx.lifecycle.ViewModelProvider;
 
 import org.wordpress.android.R;
-import org.wordpress.android.WordPress;
 import org.wordpress.android.fluxc.store.AccountStore;
 import org.wordpress.android.fluxc.store.SiteStore;
 import org.wordpress.android.ui.ActivityLauncher;
@@ -30,6 +29,9 @@
 
 import javax.inject.Inject;
 
+import dagger.hilt.android.AndroidEntryPoint;
+
+@AndroidEntryPoint
 public class LoginEpilogueActivity extends LocaleAwareActivity implements LoginEpilogueListener {
     public static final String EXTRA_DO_LOGIN_UPDATE = "EXTRA_DO_LOGIN_UPDATE";
     public static final String EXTRA_SHOW_AND_RETURN = "EXTRA_SHOW_AND_RETURN";
@@ -44,7 +46,6 @@ public class LoginEpilogueActivity extends LocaleAwareActivity implements LoginE
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ((WordPress) getApplication()).component().inject(this);
 
         LoginFlowThemeHelper.injectMissingCustomAttributes(getTheme());
 

WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginEpilogueFragment.java

@@ -19,7 +19,6 @@
 
 import org.wordpress.android.BuildConfig;
 import org.wordpress.android.R;
-import org.wordpress.android.WordPress;
 import org.wordpress.android.analytics.AnalyticsTracker;
 import org.wordpress.android.analytics.AnalyticsTracker.Stat;
 import org.wordpress.android.fluxc.model.AccountModel;
@@ -45,6 +44,9 @@
 
 import javax.inject.Inject;
 
+import dagger.hilt.android.AndroidEntryPoint;
+
+@AndroidEntryPoint
 public class LoginEpilogueFragment extends LoginBaseFormFragment<LoginEpilogueListener> {
     public static final String TAG = "login_epilogue_fragment_tag";
 
@@ -154,7 +156,6 @@ protected void setupBottomButton(Button button) {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ((WordPress) requireActivity().getApplication()).component().inject(this);
 
         mDoLoginUpdate = requireArguments().getBoolean(ARG_DO_LOGIN_UPDATE, false);
         mShowAndReturn = requireArguments().getBoolean(ARG_SHOW_AND_RETURN, false);