athaliar/APKDownloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve fliters & chip styles

Browse Source 
-- Removed filter apply & close, filter is saved on dismiss
This commit is contained in:
Rahul Patel
2024-07-15 01:16:07 +05:30
committed by Aayush Gupta
parent ec9e237a4d
commit 388e2d9a35
12 changed files with 145 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/com/aurora/store/view/ui/search/SearchResultsFragment.kt
View File

@@ -247,22 +247,22 @@ class SearchResultsFragment : BaseFragment<FragmentSearchResultBinding>(),
viewModel.observeSearchResults(query) viewModel.observeSearchResults(query)
} }
private fun filter(appList: MutableList<App>): List<App> { private fun filter(appList: List<App>): List<App> {
val tempList:MutableList<App> = mutableListOf()
tempList.addAll(appList)
val filter = viewModel.filterProvider.getSavedFilter() val filter = viewModel.filterProvider.getSavedFilter()
return tempList return appList
.asSequence() .asSequence()
.filter { it.displayName.isNotEmpty() } // Some of the apps may not have metadata .filter { app ->
.filter { if (!filter.paidApps) it.isFree else true } app.displayName.isNotEmpty() &&
.filter { if (!filter.appsWithAds) !it.containsAds else true } (filter.paidApps || app.isFree) &&
.filter { if (!filter.gsfDependentApps) it.dependencies.dependentPackages.isEmpty() else true } (filter.appsWithAds || !app.containsAds) &&
.filter { if (filter.rating > 0) it.rating.average >= filter.rating else true } (filter.gsfDependentApps || app.dependencies.dependentPackages.isEmpty()) &&
.filter { if (filter.downloads > 0) it.installs >= filter.downloads else true } (filter.rating <= 0 || app.rating.average >= filter.rating) &&
(filter.downloads <= 0 || app.installs >= filter.downloads)
}
.toList() .toList()
} }
override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) { override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
if (key == PREFERENCE_FILTER) query?.let { queryViewModel(it) } if (key == PREFERENCE_FILTER) query?.let { queryViewModel(it) }
} }

36
app/src/main/java/com/aurora/store/view/ui/sheets/FilterSheet.kt
View File

@@ -19,6 +19,7 @@
package com.aurora.store.view.ui.sheets package com.aurora.store.view.ui.sheets
import android.content.DialogInterface
import android.os.Bundle import android.os.Bundle
import android.view.View import android.view.View
import com.aurora.store.R import com.aurora.store.R
@@ -43,18 +44,11 @@ class FilterSheet : BaseDialogSheet<SheetFilterBinding>() {
attachSingleChips() attachSingleChips()
attachMultipleChips() attachMultipleChips()
attachActions()
} }
private fun attachActions() { override fun onDismiss(dialog: DialogInterface) {
binding.btnPositive.setOnClickListener { super.onDismiss(dialog)
filterProvider.saveFilter(filter) filterProvider.saveFilter(filter)
dismissAllowingStateLoss()
}
binding.btnNegative.setOnClickListener {
dismissAllowingStateLoss()
}
} }
private fun attachSingleChips() { private fun attachSingleChips() {
@@ -88,29 +82,25 @@ class FilterSheet : BaseDialogSheet<SheetFilterBinding>() {
val downloadValues = resources.getStringArray(R.array.filterDownloadsValues) val downloadValues = resources.getStringArray(R.array.filterDownloadsValues)
val ratingLabels = resources.getStringArray(R.array.filterRatingLabels) val ratingLabels = resources.getStringArray(R.array.filterRatingLabels)
val ratingValues = resources.getStringArray(R.array.filterRatingValues) val ratingValues = resources.getStringArray(R.array.filterRatingValues)
var i = 0
for (downloadLabel in downloadLabels) { downloadLabels.forEachIndexed { index, value ->
val chip = Chip(requireContext()) val chip = Chip(requireContext())
chip.id = i chip.id = index
chip.text = downloadLabel chip.text = value
chip.isChecked = filter.downloads == downloadValues[i].toInt() chip.isChecked = filter.downloads == downloadValues[index].toInt()
binding.downloadChips.addView(chip) binding.downloadChips.addView(chip)
i++
} }
binding.downloadChips.setOnCheckedStateChangeListener { _, checkedIds -> binding.downloadChips.setOnCheckedStateChangeListener { _, checkedIds ->
filter = filter.copy(downloads = downloadValues[checkedIds[0]].toInt()) filter = filter.copy(downloads = downloadValues[checkedIds[0]].toInt())
} }
i = 0 ratingLabels.forEachIndexed { index, value ->
for (ratingLabel in ratingLabels) { val chip = Chip(requireActivity())
val chip = Chip(requireContext()) chip.id = index
chip.id = i chip.text = value
chip.text = ratingLabel chip.isChecked = filter.rating == ratingValues[index].toFloat()
chip.isChecked = filter.rating == ratingValues[i].toFloat()
binding.ratingChips.addView(chip) binding.ratingChips.addView(chip)
i++
} }
binding.ratingChips.setOnCheckedStateChangeListener { _, checkedIds -> binding.ratingChips.setOnCheckedStateChangeListener { _, checkedIds ->

86
app/src/main/res/layout-land/fragment_account.xml
View File

@@ -31,6 +31,45 @@
android:id="@+id/layout_toolbar_action" android:id="@+id/layout_toolbar_action"
layout="@layout/view_toolbar_action" /> layout="@layout/view_toolbar_action" />
<HorizontalScrollView
android:id="@+id/chip_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipToPadding="false"
android:paddingStart="@dimen/margin_small"
android:paddingTop="@dimen/margin_normal"
android:paddingEnd="@dimen/margin_small"
android:paddingBottom="@dimen/margin_small"
android:scrollbars="none">
<com.google.android.material.chip.ChipGroup
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<com.google.android.material.chip.Chip
android:id="@+id/chip_tos"
style="@style/Widget.MaterialComponents.Chip.Action"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/menu_terms" />
<com.google.android.material.chip.Chip
android:id="@+id/chip_disclaimer"
style="@style/Widget.MaterialComponents.Chip.Action"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/menu_disclaimer" />
<com.google.android.material.chip.Chip
android:id="@+id/chip_license"
style="@style/Widget.MaterialComponents.Chip.Action"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/menu_license" />
</com.google.android.material.chip.ChipGroup>
</HorizontalScrollView>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
@@ -43,56 +82,17 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"> android:layout_weight="1">
<HorizontalScrollView
android:id="@+id/chip_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipToPadding="false"
android:paddingStart="@dimen/margin_small"
android:paddingTop="@dimen/margin_normal"
android:paddingEnd="@dimen/margin_small"
android:paddingBottom="@dimen/margin_small"
android:scrollbars="none">
<com.google.android.material.chip.ChipGroup
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<com.google.android.material.chip.Chip
android:id="@+id/chip_tos"
style="@style/Widget.Aurora.Chip.Info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/menu_terms" />
<com.google.android.material.chip.Chip
android:id="@+id/chip_disclaimer"
style="@style/Widget.Aurora.Chip.Info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/menu_disclaimer" />
<com.google.android.material.chip.Chip
android:id="@+id/chip_license"
style="@style/Widget.Aurora.Chip.Info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/menu_license" />
</com.google.android.material.chip.ChipGroup>
</HorizontalScrollView>
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/img_avatar" android:id="@+id/img_avatar"
android:layout_width="@dimen/icon_size_avatar" android:layout_width="@dimen/icon_size_avatar"
android:layout_height="@dimen/icon_size_avatar" android:layout_height="@dimen/icon_size_avatar"
android:layout_centerInParent="true" android:layout_centerHorizontal="true"
app:srcCompat="@drawable/bg_placeholder" /> app:srcCompat="@drawable/bg_placeholder" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/txt_name" android:id="@+id/txt_name"
style="@style/TextAppearance.Aurora.Title" style="@style/TextAppearance.Aurora.Title"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/img_avatar" android:layout_below="@id/img_avatar"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
@@ -104,7 +104,7 @@
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/txt_email" android:id="@+id/txt_email"
style="@style/TextAppearance.Aurora.Line1" style="@style/TextAppearance.Aurora.Line1"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/txt_name" android:layout_below="@id/txt_name"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
@@ -125,7 +125,7 @@
<com.google.android.material.textview.MaterialTextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/txt_logout_action" android:id="@+id/txt_logout_action"
style="@style/AuroraTextStyle.Line1" style="@style/AuroraTextStyle.Line1"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_above="@id/btn_logout" android:layout_above="@id/btn_logout"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"

8
app/src/main/res/layout/fragment_account.xml
View File

@@ -43,9 +43,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clipToPadding="false" android:clipToPadding="false"
android:paddingStart="@dimen/margin_small" android:paddingStart="@dimen/margin_small"
android:paddingTop="@dimen/margin_normal"
android:paddingEnd="@dimen/margin_small" android:paddingEnd="@dimen/margin_small"
android:paddingBottom="@dimen/margin_small"
android:scrollbars="none"> android:scrollbars="none">
<com.google.android.material.chip.ChipGroup <com.google.android.material.chip.ChipGroup
@@ -54,21 +52,21 @@
<com.google.android.material.chip.Chip <com.google.android.material.chip.Chip
android:id="@+id/chip_tos" android:id="@+id/chip_tos"
style="@style/Widget.Aurora.Chip.Info" style="@style/Widget.MaterialComponents.Chip.Action"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/menu_terms" /> android:text="@string/menu_terms" />
<com.google.android.material.chip.Chip <com.google.android.material.chip.Chip
android:id="@+id/chip_disclaimer" android:id="@+id/chip_disclaimer"
style="@style/Widget.Aurora.Chip.Info" style="@style/Widget.MaterialComponents.Chip.Action"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/menu_disclaimer" /> android:text="@string/menu_disclaimer" />
<com.google.android.material.chip.Chip <com.google.android.material.chip.Chip
android:id="@+id/chip_license" android:id="@+id/chip_license"
style="@style/Widget.Aurora.Chip.Info" style="@style/Widget.MaterialComponents.Chip.Action"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/menu_license" /> android:text="@string/menu_license" />

16
app/src/main/res/layout/fragment_details_review.xml
View File

@@ -48,56 +48,56 @@
<com.google.android.material.chip.Chip <com.google.android.material.chip.Chip
android:id="@+id/filter_review_all" android:id="@+id/filter_review_all"
style="@style/ViewStyle.Aurora.Chip" style="@style/Widget.Material3.Chip.Filter"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/filter_review_all" /> android:text="@string/filter_review_all" />
<com.google.android.material.chip.Chip <com.google.android.material.chip.Chip
android:id="@+id/filter_review_critical" android:id="@+id/filter_review_critical"
style="@style/ViewStyle.Aurora.Chip" style="@style/Widget.Material3.Chip.Filter"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/filter_review_critical" /> android:text="@string/filter_review_critical" />
<com.google.android.material.chip.Chip <com.google.android.material.chip.Chip
android:id="@+id/filter_review_positive" android:id="@+id/filter_review_positive"
style="@style/ViewStyle.Aurora.Chip" style="@style/Widget.Material3.Chip.Filter"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/filter_review_positive" /> android:text="@string/filter_review_positive" />
<com.google.android.material.chip.Chip <com.google.android.material.chip.Chip
android:id="@+id/filter_review_five" android:id="@+id/filter_review_five"
style="@style/ViewStyle.Aurora.Chip" style="@style/Widget.Material3.Chip.Filter"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/filter_review_five" /> android:text="@string/filter_review_five" />
<com.google.android.material.chip.Chip <com.google.android.material.chip.Chip
android:id="@+id/filter_review_four" android:id="@+id/filter_review_four"
style="@style/ViewStyle.Aurora.Chip" style="@style/Widget.Material3.Chip.Filter"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/filter_review_four" /> android:text="@string/filter_review_four" />
<com.google.android.material.chip.Chip <com.google.android.material.chip.Chip
android:id="@+id/filter_review_three" android:id="@+id/filter_review_three"
style="@style/ViewStyle.Aurora.Chip" style="@style/Widget.Material3.Chip.Filter"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/filter_review_three" /> android:text="@string/filter_review_three" />
<com.google.android.material.chip.Chip <com.google.android.material.chip.Chip
android:id="@+id/filter_review_two" android:id="@+id/filter_review_two"
style="@style/ViewStyle.Aurora.Chip" style="@style/Widget.Material3.Chip.Filter"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/filter_review_two" /> android:text="@string/filter_review_two" />
<com.google.android.material.chip.Chip <com.google.android.material.chip.Chip
android:id="@+id/filter_review_one" android:id="@+id/filter_review_one"
style="@style/ViewStyle.Aurora.Chip" style="@style/Widget.Material3.Chip.Filter"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/filter_review_one" /> android:text="@string/filter_review_one" />

2
app/src/main/res/layout/fragment_splash.xml
View File

@@ -101,7 +101,6 @@
android:id="@+id/btn_anonymous" android:id="@+id/btn_anonymous"
android:layout_width="@dimen/width_button" android:layout_width="@dimen/width_button"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone"
app:btnStateIcon="@drawable/ic_anonymous" app:btnStateIcon="@drawable/ic_anonymous"
app:btnStateText="@string/account_anonymous" /> app:btnStateText="@string/account_anonymous" />
@@ -109,7 +108,6 @@
android:id="@+id/btn_anonymous_insecure" android:id="@+id/btn_anonymous_insecure"
android:layout_width="@dimen/width_button" android:layout_width="@dimen/width_button"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone"
app:btnStateIcon="@drawable/ic_anonymous" app:btnStateIcon="@drawable/ic_anonymous"
app:btnStateText="@string/account_anonymous_insecure" /> app:btnStateText="@string/account_anonymous_insecure" />
</LinearLayout> </LinearLayout>

8
app/src/main/res/layout/fragment_top_chart.xml
View File

@@ -42,14 +42,14 @@
<com.google.android.material.chip.Chip <com.google.android.material.chip.Chip
android:id="@+id/tab_top_free" android:id="@+id/tab_top_free"
style="@style/Widget.Aurora.Chip" style="@style/Widget.MaterialComponents.Chip.Choice"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/tab_top_free" /> android:text="@string/tab_top_free" />
<com.google.android.material.chip.Chip <com.google.android.material.chip.Chip
android:id="@+id/tab_top_grossing" android:id="@+id/tab_top_grossing"
style="@style/Widget.Aurora.Chip" style="@style/Widget.MaterialComponents.Chip.Choice"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/tab_top_grossing" /> android:text="@string/tab_top_grossing" />
@@ -57,14 +57,14 @@
<com.google.android.material.chip.Chip <com.google.android.material.chip.Chip
android:id="@+id/tab_trending" android:id="@+id/tab_trending"
style="@style/Widget.Aurora.Chip" style="@style/Widget.MaterialComponents.Chip.Choice"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/tab_trending" /> android:text="@string/tab_trending" />
<com.google.android.material.chip.Chip <com.google.android.material.chip.Chip
android:id="@+id/tab_top_paid" android:id="@+id/tab_top_paid"
style="@style/Widget.Aurora.Chip" style="@style/Widget.MaterialComponents.Chip.Choice"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/tab_top_paid" /> android:text="@string/tab_top_paid" />

16
app/src/main/res/layout/sheet_app_peek.xml
View File

@@ -18,7 +18,6 @@
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
@@ -84,30 +83,25 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="@dimen/padding_large" android:paddingStart="@dimen/padding_large"
android:paddingEnd="@dimen/padding_large" android:paddingEnd="@dimen/padding_large">
app:chipSpacingHorizontal="@dimen/margin_small"
app:selectionRequired="true"
app:singleLine="true"
app:singleSelection="true">
<com.google.android.material.chip.Chip <com.google.android.material.chip.Chip
android:id="@+id/tab_top_free" android:id="@+id/tab_top_free"
style="@style/Widget.Aurora.Chip" style="@style/Widget.MaterialComponents.Chip.Action"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/action_wishlist_add" /> android:text="@string/action_wishlist_add" />
<com.google.android.material.chip.Chip <com.google.android.material.chip.Chip
android:id="@+id/tab_top_grossing" android:id="@+id/tab_top_grossing"
style="@style/Widget.Aurora.Chip" style="@style/Widget.MaterialComponents.Chip.Action"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/action_blacklist_add" /> android:text="@string/action_blacklist_add" />
<com.google.android.material.chip.Chip <com.google.android.material.chip.Chip
android:id="@+id/tab_trending" android:id="@+id/tab_trending"
style="@style/Widget.Aurora.Chip" style="@style/Widget.MaterialComponents.Chip.Action"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/action_ignore_version" /> android:text="@string/action_ignore_version" />
@@ -119,5 +113,5 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/height_button" android:layout_height="@dimen/height_button"
android:layout_margin="@dimen/margin_large" android:layout_margin="@dimen/margin_large"
android:text="Install" /> android:text="@string/action_install" />
</LinearLayout> </LinearLayout>

115
app/src/main/res/layout/sheet_filter.xml
View File

@@ -37,8 +37,7 @@
<androidx.core.widget.NestedScrollView <androidx.core.widget.NestedScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_above="@id/layout_bottom"
android:layout_below="@id/txt_title" android:layout_below="@id/txt_title"
android:padding="@dimen/padding_medium" android:padding="@dimen/padding_medium"
android:scrollbars="none"> android:scrollbars="none">
@@ -49,47 +48,6 @@
android:orientation="vertical" android:orientation="vertical"
tools:targetApi="o"> tools:targetApi="o">
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:paddingStart="10dp"
android:paddingEnd="10dp"
android:text="@string/action_filter_misc"
android:textAppearance="@style/TextAppearance.Aurora.SubTitle" />
<com.google.android.material.chip.ChipGroup
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:paddingStart="10dp"
android:paddingEnd="10dp"
app:chipSpacingHorizontal="@dimen/margin_small"
app:chipSpacingVertical="@dimen/margin_normal">
<com.google.android.material.chip.Chip
android:id="@+id/filter_gfs"
style="@style/Widget.Aurora.Chip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/action_filter_gsf_dependent_apps" />
<com.google.android.material.chip.Chip
android:id="@+id/filter_paid"
style="@style/Widget.Aurora.Chip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/action_filter_paid_apps" />
<com.google.android.material.chip.Chip
android:id="@+id/filter_ads"
style="@style/Widget.Aurora.Chip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/action_filter_apps_with_ads" />
</com.google.android.material.chip.ChipGroup>
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -131,38 +89,45 @@
app:chipSpacingVertical="@dimen/margin_xsmall" app:chipSpacingVertical="@dimen/margin_xsmall"
app:selectionRequired="true" app:selectionRequired="true"
app:singleSelection="true" /> app:singleSelection="true" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:paddingStart="10dp"
android:paddingEnd="10dp"
android:text="@string/action_filter_misc"
android:textAppearance="@style/TextAppearance.Aurora.SubTitle" />
<com.google.android.material.chip.ChipGroup
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:paddingStart="10dp"
android:paddingEnd="10dp">
<com.google.android.material.chip.Chip
android:id="@+id/filter_gfs"
style="@style/Widget.Material3.Chip.Filter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/action_filter_gsf_dependent_apps" />
<com.google.android.material.chip.Chip
android:id="@+id/filter_paid"
style="@style/Widget.Material3.Chip.Filter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/action_filter_paid_apps" />
<com.google.android.material.chip.Chip
android:id="@+id/filter_ads"
style="@style/Widget.Material3.Chip.Filter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/action_filter_apps_with_ads" />
</com.google.android.material.chip.ChipGroup>
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/layout_bottom"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true">
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_positive"
style="@style/Widget.Material3.Button.TextButton"
android:layout_width="0dp"
android:layout_height="@dimen/height_button"
android:text="@string/action_filter_apply"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/btn_negative"
app:layout_constraintTop_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:rippleColor="@color/colorTransparent" />
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_negative"
style="@style/Widget.Material3.Button.TextButton"
android:layout_width="0dp"
android:layout_height="@dimen/height_button"
android:text="@string/action_close"
android:textColor="@color/colorRed"
app:layout_constraintEnd_toStartOf="@id/btn_positive"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:rippleColor="@color/colorTransparent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</RelativeLayout> </RelativeLayout>

30
app/src/main/res/values/arrays.xml
View File

@@ -191,12 +191,12 @@
<string-array name="filterRatingLabels" translatable="false"> <string-array name="filterRatingLabels" translatable="false">
<item>@string/action_filter_all</item> <item>@string/action_filter_all</item>
<item> 1 + </item> <item> 1★ + </item>
<item> 2 + </item> <item> 2★ + </item>
<item> 3 + </item> <item> 3★ + </item>
<item> 4 + </item> <item> 4★ + </item>
<item> 4.5 + </item> <item> 4.5★ + </item>
<item> 4.7 + </item> <item> 4.7★ + </item>
</string-array> </string-array>
<string-array name="filterDownloadsValues" translatable="false"> <string-array name="filterDownloadsValues" translatable="false">
@@ -214,15 +214,15 @@
<string-array name="filterDownloadsLabels" translatable="false"> <string-array name="filterDownloadsLabels" translatable="false">
<item>@string/action_filter_all</item> <item>@string/action_filter_all</item>
<item> > 100 </item> <item> 100 + </item>
<item> > 1 K </item> <item> 1K + </item>
<item> > 10 K </item> <item> 10K + </item>
<item> > 50 K </item> <item> 50K + </item>
<item> > 100 K </item> <item> 100K + </item>
<item> > 1 M </item> <item> 1M + </item>
<item> > 10 M </item> <item> 10M + </item>
<item> > 50 M </item> <item> 50M + </item>
<item> > 100 M </item> <item> 100M + </item>
</string-array> </string-array>
<string-array name="pref_vending_version" translatable="false"> <string-array name="pref_vending_version" translatable="false">

46
app/src/main/res/values/styles_widget.xml
View File

@@ -18,52 +18,6 @@
--> -->
<resources> <resources>
<!-- Chips -->
<style name="Widget.Aurora.Chip.Info" parent="@style/Widget.MaterialComponents.Chip.Action">
<item name="iconStartPadding">2dp</item>
<item name="enforceTextAppearance">true</item>
<item name="rippleColor">@color/colorTransparent</item>
<item name="chipEndPadding">@dimen/margin_xxsmall</item>
<item name="chipStartPadding">@dimen/margin_xxsmall</item>
<item name="chipStrokeWidth">1dp</item>
<item name="android:textAppearance">@style/TextAppearance.Aurora.Chip</item>
<item name="chipBackgroundColor">?android:colorBackground</item>
</style>
<style name="Widget.Aurora.Chip.Review" parent="@style/Widget.MaterialComponents.Chip.Filter">
<item name="iconStartPadding">2dp</item>
<item name="enforceTextAppearance">true</item>
<item name="rippleColor">@color/colorTransparent</item>
<item name="chipBackgroundColor">?android:colorBackground</item>
<item name="chipEndPadding">@dimen/margin_xxsmall</item>
<item name="chipStartPadding">@dimen/margin_xxsmall</item>
<item name="chipStrokeWidth">1dp</item>
<item name="chipStrokeColor">?android:attr/strokeColor</item>
<item name="android:textAppearance">@style/TextAppearance.Aurora.Chip</item>
</style>
<style name="Widget.Aurora.Chip" parent="Widget.MaterialComponents.Chip.Choice">
<item name="chipBackgroundColor">@android:color/transparent</item>
<item name="chipStrokeColor">@color/chip_stroke_selector</item>
<item name="android:textColor">@color/chip_txt_selector</item>
<item name="chipSurfaceColor">@color/chip_surface_selector</item>
<item name="chipStrokeWidth">1dp</item>
<item name="chipStartPadding">@dimen/margin_normal</item>
<item name="chipEndPadding">@dimen/margin_normal</item>
<item name="android:textAppearance">@style/TextAppearance.Aurora.Chip</item>
</style>
<style name="ViewStyle.Aurora.Chip" parent="Widget.MaterialComponents.Chip.Choice">
<item name="chipBackgroundColor">@android:color/transparent</item>
<item name="chipStrokeColor">@color/chip_stroke_selector</item>
<item name="android:textColor">@color/chip_txt_selector</item>
<item name="chipSurfaceColor">@color/chip_surface_selector</item>
<item name="chipStrokeWidth">1dp</item>
<item name="chipStartPadding">@dimen/padding_normal</item>
<item name="chipEndPadding">@dimen/padding_normal</item>
<item name="android:textAppearance">@style/TextAppearance.Aurora.Chip</item>
</style>
<style name="AuroraProgressView"> <style name="AuroraProgressView">
<item name="minWidth">32dp</item> <item name="minWidth">32dp</item>
<item name="maxWidth">46dp</item> <item name="maxWidth">46dp</item>

6
app/src/main/res/values/themes.xml
View File

@@ -30,7 +30,7 @@
<item name="scrimBlack">@color/colorScrimBlack</item> <item name="scrimBlack">@color/colorScrimBlack</item>
<item name="colorShimmer">@color/colorShimmer</item> <item name="colorShimmer">@color/colorShimmer</item>
<item name="colorStroke">@color/colorStroke</item> <item name="colorStroke">@color/colorStroke</item>
<item name="chipStyle">@style/Widget.Aurora.Chip</item> <item name="chipStyle">@style/Widget.Material3.Chip.Filter</item>
<item name="preferenceTheme">@style/AppTheme.PreferenceThemeOverlay</item> <item name="preferenceTheme">@style/AppTheme.PreferenceThemeOverlay</item>
</style> </style>
@@ -60,7 +60,7 @@
<item name="scrimBlack">@color/colorScrimBlack</item> <item name="scrimBlack">@color/colorScrimBlack</item>
<item name="colorShimmer">@color/colorShimmer</item> <item name="colorShimmer">@color/colorShimmer</item>
<item name="colorStroke">@color/colorStroke</item> <item name="colorStroke">@color/colorStroke</item>
<item name="chipStyle">@style/Widget.Aurora.Chip</item> <item name="chipStyle">@style/Widget.Material3.Chip.Filter</item>
<item name="preferenceTheme">@style/AppTheme.PreferenceThemeOverlay</item> <item name="preferenceTheme">@style/AppTheme.PreferenceThemeOverlay</item>
</style> </style>
@@ -78,7 +78,7 @@
<item name="scrimBlack">@color/colorScrimBlack</item> <item name="scrimBlack">@color/colorScrimBlack</item>
<item name="colorShimmer">@color/colorShimmerDark</item> <item name="colorShimmer">@color/colorShimmerDark</item>
<item name="colorStroke">@color/colorStrokeDark</item> <item name="colorStroke">@color/colorStrokeDark</item>
<item name="chipStyle">@style/Widget.Aurora.Chip</item> <item name="chipStyle">@style/Widget.Material3.Chip.Filter</item>
<item name="preferenceTheme">@style/AppTheme.PreferenceThemeOverlay</item> <item name="preferenceTheme">@style/AppTheme.PreferenceThemeOverlay</item>
</style> </style>