diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/MainViewModel.java b/app/src/main/java/it/niedermann/owncloud/notes/main/MainViewModel.java index a40a6f715..2bc0bf8a7 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/main/MainViewModel.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/main/MainViewModel.java @@ -318,8 +318,8 @@ public LiveData> getNavigationCategories() { private static List fromCategoriesWithNotesCount(@NonNull Context context, @Nullable String expandedCategory, @NonNull List 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(fromDatabase.size() + 3); items.add(itemRecent); diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/navigation/NavigationAdapter.java b/app/src/main/java/it/niedermann/owncloud/notes/main/navigation/NavigationAdapter.java index 1e38a40c1..f6a5f9a7d 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/main/navigation/NavigationAdapter.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/main/navigation/NavigationAdapter.java @@ -32,17 +32,17 @@ public class NavigationAdapter extends RecyclerView.Adapter items = new ArrayList<>(); diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/DisplayUtils.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/DisplayUtils.java index a8c97a2ab..1790add08 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/DisplayUtils.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/DisplayUtils.java @@ -44,13 +44,13 @@ public class DisplayUtils { private static final Map> 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) ); diff --git a/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListViewModel.java b/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListViewModel.java index 8452972f7..d720c224d 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListViewModel.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListViewModel.java @@ -51,8 +51,8 @@ public LiveData> getAdapterCategories(Long accountId) { final var categories = convertToCategoryNavigationItem(getApplication(), fromDatabase); final var items = new ArrayList(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)); diff --git a/app/src/main/res/drawable/ic_access_time_grey600_24dp.xml b/app/src/main/res/drawable/ic_access_time_grey600_24dp.xml index 808c3ad15..98df2f978 100644 --- a/app/src/main/res/drawable/ic_access_time_grey600_24dp.xml +++ b/app/src/main/res/drawable/ic_access_time_grey600_24dp.xml @@ -1,17 +1,16 @@ - + android:viewportWidth="960" + android:viewportHeight="960"> + 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" /> diff --git a/app/src/main/res/drawable/ic_access_time_grey600_outline_24dp.xml b/app/src/main/res/drawable/ic_access_time_grey600_outline_24dp.xml new file mode 100644 index 000000000..f893f5e07 --- /dev/null +++ b/app/src/main/res/drawable/ic_access_time_grey600_outline_24dp.xml @@ -0,0 +1,16 @@ + + + + diff --git a/app/src/main/res/drawable/ic_account_circle_grey_24dp.xml b/app/src/main/res/drawable/ic_account_circle_grey_24dp.xml index c967f4d2a..3c7609dba 100644 --- a/app/src/main/res/drawable/ic_account_circle_grey_24dp.xml +++ b/app/src/main/res/drawable/ic_account_circle_grey_24dp.xml @@ -1,15 +1,16 @@ + android:tint="#757575" + android:viewportWidth="960" + android:viewportHeight="960"> + 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" /> diff --git a/app/src/main/res/drawable/ic_add_blue_24dp.xml b/app/src/main/res/drawable/ic_add_blue_24dp.xml index 4ca05b414..bc3bbc4d1 100644 --- a/app/src/main/res/drawable/ic_add_blue_24dp.xml +++ b/app/src/main/res/drawable/ic_add_blue_24dp.xml @@ -1,17 +1,16 @@ - + android:viewportWidth="960" + android:viewportHeight="960"> + android:fillColor="@android:color/white" + android:pathData="M440,520L200,520L200,440L440,440L440,200L520,200L520,440L760,440L760,520L520,520L520,760L440,760L440,520Z" /> diff --git a/app/src/main/res/drawable/ic_add_white_24dp.xml b/app/src/main/res/drawable/ic_add_white_24dp.xml index 3206c180c..fe58b6bf5 100644 --- a/app/src/main/res/drawable/ic_add_white_24dp.xml +++ b/app/src/main/res/drawable/ic_add_white_24dp.xml @@ -1,17 +1,15 @@ - + android:height="24dp" + android:viewportWidth="960" + android:viewportHeight="960"> + android:fillColor="@android:color/white" + android:pathData="M440,520L200,520L200,440L440,440L440,200L520,200L520,440L760,440L760,520L520,520L520,760L440,760L440,520Z" /> diff --git a/app/src/main/res/drawable/ic_baseline_dashboard_24.xml b/app/src/main/res/drawable/ic_baseline_dashboard_24.xml index e8110b766..bf1ec959e 100644 --- a/app/src/main/res/drawable/ic_baseline_dashboard_24.xml +++ b/app/src/main/res/drawable/ic_baseline_dashboard_24.xml @@ -1,17 +1,16 @@ - + android:viewportWidth="960" + android:viewportHeight="960"> + 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" /> diff --git a/app/src/main/res/drawable/ic_baseline_fastfood_24.xml b/app/src/main/res/drawable/ic_baseline_fastfood_24.xml index 9b5430134..1a2d54a4b 100644 --- a/app/src/main/res/drawable/ic_baseline_fastfood_24.xml +++ b/app/src/main/res/drawable/ic_baseline_fastfood_24.xml @@ -1,17 +1,16 @@ + android:viewportWidth="960" + android:viewportHeight="960"> + 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"/> diff --git a/app/src/main/res/drawable/ic_baseline_fastfood_outline_24.xml b/app/src/main/res/drawable/ic_baseline_fastfood_outline_24.xml new file mode 100644 index 000000000..af0f6019f --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_fastfood_outline_24.xml @@ -0,0 +1,16 @@ + + + + diff --git a/app/src/main/res/drawable/ic_baseline_games_24.xml b/app/src/main/res/drawable/ic_baseline_games_24.xml index 4b9d0d36f..d3b65c837 100644 --- a/app/src/main/res/drawable/ic_baseline_games_24.xml +++ b/app/src/main/res/drawable/ic_baseline_games_24.xml @@ -1,17 +1,16 @@ + android:viewportWidth="960" + android:viewportHeight="960"> + 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"/> diff --git a/app/src/main/res/drawable/ic_baseline_games_outline_24.xml b/app/src/main/res/drawable/ic_baseline_games_outline_24.xml new file mode 100644 index 000000000..6c8462610 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_games_outline_24.xml @@ -0,0 +1,16 @@ + + + + diff --git a/app/src/main/res/drawable/ic_baseline_help_outline_24.xml b/app/src/main/res/drawable/ic_baseline_help_outline_24.xml index c21a09ac5..ded7d0050 100644 --- a/app/src/main/res/drawable/ic_baseline_help_outline_24.xml +++ b/app/src/main/res/drawable/ic_baseline_help_outline_24.xml @@ -1,16 +1,17 @@ - + android:height="24dp" + android:autoMirrored="true" + android:tint="#757575" + android:viewportWidth="960" + android:viewportHeight="960"> + android:fillColor="@android:color/white" + android:pathData="M478,720Q499,720 513.5,705.5Q528,691 528,670Q528,649 513.5,634.5Q499,620 478,620Q457,620 442.5,634.5Q428,649 428,670Q428,691 442.5,705.5Q457,720 478,720ZM442,566L516,566Q516,533 523.5,514Q531,495 566,462Q592,436 607,412.5Q622,389 622,356Q622,300 581,270Q540,240 484,240Q427,240 391.5,270Q356,300 342,342L408,368Q413,350 430.5,329Q448,308 484,308Q516,308 532,325.5Q548,343 548,364Q548,384 536,401.5Q524,419 506,434Q462,473 452,493Q442,513 442,566ZM480,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,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z" /> diff --git a/app/src/main/res/drawable/ic_baseline_screen_lock_portrait_24.xml b/app/src/main/res/drawable/ic_baseline_screen_lock_portrait_24.xml index a0a246dfa..f3d76c6e5 100644 --- a/app/src/main/res/drawable/ic_baseline_screen_lock_portrait_24.xml +++ b/app/src/main/res/drawable/ic_baseline_screen_lock_portrait_24.xml @@ -8,9 +8,9 @@ android:width="24dp" android:height="24dp" android:tint="#757575" - android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportWidth="960" + android:viewportHeight="960"> + android:pathData="M280,920Q247,920 223.5,896.5Q200,873 200,840L200,120Q200,87 223.5,63.5Q247,40 280,40L680,40Q713,40 736.5,63.5Q760,87 760,120L760,244Q778,251 789,266Q800,281 800,300L800,380Q800,399 789,414Q778,429 760,436L760,840Q760,873 736.5,896.5Q713,920 680,920L280,920ZM280,840L680,840Q680,840 680,840Q680,840 680,840L680,120Q680,120 680,120Q680,120 680,120L280,120Q280,120 280,120Q280,120 280,120L280,840Q280,840 280,840Q280,840 280,840ZM280,840Q280,840 280,840Q280,840 280,840L280,120Q280,120 280,120Q280,120 280,120L280,120Q280,120 280,120Q280,120 280,120L280,840Q280,840 280,840Q280,840 280,840ZM394,640L566,640Q580,640 590,630Q600,620 600,606L600,474Q600,460 590,450Q580,440 566,440L560,440L560,400Q560,367 536.5,343.5Q513,320 480,320Q447,320 423.5,343.5Q400,367 400,400L400,440L394,440Q380,440 370,450Q360,460 360,474L360,606Q360,620 370,630Q380,640 394,640ZM440,440L440,400Q440,383 451.5,371.5Q463,360 480,360Q497,360 508.5,371.5Q520,383 520,400L520,440L440,440Z" /> diff --git a/app/src/main/res/drawable/ic_baseline_smartphone_24.xml b/app/src/main/res/drawable/ic_baseline_smartphone_24.xml index 168a2019c..d3c0e0a6f 100644 --- a/app/src/main/res/drawable/ic_baseline_smartphone_24.xml +++ b/app/src/main/res/drawable/ic_baseline_smartphone_24.xml @@ -1,17 +1,16 @@ + android:viewportWidth="960" + android:viewportHeight="960"> + android:fillColor="@android:color/white" + android:pathData="M280,920Q247,920 223.5,896.5Q200,873 200,840L200,120Q200,87 223.5,63.5Q247,40 280,40L680,40Q713,40 736.5,63.5Q760,87 760,120L760,244Q778,251 789,266Q800,281 800,300L800,380Q800,399 789,414Q778,429 760,436L760,840Q760,873 736.5,896.5Q713,920 680,920L280,920ZM280,840L680,840Q680,840 680,840Q680,840 680,840L680,120Q680,120 680,120Q680,120 680,120L280,120Q280,120 280,120Q280,120 280,120L280,840Q280,840 280,840Q280,840 280,840ZM280,840Q280,840 280,840Q280,840 280,840L280,120Q280,120 280,120Q280,120 280,120L280,120Q280,120 280,120Q280,120 280,120L280,840Q280,840 280,840Q280,840 280,840ZM480,240Q497,240 508.5,228.5Q520,217 520,200Q520,183 508.5,171.5Q497,160 480,160Q463,160 451.5,171.5Q440,183 440,200Q440,217 451.5,228.5Q463,240 480,240Z" /> diff --git a/app/src/main/res/drawable/ic_baseline_vpn_key_24.xml b/app/src/main/res/drawable/ic_baseline_vpn_key_24.xml index 1c90f9952..36a8304c7 100644 --- a/app/src/main/res/drawable/ic_baseline_vpn_key_24.xml +++ b/app/src/main/res/drawable/ic_baseline_vpn_key_24.xml @@ -1,17 +1,16 @@ + android:viewportWidth="960" + android:viewportHeight="960"> + android:fillColor="@android:color/white" + android:pathData="M280,720Q180,720 110,650Q40,580 40,480Q40,380 110,310Q180,240 280,240Q361,240 421.5,285.5Q482,331 506,400L920,400L920,560L840,560L840,720L680,720L680,560L506,560Q482,629 421.5,674.5Q361,720 280,720ZM280,560Q313,560 336.5,536.5Q360,513 360,480Q360,447 336.5,423.5Q313,400 280,400Q247,400 223.5,423.5Q200,447 200,480Q200,513 223.5,536.5Q247,560 280,560Z"/> diff --git a/app/src/main/res/drawable/ic_baseline_vpn_key_outline_24.xml b/app/src/main/res/drawable/ic_baseline_vpn_key_outline_24.xml new file mode 100644 index 000000000..a3107d598 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_vpn_key_outline_24.xml @@ -0,0 +1,16 @@ + + + + diff --git a/app/src/main/res/drawable/ic_brightness_2_grey_24dp.xml b/app/src/main/res/drawable/ic_brightness_2_grey_24dp.xml index a9655e8cf..b3e395ad3 100644 --- a/app/src/main/res/drawable/ic_brightness_2_grey_24dp.xml +++ b/app/src/main/res/drawable/ic_brightness_2_grey_24dp.xml @@ -1,15 +1,16 @@ + android:tint="#FF757575" + android:viewportWidth="960" + android:viewportHeight="960"> + android:fillColor="@android:color/white" + android:pathData="M380,800Q513,800 606.5,706.5Q700,613 700,480Q700,347 606.5,253.5Q513,160 380,160Q369,160 359,160Q349,160 340,162Q397,228 428.5,309.5Q460,391 460,480Q460,569 428.5,650.5Q397,732 340,798Q349,800 359,800Q369,800 380,800ZM380,880Q327,880 276.5,866.5Q226,853 180,826Q273,772 326.5,680Q380,588 380,480Q380,372 326.5,280Q273,188 180,134Q226,107 276.5,93.5Q327,80 380,80Q463,80 536,111.5Q609,143 663,197Q717,251 748.5,324Q780,397 780,480Q780,563 748.5,636Q717,709 663,763Q609,817 536,848.5Q463,880 380,880ZM460,480Q460,480 460,480Q460,480 460,480Q460,480 460,480Q460,480 460,480Q460,480 460,480Q460,480 460,480Q460,480 460,480Q460,480 460,480Q460,480 460,480Q460,480 460,480Q460,480 460,480Q460,480 460,480Z" /> diff --git a/app/src/main/res/drawable/ic_circles.xml b/app/src/main/res/drawable/ic_circles.xml index 3f152e7da..4a57b71a7 100644 --- a/app/src/main/res/drawable/ic_circles.xml +++ b/app/src/main/res/drawable/ic_circles.xml @@ -1,18 +1,16 @@ - + android:tint="#FF000000" + android:viewportWidth="960" + android:viewportHeight="960"> + android:fillColor="@android:color/white" + android:pathData="M0,720L0,657Q0,614 44,587Q88,560 160,560Q173,560 185,560.5Q197,561 208,563Q194,584 187,607Q180,630 180,655L180,720L0,720ZM240,720L240,655Q240,623 257.5,596.5Q275,570 307,550Q339,530 383.5,520Q428,510 480,510Q533,510 577.5,520Q622,530 654,550Q686,570 703,596.5Q720,623 720,655L720,720L240,720ZM780,720L780,655Q780,629 773.5,606Q767,583 754,563Q765,561 776.5,560.5Q788,560 800,560Q872,560 916,586.5Q960,613 960,657L960,720L780,720ZM325,640L636,640L636,640Q626,620 580.5,605Q535,590 480,590Q425,590 379.5,605Q334,620 325,640ZM160,520Q127,520 103.5,496.5Q80,473 80,440Q80,406 103.5,383Q127,360 160,360Q194,360 217,383Q240,406 240,440Q240,473 217,496.5Q194,520 160,520ZM800,520Q767,520 743.5,496.5Q720,473 720,440Q720,406 743.5,383Q767,360 800,360Q834,360 857,383Q880,406 880,440Q880,473 857,496.5Q834,520 800,520ZM480,480Q430,480 395,445Q360,410 360,360Q360,309 395,274.5Q430,240 480,240Q531,240 565.5,274.5Q600,309 600,360Q600,410 565.5,445Q531,480 480,480ZM480,400Q497,400 508.5,388.5Q520,377 520,360Q520,343 508.5,331.5Q497,320 480,320Q463,320 451.5,331.5Q440,343 440,360Q440,377 451.5,388.5Q463,400 480,400ZM481,640L481,640Q481,640 481,640Q481,640 481,640Q481,640 481,640Q481,640 481,640L481,640ZM480,360Q480,360 480,360Q480,360 480,360Q480,360 480,360Q480,360 480,360Q480,360 480,360Q480,360 480,360Q480,360 480,360Q480,360 480,360Z" /> diff --git a/app/src/main/res/drawable/ic_contact_book.xml b/app/src/main/res/drawable/ic_contact_book.xml index 1ca1a2799..f6af68e08 100644 --- a/app/src/main/res/drawable/ic_contact_book.xml +++ b/app/src/main/res/drawable/ic_contact_book.xml @@ -1,16 +1,16 @@ + android:viewportWidth="960" + android:viewportHeight="960"> + android:pathData="M160,920L160,840L800,840L800,920L160,920ZM160,120L160,40L800,40L800,120L160,120ZM480,520Q530,520 565,485Q600,450 600,400Q600,350 565,315Q530,280 480,280Q430,280 395,315Q360,350 360,400Q360,450 395,485Q430,520 480,520ZM160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160L800,160Q833,160 856.5,183.5Q880,207 880,240L880,720Q880,753 856.5,776.5Q833,800 800,800L160,800ZM230,720Q275,664 339,632Q403,600 480,600Q557,600 621,632Q685,664 730,720L800,720Q800,720 800,720Q800,720 800,720L800,240Q800,240 800,240Q800,240 800,240L160,240Q160,240 160,240Q160,240 160,240L160,720Q160,720 160,720Q160,720 160,720L230,720ZM348,720L612,720Q583,700 549.5,690Q516,680 480,680Q444,680 410.5,690Q377,700 348,720ZM480,440Q463,440 451.5,428.5Q440,417 440,400Q440,383 451.5,371.5Q463,360 480,360Q497,360 508.5,371.5Q520,383 520,400Q520,417 508.5,428.5Q497,440 480,440ZM480,480L480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z" /> diff --git a/app/src/main/res/drawable/ic_create_new_folder_grey600_18dp.xml b/app/src/main/res/drawable/ic_create_new_folder_grey600_18dp.xml index 11d028266..96dc05506 100644 --- a/app/src/main/res/drawable/ic_create_new_folder_grey600_18dp.xml +++ b/app/src/main/res/drawable/ic_create_new_folder_grey600_18dp.xml @@ -1,17 +1,16 @@ - + android:viewportWidth="960" + android:viewportHeight="960"> + android:fillColor="@android:color/white" + android:pathData="M560,640L640,640L640,560L720,560L720,480L640,480L640,400L560,400L560,480L480,480L480,560L560,560L560,640ZM160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160L400,160L480,240L800,240Q833,240 856.5,263.5Q880,287 880,320L880,720Q880,753 856.5,776.5Q833,800 800,800L160,800Z"/> diff --git a/app/src/main/res/drawable/ic_create_new_folder_grey600_24dp.xml b/app/src/main/res/drawable/ic_create_new_folder_grey600_24dp.xml index f88e52991..e3c91e4f0 100644 --- a/app/src/main/res/drawable/ic_create_new_folder_grey600_24dp.xml +++ b/app/src/main/res/drawable/ic_create_new_folder_grey600_24dp.xml @@ -1,17 +1,16 @@ - + android:viewportWidth="960" + android:viewportHeight="960"> - + android:fillColor="@android:color/white" + android:pathData="M560,640L640,640L640,560L720,560L720,480L640,480L640,400L560,400L560,480L480,480L480,560L560,560L560,640ZM160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160L400,160L480,240L800,240Q833,240 856.5,263.5Q880,287 880,320L880,720Q880,753 856.5,776.5Q833,800 800,800L160,800Z"/> + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_create_new_folder_grey600_outline_18dp.xml b/app/src/main/res/drawable/ic_create_new_folder_grey600_outline_18dp.xml new file mode 100644 index 000000000..7da0ed176 --- /dev/null +++ b/app/src/main/res/drawable/ic_create_new_folder_grey600_outline_18dp.xml @@ -0,0 +1,16 @@ + + + + diff --git a/app/src/main/res/drawable/ic_create_new_folder_grey600_outline_24dp.xml b/app/src/main/res/drawable/ic_create_new_folder_grey600_outline_24dp.xml new file mode 100644 index 000000000..935e395d5 --- /dev/null +++ b/app/src/main/res/drawable/ic_create_new_folder_grey600_outline_24dp.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml index 0f6e822c9..a4793e516 100644 --- a/app/src/main/res/drawable/ic_delete.xml +++ b/app/src/main/res/drawable/ic_delete.xml @@ -1,16 +1,16 @@ + android:viewportWidth="960" + android:viewportHeight="960"> + android:fillColor="@android:color/white" + android:pathData="M280,840Q247,840 223.5,816.5Q200,793 200,760L200,240L160,240L160,160L360,160L360,120L600,120L600,160L800,160L800,240L760,240L760,760Q760,793 736.5,816.5Q713,840 680,840L280,840ZM680,240L280,240L280,760Q280,760 280,760Q280,760 280,760L680,760Q680,760 680,760Q680,760 680,760L680,240ZM360,680L440,680L440,320L360,320L360,680ZM520,680L600,680L600,320L520,320L520,680ZM280,240L280,240L280,760Q280,760 280,760Q280,760 280,760L280,760Q280,760 280,760Q280,760 280,760L280,240Z" /> diff --git a/app/src/main/res/drawable/ic_delete_grey600_24dp.xml b/app/src/main/res/drawable/ic_delete_grey600_24dp.xml index c0988e14c..3688eeb5a 100644 --- a/app/src/main/res/drawable/ic_delete_grey600_24dp.xml +++ b/app/src/main/res/drawable/ic_delete_grey600_24dp.xml @@ -1,16 +1,16 @@ - + android:height="24dp" + android:tint="#757575" + android:viewportWidth="960" + android:viewportHeight="960"> + android:fillColor="@android:color/white" + android:pathData="M280,840Q247,840 223.5,816.5Q200,793 200,760L200,240L160,240L160,160L360,160L360,120L600,120L600,160L800,160L800,240L760,240L760,760Q760,793 736.5,816.5Q713,840 680,840L280,840ZM680,240L280,240L280,760Q280,760 280,760Q280,760 280,760L680,760Q680,760 680,760Q680,760 680,760L680,240ZM360,680L440,680L440,320L360,320L360,680ZM520,680L600,680L600,320L520,320L520,680ZM280,240L280,240L280,760Q280,760 280,760Q280,760 280,760L280,760Q280,760 280,760Q280,760 280,760L280,240Z" /> diff --git a/app/src/main/res/drawable/ic_delete_white_32dp.xml b/app/src/main/res/drawable/ic_delete_white_32dp.xml index 5737f4266..b35e9cc11 100644 --- a/app/src/main/res/drawable/ic_delete_white_32dp.xml +++ b/app/src/main/res/drawable/ic_delete_white_32dp.xml @@ -1,17 +1,16 @@ - + android:viewportWidth="960" + android:viewportHeight="960"> + android:fillColor="@android:color/white" + android:pathData="M280,840Q247,840 223.5,816.5Q200,793 200,760L200,240L160,240L160,160L360,160L360,120L600,120L600,160L800,160L800,240L760,240L760,760Q760,793 736.5,816.5Q713,840 680,840L280,840ZM680,240L280,240L280,760Q280,760 280,760Q280,760 280,760L680,760Q680,760 680,760Q680,760 680,760L680,240ZM360,680L440,680L440,320L360,320L360,680ZM520,680L600,680L600,320L520,320L520,680ZM280,240L280,240L280,760Q280,760 280,760Q280,760 280,760L280,760Q280,760 280,760Q280,760 280,760L280,240Z" /> diff --git a/app/src/main/res/drawable/ic_edit.xml b/app/src/main/res/drawable/ic_edit.xml index 694e51939..745b1dd82 100644 --- a/app/src/main/res/drawable/ic_edit.xml +++ b/app/src/main/res/drawable/ic_edit.xml @@ -1,18 +1,16 @@ + android:tint="#FF000000" + android:viewportWidth="960" + android:viewportHeight="960"> + android:fillColor="@android:color/white" + android:pathData="M200,760L257,760L648,369L591,312L200,703L200,760ZM120,840L120,670L648,143Q660,132 674.5,126Q689,120 705,120Q721,120 736,126Q751,132 762,144L817,200Q829,211 834.5,226Q840,241 840,256Q840,272 834.5,286.5Q829,301 817,313L290,840L120,840ZM760,256L760,256L704,200L704,200L760,256ZM619,341L591,312L591,312L648,369L648,369L619,341Z" /> diff --git a/app/src/main/res/drawable/ic_edit_grey600_24dp.xml b/app/src/main/res/drawable/ic_edit_grey600_24dp.xml index 31edf9ff7..95a52aa38 100644 --- a/app/src/main/res/drawable/ic_edit_grey600_24dp.xml +++ b/app/src/main/res/drawable/ic_edit_grey600_24dp.xml @@ -1,17 +1,16 @@ - + android:viewportWidth="960" + android:viewportHeight="960"> + android:fillColor="@android:color/white" + android:pathData="M200,760L257,760L648,369L591,312L200,703L200,760ZM120,840L120,670L648,143Q660,132 674.5,126Q689,120 705,120Q721,120 736,126Q751,132 762,144L817,200Q829,211 834.5,226Q840,241 840,256Q840,272 834.5,286.5Q829,301 817,313L290,840L120,840ZM760,256L760,256L704,200L704,200L760,256ZM619,341L591,312L591,312L648,369L648,369L619,341Z" /> diff --git a/app/src/main/res/drawable/ic_email.xml b/app/src/main/res/drawable/ic_email.xml index c6e736593..3099d3f30 100644 --- a/app/src/main/res/drawable/ic_email.xml +++ b/app/src/main/res/drawable/ic_email.xml @@ -1,13 +1,16 @@ - + android:height="24dp" + android:tint="#757575" + android:viewportWidth="960" + android:viewportHeight="960"> + diff --git a/app/src/main/res/drawable/ic_eye_grey600_24dp.xml b/app/src/main/res/drawable/ic_eye_grey600_24dp.xml index 5393b3895..6b673d366 100644 --- a/app/src/main/res/drawable/ic_eye_grey600_24dp.xml +++ b/app/src/main/res/drawable/ic_eye_grey600_24dp.xml @@ -1,17 +1,16 @@ - + android:viewportWidth="960" + android:viewportHeight="960"> + android:fillColor="@android:color/white" + android:pathData="M480,640Q555,640 607.5,587.5Q660,535 660,460Q660,385 607.5,332.5Q555,280 480,280Q405,280 352.5,332.5Q300,385 300,460Q300,535 352.5,587.5Q405,640 480,640ZM480,568Q435,568 403.5,536.5Q372,505 372,460Q372,415 403.5,383.5Q435,352 480,352Q525,352 556.5,383.5Q588,415 588,460Q588,505 556.5,536.5Q525,568 480,568ZM480,760Q334,760 214,678.5Q94,597 40,460Q94,323 214,241.5Q334,160 480,160Q626,160 746,241.5Q866,323 920,460Q866,597 746,678.5Q626,760 480,760ZM480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460ZM480,680Q593,680 687.5,620.5Q782,561 832,460Q782,359 687.5,299.5Q593,240 480,240Q367,240 272.5,299.5Q178,359 128,460Q178,561 272.5,620.5Q367,680 480,680Z" /> diff --git a/app/src/main/res/drawable/ic_folder_grey600_18dp.xml b/app/src/main/res/drawable/ic_folder_grey600_18dp.xml index fbc3b310d..4180887c4 100644 --- a/app/src/main/res/drawable/ic_folder_grey600_18dp.xml +++ b/app/src/main/res/drawable/ic_folder_grey600_18dp.xml @@ -4,13 +4,13 @@ ~ SPDX-FileCopyrightText: 2018-2024 Google LLC ~ SPDX-License-Identifier: Apache-2.0 --> - + android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_folder_grey600_24dp.xml b/app/src/main/res/drawable/ic_folder_grey600_24dp.xml index 49d8b4655..c5bb3d55f 100644 --- a/app/src/main/res/drawable/ic_folder_grey600_24dp.xml +++ b/app/src/main/res/drawable/ic_folder_grey600_24dp.xml @@ -4,13 +4,13 @@ ~ SPDX-FileCopyrightText: 2018-2024 Google LLC ~ SPDX-License-Identifier: Apache-2.0 --> - + android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_folder_grey600_outline_18dp.xml b/app/src/main/res/drawable/ic_folder_grey600_outline_18dp.xml new file mode 100644 index 000000000..c85622d26 --- /dev/null +++ b/app/src/main/res/drawable/ic_folder_grey600_outline_18dp.xml @@ -0,0 +1,17 @@ + + + + diff --git a/app/src/main/res/drawable/ic_folder_grey600_outline_24dp.xml b/app/src/main/res/drawable/ic_folder_grey600_outline_24dp.xml new file mode 100644 index 000000000..b0024958c --- /dev/null +++ b/app/src/main/res/drawable/ic_folder_grey600_outline_24dp.xml @@ -0,0 +1,17 @@ + + + + diff --git a/app/src/main/res/drawable/ic_folder_open_grey600_24dp.xml b/app/src/main/res/drawable/ic_folder_open_grey600_24dp.xml index af1a17968..70898958a 100644 --- a/app/src/main/res/drawable/ic_folder_open_grey600_24dp.xml +++ b/app/src/main/res/drawable/ic_folder_open_grey600_24dp.xml @@ -1,17 +1,16 @@ - + android:viewportWidth="960" + android:viewportHeight="960"> + android:fillColor="@android:color/white" + android:pathData="M160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160L400,160L480,240L800,240Q833,240 856.5,263.5Q880,287 880,320L160,320L160,720Q160,720 160,720Q160,720 160,720L256,400L940,400L837,743Q829,769 807.5,784.5Q786,800 760,800L160,800Z" /> diff --git a/app/src/main/res/drawable/ic_folder_open_grey600_outline_24dp.xml b/app/src/main/res/drawable/ic_folder_open_grey600_outline_24dp.xml new file mode 100644 index 000000000..3bf91d27a --- /dev/null +++ b/app/src/main/res/drawable/ic_folder_open_grey600_outline_24dp.xml @@ -0,0 +1,16 @@ + + + + diff --git a/app/src/main/res/drawable/ic_group.xml b/app/src/main/res/drawable/ic_group.xml index aad10ce3f..a50537342 100644 --- a/app/src/main/res/drawable/ic_group.xml +++ b/app/src/main/res/drawable/ic_group.xml @@ -1,13 +1,16 @@ - + android:height="24dp" + android:tint="#757575" + android:viewportWidth="960" + android:viewportHeight="960"> + diff --git a/app/src/main/res/drawable/ic_info_outline_grey600_24dp.xml b/app/src/main/res/drawable/ic_info_outline_grey600_24dp.xml index b95b6cc60..710a8063d 100644 --- a/app/src/main/res/drawable/ic_info_outline_grey600_24dp.xml +++ b/app/src/main/res/drawable/ic_info_outline_grey600_24dp.xml @@ -1,17 +1,16 @@ - + android:viewportWidth="960" + android:viewportHeight="960"> + android:fillColor="@android:color/white" + android:pathData="M440,680L520,680L520,440L440,440L440,680ZM480,360Q497,360 508.5,348.5Q520,337 520,320Q520,303 508.5,291.5Q497,280 480,280Q463,280 451.5,291.5Q440,303 440,320Q440,337 451.5,348.5Q463,360 480,360ZM480,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,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z" /> diff --git a/app/src/main/res/drawable/ic_library_music_grey600_24dp.xml b/app/src/main/res/drawable/ic_library_music_grey600_24dp.xml index 0eb799705..89a4bb215 100644 --- a/app/src/main/res/drawable/ic_library_music_grey600_24dp.xml +++ b/app/src/main/res/drawable/ic_library_music_grey600_24dp.xml @@ -1,17 +1,16 @@ - + android:viewportWidth="960" + android:viewportHeight="960"> + android:fillColor="@android:color/white" + android:pathData="M500,600Q542,600 571,571Q600,542 600,500L600,280L720,280L720,200L560,200L560,420Q547,410 532,405Q517,400 500,400Q458,400 429,429Q400,458 400,500Q400,542 429,571Q458,600 500,600ZM320,720Q287,720 263.5,696.5Q240,673 240,640L240,160Q240,127 263.5,103.5Q287,80 320,80L800,80Q833,80 856.5,103.5Q880,127 880,160L880,640Q880,673 856.5,696.5Q833,720 800,720L320,720ZM160,880Q127,880 103.5,856.5Q80,833 80,800L80,240L160,240L160,800Q160,800 160,800Q160,800 160,800L720,800L720,880L160,880Z"/> diff --git a/app/src/main/res/drawable/ic_library_music_grey600_outline_24dp.xml b/app/src/main/res/drawable/ic_library_music_grey600_outline_24dp.xml new file mode 100644 index 000000000..e77e101eb --- /dev/null +++ b/app/src/main/res/drawable/ic_library_music_grey600_outline_24dp.xml @@ -0,0 +1,16 @@ + + + + diff --git a/app/src/main/res/drawable/ic_lightbulb_outline_grey600_24dp.xml b/app/src/main/res/drawable/ic_lightbulb_outline_grey600_24dp.xml index 56e66b872..8da564199 100644 --- a/app/src/main/res/drawable/ic_lightbulb_outline_grey600_24dp.xml +++ b/app/src/main/res/drawable/ic_lightbulb_outline_grey600_24dp.xml @@ -1,16 +1,16 @@ - + android:height="24dp" + android:tint="#757575" + android:viewportWidth="960" + android:viewportHeight="960"> + android:fillColor="@android:color/white" + android:pathData="M400,720Q367,720 343.5,696.5Q320,673 320,640L320,590Q263,551 231.5,490Q200,429 200,360Q200,243 281.5,161.5Q363,80 480,80Q597,80 678.5,161.5Q760,243 760,360Q760,429 728.5,489.5Q697,550 640,590L640,640Q640,673 616.5,696.5Q593,720 560,720L400,720ZM400,640L560,640Q560,640 560,640Q560,640 560,640L560,548L594,524Q635,496 657.5,452.5Q680,409 680,360Q680,277 621.5,218.5Q563,160 480,160Q397,160 338.5,218.5Q280,277 280,360Q280,409 302.5,452.5Q325,496 366,524L400,548L400,640Q400,640 400,640Q400,640 400,640ZM400,880Q383,880 371.5,868.5Q360,857 360,840L360,800L600,800L600,840Q600,857 588.5,868.5Q577,880 560,880L400,880ZM480,360Q480,360 480,360Q480,360 480,360L480,360L480,360Q480,360 480,360Q480,360 480,360Q480,360 480,360Q480,360 480,360Q480,360 480,360Q480,360 480,360Q480,360 480,360Q480,360 480,360L480,360L480,360Q480,360 480,360Q480,360 480,360Z" /> diff --git a/app/src/main/res/drawable/ic_local_movies_grey600_24dp.xml b/app/src/main/res/drawable/ic_local_movies_grey600_24dp.xml index ca424f37c..9340149f7 100644 --- a/app/src/main/res/drawable/ic_local_movies_grey600_24dp.xml +++ b/app/src/main/res/drawable/ic_local_movies_grey600_24dp.xml @@ -1,17 +1,16 @@ - + android:viewportWidth="960" + android:viewportHeight="960"> + android:fillColor="@android:color/white" + android:pathData="M160,160L240,320L360,320L280,160L360,160L440,320L560,320L480,160L560,160L640,320L760,320L680,160L800,160Q833,160 856.5,183.5Q880,207 880,240L880,720Q880,753 856.5,776.5Q833,800 800,800L160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160Z"/> diff --git a/app/src/main/res/drawable/ic_local_movies_grey600_outline_24dp.xml b/app/src/main/res/drawable/ic_local_movies_grey600_outline_24dp.xml new file mode 100644 index 000000000..ca218c0a7 --- /dev/null +++ b/app/src/main/res/drawable/ic_local_movies_grey600_outline_24dp.xml @@ -0,0 +1,16 @@ + + + + diff --git a/app/src/main/res/drawable/ic_lock_grey600_24dp.xml b/app/src/main/res/drawable/ic_lock_grey600_24dp.xml index 38cb42e26..a49dd81ee 100644 --- a/app/src/main/res/drawable/ic_lock_grey600_24dp.xml +++ b/app/src/main/res/drawable/ic_lock_grey600_24dp.xml @@ -1,17 +1,16 @@ - + android:viewportWidth="960" + android:viewportHeight="960"> + android:fillColor="@android:color/white" + android:pathData="M240,880Q207,880 183.5,856.5Q160,833 160,800L160,400Q160,367 183.5,343.5Q207,320 240,320L280,320L280,240Q280,157 338.5,98.5Q397,40 480,40Q563,40 621.5,98.5Q680,157 680,240L680,320L720,320Q753,320 776.5,343.5Q800,367 800,400L800,800Q800,833 776.5,856.5Q753,880 720,880L240,880ZM240,800L720,800Q720,800 720,800Q720,800 720,800L720,400Q720,400 720,400Q720,400 720,400L240,400Q240,400 240,400Q240,400 240,400L240,800Q240,800 240,800Q240,800 240,800ZM480,680Q513,680 536.5,656.5Q560,633 560,600Q560,567 536.5,543.5Q513,520 480,520Q447,520 423.5,543.5Q400,567 400,600Q400,633 423.5,656.5Q447,680 480,680ZM360,320L600,320L600,240Q600,190 565,155Q530,120 480,120Q430,120 395,155Q360,190 360,240L360,320ZM240,800Q240,800 240,800Q240,800 240,800L240,400Q240,400 240,400Q240,400 240,400L240,400Q240,400 240,400Q240,400 240,400L240,800Q240,800 240,800Q240,800 240,800Z" /> diff --git a/app/src/main/res/drawable/ic_network_wifi_grey600_24dp.xml b/app/src/main/res/drawable/ic_network_wifi_grey600_24dp.xml index 880301eaa..f5486e7fa 100644 --- a/app/src/main/res/drawable/ic_network_wifi_grey600_24dp.xml +++ b/app/src/main/res/drawable/ic_network_wifi_grey600_24dp.xml @@ -1,21 +1,16 @@ - - + android:viewportWidth="960" + android:viewportHeight="960"> + android:fillColor="@android:color/white" + android:pathData="M480,840L0,360Q96,262 220,211Q344,160 480,160Q617,160 741,211Q865,262 960,360L480,840ZM232,478Q285,440 348,418.5Q411,397 480,397Q549,397 612,418.5Q675,440 728,478L844,362Q766,303 673.5,271.5Q581,240 480,240Q379,240 286.5,271.5Q194,303 116,362L232,478Z" /> diff --git a/app/src/main/res/drawable/ic_person_add_grey600_24dp.xml b/app/src/main/res/drawable/ic_person_add_grey600_24dp.xml index 25b5921fa..34cd3d363 100644 --- a/app/src/main/res/drawable/ic_person_add_grey600_24dp.xml +++ b/app/src/main/res/drawable/ic_person_add_grey600_24dp.xml @@ -1,17 +1,16 @@ - + android:viewportWidth="960" + android:viewportHeight="960"> + android:fillColor="@android:color/white" + android:pathData="M720,560L720,440L600,440L600,360L720,360L720,240L800,240L800,360L920,360L920,440L800,440L800,560L720,560ZM360,480Q294,480 247,433Q200,386 200,320Q200,254 247,207Q294,160 360,160Q426,160 473,207Q520,254 520,320Q520,386 473,433Q426,480 360,480ZM40,800L40,688Q40,654 57.5,625.5Q75,597 104,582Q166,551 230,535.5Q294,520 360,520Q426,520 490,535.5Q554,551 616,582Q645,597 662.5,625.5Q680,654 680,688L680,800L40,800ZM120,720L600,720L600,688Q600,677 594.5,668Q589,659 580,654Q526,627 471,613.5Q416,600 360,600Q304,600 249,613.5Q194,627 140,654Q131,659 125.5,668Q120,677 120,688L120,720ZM360,400Q393,400 416.5,376.5Q440,353 440,320Q440,287 416.5,263.5Q393,240 360,240Q327,240 303.5,263.5Q280,287 280,320Q280,353 303.5,376.5Q327,400 360,400ZM360,320Q360,320 360,320Q360,320 360,320Q360,320 360,320Q360,320 360,320Q360,320 360,320Q360,320 360,320Q360,320 360,320Q360,320 360,320ZM360,720L360,720Q360,720 360,720Q360,720 360,720Q360,720 360,720Q360,720 360,720Q360,720 360,720Q360,720 360,720Q360,720 360,720Q360,720 360,720L360,720Z" /> diff --git a/app/src/main/res/drawable/ic_remove_red_eye_grey_24dp.xml b/app/src/main/res/drawable/ic_remove_red_eye_grey_24dp.xml index 65b124fa7..6b673d366 100644 --- a/app/src/main/res/drawable/ic_remove_red_eye_grey_24dp.xml +++ b/app/src/main/res/drawable/ic_remove_red_eye_grey_24dp.xml @@ -1,15 +1,16 @@ + android:tint="#757575" + android:viewportWidth="960" + android:viewportHeight="960"> + android:fillColor="@android:color/white" + android:pathData="M480,640Q555,640 607.5,587.5Q660,535 660,460Q660,385 607.5,332.5Q555,280 480,280Q405,280 352.5,332.5Q300,385 300,460Q300,535 352.5,587.5Q405,640 480,640ZM480,568Q435,568 403.5,536.5Q372,505 372,460Q372,415 403.5,383.5Q435,352 480,352Q525,352 556.5,383.5Q588,415 588,460Q588,505 556.5,536.5Q525,568 480,568ZM480,760Q334,760 214,678.5Q94,597 40,460Q94,323 214,241.5Q334,160 480,160Q626,160 746,241.5Q866,323 920,460Q866,597 746,678.5Q626,760 480,760ZM480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460ZM480,680Q593,680 687.5,620.5Q782,561 832,460Q782,359 687.5,299.5Q593,240 480,240Q367,240 272.5,299.5Q178,359 128,460Q178,561 272.5,620.5Q367,680 480,680Z" /> diff --git a/app/src/main/res/drawable/ic_search_grey600_24dp.xml b/app/src/main/res/drawable/ic_search_grey600_24dp.xml index dfaf51010..4b0b4a3ad 100644 --- a/app/src/main/res/drawable/ic_search_grey600_24dp.xml +++ b/app/src/main/res/drawable/ic_search_grey600_24dp.xml @@ -1,15 +1,16 @@ + android:tint="#757575" + android:viewportWidth="960" + android:viewportHeight="960"> + android:fillColor="@android:color/white" + android:pathData="M784,840L532,588Q502,612 463,626Q424,640 380,640Q271,640 195.5,564.5Q120,489 120,380Q120,271 195.5,195.5Q271,120 380,120Q489,120 564.5,195.5Q640,271 640,380Q640,424 626,463Q612,502 588,532L840,784L784,840ZM380,560Q455,560 507.5,507.5Q560,455 560,380Q560,305 507.5,252.5Q455,200 380,200Q305,200 252.5,252.5Q200,305 200,380Q200,455 252.5,507.5Q305,560 380,560Z" /> diff --git a/app/src/main/res/drawable/ic_send_grey600_24dp.xml b/app/src/main/res/drawable/ic_send_grey600_24dp.xml index 4c904c1e7..a78fb234d 100644 --- a/app/src/main/res/drawable/ic_send_grey600_24dp.xml +++ b/app/src/main/res/drawable/ic_send_grey600_24dp.xml @@ -1,17 +1,17 @@ - + android:viewportWidth="960" + android:viewportHeight="960"> + android:fillColor="@android:color/white" + android:pathData="M120,800L120,160L880,480L120,800ZM200,680L674,480L200,280L200,420L440,480L200,540L200,680ZM200,680L200,480L200,280L200,420L200,420L200,540L200,540L200,680Z" /> diff --git a/app/src/main/res/drawable/ic_settings_grey600_24dp.xml b/app/src/main/res/drawable/ic_settings_grey600_24dp.xml index 7ec95d70f..c1063687e 100644 --- a/app/src/main/res/drawable/ic_settings_grey600_24dp.xml +++ b/app/src/main/res/drawable/ic_settings_grey600_24dp.xml @@ -1,19 +1,16 @@ - +android:width="24dp" +android:height="24dp" +android:viewportWidth="960" +android:viewportHeight="960" +android:tint="#757575"> + diff --git a/app/src/main/res/drawable/ic_share_white_24dp.xml b/app/src/main/res/drawable/ic_share_white_24dp.xml index 839575a0b..3285018f0 100644 --- a/app/src/main/res/drawable/ic_share_white_24dp.xml +++ b/app/src/main/res/drawable/ic_share_white_24dp.xml @@ -1,17 +1,15 @@ - + android:height="24dp" + android:viewportWidth="960" + android:viewportHeight="960"> + android:fillColor="@android:color/white" + android:pathData="M680,880Q630,880 595,845Q560,810 560,760Q560,754 563,732L282,568Q266,583 245,591.5Q224,600 200,600Q150,600 115,565Q80,530 80,480Q80,430 115,395Q150,360 200,360Q224,360 245,368.5Q266,377 282,392L563,228Q561,221 560.5,214.5Q560,208 560,200Q560,150 595,115Q630,80 680,80Q730,80 765,115Q800,150 800,200Q800,250 765,285Q730,320 680,320Q656,320 635,311.5Q614,303 598,288L317,452Q319,459 319.5,465.5Q320,472 320,480Q320,488 319.5,494.5Q319,501 317,508L598,672Q614,657 635,648.5Q656,640 680,640Q730,640 765,675Q800,710 800,760Q800,810 765,845Q730,880 680,880ZM680,800Q697,800 708.5,788.5Q720,777 720,760Q720,743 708.5,731.5Q697,720 680,720Q663,720 651.5,731.5Q640,743 640,760Q640,777 651.5,788.5Q663,800 680,800ZM200,520Q217,520 228.5,508.5Q240,497 240,480Q240,463 228.5,451.5Q217,440 200,440Q183,440 171.5,451.5Q160,463 160,480Q160,497 171.5,508.5Q183,520 200,520ZM680,240Q697,240 708.5,228.5Q720,217 720,200Q720,183 708.5,171.5Q697,160 680,160Q663,160 651.5,171.5Q640,183 640,200Q640,217 651.5,228.5Q663,240 680,240ZM680,760Q680,760 680,760Q680,760 680,760Q680,760 680,760Q680,760 680,760Q680,760 680,760Q680,760 680,760Q680,760 680,760Q680,760 680,760ZM200,480Q200,480 200,480Q200,480 200,480Q200,480 200,480Q200,480 200,480Q200,480 200,480Q200,480 200,480Q200,480 200,480Q200,480 200,480ZM680,200Q680,200 680,200Q680,200 680,200Q680,200 680,200Q680,200 680,200Q680,200 680,200Q680,200 680,200Q680,200 680,200Q680,200 680,200Z" /> diff --git a/app/src/main/res/drawable/ic_star_border_white_24dp.xml b/app/src/main/res/drawable/ic_star_border_white_24dp.xml index ef6fc44d1..4dfd0bf45 100644 --- a/app/src/main/res/drawable/ic_star_border_white_24dp.xml +++ b/app/src/main/res/drawable/ic_star_border_white_24dp.xml @@ -1,17 +1,15 @@ - + android:height="24dp" + android:viewportWidth="960" + android:viewportHeight="960"> + android:fillColor="@android:color/white" + android:pathData="M354,673L480,597L606,674L573,530L684,434L538,421L480,285L422,420L276,433L387,530L354,673ZM233,840L298,559L80,370L368,345L480,80L592,345L880,370L662,559L727,840L480,691L233,840ZM480,490L480,490L480,490L480,490L480,490L480,490L480,490L480,490L480,490L480,490Z" /> diff --git a/app/src/main/res/drawable/ic_star_grey_ccc_24dp.xml b/app/src/main/res/drawable/ic_star_grey_ccc_24dp.xml index 4d06c2a87..495900f61 100644 --- a/app/src/main/res/drawable/ic_star_grey_ccc_24dp.xml +++ b/app/src/main/res/drawable/ic_star_grey_ccc_24dp.xml @@ -1,17 +1,16 @@ - + android:viewportWidth="960" + android:viewportHeight="960"> + android:fillColor="@android:color/white" + android:pathData="M233,840L298,559L80,370L368,345L480,80L592,345L880,370L662,559L727,840L480,691L233,840Z" /> diff --git a/app/src/main/res/drawable/ic_star_white_24dp.xml b/app/src/main/res/drawable/ic_star_white_24dp.xml index 21d0b060b..ae4853700 100644 --- a/app/src/main/res/drawable/ic_star_white_24dp.xml +++ b/app/src/main/res/drawable/ic_star_white_24dp.xml @@ -1,17 +1,15 @@ - + android:height="24dp" + android:viewportWidth="960" + android:viewportHeight="960"> + android:fillColor="@android:color/white" + android:pathData="M233,840L298,559L80,370L368,345L480,80L592,345L880,370L662,559L727,840L480,691L233,840Z" /> diff --git a/app/src/main/res/drawable/ic_star_yellow_24dp.xml b/app/src/main/res/drawable/ic_star_yellow_24dp.xml index 59090ed26..dea4e7497 100644 --- a/app/src/main/res/drawable/ic_star_yellow_24dp.xml +++ b/app/src/main/res/drawable/ic_star_yellow_24dp.xml @@ -1,16 +1,16 @@ - - + + diff --git a/app/src/main/res/drawable/ic_sync_black_24dp.xml b/app/src/main/res/drawable/ic_sync_black_24dp.xml index 3667ab0b4..d287c4df0 100644 --- a/app/src/main/res/drawable/ic_sync_black_24dp.xml +++ b/app/src/main/res/drawable/ic_sync_black_24dp.xml @@ -1,17 +1,16 @@ - + android:viewportWidth="960" + android:viewportHeight="960"> + android:fillColor="@android:color/white" + android:pathData="M160,800L160,720L270,720L254,706Q205,657 182.5,599.5Q160,542 160,482Q160,371 226.5,284.5Q293,198 400,170L400,254Q328,280 284,342.5Q240,405 240,482Q240,527 257,569.5Q274,612 310,648L320,658L320,560L400,560L400,800L160,800ZM560,790L560,706Q632,680 676,617.5Q720,555 720,478Q720,433 703,390.5Q686,348 650,312L640,302L640,400L560,400L560,160L800,160L800,240L690,240L706,254Q755,303 777.5,360.5Q800,418 800,478Q800,589 733.5,675.5Q667,762 560,790Z" /> diff --git a/app/src/main/res/drawable/ic_sync_blue_18dp.xml b/app/src/main/res/drawable/ic_sync_blue_18dp.xml index 6c82317bf..5bb3ada2e 100644 --- a/app/src/main/res/drawable/ic_sync_blue_18dp.xml +++ b/app/src/main/res/drawable/ic_sync_blue_18dp.xml @@ -1,17 +1,16 @@ + android:viewportWidth="960" + android:viewportHeight="960"> + android:fillColor="@android:color/white" + android:pathData="M160,800L160,720L270,720L254,706Q205,657 182.5,599.5Q160,542 160,482Q160,371 226.5,284.5Q293,198 400,170L400,254Q328,280 284,342.5Q240,405 240,482Q240,527 257,569.5Q274,612 310,648L320,658L320,560L400,560L400,800L160,800ZM560,790L560,706Q632,680 676,617.5Q720,555 720,478Q720,433 703,390.5Q686,348 650,312L640,302L640,400L560,400L560,160L800,160L800,240L690,240L706,254Q755,303 777.5,360.5Q800,418 800,478Q800,589 733.5,675.5Q667,762 560,790Z" /> diff --git a/app/src/main/res/drawable/ic_work_grey600_24dp.xml b/app/src/main/res/drawable/ic_work_grey600_24dp.xml index 1183be3ea..826510785 100644 --- a/app/src/main/res/drawable/ic_work_grey600_24dp.xml +++ b/app/src/main/res/drawable/ic_work_grey600_24dp.xml @@ -1,17 +1,16 @@ + android:viewportWidth="960" + android:viewportHeight="960"> + android:fillColor="@android:color/white" + android:pathData="M160,840Q127,840 103.5,816.5Q80,793 80,760L80,320Q80,287 103.5,263.5Q127,240 160,240L320,240L320,160Q320,127 343.5,103.5Q367,80 400,80L560,80Q593,80 616.5,103.5Q640,127 640,160L640,240L800,240Q833,240 856.5,263.5Q880,287 880,320L880,760Q880,793 856.5,816.5Q833,840 800,840L160,840ZM400,240L560,240L560,160Q560,160 560,160Q560,160 560,160L400,160Q400,160 400,160Q400,160 400,160L400,240Z" /> diff --git a/app/src/main/res/drawable/ic_work_grey600_outline_24dp.xml b/app/src/main/res/drawable/ic_work_grey600_outline_24dp.xml new file mode 100644 index 000000000..db7db825f --- /dev/null +++ b/app/src/main/res/drawable/ic_work_grey600_outline_24dp.xml @@ -0,0 +1,16 @@ + + + + diff --git a/app/src/main/res/drawable/selector_all_notes.xml b/app/src/main/res/drawable/selector_all_notes.xml new file mode 100644 index 000000000..e3e0f20d2 --- /dev/null +++ b/app/src/main/res/drawable/selector_all_notes.xml @@ -0,0 +1,10 @@ + + + + + diff --git a/app/src/main/res/drawable/selector_credentials.xml b/app/src/main/res/drawable/selector_credentials.xml new file mode 100644 index 000000000..807bc6db7 --- /dev/null +++ b/app/src/main/res/drawable/selector_credentials.xml @@ -0,0 +1,10 @@ + + + + + diff --git a/app/src/main/res/drawable/selector_favorites.xml b/app/src/main/res/drawable/selector_favorites.xml new file mode 100644 index 000000000..9e483e4a5 --- /dev/null +++ b/app/src/main/res/drawable/selector_favorites.xml @@ -0,0 +1,10 @@ + + + + + diff --git a/app/src/main/res/drawable/selector_folder.xml b/app/src/main/res/drawable/selector_folder.xml new file mode 100644 index 000000000..fb8242475 --- /dev/null +++ b/app/src/main/res/drawable/selector_folder.xml @@ -0,0 +1,10 @@ + + + + + diff --git a/app/src/main/res/drawable/selector_folder_18.xml b/app/src/main/res/drawable/selector_folder_18.xml new file mode 100644 index 000000000..05736d1ea --- /dev/null +++ b/app/src/main/res/drawable/selector_folder_18.xml @@ -0,0 +1,10 @@ + + + + + diff --git a/app/src/main/res/drawable/selector_folder_open.xml b/app/src/main/res/drawable/selector_folder_open.xml new file mode 100644 index 000000000..5508fa921 --- /dev/null +++ b/app/src/main/res/drawable/selector_folder_open.xml @@ -0,0 +1,10 @@ + + + + + diff --git a/app/src/main/res/drawable/selector_food.xml b/app/src/main/res/drawable/selector_food.xml new file mode 100644 index 000000000..b2a13a4c9 --- /dev/null +++ b/app/src/main/res/drawable/selector_food.xml @@ -0,0 +1,10 @@ + + + + + diff --git a/app/src/main/res/drawable/selector_games.xml b/app/src/main/res/drawable/selector_games.xml new file mode 100644 index 000000000..e378e1d85 --- /dev/null +++ b/app/src/main/res/drawable/selector_games.xml @@ -0,0 +1,10 @@ + + + + + diff --git a/app/src/main/res/drawable/selector_movies.xml b/app/src/main/res/drawable/selector_movies.xml new file mode 100644 index 000000000..481a37fc1 --- /dev/null +++ b/app/src/main/res/drawable/selector_movies.xml @@ -0,0 +1,10 @@ + + + + + diff --git a/app/src/main/res/drawable/selector_music.xml b/app/src/main/res/drawable/selector_music.xml new file mode 100644 index 000000000..251073473 --- /dev/null +++ b/app/src/main/res/drawable/selector_music.xml @@ -0,0 +1,10 @@ + + + + + diff --git a/app/src/main/res/drawable/selector_new_folder.xml b/app/src/main/res/drawable/selector_new_folder.xml new file mode 100644 index 000000000..cdc576383 --- /dev/null +++ b/app/src/main/res/drawable/selector_new_folder.xml @@ -0,0 +1,10 @@ + + + + + diff --git a/app/src/main/res/drawable/selector_new_folder_18.xml b/app/src/main/res/drawable/selector_new_folder_18.xml new file mode 100644 index 000000000..e1708a0f0 --- /dev/null +++ b/app/src/main/res/drawable/selector_new_folder_18.xml @@ -0,0 +1,10 @@ + + + + + diff --git a/app/src/main/res/drawable/selector_work.xml b/app/src/main/res/drawable/selector_work.xml new file mode 100644 index 000000000..7036a71ad --- /dev/null +++ b/app/src/main/res/drawable/selector_work.xml @@ -0,0 +1,10 @@ + + + + + diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index 267a41136..f5013a4b8 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -34,7 +34,6 @@ + android:layout_height="wrap_content" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_note_preview.xml b/app/src/main/res/layout/fragment_note_preview.xml index d407ce286..82aeadfc0 100644 --- a/app/src/main/res/layout/fragment_note_preview.xml +++ b/app/src/main/res/layout/fragment_note_preview.xml @@ -100,7 +100,7 @@ android:text="@string/noteMode_plain_edit" android:visibility="visible" app:backgroundTint="@color/defaultBrand" - app:layout_anchor="@id/scrollView" - app:layout_anchorGravity="bottom|end" - app:icon="@drawable/ic_edit_grey600_24dp" /> + app:icon="@drawable/ic_edit_grey600_24dp" + app:layout_anchor="@+id/direct_editing" + app:layout_anchorGravity="center" />