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

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

@@ -43,9 +43,7 @@
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
@@ -54,21 +52,21 @@
<com.google.android.material.chip.Chip
android:id="@+id/chip_tos"
style="@style/Widget.Aurora.Chip.Info"
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.Aurora.Chip.Info"
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.Aurora.Chip.Info"
style="@style/Widget.MaterialComponents.Chip.Action"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
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
android:id="@+id/filter_review_all"
style="@style/ViewStyle.Aurora.Chip"
style="@style/Widget.Material3.Chip.Filter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/filter_review_all" />
<com.google.android.material.chip.Chip
android:id="@+id/filter_review_critical"
style="@style/ViewStyle.Aurora.Chip"
style="@style/Widget.Material3.Chip.Filter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/filter_review_critical" />
<com.google.android.material.chip.Chip
android:id="@+id/filter_review_positive"
style="@style/ViewStyle.Aurora.Chip"
style="@style/Widget.Material3.Chip.Filter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/filter_review_positive" />
<com.google.android.material.chip.Chip
android:id="@+id/filter_review_five"
style="@style/ViewStyle.Aurora.Chip"
style="@style/Widget.Material3.Chip.Filter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/filter_review_five" />
<com.google.android.material.chip.Chip
android:id="@+id/filter_review_four"
style="@style/ViewStyle.Aurora.Chip"
style="@style/Widget.Material3.Chip.Filter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/filter_review_four" />
<com.google.android.material.chip.Chip
android:id="@+id/filter_review_three"
style="@style/ViewStyle.Aurora.Chip"
style="@style/Widget.Material3.Chip.Filter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/filter_review_three" />
<com.google.android.material.chip.Chip
android:id="@+id/filter_review_two"
style="@style/ViewStyle.Aurora.Chip"
style="@style/Widget.Material3.Chip.Filter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/filter_review_two" />
<com.google.android.material.chip.Chip
android:id="@+id/filter_review_one"
style="@style/ViewStyle.Aurora.Chip"
style="@style/Widget.Material3.Chip.Filter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
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:layout_width="@dimen/width_button"
android:layout_height="wrap_content"
android:visibility="gone"
app:btnStateIcon="@drawable/ic_anonymous"
app:btnStateText="@string/account_anonymous" />
@@ -109,7 +108,6 @@
android:id="@+id/btn_anonymous_insecure"
android:layout_width="@dimen/width_button"
android:layout_height="wrap_content"
android:visibility="gone"
app:btnStateIcon="@drawable/ic_anonymous"
app:btnStateText="@string/account_anonymous_insecure" />
</LinearLayout>

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

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

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

@@ -37,8 +37,7 @@
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/layout_bottom"
android:layout_height="wrap_content"
android:layout_below="@id/txt_title"
android:padding="@dimen/padding_medium"
android:scrollbars="none">
@@ -49,47 +48,6 @@
android:orientation="vertical"
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
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -131,38 +89,45 @@
app:chipSpacingVertical="@dimen/margin_xsmall"
app:selectionRequired="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>
</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>