Skip to content
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.

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

Trashbin scrolling #6295

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

Trashbin scrolling #6295

wants to merge 2 commits into from

Conversation

tobiasKaminsky
Copy link
Member

Fix #6241

2020-06-15-1456092020-06-15-145603 2020-06-15-145559

TODO

  • change menu button to <- when searching (@JorisBodin can you point me to the code?)
  • add "no deleted files" if filter finds no file
  • switch back to new header on close (@JorisBodin can you point me to the code?)

Signed-off-by: tobiasKaminsky <[email protected]>
Signed-off-by: tobiasKaminsky <[email protected]>
@nextcloud-android-bot
Copy link
Collaborator

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/14475.apk

qrcode

To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.

@nextcloud-android-bot
Copy link
Collaborator

Codacy

393

Lint

TypemasterPR
Warnings9599
Errors00

SpotBugs (new)

Warning TypeNumber
Bad practice Warnings27
Correctness Warnings64
Internationalization Warnings9
Malicious code vulnerability Warnings4
Multithreaded correctness Warnings9
Performance Warnings75
Security Warnings44
Dodgy code Warnings152
Total384

SpotBugs (master)

Warning TypeNumber
Bad practice Warnings27
Correctness Warnings64
Internationalization Warnings9
Malicious code vulnerability Warnings4
Multithreaded correctness Warnings9
Performance Warnings75
Security Warnings44
Dodgy code Warnings141
Total373

Lint increased!

SpotBugs increased!

@@ -159,9 +159,9 @@ public void showFiles(boolean onDeviceOnly) {
// must be specialized in subclasses
MainApp.showOnlyFilesOnDevice(onDeviceOnly);
if (onDeviceOnly) {
setupToolbar();
setupHomeSearchToolbar(true);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

onDeviceOnly is not trash

@@ -1190,16 +1191,16 @@ protected void onResume() {
if (menuItemId == -1) {
if (MainApp.isOnlyOnDevice()) {
setDrawerMenuItemChecked(R.id.nav_on_device);
setupToolbar();
setupHomeSearchToolbar(true);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why?
With this code it's for all views. With duplication

setupToolbar(true, false);
}

public void setupHomeSearchToolbar(boolean showShortListGroup) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JorisBodin
Copy link
Member

change menu button to <- when searching (@JorisBodin can you point me to the code?)
switch back to new header on close (@JorisBodin can you point me to the code?)

I don't remember doing anything special. It was already implemented, it seems to me.

@AndyScherzinger AndyScherzinger added this to the Nextcloud App 3.13.0 milestone Jun 17, 2020
@tobiasKaminsky tobiasKaminsky removed this from the Nextcloud App 3.13.0 milestone Jul 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

add new header to trash bin
4 participants