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

[BUG] List filtering not working after rotating device #4467

Conversation

AwaisKhan128
Copy link
Contributor

@AwaisKhan128 AwaisKhan128 commented Sep 16, 2024

Related Issues

App:

  • Add changelog files for the fixed issues in folder changelog/unreleased. More info here
  • Add feature to Release Notes in ReleaseNotesViewModel.kt creating a new ReleaseNote() with String resources (if required)

QA

@AwaisKhan128
Copy link
Contributor Author

@JuancaG05 please review this one.

@JuancaG05 JuancaG05 linked an issue Sep 18, 2024 that may be closed by this pull request
@JuancaG05 JuancaG05 changed the title Fix/list filtering not working after rotating device [BUG] List filtering not working after rotating device Sep 18, 2024
@JuancaG05 JuancaG05 self-requested a review September 18, 2024 06:32
@JuancaG05 JuancaG05 force-pushed the fix/list_filtering_not_working_after_rotating_device branch from 44642c7 to 0361c2e Compare September 18, 2024 06:35
Copy link
Collaborator

@JuancaG05 JuancaG05 left a comment

Choose a reason for hiding this comment

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

Some comments here @AwaisKhan128! BTW, when you push new commits fixing what I commented here, please do it with conventional commits naming as well. There is already 1 commit (the one to update 4464) that doesn't follow the convention 😅. I encourage you to remove those commits with an interactive rebase and add a new one that includes the file 4467 correctly 👍

changelog/unreleased/4464 Outdated Show resolved Hide resolved
owncloudApp/src/main/res/values/strings.xml Outdated Show resolved Hide resolved
owncloudApp/src/main/res/values/strings.xml Outdated Show resolved Hide resolved
owncloudApp/src/main/res/values/strings.xml Outdated Show resolved Hide resolved
changelog/unreleased/4464 Outdated Show resolved Hide resolved
@AwaisKhan128
Copy link
Contributor Author

Alright.

@AwaisKhan128
Copy link
Contributor Author

@JuancaG05 Could you please have a look now?

@JuancaG05
Copy link
Collaborator

Hi @AwaisKhan128, friendly reminder that you should use conventional commits for naming, there are several commits not following that convention 😃

@AwaisKhan128
Copy link
Contributor Author

AwaisKhan128 commented Sep 18, 2024

@JuancaG05 I did only two commits this time. Which one you are talking about?
Let me do it again

@JuancaG05
Copy link
Collaborator

Hi @AwaisKhan128! The code now is in perfect status to be merged, but if you realise, we have 14 commits in this PR (you can check them in the Commits tab). The ones I meant are not following conventional commits:

  • Update 4464
  • Merge branch 'master' into fix/list_filtering_not_working_after_rotating_device
  • updated string file release_notes_4_4_6_4_bugfixes title and subtitle content

Also, the revert ones are not necessary. Although the code is in a good status, if we merge this PR, all of these 14 commits will be merged, and in addition to not following the conventional commits, some of them are not useful at all because the changes performed in them were already removed (for example, Update 4464 will have no effect since the file 4464 doesn't exist anymore).

What you can do here to leave it in a good status, is removing the unnecessary commits with an interactive rebase. A quick explanation so that you learn for a future too:

  1. Using the Terminal from Android Studio, run the command:
git rebase -i HEAD~15

The number that goes together with HEAD is the number of commits you want to work with, but since this PR has 14, 15 is enough

  1. Replace pick by drop in those commits you want to discard (remember this is a vim editor, you have to use arrows to move, i to enter writing mode and Esc to exit the writing mode)
  2. Exit the writing mode, write :wq and press Enter
  3. Run the command to push it to GitHub (-f because otherwise you won't be able to push it since it will detect conflicts):
git push -f

After this, you should have in this PR only the commits we want and will be ready to be moved to QA and if approved, finally merged 🤠

@AwaisKhan128 AwaisKhan128 force-pushed the fix/list_filtering_not_working_after_rotating_device branch from f7f39fb to 19ba863 Compare September 19, 2024 07:44
@AwaisKhan128
Copy link
Contributor Author

@JuancaG05 Could you please have a look on it?

Copy link
Collaborator

@JuancaG05 JuancaG05 left a comment

Choose a reason for hiding this comment

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

Cool!! Great job @AwaisKhan128!! 🥇 Thanks a lot for your work, let's move this to QA to give the final approval 😃

@JuancaG05 JuancaG05 force-pushed the fix/list_filtering_not_working_after_rotating_device branch from e10c458 to 2f32b08 Compare September 19, 2024 08:20
@JuancaG05
Copy link
Collaborator

@jesmrec let's QA here the configuration changes in FileDisplayActivity, which includes the next views:

  • Main file list (in the different tabs: Personal/Files, Links (in oC10) and Offline)
  • File details
  • Shares
  • Spaces list
  • Image preview
  • Text preview
  • Audio preview

@jesmrec
Copy link
Collaborator

jesmrec commented Sep 20, 2024

QA checks

  • Filter list of files in portrait (root)
  • Filter list of files in landscape (root)
  • Change orientation while filtering in file list (root)
  • Filter list of files in portrait (non root)
  • Filter list of files in landscape (non root)
  • Change orientation while filtering in file list (non root)

  • Filter av. offline in portrait (root)
  • Filter av. offline in landscape (root)
  • Change orientation while filtering in av. offline list (root)
  • Filter av. offline in portrait (non root)
  • Filter av. offline in landscape (non root)
  • Change orientation while filtering in av. offline list (non root)

  • Filter links in portrait (root)
  • Filter links in landscape (root)
  • Change orientation while filtering in links list (root)
  • Filter links in portrait (non root)
  • Filter links in landscape (non root)
  • Change orientation while filtering in links list (non root)

  • File Details -> not filtering here, just checking whether info is correctly displayed when changing orientation

  • Shares -> not filtering here, just checking whether info is correctly displayed when changing orientation

  • Filter list of spaces in portrait
  • Filter list of spaces in landscape
  • Change orientation while filtering in spaces list

  • Image Preview -> not filtering here, just checking whether pic is correctly displayed when changing orientation

  • Text Preview -> not filtering here, just checking whether text is correctly displayed when changing orientation

  • Audio Preview -> not filtering here, just checking whether audio view is correctly displayed when changing orientation

Devices:

Xiaomi Redmi 13
Galaxy Tab A8

@jesmrec
Copy link
Collaborator

jesmrec commented Sep 20, 2024

@AwaisKhan128 thanks a lot for your contribution! you did many attempts but finally it is ready to merge and become part of the product. I hope you enjoyed the contribution and learnt something new!

Wish to see you in other contributions!!

@jesmrec jesmrec merged commit db0f0e1 into owncloud:master Sep 20, 2024
4 checks passed
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.

[BUG] List filtering not working after rotating device
3 participants