diff --git a/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java b/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java index ba3aecb1f..22a2f9a5c 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java +++ b/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java @@ -16,7 +16,8 @@ import org.joinmastodon.android.fragments.HomeFragment; import org.joinmastodon.android.fragments.ProfileFragment; import org.joinmastodon.android.fragments.ThreadFragment; import org.joinmastodon.android.fragments.onboarding.AccountActivationFragment; -import org.joinmastodon.android.fragments.onboarding.CustomLoginFragment; +import org.joinmastodon.android.fragments.onboarding.CustomWelcomeFragment; +import org.joinmastodon.android.fragments.onboarding.CustomWelcomeFragment; import org.joinmastodon.android.model.Notification; import org.joinmastodon.android.ui.utils.UiUtils; import org.joinmastodon.android.updater.GithubSelfUpdater; @@ -33,7 +34,7 @@ public class MainActivity extends FragmentStackActivity{ if(savedInstanceState==null){ if(AccountSessionManager.getInstance().getLoggedInAccounts().isEmpty()){ - showFragmentClearingBackStack(new CustomLoginFragment()); + showFragmentClearingBackStack(new CustomWelcomeFragment()); }else{ AccountSessionManager.getInstance().maybeUpdateLocalInfo(); AccountSession session; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomLoginFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java similarity index 100% rename from mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomLoginFragment.java rename to mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java b/mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java index 91032a4e2..437d75e80 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java @@ -23,7 +23,8 @@ import org.joinmastodon.android.R; import org.joinmastodon.android.api.requests.oauth.RevokeOauthToken; import org.joinmastodon.android.api.session.AccountSession; import org.joinmastodon.android.api.session.AccountSessionManager; -import org.joinmastodon.android.fragments.onboarding.CustomLoginFragment; +import org.joinmastodon.android.fragments.onboarding.CustomWelcomeFragment; +import org.joinmastodon.android.fragments.onboarding.CustomWelcomeFragment; import org.joinmastodon.android.ui.utils.UiUtils; import java.util.List; @@ -77,7 +78,7 @@ public class AccountSwitcherSheet extends BottomSheet{ holder.avatar.setImageResource(R.drawable.ic_fluent_add_circle_24_filled); holder.avatar.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(activity, android.R.attr.textColorPrimary))); adapter.addAdapter(new ClickableSingleViewRecyclerAdapter(holder.itemView, ()->{ - Nav.go(activity, CustomLoginFragment.class, null); + Nav.go(activity, CustomWelcomeFragment.class, null); dismiss(); }));