mirrors/nextcloud-notes-android
1
0
Fork 0
mirror of https://github.com/nextcloud/notes-android.git synced 2024-11-27 09:46:50 +03:00
Code Issues Projects Releases Packages Wiki Activity

Seperates function getCategoryOrder & modifyCategoryOrder

Browse source
This commit is contained in:
IF-ACT 2020-05-24 20:29:25 +08:00
parent 5b0ec91c86
commit 9e677e52a6
3 changed files with 75 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -619,7 +619,7 @@ public class NotesListViewActivity extends LockedActivity implements ItemAdapter
return;
}
MenuItem sortMethod = currentMenu.findItem(R.id.sorting_method);
CategorySortingMethod method = db.getCategoryOrderByTitle(localAccount.getId(), navigationSelection);
CategorySortingMethod method = db.getCategoryOrder(localAccount.getId(), navigationSelection);
if (method == CategorySortingMethod.SORT_LEXICOGRAPHICAL_ASC) {
sortMethod.setIcon(R.drawable.alphabetical_asc);
} else {
@ -639,14 +639,14 @@ public class NotesListViewActivity extends LockedActivity implements ItemAdapter
if (item.getItemId() == R.id.sorting_method) {
Log.d("onOptionsItemSelected", navigationSelection.category + localAccount.getId());
method = db.getCategoryOrderByTitle(localAccount.getId(), navigationSelection);
method = db.getCategoryOrder(localAccount.getId(), navigationSelection);
if (method == CategorySortingMethod.SORT_LEXICOGRAPHICAL_ASC) {
method = CategorySortingMethod.SORT_MODIFIED_DESC;
} else {
method = CategorySortingMethod.SORT_LEXICOGRAPHICAL_ASC;
}
db.modifyCategoryOrderByTitle(localAccount.getId(), navigationSelection, method);
db.modifyCategoryOrder(localAccount.getId(), navigationSelection, method);
refreshLists();
return true;
} else {

2
app/src/main/java/it/niedermann/owncloud/notes/persistence/LoadNotesListTask.java
View file

@ -52,7 +52,7 @@ public class LoadNotesListTask extends AsyncTask<Void, Void, List<Item>> {
protected List<Item> doInBackground(Void... voids) {
List<DBNote> noteList;
NotesDatabase db = NotesDatabase.getInstance(context);
noteList = db.searchNotes(accountId, searchQuery, category.category, category.favorite, db.getCategoryOrderByTitle(accountId, category));
noteList = db.searchNotes(accountId, searchQuery, category.category, category.favorite, db.getCategoryOrder(accountId, category));
if (category.category == null) {
return fillListByTime(noteList);

103
app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java
View file

@ -981,15 +981,66 @@ public class NotesDatabase extends AbstractNotesDatabase {
}
/**
* This function is used to get the sorting method of a category.
* This function is used to get the sorting method of a category by title.
* The sorting method of the category can be used to decide
* to use which sorting method to show the notes for each categories.
*
* @param accountId The user accountID
* @param categoryTitle The category title
* @return The sorting method in CategorySortingMethod enum format
*/
public CategorySortingMethod getCategoryOrderByTitle(long accountId, String categoryTitle) {
validateAccountId(accountId);
long categoryId = getCategoryIdByTitle(accountId, categoryTitle);
SQLiteDatabase db = getReadableDatabase();
Cursor cursor = db.query(table_category, new String[]{key_category_sorting_method},
key_category_id + " = ?", new String[]{String.valueOf(categoryId)},
null, null, null);
int orderIndex = 0;
while (cursor.moveToNext()) {
orderIndex = cursor.getInt(0);
}
return CategorySortingMethod.getCSM(orderIndex);
}
/**
* This method is used to modify the sorting method for one category by title.
* The user can determine use which sorting method to show the notes for a category.
* When the user changes the sorting method, this method should be called.
*
* @param accountId The user accountID
* @param categoryTitle The category title
* @param sortingMethod The sorting method in CategorySortingMethod enum format
*/
public void modifyCategoryOrderByTitle(
long accountId, String categoryTitle, CategorySortingMethod sortingMethod) {
validateAccountId(accountId);
long categoryId = getCategoryIdByTitle(accountId, categoryTitle);
SQLiteDatabase db = getWritableDatabase();
ContentValues values = new ContentValues();
values.put(key_category_sorting_method, sortingMethod.getCSMID());
db.update(table_category, values,
key_category_id + " = ?", new String[]{String.valueOf(categoryId)});
}
/**
* Gets the sorting method of a category, the category can be normal category or
* one of "All notes", "Favorite", and "Uncategorized".
* If category is one of these three, sorting method will be got from android.content.SharedPreference.
* The sorting method of the category can be used to decide
* to use which sorting method to show the notes for each categories.
*
* @param accountId The user accountID
* @param category The category
* @return The sorting method in CategorySortingMethod enum format
* @return
*/
public CategorySortingMethod getCategoryOrderByTitle(long accountId, @NonNull Category category) {
public CategorySortingMethod getCategoryOrder(long accountId, Category category) {
validateAccountId(accountId);
final Context ctx = getContext().getApplicationContext();
@ -1000,45 +1051,39 @@ public class NotesDatabase extends AbstractNotesDatabase {
if (category.favorite != null && category.favorite) {
// Favorite
orderIndex = sp.getInt(ctx.getString(R.string.action_sorting_method) +
' ' + ctx.getString(R.string.label_favorites),
' ' + ctx.getString(R.string.label_favorites),
0);
} else {
// All notes
orderIndex = sp.getInt(ctx.getString(R.string.action_sorting_method) +
' ' + ctx.getString(R.string.label_all_notes),
' ' + ctx.getString(R.string.label_all_notes),
0);
}
} else if (category.category.isEmpty()) {
// Uncategorized
orderIndex = sp.getInt(ctx.getString(R.string.action_sorting_method) +
' ' + ctx.getString(R.string.action_uncategorized),
' ' + ctx.getString(R.string.action_uncategorized),
0);
} else {
long categoryId = getCategoryIdByTitle(accountId, category.category);
SQLiteDatabase db = getReadableDatabase();
Cursor cursor = db.query(table_category, new String[]{key_category_sorting_method},
key_category_id + " = ?", new String[]{String.valueOf(categoryId)},
null, null, null);
while (cursor.moveToNext()) {
orderIndex = cursor.getInt(0);
}
return getCategoryOrderByTitle(accountId, category.category);
}
return CategorySortingMethod.getCSM(orderIndex);
}
/**
* This method is used to modify the sorting method for one category.
* Modifies the sorting method for one category, the category can be normal category or
* one of "All notes", "Favorite", and "Uncategorized".
* If category is one of these three, sorting method will be modified in android.content.SharedPreference.
* The user can determine use which sorting method to show the notes for a category.
* When the user changes the sorting method, this method should be called.
*
* @param accountId The user accountID
* @param category The category
* @param sortingMethod The sorting method in CategorySortingMethod enum format
* @param accountId The user accountID
* @param category The category to be modified
* @param sortingMethod The sorting method in CategorySortingMethod enum format
*/
public void modifyCategoryOrderByTitle(
long accountId, @NonNull Category category, CategorySortingMethod sortingMethod) {
public void modifyCategoryOrder(
long accountId, Category category, CategorySortingMethod sortingMethod) {
validateAccountId(accountId);
final Context ctx = getContext().getApplicationContext();
@ -1048,28 +1093,22 @@ public class NotesDatabase extends AbstractNotesDatabase {
if (category.favorite != null && category.favorite) {
// Favorite
sp.putInt(ctx.getString(R.string.action_sorting_method) +
' ' + ctx.getString(R.string.label_favorites),
' ' + ctx.getString(R.string.label_favorites),
orderIndex);
} else {
// All notes
sp.putInt(ctx.getString(R.string.action_sorting_method) +
' ' + ctx.getString(R.string.label_all_notes),
' ' + ctx.getString(R.string.label_all_notes),
orderIndex);
}
} else if (category.category.isEmpty()) {
// Uncategorized
sp.putInt(ctx.getString(R.string.action_sorting_method) +
' ' + ctx.getString(R.string.action_uncategorized),
' ' + ctx.getString(R.string.action_uncategorized),
orderIndex);
} else {
long categoryId = getCategoryIdByTitle(accountId, category.category);
SQLiteDatabase db = getWritableDatabase();
ContentValues values = new ContentValues();
values.put(key_category_sorting_method, sortingMethod.getCSMID());
db.update(table_category, values,
key_category_id + " = ?", new String[]{String.valueOf(categoryId)});
modifyCategoryOrderByTitle(accountId, category.category, sortingMethod);
return;
}
sp.apply();
}