diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java index f14c66b1f..1c819d69a 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java @@ -17,6 +17,7 @@ import org.joinmastodon.android.api.session.AccountSession; import org.joinmastodon.android.api.session.AccountSessionManager; import org.joinmastodon.android.events.SelfUpdateStateChangedEvent; import org.joinmastodon.android.model.viewmodel.ListItem; +import org.joinmastodon.android.ui.AccountSwitcherSheet; import org.joinmastodon.android.ui.M3AlertDialogBuilder; import org.joinmastodon.android.ui.utils.HideableSingleViewRecyclerAdapter; import org.joinmastodon.android.ui.utils.UiUtils; @@ -57,6 +58,7 @@ public class SettingsMainFragment extends BaseSettingsFragment{ new ListItem<>(R.string.settings_notifications, 0, R.drawable.ic_notifications_24px, this::onNotificationsClick), new ListItem<>(AccountSessionManager.get(accountID).domain, getString(R.string.settings_server_explanation), R.drawable.ic_dns_24px, this::onServerClick), new ListItem<>(getString(R.string.about_app, getString(R.string.app_name)), null, R.drawable.ic_info_24px, this::onAboutClick, null, 0, true), + new ListItem<>(R.string.manage_accounts, 0, R.drawable.ic_switch_account_24px, this::onManageAccountsClick), new ListItem<>(R.string.log_out, 0, R.drawable.ic_logout_24px, this::onLogOutClick, R.attr.colorM3Error, false) )); @@ -150,6 +152,10 @@ public class SettingsMainFragment extends BaseSettingsFragment{ Nav.go(getActivity(), SettingsAboutAppFragment.class, makeFragmentArgs()); } + private void onManageAccountsClick(ListItem item){ + new AccountSwitcherSheet(getActivity(), null).show(); + } + private void onLogOutClick(ListItem item_){ AccountSession session=AccountSessionManager.getInstance().getAccount(accountID); new M3AlertDialogBuilder(getActivity()) diff --git a/mastodon/src/main/res/drawable/ic_switch_account_24px.xml b/mastodon/src/main/res/drawable/ic_switch_account_24px.xml new file mode 100644 index 000000000..f496736ba --- /dev/null +++ b/mastodon/src/main/res/drawable/ic_switch_account_24px.xml @@ -0,0 +1,9 @@ + + + diff --git a/mastodon/src/main/res/values/strings.xml b/mastodon/src/main/res/values/strings.xml index e7078aecb..967138f58 100644 --- a/mastodon/src/main/res/values/strings.xml +++ b/mastodon/src/main/res/values/strings.xml @@ -645,6 +645,7 @@ Follows will appear here Organize your home feed with Lists Yours will appear here + Manage accounts %,d post recently %,d posts recently