mirrors/nextcloud-notes-android
1
0
Fork 0
mirror of https://github.com/nextcloud/notes-android.git synced 2024-11-24 13:56:14 +03:00
Code Issues Projects Releases Packages Wiki Activity

select category when opened in navigation

Browse source
This commit is contained in:
korelstar 2017-11-17 08:26:09 +01:00 committed by Niedermann IT-Dienstleistungen
parent 98d0ab29dc
commit dc88558207
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java
View file

@ -189,13 +189,18 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap
});
}
private void setupNavigationList(String selectedItem) {
private void setupNavigationList(final String selectedItem) {
itemRecent = new NavigationAdapter.NavigationItem(ADAPTER_KEY_RECENT, getString(R.string.action_recent), null, R.drawable.ic_clock_grey600_24dp);
itemStarred = new NavigationAdapter.NavigationItem(ADAPTER_KEY_STARRED, getString(R.string.action_starred), null, R.drawable.ic_star_grey600_24dp);
adapterCategories = new NavigationAdapter(new NavigationAdapter.ClickListener() {
@Override
public void onItemClick(NavigationAdapter.NavigationItem item) {
selectItem(item, true);
}
private void selectItem(NavigationAdapter.NavigationItem item, boolean closeNavigation) {
adapterCategories.setSelectedItem(item.id);
// update current selection
if(itemRecent == item) {
navigationSelection = new Category(null, null);
@ -206,6 +211,7 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap
} else {
navigationSelection = new Category(item.label, null);
}
// auto-close sub-folder in Navigation if selection is outside of that folder
if(navigationOpen != null) {
int slashIndex = navigationSelection.category==null ? -1 : navigationSelection.category.indexOf('/');
@ -214,8 +220,11 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap
navigationOpen = null;
}
}
// update views
drawerLayout.closeDrawers();
if(closeNavigation) {
drawerLayout.closeDrawers();
}
refreshLists();
}
@ -223,7 +232,7 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap
public void onIconClick(NavigationAdapter.NavigationItem item) {
if(item.icon == NavigationAdapter.ICON_MULTIPLE && !item.label.equals(navigationOpen)) {
navigationOpen = item.label;
refreshLists();
selectItem(item, false);
} else if(item.icon== NavigationAdapter.ICON_MULTIPLE || item.icon==NavigationAdapter.ICON_MULTIPLE_OPEN && item.label.equals(navigationOpen)) {
navigationOpen = null;
refreshLists();
@ -286,6 +295,7 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap
} else if(belongsToLastPrimaryCategory) {
if(isCategoryOpen) {
item.label = currentPrimaryCategory + "/" + currentSecondaryCategory;
item.id = "category:"+item.label;
item.icon = NavigationAdapter.ICON_SUB_FOLDER;
items.add(item);
lastSecondaryCategory = item;
@ -299,6 +309,7 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap
item.icon = NavigationAdapter.ICON_MULTIPLE_OPEN;
} else {
item.label = currentPrimaryCategory;
item.id = "category:"+item.label;
}
items.add(item);
lastPrimaryCategory = item;