FreshRSS/Readrops
1
0
Fork 0
mirror of https://github.com/readrops/Readrops.git synced 2025-02-02 19:56:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix account settings drawer item disappearing after deleting an account

Browse Source
This commit is contained in:
Shinokuni 2019-09-28 19:06:44 +02:00
parent 6751e9acca
commit c64c341842
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/readrops/app/activities/MainActivity.java
View File

@ -194,6 +194,7 @@ public class MainActivity extends AppCompatActivity implements SwipeRefreshLayou
if (drawer == null) {
drawer = drawerManager.buildDrawer(accounts);
drawer.setSelection(DrawerManager.ARTICLES_ITEM_ID);
updateDrawerFeeds();
} else if (accounts.size() < drawerManager.getNumberOfProfiles() && accounts.size() > 0) {
drawerManager.updateHeader(accounts);
@ -213,7 +214,6 @@ public class MainActivity extends AppCompatActivity implements SwipeRefreshLayou
onRefresh();
savedInstanceState.clear();
}
});
}

40
app/src/main/java/com/readrops/app/utils/DrawerManager.java
View File

@ -122,8 +122,6 @@ public class DrawerManager {
for (SecondaryDrawerItem primaryDrawerItem : feedsWithoutFolder) {
drawer.addItem(primaryDrawerItem);
}
drawer.setSelection(ARTICLES_ITEM_ID);
}
private void createAccountHeader(List<Account> accounts) {
@ -140,20 +138,9 @@ public class DrawerManager {
profileItems[i] = profileItem;
}
ProfileSettingDrawerItem addAccountSettingsItem = new ProfileSettingDrawerItem()
.withName(R.string.add_account)
.withIcon(R.drawable.ic_add_account_grey)
.withIdentifier(ADD_ACCOUNT_ID);
ProfileSettingDrawerItem accountSettingsItem = new ProfileSettingDrawerItem()
.withName(R.string.account_settings)
.withIcon(R.drawable.ic_settings)
.withIdentifier(ACCOUNT_SETTINGS_ID);
header = new AccountHeaderBuilder()
.withActivity(activity)
.addProfiles(profileItems)
.addProfiles(accountSettingsItem, addAccountSettingsItem)
.withDividerBelowHeader(false)
.withAlternativeProfileHeaderSwitching(true)
.withCurrentProfileHiddenInList(true)
@ -163,6 +150,7 @@ public class DrawerManager {
.withOnAccountHeaderListener(headerListener)
.build();
addProfileSettingItems();
header.setActiveProfile(currentAccountId);
}
@ -233,6 +221,20 @@ public class DrawerManager {
drawer.addItem(new DividerDrawerItem());
}
private void addProfileSettingItems() {
ProfileSettingDrawerItem accountSettingsItem = new ProfileSettingDrawerItem()
.withName(R.string.account_settings)
.withIcon(R.drawable.ic_settings)
.withIdentifier(ACCOUNT_SETTINGS_ID);
ProfileSettingDrawerItem addAccountSettingsItem = new ProfileSettingDrawerItem()
.withName(R.string.add_account)
.withIcon(R.drawable.ic_add_account_grey)
.withIdentifier(ADD_ACCOUNT_ID);
header.addProfiles(accountSettingsItem, addAccountSettingsItem);
}
public void addAccount(Account account, boolean currentProfile) {
ProfileDrawerItem profileItem = createProfileItem(account);
@ -244,13 +246,7 @@ public class DrawerManager {
public void updateHeader(List<Account> accounts) {
header.clear();
ProfileSettingDrawerItem addAccountSettingsItem = new ProfileSettingDrawerItem()
.withName(R.string.add_account)
.withIcon(R.drawable.ic_add_account_grey)
.withIdentifier(ADD_ACCOUNT_ID);
header.addProfiles(addAccountSettingsItem);
addProfileSettingItems();
for (Account account : accounts) {
addAccount(account, account.isCurrentAccount());
@ -296,4 +292,8 @@ public class DrawerManager {
}
}
}
public void setDrawerSelection(long identifier) {
drawer.setSelection(identifier);
}
}