diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/adapter/ChapterListItemAD.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/adapter/ChapterListItemAD.kt index f65951d47..ab051c176 100644 --- a/app/src/main/java/org/koitharu/kotatsu/details/ui/adapter/ChapterListItemAD.kt +++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/adapter/ChapterListItemAD.kt @@ -34,7 +34,7 @@ fun chapterListItemAD( when (item.status) { FLAG_UNREAD -> { binding.textViewNumber.setBackgroundResource(R.drawable.bg_badge_default) - binding.textViewNumber.setTextColor(context.getThemeColor(android.R.attr.textColorSecondaryInverse)) + binding.textViewNumber.setTextColor(context.getThemeColor(com.google.android.material.R.attr.colorOnTertiary)) } FLAG_CURRENT -> { binding.textViewNumber.setBackgroundResource(R.drawable.bg_badge_accent) @@ -53,4 +53,4 @@ fun chapterListItemAD( binding.imageViewDownloaded.isVisible = item.hasFlag(FLAG_DOWNLOADED) binding.imageViewNew.isVisible = item.hasFlag(FLAG_NEW) } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/koitharu/kotatsu/explore/ui/ExploreViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/explore/ui/ExploreViewModel.kt index 122c14b21..6d2657368 100644 --- a/app/src/main/java/org/koitharu/kotatsu/explore/ui/ExploreViewModel.kt +++ b/app/src/main/java/org/koitharu/kotatsu/explore/ui/ExploreViewModel.kt @@ -61,7 +61,7 @@ class ExploreViewModel @Inject constructor( sources.mapTo(result) { ExploreItem.Source(it) } } else { result += ExploreItem.EmptyHint( - icon = R.drawable.ic_empty_search, + icon = R.drawable.ic_empty_common, textPrimary = R.string.no_manga_sources, textSecondary = R.string.no_manga_sources_text, actionStringRes = R.string.manage, diff --git a/app/src/main/java/org/koitharu/kotatsu/remotelist/ui/RemoteListViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/remotelist/ui/RemoteListViewModel.kt index 4c5455f57..386808b28 100644 --- a/app/src/main/java/org/koitharu/kotatsu/remotelist/ui/RemoteListViewModel.kt +++ b/app/src/main/java/org/koitharu/kotatsu/remotelist/ui/RemoteListViewModel.kt @@ -163,7 +163,7 @@ class RemoteListViewModel @AssistedInject constructor( } private fun createEmptyState(canResetFilter: Boolean) = EmptyState( - icon = R.drawable.ic_empty_search, + icon = R.drawable.ic_empty_common, textPrimary = R.string.nothing_found, textSecondary = 0, actionStringRes = if (canResetFilter) R.string.reset_filter else 0, diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/SearchViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/SearchViewModel.kt index f4a18319c..37301cd11 100644 --- a/app/src/main/java/org/koitharu/kotatsu/search/ui/SearchViewModel.kt +++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/SearchViewModel.kt @@ -48,7 +48,7 @@ class SearchViewModel @AssistedInject constructor( list == null -> listOf(LoadingState) list.isEmpty() -> listOf( EmptyState( - icon = R.drawable.ic_empty_search, + icon = R.drawable.ic_empty_common, textPrimary = R.string.nothing_found, textSecondary = R.string.text_search_holder_secondary, actionStringRes = 0, diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/multi/MultiSearchViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/multi/MultiSearchViewModel.kt index 3fc76fc7e..2a9455e08 100644 --- a/app/src/main/java/org/koitharu/kotatsu/search/ui/multi/MultiSearchViewModel.kt +++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/multi/MultiSearchViewModel.kt @@ -48,7 +48,7 @@ class MultiSearchViewModel @AssistedInject constructor( loading -> LoadingState error != null -> error.toErrorState(canRetry = true) else -> EmptyState( - icon = R.drawable.ic_empty_search, + icon = R.drawable.ic_empty_common, textPrimary = R.string.nothing_found, textSecondary = R.string.text_search_holder_secondary, actionStringRes = 0, diff --git a/app/src/main/java/org/koitharu/kotatsu/shelf/ui/ShelfViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/shelf/ui/ShelfViewModel.kt index 9577fd323..2e88331b2 100644 --- a/app/src/main/java/org/koitharu/kotatsu/shelf/ui/ShelfViewModel.kt +++ b/app/src/main/java/org/koitharu/kotatsu/shelf/ui/ShelfViewModel.kt @@ -156,7 +156,7 @@ class ShelfViewModel @Inject constructor( } } else { result += EmptyHint( - icon = R.drawable.ic_empty_suggestions, + icon = R.drawable.ic_empty_common, textPrimary = R.string.network_unavailable, textSecondary = R.string.network_unavailable_hint, actionStringRes = R.string.manage, diff --git a/app/src/main/java/org/koitharu/kotatsu/suggestions/ui/SuggestionsViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/suggestions/ui/SuggestionsViewModel.kt index 6b98d88db..25941f2e3 100644 --- a/app/src/main/java/org/koitharu/kotatsu/suggestions/ui/SuggestionsViewModel.kt +++ b/app/src/main/java/org/koitharu/kotatsu/suggestions/ui/SuggestionsViewModel.kt @@ -31,7 +31,7 @@ class SuggestionsViewModel @Inject constructor( when { list.isEmpty() -> listOf( EmptyState( - icon = R.drawable.ic_empty_suggestions, + icon = R.drawable.ic_empty_common, textPrimary = R.string.nothing_found, textSecondary = R.string.text_suggestion_holder, actionStringRes = 0, diff --git a/app/src/main/res/color-v23/bottom_menu_active_indicator.xml b/app/src/main/res/color-v23/bottom_menu_active_indicator.xml new file mode 100644 index 000000000..6bb0c8f83 --- /dev/null +++ b/app/src/main/res/color-v23/bottom_menu_active_indicator.xml @@ -0,0 +1,4 @@ + + + + diff --git a/app/src/main/res/color-v23/selector_overlay.xml b/app/src/main/res/color-v23/selector_overlay.xml index e58e11d7c..538011ef8 100644 --- a/app/src/main/res/color-v23/selector_overlay.xml +++ b/app/src/main/res/color-v23/selector_overlay.xml @@ -1,4 +1,4 @@ - - \ No newline at end of file + + diff --git a/app/src/main/res/color-v23/toolbar_background_scrim.xml b/app/src/main/res/color-v23/toolbar_background_scrim.xml index 1c0adc72a..2b5794201 100644 --- a/app/src/main/res/color-v23/toolbar_background_scrim.xml +++ b/app/src/main/res/color-v23/toolbar_background_scrim.xml @@ -1,4 +1,4 @@ - \ No newline at end of file + diff --git a/app/src/main/res/color/bottom_menu_active_indicator.xml b/app/src/main/res/color/bottom_menu_active_indicator.xml new file mode 100644 index 000000000..cd82add77 --- /dev/null +++ b/app/src/main/res/color/bottom_menu_active_indicator.xml @@ -0,0 +1,4 @@ + + + + diff --git a/app/src/main/res/color/selector_overlay.xml b/app/src/main/res/color/selector_overlay.xml index 5a4a4ecb0..515d4a190 100644 --- a/app/src/main/res/color/selector_overlay.xml +++ b/app/src/main/res/color/selector_overlay.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + + diff --git a/app/src/main/res/drawable/ic_empty_common.xml b/app/src/main/res/drawable/ic_empty_common.xml new file mode 100644 index 000000000..37d2167b3 --- /dev/null +++ b/app/src/main/res/drawable/ic_empty_common.xml @@ -0,0 +1,41 @@ + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_empty_favourites.xml b/app/src/main/res/drawable/ic_empty_favourites.xml index ccfc51361..41dcf6836 100644 --- a/app/src/main/res/drawable/ic_empty_favourites.xml +++ b/app/src/main/res/drawable/ic_empty_favourites.xml @@ -1,91 +1,43 @@ - - - - - - - - - - - - - - - - - - - - - + android:width="200dp" + android:height="200dp" + android:viewportWidth="500" + android:viewportHeight="500"> + + + + + + + + diff --git a/app/src/main/res/drawable/ic_empty_feed.xml b/app/src/main/res/drawable/ic_empty_feed.xml index 1df74d5ed..748a05492 100644 --- a/app/src/main/res/drawable/ic_empty_feed.xml +++ b/app/src/main/res/drawable/ic_empty_feed.xml @@ -1,58 +1,71 @@ + android:width="200dp" + android:height="200dp" + android:viewportWidth="200" + android:viewportHeight="200"> + android:fillColor="?colorOnSurface" + android:pathData="M116.81,165.77a129.74,129.74 0,0 0,28.63 -3.31l1.91,-0.46a9.23,9.23 0,0 0,-0.38 2.64,2.52 2.52,0 0,0 1.21,1.79c0.5,0.15 1.38,-0.47 1.89,-1a10.05,10.05 0,0 0,1.11 -1.86c0.35,-0.54 0.77,-1 1.24,-1.64a38.77,38.77 0,0 0,2.55 3.09,1.88 1.88,0 0,0 1.68,0.43c0.38,-0.2 0.44,-1.07 0.53,-1.67a1.36,1.36 0,0 0,-0.23 -0.93c-2.19,-3.14 -0.7,-5 1.87,-7.13 8.68,-10.52 10.57,-17.58 10.12,-29.23 -0.53,-13.89 -0.37,-27.56 -6.28,-40.37 -1.88,-4.07 -2.57,-8.71 -3.64,-13.13a12.3,12.3 0,0 1,0.08 -3.87c0.88,-9 0.48,-17.7 0.9,-26.74a38,38 0,0 0,-2.22 -12.63c-1.6,-4.7 -10.07,-8.92 -13.6,-5.41 -3.78,3.77 -4.89,11.23 -7,16.12 -2.66,6 -3.2,12.08 -6.48,18.24a61.29,61.29 0,0 0,-13 0.81A84.19,84.19 0,0 0,116 45c-1.59,-7.45 -3.62,-14.8 -8.75,-20.79 -0.37,-0.44 -0.72,-0.9 -1.12,-1.3 -3.72,-3.76 -7.52,-3.42 -9.39,1.49A94.12,94.12 0,0 0,91.9 41.81c-1.3,7.54 -1.73,15.24 -2.58,22.86a6.62,6.62 0,0 1,-0.69 2.54,47.22 47.22,0 0,0 -5.76,20.1 73.07,73.07 0,0 1,-2.61 15.4c-3,10 -1.44,19.94 1.21,29.75a67,67 0,0 0,10.28 22.38,36 36,0 0,0 6.48,7.46c1.37,1.08 3.54,1.13 3.54,1.46s-0.93,0.63 -3.33,2c-1.34,0.77 -1.75,1.11 -1.76,1.55s0.91,0.65 1.39,0.91a0.57,0.57 0,0 0,0.54 0,10.4 10.4,0 0,0 3.07,-1.89 6.66,6.66 0,0 0,1.83 -1.91,18.27 18.27,0 0,0 -1.49,4.2c-0.1,0.58 1.81,0.8 2.23,0 0.55,-1 0.08,-2.59 1.72,-3.41 0,0 -1.47,3.43 -0.4,4.39a1.59,1.59 0,0 0,1.86 0c1.08,-0.85 0,-2.83 0.7,-4S110.85,165 116.81,165.77ZM132.88,62.63c0.41,-0.78 0.82,-1.47 1.15,-2.2 2.41,-5.33 2.9,-10.6 5.19,-16.58 2.71,-7.05 3,-12.79 7,-17.22 2.14,-2.35 8.57,1.64 9.37,4.66A41.64,41.64 0,0 1,156.92 43c-0.28,7.49 1,15 -0.18,22.4A34.77,34.77 0,0 0,159.91 87a49.61,49.61 0,0 1,5.27 16.54c1.59,12.34 2.91,23.56 0.45,35.4 -2.54,8.1 -5.1,15 -16.38,19.2 -13.2,4.92 -27.06,5.94 -41.07,4.13A18.7,18.7 0,0 1,95 154.65a69.33,69.33 0,0 1,-11.61 -25.72c-2.12,-8.75 -2.79,-17.54 -0.36,-26.42a63.49,63.49 0,0 0,2.25 -11.72c0.65,-8.16 2,-16.05 6.27,-23.19A5.1,5.1 0,0 0,92.11 65a112.69,112.69 0,0 1,3.21 -26.45,100.9 100.9,0 0,1 3.85,-12.88c1.2,-3.16 3,-3.41 5,-0.75a43.48,43.48 0,0 1,5.69 9.34,64.61 64.61,0 0,1 4.93,25.34c0,1.42 0.3,2.52 2.08,2.12A28.78,28.78 0,0 1,132.88 62.63Z" + android:strokeWidth="1" + android:strokeColor="?colorOnSurface" /> + android:fillColor="?colorOnSurface" + android:pathData="M138.66,76.15a12.12,12.12 0,1 0,14.14 9.77A12.14,12.14 0,0 0,138.66 76.15ZM139.32,79.24a9.22,9.22 0,0 1,10.28 7.35c0.77,4.56 -2.63,9.47 -7.09,10.23a8.93,8.93 0,1 1,-3.19 -17.58Z" + android:strokeWidth="1" + android:strokeColor="?colorOnSurface" /> + android:fillColor="?colorOnSurface" + android:pathData="M103.2,95.12a11.12,11.12 0,1 0,-13 -9A11.14,11.14 0,0 0,103.2 95.12ZM93.46,85.55a8.13,8.13 0,0 1,6.32 -9.13,7.87 7.87,0 1,1 2.74,15.49A8,8 0,0 1,93.46 85.55Z" + android:strokeWidth="1" + android:strokeColor="?colorOnSurface" /> + android:fillColor="?colorOnSurface" + android:pathData="M141.11,94.33c1.2,-0.29 2.39,-0.65 2.39,-2.83a3.67,3.67 0,0 0,-4.24 -3.84c-1.95,0.32 -3.18,3 -2.76,4.84C136.87,94.11 138.27,94.85 141.11,94.33Z" + android:strokeWidth="1" + android:strokeColor="?colorOnSurface" /> + android:fillColor="?colorOnSurface" + android:pathData="M101,89.58a3.46,3.46 0,0 0,2.52 -4.08c-0.25,-1.65 -2.19,-2.84 -4.4,-2.36a3.34,3.34 0,0 0,-2.42 4.24C97.09,89.09 98.39,90.09 101,89.58Z" + android:strokeWidth="1" + android:strokeColor="?colorOnSurface" /> + android:fillColor="?colorSurface" + android:pathData="M31.54,84.88l0,60.92a4.52,4.52 0,0 0,0.4 2.28,4.66 4.66,0 0,0 1.52,1.37c12.43,8.11 17.64,12.94 30.07,21.05 1.28,0.83 4.49,3.75 6,4 6,1 8.09,2.19 9.57,2.38 16.52,2.14 32.76,2.57 49.43,2.62 0,-22 0.44,-43.4 0.45,-65.43a1.69,1.69 0,0 0,-0.2 -1,1.79 1.79,0 0,0 -1.43,-0.55l-45.25,-2.78a40.24,40.24 0,0 1,-9.35 -1.31,37.7 37.7,0 0,1 -7,-3.19A284.06,284.06 0,0 1,32.57 83.87" /> + android:fillColor="?colorOnSurface" + android:pathData="M29.79,84.88l0,53.06c0,3.13 -0.72,7.09 0.29,10.05 0.69,2 2.39,2.87 4.08,4 5.76,3.86 11.33,8 16.94,12 5.16,3.75 10.41,8.05 15.92,11.22 3.12,1.8 8,2.59 11.61,3.32 16.06,3.24 33.6,2.61 49.9,2.68a1.77,1.77 0,0 0,1.75 -1.75c0,-15.38 0.23,-30.75 0.36,-46.13 0,-3.85 0.06,-7.7 0.07,-11.55 0,-2.58 0.81,-6.27 -0.14,-8.72 -1.53,-3.93 -8.71,-2.66 -12.07,-2.87l-22.63,-1.39c-7.73,-0.47 -16.79,0.16 -24.1,-2.6 -6.91,-2.61 -13.46,-7.18 -19.68,-11.1q-9.56,-6 -18.6,-12.79c-1.81,-1.34 -3.56,1.7 -1.77,3a260.74,260.74 0,0 0,34.54 22.1c11.4,6 25.94,4.63 38.46,5.4l10.83,0.67c2.86,0.17 8.81,-0.49 10.76,1.53s0.9,7.74 0.88,10.6c0,3.52 0,7 -0.08,10.57 -0.13,14.42 -0.32,28.83 -0.33,43.25l1.75,-1.75c-15.23,-0.06 -30.49,-0.39 -45.62,-2.16 -4.27,-0.49 -10.37,-1.38 -14.12,-3.36 -4.9,-2.58 -9.62,-6.69 -14.12,-9.92 -4.82,-3.45 -9.54,-7 -14.42,-10.4 -3.67,-2.55 -6.41,-3.4 -7,-8.07 -0.45,-3.8 0,-8 0,-11.79l0,-47.17a1.75,1.75 0,0 0,-3.5 0Z" /> + android:fillColor="?colorOnSurface" + android:pathData="M69.75,113.5c-0.08,17.69 -2,35.31 -2,53a1.75,1.75 0,0 0,3.5 0c0,-17.69 1.92,-35.31 2,-53a1.75,1.75 0,0 0,-3.5 0Z" /> + android:pathData="M78.52,156.22l8.93,0.45 -0.85,-1.11a11.6,11.6 0,0 1,-5.67 7.62c-1,0.54 -0.11,2 0.88,1.52A13.29,13.29 0,0 0,88.29 156a0.87,0.87 0,0 0,-0.84 -1.1l-8.93,-0.45c-1.13,-0.05 -1.12,1.7 0,1.75Z" /> + android:pathData="M77.56,161.84c2.46,1.85 4.83,3.78 6.31,6.54 0.53,1 2,0.11 1.51,-0.88 -1.62,-3 -4.24,-5.14 -6.94,-7.17 -0.9,-0.67 -1.77,0.84 -0.88,1.51Z" /> + android:fillColor="?colorPrimary" + android:pathData="M92.25,156.63a13.6,13.6 0,0 0,4.31 3.13c1,0.43 1.92,-1.08 0.88,-1.52a12.21,12.21 0,0 1,-4 -2.85c-0.79,-0.8 -2,0.43 -1.24,1.24Z" /> + android:fillColor="?colorPrimary" + android:pathData="M102.12,156a21.58,21.58 0,0 1,-1.1 7.14c-1.37,3.69 -4.49,4.09 -8,3.94 -1.13,0 -1.12,1.71 0,1.75 3.06,0.13 6.83,-0.06 8.66,-2.91s2.15,-6.63 2.22,-9.92a0.88,0.88 0,0 0,-1.76 0Z" /> + + android:fillColor="?colorPrimary" + android:pathData="M107,159.88h9.45c0.79,0 1.28,-0.21 1.76,0.53 0.29,0.46 0,1.91 0,2.42 0,1.59 0.62,6.37 -2.39,5.41 -1.07,-0.35 -1.53,1.34 -0.46,1.69 5.52,1.76 4.64,-6.57 4.58,-9.52 0,-2.36 -0.77,-2.28 -3.06,-2.28H107a0.88,0.88 0,0 0,0 1.76Z" /> + android:fillColor="?colorPrimary" + android:pathData="M118.89,156.58a7.65,7.65 0,0 1,1.58 1.31c0.77,0.83 2,-0.41 1.24,-1.24a9.46,9.46 0,0 0,-1.93 -1.58,0.88 0.88,0 0,0 -0.89,1.51Z" /> + android:fillColor="?colorPrimary" + android:pathData="M120.67,154.89a4.09,4.09 0,0 1,1.57 1.7c0.53,1 2,0.11 1.52,-0.89a5.85,5.85 0,0 0,-2.2 -2.32,0.88 0.88,0 0,0 -0.89,1.51Z" /> + android:fillColor="?colorPrimary" + android:pathData="M117,132c0.38,-0.18 0.08,-1.13 0.08,-1.55 0,-6.64 -0.11,-13.81 -0.08,-20.45l-11,-1a148.65,148.65 0,0 1,-0.89 22.33,55.65 55.65,0 0,0 5.63,-4.3 1.64,1.64 0,0 1,2.3 0.21Z" /> + android:fillColor="?colorPrimary" + android:pathData="M117.84,132.23c0.76,-2.84 0.12,-6.48 0.1,-9.42 0,-4.27 -0.08,-8.54 -0.06,-12.81a0.92,0.92 0,0 0,-0.88 -0.88l-11,-1a0.89,0.89 0,0 0,-0.88 0.88,157.13 157.13,0 0,1 -0.88,22.33 0.88,0.88 0,0 0,1.32 0.75c2.23,-1.5 5.15,-5 7.59,-3.35 1.23,0.81 2.28,2.74 3.23,3.89 0.72,0.87 2,-0.38 1.24,-1.24 -1.26,-1.51 -2.52,-3.79 -4.14,-4.89 -3.09,-2.13 -6.53,2.55 -8.81,4.08l1.32,0.76c0.74,-6 1.8,-13 0.93,-18.94 0,-0.26 -0.07,-3.12 -0.71,-2.5 0.13,-0.12 0.84,0.13 1.05,0.1a19.08,19.08 0,0 1,4.24 0.39,24.43 24.43,0 0,1 3.93,0.35c2,0.53 1,0 0.69,2.63a79.42,79.42 0,0 0,0.06 8.59c0,3 0.74,7 0,9.82A0.87,0.87 0,0 0,117.84 132.23Z" /> diff --git a/app/src/main/res/drawable/ic_empty_history.xml b/app/src/main/res/drawable/ic_empty_history.xml index f0c6fdee1..da5592f54 100644 --- a/app/src/main/res/drawable/ic_empty_history.xml +++ b/app/src/main/res/drawable/ic_empty_history.xml @@ -1,31 +1,44 @@ - - - - - - + android:width="200dp" + android:height="200dp" + android:viewportWidth="500" + android:viewportHeight="500"> + + + + + + + android:pathData="M354.62,86C342.45,72.37 329.1,60.22 312.5,52.5s-31.71,-12.79 -45,-14c-11,-1 -17.87,-0.3 -27,1a82.54,82.54 0,0 0,-28 9c-17.19,8.6 -35.65,16.73 -48,2 7.24,10.61 10.87,18.31 18,29 4,6 13.68,14.75 17,17a77.36,77.36 0,0 0,19 9c12,3.73 13.14,4.19 25.53,6.07a204.89,204.89 0,0 0,29.61 1.9c14.84,0.07 29.85,-0.61 44.12,-4.7s27.85,-11.91 36.62,-23.88" /> + + android:fillColor="?colorOnSurface" + android:pathData="M353.18,80.05c-9.46,0.34 -18.91,0.51 -28.37,0.21 -6.1,-0.2 -12.19,-0.57 -18.26,-1.18 -1.6,-0.16 -3.2,-0.33 -4.8,-0.52l-2.41,-0.31c1.05,0.14 -0.3,0 -0.42,0L297.3,78q-4.91,-0.72 -9.75,-1.69a142.18,142.18 0,0 1,-21.85 -6.11,4.53 4.53,0 0,0 -5.54,3.14 4.63,4.63 0,0 0,3.14 5.54c13,4.84 26.71,7.42 40.46,9a292.64,292.64 0,0 0,35.4 1.61c4.67,0 9.34,-0.18 14,-0.35a4.5,4.5 0,0 0,0 -9Z" /> diff --git a/app/src/main/res/drawable/ic_empty_local.xml b/app/src/main/res/drawable/ic_empty_local.xml index f578a6ce8..2b40767fe 100644 --- a/app/src/main/res/drawable/ic_empty_local.xml +++ b/app/src/main/res/drawable/ic_empty_local.xml @@ -1,71 +1,53 @@ + android:width="200dp" + android:height="200dp" + android:viewportWidth="200" + android:viewportHeight="200"> + android:fillColor="?colorOnSurface" + android:pathData="M81.94,186.19a154.12,154.12 0,0 0,33 -9.82l2.14,-0.93a10.54,10.54 0,0 0,0.11 3.18c0.27,0.77 1.1,1.78 1.78,1.85s1.53,-0.84 2,-1.52a11.55,11.55 0,0 0,0.91 -2.41c0.3,-0.71 0.7,-1.37 1.12,-2.19a43.76,43.76 0,0 0,3.64 3.11,2.27 2.27,0 0,0 2.07,0.16c0.4,-0.32 0.29,-1.36 0.27,-2.07a1.7,1.7 0,0 0,-0.46 -1.06c-3.23,-3.23 -1.86,-5.71 0.72,-8.76 8,-14.16 8.77,-22.84 5.83,-36.44 -3.51,-16.2 -6.14,-32.31 -15.74,-46.14 -3,-4.39 -4.83,-9.69 -7,-14.66a14.64,14.64 0,0 1,-0.71 -4.58c-0.83,-10.78 -3.1,-20.89 -4.48,-31.6 -0.59,-4.59 -3,-10.25 -5.23,-14.37 -2.85,-5.19 -13.68,-8.4 -17.09,-3.54 -3.66,5.21 -3.42,14.21 -4.93,20.39C78,42.44 78.64,49.65 76.06,57.56a73.93,73.93 0,0 0,-15.12 3.65,99.69 99.69,0 0,0 -5,-16.75C52.58,36 48.67,27.83 41.4,21.84c-0.53,-0.43 -1,-0.9 -1.59,-1.29 -5.14,-3.64 -9.54,-2.46 -10.72,3.69A112.24,112.24 0,0 0,27 45.71C27,54.84 28.12,64 28.7,73.1a8,8 0,0 1,-0.28 3.13C25.52,84.29 25,92.61 25.81,101a86.56,86.56 0,0 1,0.12 18.63c-1.4,12.31 2.45,23.73 7.59,34.71 4.21,9 9.53,17.26 16.72,24.17C53,181.22 55.82,184 59.4,186c1.84,1 4.4,0.6 4.46,1s-1,0.93 -3.5,3c-1.4,1.19 -1.82,1.67 -1.74,2.19s1.2,0.58 1.82,0.78a0.7,0.7 0,0 0,0.64 -0.11A12.45,12.45 0,0 0,64.29 190,7.41 7.41,0 0,0 66,187.39a22.49,22.49 0,0 0,-0.87 5.25c0,0.7 2.29,0.56 2.62,-0.44 0.44,-1.31 -0.44,-3.06 1.31,-4.37 0,0 -1,4.34 0.44,5.24a1.9,1.9 0,0 0,2.18 -0.43c1.09,-1.22 -0.61,-3.32 0,-4.81S74.78,186.52 81.94,186.19ZM79.47,61.68c0.32,-1 0.65,-1.9 0.89,-2.82C82.08,52.09 81.57,45.8 83,38.3c1.71,-8.84 0.81,-15.64 4.65,-21.69 2,-3.2 10.42,0.16 12,3.54a50.1,50.1 0,0 1,4 13.44c1.23,8.86 4.31,17.41 4.43,26.35a41.43,41.43 0,0 0,8.22 24.79,59.62 59.62,0 0,1 9.62,18.34c4.41,14.18 8.3,27.09 7.86,41.51 -1.31,10 -2.88,18.68 -15.27,26 -14.5,8.51 -30.57,12.59 -47.41,13.36a22.35,22.35 0,0 1,-17 -6.25c-8.42,-7.89 -14.4,-17.39 -19,-27.82 -4.3,-9.84 -6.91,-20 -5.89,-31a76.17,76.17 0,0 0,0.22 -14.24c-0.94,-9.72 -1,-19.26 2.55,-28.55a6.05,6.05 0,0 0,0.09 -3.14,134.53 134.53,0 0,1 -1.71,-31.74A121.63,121.63 0,0 1,32.2 25.26c0.76,-4 2.8,-4.63 5.72,-1.92a52,52 0,0 1,8.61 9.79,77.09 77.09,0 0,1 11,28.76c0.28,1.67 0.88,2.9 2.88,2.06A34.41,34.41 0,0 1,79.47 61.68Z" + android:strokeWidth="1" + android:strokeColor="?colorOnSurface" /> + android:fillColor="?colorOnSurface" + android:pathData="M89.05,76.37a14.46,14.46 0,1 0,18.64 8.55A14.49,14.49 0,0 0,89.05 76.37ZM90.46,79.87c5.23,-1.92 11.73,1.18 13.62,6.5s-1.14,11.68 -6.23,13.49a10.66,10.66 0,0 1,-7.39 -20Z" + android:strokeWidth="1" + android:strokeColor="?colorOnSurface" /> + android:fillColor="?colorOnSurface" + android:pathData="M51.32,106a13.27,13.27 0,1 0,-17.15 -7.9A13.29,13.29 0,0 0,51.32 106ZM37.9,96.78a9.68,9.68 0,0 1,5.52 -12,9.39 9.39,0 1,1 6.44,17.64A9.57,9.57 0,0 1,37.9 96.78Z" + android:strokeWidth="1" + android:strokeColor="?colorOnSurface" /> + android:fillColor="?colorOnSurface" + android:pathData="M96.25,93.49c1.35,-0.59 3,-1.64 2.15,-4.11s-3.71,-4 -5.71,-3.35c-2.22,0.78 -3.79,4.16 -2.91,6.25C90.55,94.09 93,94.69 96.25,93.49Z" + android:strokeWidth="1" + android:strokeColor="?colorOnSurface" /> + android:fillColor="?colorOnSurface" + android:pathData="M48.33,97.4A4.61,4.61 0,0 0,51.12 92c-0.64,-1.89 -3.84,-2.79 -6.34,-1.78a4,4 0,0 0,-2 5.5C43.66,97.63 45.39,98.53 48.33,97.4Z" + android:strokeWidth="1" + android:strokeColor="?colorOnSurface" /> + android:fillColor="?colorOnSurface" + android:pathData="M121.32,84.4 L128.48,62c0.93,-2.88 1.67,-9 5.08,-9.14 2.75,-0.11 7.08,2.25 9.73,3.16 3.51,1.21 7,2.47 10.53,3.64 3.31,1.1 8,1.52 11,3.33 1.87,1.15 3.29,4.78 4.1,6.74a48.92,48.92 0,0 1,2.78 8.59c1.33,6.43 -1.94,13.48 -3.61,19.76 -1.79,6.74 -3.53,13.49 -5.44,20.2 -0.9,3.17 -1.83,6.33 -2.83,9.47 -0.45,1.43 -0.76,3.75 -1.65,5 0,1.24 -0.39,1.58 -1.24,1l-2.39,-0.77c-6.61,-2.11 -13.24,-4.18 -19.85,-6.31 -2.15,-0.7 -3.07,2.68 -0.93,3.37 4.4,1.42 8.8,2.81 13.2,4.2 3.06,1 7.86,3.63 11.07,3.38 2.36,-0.19 2.81,-2 3.51,-4 1.38,-3.9 2.58,-7.88 3.74,-11.86 2.71,-9.27 5,-18.65 7.57,-28 1,-3.63 2.83,-7.74 3.09,-11.48 0.2,-2.79 -1,-6.24 -1.84,-8.85 -1.43,-4.26 -3.33,-11.21 -7.51,-13.54 -3.42,-1.91 -8.09,-2.45 -11.81,-3.69 -4.7,-1.56 -9.35,-3.27 -14.06,-4.83 -2.73,-0.91 -6.59,-3 -9.58,-2.49 -2.5,0.46 -2.91,2.52 -3.61,4.66 -3.29,9.9 -6.37,19.88 -9.56,29.81 -0.68,2.15 2.69,3.07 3.38,0.93Z" /> + android:fillColor="?colorOnSurface" + android:pathData="M132.76,56.37a34.42,34.42 0,0 0,-3.06 9.42c-0.36,2.2 3,3.15 3.38,0.93a31.17,31.17 0,0 1,2.7 -8.58c1,-2 -2,-3.79 -3,-1.77Z" /> + android:fillColor="?colorOnSurface" + android:pathData="M139.22,57.27a21,21 0,0 0,-4 9.44c-0.35,2.21 3,3.16 3.37,0.93A18.93,18.93 0,0 1,142.24 59c1.35,-1.8 -1.69,-3.55 -3,-1.76Z" /> + android:fillColor="?colorOnSurface" + android:pathData="M144,59.9l-2.4,8.66a1.75,1.75 0,0 0,3.38 0.93l2.4,-8.65A1.76,1.76 0,0 0,144 59.9Z" /> + android:fillColor="?colorOnSurface" + android:pathData="M148.93,62.23a25.59,25.59 0,0 1,-0.94 7.83,1.76 1.76,0 0,0 3.38,0.94 28.9,28.9 0,0 0,1.06 -8.77c-0.07,-2.25 -3.57,-2.26 -3.5,0Z" /> + android:fillColor="?colorOnSurface" + android:pathData="M155.87,63l-2.58,9.22a1.75,1.75 0,0 0,3.38 0.93L159.24,64a1.75,1.75 0,0 0,-3.37 -0.93Z" /> - - - - + android:fillColor="?colorOnSurface" + android:pathData="M161.44,64.86a64.54,64.54 0,0 1,-2.72 9.35c-0.75,2.13 2.63,3 3.38,0.93a65.83,65.83 0,0 0,2.72 -9.35c0.42,-2.2 -2.95,-3.14 -3.38,-0.93Z" /> diff --git a/app/src/main/res/drawable/ic_empty_search.xml b/app/src/main/res/drawable/ic_empty_search.xml deleted file mode 100644 index 37fa1c487..000000000 --- a/app/src/main/res/drawable/ic_empty_search.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_empty_suggestions.xml b/app/src/main/res/drawable/ic_empty_suggestions.xml deleted file mode 100644 index 84025ea16..000000000 --- a/app/src/main/res/drawable/ic_empty_suggestions.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 01c535da6..13d052231 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -94,6 +94,7 @@ android:layout_height="wrap_content" android:layout_gravity="bottom" android:clickable="true" + app:itemActiveIndicatorStyle="@style/Widget.Kotatsu.BottomNavigationView.ActiveIndicator" app:layout_insetEdge="bottom" app:menu="@menu/nav_bottom" tools:ignore="KeyboardInaccessibleWidget" /> diff --git a/app/src/main/res/values-night-v31/themes.xml b/app/src/main/res/values-night-v31/themes.xml index 48f102679..2e49383b3 100644 --- a/app/src/main/res/values-night-v31/themes.xml +++ b/app/src/main/res/values-night-v31/themes.xml @@ -3,28 +3,28 @@ + +