Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,8 @@ public LiveData<List<NavigationItem>> getNavigationCategories() {

private static List<NavigationItem> fromCategoriesWithNotesCount(@NonNull Context context, @Nullable String expandedCategory, @NonNull List<CategoryWithNotesCount> fromDatabase, int count, int favoritesCount) {
final var categories = convertToCategoryNavigationItem(context, fromDatabase);
final var itemRecent = new NavigationItem(ADAPTER_KEY_RECENT, context.getString(R.string.label_all_notes), count, R.drawable.ic_access_time_grey600_24dp, RECENT);
final var itemFavorites = new NavigationItem(ADAPTER_KEY_STARRED, context.getString(R.string.label_favorites), favoritesCount, R.drawable.ic_star_yellow_24dp, FAVORITES);
final var itemRecent = new NavigationItem(ADAPTER_KEY_RECENT, context.getString(R.string.label_all_notes), count, R.drawable.selector_all_notes, RECENT);
final var itemFavorites = new NavigationItem(ADAPTER_KEY_STARRED, context.getString(R.string.label_favorites), favoritesCount, R.drawable.selector_favorites, FAVORITES);

final var items = new ArrayList<NavigationItem>(fromDatabase.size() + 3);
items.add(itemRecent);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,17 @@ public class NavigationAdapter extends RecyclerView.Adapter<NavigationViewHolder
@ColorInt
private int color;
@DrawableRes
public static final int ICON_FOLDER = R.drawable.ic_folder_grey600_24dp;
public static final int ICON_FOLDER = R.drawable.selector_folder;
@DrawableRes
public static final int ICON_NOFOLDER = R.drawable.ic_folder_open_grey600_24dp;
public static final int ICON_NOFOLDER = R.drawable.selector_folder_open;
@DrawableRes
public static final int ICON_SUB_FOLDER = R.drawable.ic_folder_grey600_18dp;
public static final int ICON_SUB_FOLDER = R.drawable.selector_folder_18;
@DrawableRes
public static final int ICON_MULTIPLE = R.drawable.ic_create_new_folder_grey600_24dp;
public static final int ICON_MULTIPLE = R.drawable.selector_new_folder;
@DrawableRes
public static final int ICON_MULTIPLE_OPEN = R.drawable.ic_folder_grey600_24dp;
public static final int ICON_MULTIPLE_OPEN = R.drawable.selector_folder;
@DrawableRes
public static final int ICON_SUB_MULTIPLE = R.drawable.ic_create_new_folder_grey600_18dp;
public static final int ICON_SUB_MULTIPLE = R.drawable.selector_new_folder_18;

@NonNull
private List<NavigationItem> items = new ArrayList<>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@
public class DisplayUtils {

private static final Map<Integer, Collection<Integer>> SPECIAL_CATEGORY_REPLACEMENTS = Map.of(
R.drawable.ic_library_music_grey600_24dp, singletonList(R.string.category_music),
R.drawable.ic_local_movies_grey600_24dp, asList(R.string.category_movies, R.string.category_movie),
R.drawable.ic_work_grey600_24dp, singletonList(R.string.category_work),
R.drawable.selector_music, singletonList(R.string.category_music),
R.drawable.selector_movies, asList(R.string.category_movies, R.string.category_movie),
R.drawable.selector_work, singletonList(R.string.category_work),
R.drawable.ic_baseline_checklist_24, asList(R.string.category_todo, R.string.category_todos, R.string.category_tasks, R.string.category_checklists),
R.drawable.ic_baseline_fastfood_24, asList(R.string.category_recipe, R.string.category_recipes, R.string.category_restaurant, R.string.category_restaurants, R.string.category_food, R.string.category_bake),
R.drawable.ic_baseline_vpn_key_24, asList(R.string.category_key, R.string.category_keys, R.string.category_password, R.string.category_passwords, R.string.category_credentials),
R.drawable.ic_baseline_games_24, asList(R.string.category_game, R.string.category_games, R.string.category_play),
R.drawable.selector_food, asList(R.string.category_recipe, R.string.category_recipes, R.string.category_restaurant, R.string.category_restaurants, R.string.category_food, R.string.category_bake),
R.drawable.selector_credentials, asList(R.string.category_key, R.string.category_keys, R.string.category_password, R.string.category_passwords, R.string.category_credentials),
R.drawable.selector_games, asList(R.string.category_game, R.string.category_games, R.string.category_play),
R.drawable.ic_baseline_card_giftcard_24, asList(R.string.category_gift, R.string.category_gifts, R.string.category_present, R.string.category_presents)
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ public LiveData<List<NavigationItem>> getAdapterCategories(Long accountId) {
final var categories = convertToCategoryNavigationItem(getApplication(), fromDatabase);

final var items = new ArrayList<NavigationItem>(fromDatabase.size() + 3);
items.add(new NavigationItem(MainActivity.ADAPTER_KEY_RECENT, getApplication().getString(R.string.label_all_notes), count, R.drawable.ic_access_time_grey600_24dp, RECENT));
items.add(new NavigationItem(MainActivity.ADAPTER_KEY_STARRED, getApplication().getString(R.string.label_favorites), favoritesCount, R.drawable.ic_star_yellow_24dp, FAVORITES));
items.add(new NavigationItem(MainActivity.ADAPTER_KEY_RECENT, getApplication().getString(R.string.label_all_notes), count, R.drawable.selector_all_notes, RECENT));
items.add(new NavigationItem(MainActivity.ADAPTER_KEY_STARRED, getApplication().getString(R.string.label_favorites), favoritesCount, R.drawable.selector_favorites, FAVORITES));

if (categories.size() > 2 && categories.get(2).label.isEmpty()) {
items.add(new NavigationItem(MainActivity.ADAPTER_KEY_UNCATEGORIZED, "", null, NavigationAdapter.ICON_NOFOLDER));
Expand Down
15 changes: 7 additions & 8 deletions app/src/main/res/drawable/ic_access_time_grey600_24dp.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
<!--
~ Nextcloud Notes - Android Client
~
~ SPDX-FileCopyrightText: 2018-2024 Google LLC
~ SPDX-FileCopyrightText: 2018-2025 Google LLC
~ SPDX-License-Identifier: Apache-2.0
-->
<vector android:autoMirrored="true"
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="#757575"
android:viewportHeight="24.0"
android:viewportWidth="24.0"
android:width="24dp"
xmlns:android="http://schemas.android.com/apk/res/android">
android:viewportWidth="960"
android:viewportHeight="960">
<path
android:fillColor="#FF757575"
android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z" />
android:fillColor="@android:color/white"
android:pathData="M612,668L668,612L520,464L520,280L440,280L440,496L612,668ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880Z" />
</vector>
16 changes: 16 additions & 0 deletions app/src/main/res/drawable/ic_access_time_grey600_outline_24dp.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<!--
~ Nextcloud Notes - Android Client
~
~ SPDX-FileCopyrightText: 2018-2025 Google LLC
~ SPDX-License-Identifier: Apache-2.0
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="#757575"
android:viewportWidth="960"
android:viewportHeight="960">
<path
android:fillColor="@android:color/white"
android:pathData="M612,668L668,612L520,464L520,280L440,280L440,496L612,668ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480ZM480,800Q613,800 706.5,706.5Q800,613 800,480Q800,347 706.5,253.5Q613,160 480,160Q347,160 253.5,253.5Q160,347 160,480Q160,613 253.5,706.5Q347,800 480,800Z" />
</vector>
11 changes: 6 additions & 5 deletions app/src/main/res/drawable/ic_account_circle_grey_24dp.xml
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
<!--
~ Nextcloud Notes - Android Client
~
~ SPDX-FileCopyrightText: 2018-2024 Google LLC
~ SPDX-FileCopyrightText: 2018-2025 Google LLC
~ SPDX-License-Identifier: Apache-2.0
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
android:tint="#757575"
android:viewportWidth="960"
android:viewportHeight="960">
<path
android:fillColor="#FF757575"
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,5c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM12,19.2c-2.5,0 -4.71,-1.28 -6,-3.22 0.03,-1.99 4,-3.08 6,-3.08 1.99,0 5.97,1.09 6,3.08 -1.29,1.94 -3.5,3.22 -6,3.22z" />
android:fillColor="@android:color/white"
android:pathData="M234,684Q285,645 348,622.5Q411,600 480,600Q549,600 612,622.5Q675,645 726,684Q761,643 780.5,591Q800,539 800,480Q800,347 706.5,253.5Q613,160 480,160Q347,160 253.5,253.5Q160,347 160,480Q160,539 179.5,591Q199,643 234,684ZM480,520Q421,520 380.5,479.5Q340,439 340,380Q340,321 380.5,280.5Q421,240 480,240Q539,240 579.5,280.5Q620,321 620,380Q620,439 579.5,479.5Q539,520 480,520ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q533,800 580,784.5Q627,769 666,740Q627,711 580,695.5Q533,680 480,680Q427,680 380,695.5Q333,711 294,740Q333,769 380,784.5Q427,800 480,800ZM480,440Q506,440 523,423Q540,406 540,380Q540,354 523,337Q506,320 480,320Q454,320 437,337Q420,354 420,380Q420,406 437,423Q454,440 480,440ZM480,380Q480,380 480,380Q480,380 480,380Q480,380 480,380Q480,380 480,380Q480,380 480,380Q480,380 480,380Q480,380 480,380Q480,380 480,380ZM480,740Q480,740 480,740Q480,740 480,740Q480,740 480,740Q480,740 480,740Q480,740 480,740Q480,740 480,740Q480,740 480,740Q480,740 480,740Z" />
</vector>
15 changes: 7 additions & 8 deletions app/src/main/res/drawable/ic_add_blue_24dp.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
<!--
~ Nextcloud Notes - Android Client
~
~ SPDX-FileCopyrightText: 2018-2024 Google LLC
~ SPDX-FileCopyrightText: 2018-2025 Google LLC
~ SPDX-License-Identifier: Apache-2.0
-->
<vector android:autoMirrored="true"
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="#0082C9"
android:viewportHeight="24.0"
android:viewportWidth="24.0"
android:width="24dp"
xmlns:android="http://schemas.android.com/apk/res/android">
android:viewportWidth="960"
android:viewportHeight="960">
<path
android:fillColor="#FF0082C9"
android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
android:fillColor="@android:color/white"
android:pathData="M440,520L200,520L200,440L440,440L440,200L520,200L520,440L760,440L760,520L520,520L520,760L440,760L440,520Z" />
</vector>
16 changes: 7 additions & 9 deletions app/src/main/res/drawable/ic_add_white_24dp.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
<!--
~ Nextcloud Notes - Android Client
~
~ SPDX-FileCopyrightText: 2018-2024 Google LLC
~ SPDX-FileCopyrightText: 2018-2025 Google LLC
~ SPDX-License-Identifier: Apache-2.0
-->
<vector android:autoMirrored="true"
android:height="24dp"
android:tint="#FFFFFF"
android:viewportHeight="24.0"
android:viewportWidth="24.0"
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
xmlns:android="http://schemas.android.com/apk/res/android">
android:height="24dp"
android:viewportWidth="960"
android:viewportHeight="960">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
android:fillColor="@android:color/white"
android:pathData="M440,520L200,520L200,440L440,440L440,200L520,200L520,440L760,440L760,520L520,520L520,760L440,760L440,520Z" />
</vector>
13 changes: 6 additions & 7 deletions app/src/main/res/drawable/ic_baseline_dashboard_24.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
<!--
~ Nextcloud Notes - Android Client
~
~ SPDX-FileCopyrightText: 2018-2024 Google LLC
~ SPDX-FileCopyrightText: 2018-2025 Google LLC
~ SPDX-License-Identifier: Apache-2.0
-->
<vector android:autoMirrored="true"
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="#757575"
android:viewportHeight="24"
android:viewportWidth="24"
android:width="24dp"
xmlns:android="http://schemas.android.com/apk/res/android">
android:viewportWidth="960"
android:viewportHeight="960">
<path
android:fillColor="@android:color/white"
android:pathData="M3,13h8L11,3L3,3v10zM3,21h8v-6L3,15v6zM13,21h8L21,11h-8v10zM13,3v6h8L21,3h-8z" />
android:pathData="M340,420L200,420Q167,420 143.5,396.5Q120,373 120,340L120,200Q120,167 143.5,143.5Q167,120 200,120L340,120Q373,120 396.5,143.5Q420,167 420,200L420,340Q420,373 396.5,396.5Q373,420 340,420ZM200,340L340,340Q340,340 340,340Q340,340 340,340L340,200Q340,200 340,200Q340,200 340,200L200,200Q200,200 200,200Q200,200 200,200L200,340Q200,340 200,340Q200,340 200,340ZM340,840L200,840Q167,840 143.5,816.5Q120,793 120,760L120,620Q120,587 143.5,563.5Q167,540 200,540L340,540Q373,540 396.5,563.5Q420,587 420,620L420,760Q420,793 396.5,816.5Q373,840 340,840ZM200,760L340,760Q340,760 340,760Q340,760 340,760L340,620Q340,620 340,620Q340,620 340,620L200,620Q200,620 200,620Q200,620 200,620L200,760Q200,760 200,760Q200,760 200,760ZM760,420L620,420Q587,420 563.5,396.5Q540,373 540,340L540,200Q540,167 563.5,143.5Q587,120 620,120L760,120Q793,120 816.5,143.5Q840,167 840,200L840,340Q840,373 816.5,396.5Q793,420 760,420ZM620,340L760,340Q760,340 760,340Q760,340 760,340L760,200Q760,200 760,200Q760,200 760,200L620,200Q620,200 620,200Q620,200 620,200L620,340Q620,340 620,340Q620,340 620,340ZM760,840L620,840Q587,840 563.5,816.5Q540,793 540,760L540,620Q540,587 563.5,563.5Q587,540 620,540L760,540Q793,540 816.5,563.5Q840,587 840,620L840,760Q840,793 816.5,816.5Q793,840 760,840ZM620,760L760,760Q760,760 760,760Q760,760 760,760L760,620Q760,620 760,620Q760,620 760,620L620,620Q620,620 620,620Q620,620 620,620L620,760Q620,760 620,760Q620,760 620,760ZM340,340Q340,340 340,340Q340,340 340,340L340,340Q340,340 340,340Q340,340 340,340L340,340Q340,340 340,340Q340,340 340,340L340,340Q340,340 340,340Q340,340 340,340ZM340,620Q340,620 340,620Q340,620 340,620L340,620Q340,620 340,620Q340,620 340,620L340,620Q340,620 340,620Q340,620 340,620L340,620Q340,620 340,620Q340,620 340,620ZM620,340Q620,340 620,340Q620,340 620,340L620,340Q620,340 620,340Q620,340 620,340L620,340Q620,340 620,340Q620,340 620,340L620,340Q620,340 620,340Q620,340 620,340ZM620,620Q620,620 620,620Q620,620 620,620L620,620Q620,620 620,620Q620,620 620,620L620,620Q620,620 620,620Q620,620 620,620L620,620Q620,620 620,620Q620,620 620,620Z" />
</vector>
11 changes: 5 additions & 6 deletions app/src/main/res/drawable/ic_baseline_fastfood_24.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
<!--
~ Nextcloud Notes - Android Client
~
~ SPDX-FileCopyrightText: 2018-2024 Google LLC
~ SPDX-FileCopyrightText: 2018-2025 Google LLC
~ SPDX-License-Identifier: Apache-2.0
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:autoMirrored="true"
android:tint="#757575"
android:viewportWidth="24"
android:viewportHeight="24">
android:viewportWidth="960"
android:viewportHeight="960">
<path
android:fillColor="#FF757575"
android:pathData="M18.06,22.99h1.66c0.84,0 1.53,-0.64 1.63,-1.46L23,5.05h-5L18,1h-1.97v4.05h-4.97l0.3,2.34c1.71,0.47 3.31,1.32 4.27,2.26 1.44,1.42 2.43,2.89 2.43,5.29v8.05zM1,21.99L1,21h15.03v0.99c0,0.55 -0.45,1 -1.01,1L2.01,22.99c-0.56,0 -1.01,-0.45 -1.01,-1zM16.03,14.99c0,-8 -15.03,-8 -15.03,0h15.03zM1.02,17h15v2h-15z" />
android:fillColor="@android:color/white"
android:pathData="M40,600Q40,491 131,425.5Q222,360 340,360Q458,360 549,425.5Q640,491 640,600L40,600ZM40,760L40,680L640,680L640,760L40,760ZM80,920Q63,920 51.5,908.5Q40,897 40,880L40,840L640,840L640,880Q640,897 628.5,908.5Q617,920 600,920L80,920ZM720,920L720,600Q720,486 642,403Q564,320 451,292L440,200L640,200L640,40L720,40L720,200L920,200L855,848Q852,879 829.5,899.5Q807,920 776,920L720,920Z"/>
</vector>
16 changes: 16 additions & 0 deletions app/src/main/res/drawable/ic_baseline_fastfood_outline_24.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<!--
~ Nextcloud Notes - Android Client
~
~ SPDX-FileCopyrightText: 2018-2025 Google LLC
~ SPDX-License-Identifier: Apache-2.0
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="#757575"
android:viewportWidth="960"
android:viewportHeight="960">
<path
android:fillColor="@android:color/white"
android:pathData="M533,520Q501,475 448.5,457.5Q396,440 340,440Q284,440 231.5,457.5Q179,475 147,520L533,520ZM40,600Q40,491 131,425.5Q222,360 340,360Q458,360 549,425.5Q640,491 640,600L40,600ZM40,760L40,680L640,680L640,760L40,760ZM720,920L720,840L776,840L832,280L450,280L440,200L640,200L640,40L720,40L720,200L920,200L854,862Q851,887 832,903.5Q813,920 788,920L720,920ZM720,840L776,840L776,840L720,840L720,840Q720,840 720,840Q720,840 720,840ZM80,920Q63,920 51.5,908.5Q40,897 40,880L40,840L640,840L640,880Q640,897 628.5,908.5Q617,920 600,920L80,920ZM340,520Q340,520 340,520Q340,520 340,520Q340,520 340,520Q340,520 340,520Z" />
</vector>
11 changes: 5 additions & 6 deletions app/src/main/res/drawable/ic_baseline_games_24.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
<!--
~ Nextcloud Notes - Android Client
~
~ SPDX-FileCopyrightText: 2018-2024 Google LLC
~ SPDX-FileCopyrightText: 2018-2025 Google LLC
~ SPDX-License-Identifier: Apache-2.0
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:autoMirrored="true"
android:tint="#757575"
android:viewportWidth="24"
android:viewportHeight="24">
android:viewportWidth="960"
android:viewportHeight="960">
<path
android:fillColor="#FF757575"
android:pathData="M15,7.5V2H9v5.5l3,3 3,-3zM7.5,9H2v6h5.5l3,-3 -3,-3zM9,16.5V22h6v-5.5l-3,-3 -3,3zM16.5,9l-3,3 3,3H22V9h-5.5z" />
android:fillColor="@android:color/white"
android:pathData="M182,760Q131,760 103,724.5Q75,689 82,638L124,338Q133,278 177.5,239Q222,200 282,200L678,200Q738,200 782.5,239Q827,278 836,338L878,638Q885,689 857,724.5Q829,760 778,760Q757,760 739,752.5Q721,745 706,730L616,640L344,640L254,730Q239,745 221,752.5Q203,760 182,760ZM680,520Q697,520 708.5,508.5Q720,497 720,480Q720,463 708.5,451.5Q697,440 680,440Q663,440 651.5,451.5Q640,463 640,480Q640,497 651.5,508.5Q663,520 680,520ZM600,400Q617,400 628.5,388.5Q640,377 640,360Q640,343 628.5,331.5Q617,320 600,320Q583,320 571.5,331.5Q560,343 560,360Q560,377 571.5,388.5Q583,400 600,400ZM310,520L370,520L370,450L440,450L440,390L370,390L370,320L310,320L310,390L240,390L240,450L310,450L310,520Z"/>
</vector>
Loading
Loading