Skip to content

[master] Drawer changes #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tobiasKaminsky wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[master] Drawer changes #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2da9d35
Remove "on device"
tobiasKaminsky Nov 30, 2022
64b20c5
Merge branch 'master' into DummyChange2
tobiasKaminsky Jun 6, 2023
862940d
Update partial_drawer_entries.xml
tobiasKaminsky Jun 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,9 +442,6 @@ private void onNavigationItemClicked(final MenuItem menuItem) {
menuItem.getItemId());
} else if (itemId == R.id.nav_gallery) {
startPhotoSearch(menuItem);
} else if (itemId == R.id.nav_on_device) {
EventBus.getDefault().post(new ChangeMenuEvent());
showFiles(true);
} else if (itemId == R.id.nav_uploads) {
startActivity(UploadListActivity.class, Intent.FLAG_ACTIVITY_CLEAR_TOP);
} else if (itemId == R.id.nav_trashbin) {
Expand Down
5 changes: 0 additions & 5 deletions app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1184,13 +1184,8 @@ protected void onResume() {
}

private void setDrawerAllFiles() {
if (MainApp.isOnlyOnDevice()) {
setDrawerMenuItemChecked(R.id.nav_on_device);
setupToolbar();
} else {
setDrawerMenuItemChecked(R.id.nav_all_files);
setupHomeSearchToolbarWithSortAndListButtons();
}
}

public void initSyncBroadcastReceiver() {
Expand Down
13 changes: 4 additions & 9 deletions app/src/main/res/menu/partial_drawer_entries.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,16 @@
android:id="@+id/nav_gallery"
android:icon="@drawable/nav_photos"
android:title="@string/drawer_item_gallery" />
<item
android:id="@+id/nav_shared"
android:orderInCategory="0"
android:icon="@drawable/nav_shared"
android:title="@string/drawer_item_shared" />
<item
<item
android:id="@+id/nav_groupfolders"
android:orderInCategory="0"
android:icon="@drawable/ic_group"
android:title="@string/drawer_item_groupfolders" />
<item
android:id="@+id/nav_on_device"
android:icon="@drawable/nav_on_device"
android:id="@+id/nav_shared"
android:orderInCategory="0"
android:title="@string/drawer_item_on_device"/>
android:icon="@drawable/nav_shared"
android:title="@string/drawer_item_shared" />
<item
android:id="@+id/nav_recently_modified"
android:icon="@drawable/nav_recently"
Expand Down