Skip to content

Bugfix/Correct sort descending lexicographical #2611

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

Merged
tobiasKaminsky merged 4 commits into from
Apr 10, 2025
Merged

Bugfix/Correct sort descending lexicographical #2611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ebb60b1
Fix null id exception
Kokika Apr 3, 2025
20f540c
Fix sorting during category selected
Kokika Apr 3, 2025
03331be
Add creator name to alphabetical_desc.xml
Kokika Apr 3, 2025
f2cb10a
Merge branch 'main' into bugfix/sort-descending-lexicographical
Kokika Apr 5, 2025
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
7 changes: 6 additions & 1 deletion app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,8 +262,13 @@ protected void onCreate(Bundle savedInstanceState) {
updateSortMethodIcon(methodOfCategory.second);
activityBinding.sortingMethod.setOnClickListener((v) -> {
if (methodOfCategory.first != null) {
int newId = 0;
if (methodOfCategory.second != null)
{
newId = methodOfCategory.second.getId();
}
//Rotate for next sorting method
var newMethod = CategorySortingMethod.findById(methodOfCategory.second.getId() + 1);
var newMethod = CategorySortingMethod.findById(newId + 1);
final var modifyLiveData = mainViewModel.modifyCategoryOrder(methodOfCategory.first, newMethod);
modifyLiveData.observe(this, (next) -> modifyLiveData.removeObservers(this));
}
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/it/niedermann/owncloud/notes/main/MainViewModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import static it.niedermann.owncloud.notes.main.slots.SlotterUtil.fillListByInitials;
import static it.niedermann.owncloud.notes.main.slots.SlotterUtil.fillListByTime;
import static it.niedermann.owncloud.notes.shared.model.CategorySortingMethod.SORT_MODIFIED_DESC;
import static it.niedermann.owncloud.notes.shared.model.CategorySortingMethod.SORT_LEXICOGRAPHICAL_ASC;
import static it.niedermann.owncloud.notes.shared.model.CategorySortingMethod.SORT_LEXICOGRAPHICAL_DESC;
import static it.niedermann.owncloud.notes.shared.model.ENavigationCategoryType.DEFAULT_CATEGORY;
import static it.niedermann.owncloud.notes.shared.model.ENavigationCategoryType.FAVORITES;
import static it.niedermann.owncloud.notes.shared.model.ENavigationCategoryType.RECENT;
Expand Down Expand Up @@ -273,6 +273,9 @@ public LiveData<List<Item>> getNotesListLiveData() {
}

private List<Item> fromNotes(List<Note> noteList, @NonNull NavigationCategory selectedCategory, @Nullable CategorySortingMethod sortingMethod) {
if(sortingMethod == SORT_LEXICOGRAPHICAL_DESC){
Collections.reverse(noteList);
}
if (selectedCategory.getType() == DEFAULT_CATEGORY) {
final String category = selectedCategory.getCategory();
if (category != null) {
Expand All @@ -284,9 +287,6 @@ private List<Item> fromNotes(List<Note> noteList, @NonNull NavigationCategory se
if (sortingMethod == SORT_MODIFIED_DESC) {
return fillListByTime(getApplication(), noteList);
}
if(sortingMethod != SORT_LEXICOGRAPHICAL_ASC){
Collections.reverse(noteList);
}
return fillListByInitials(getApplication(), noteList);
}

Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/drawable/alphabetical_desc.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
~
~ SPDX-FileCopyrightText: 2018-2024 Google LLC
~ SPDX-FileCopyrightText: 2018-2024 Andy Scherzinger
~ SPDX-FileCopyrightText: 2024-2025 Kornél Szekeres
~ SPDX-License-Identifier: Apache-2.0
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
Expand Down