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

Sheets: Improve layout

Browse Source
This commit is contained in:
Rahul Patel
2024-09-04 02:42:35 +05:30
committed by Aayush Gupta
parent 4f46817a54
commit 6618dc7108
7 changed files with 123 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/res/layout/fragment_search_result.xml
View File

@@ -45,6 +45,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_below="@+id/divider" android:layout_below="@+id/divider"
android:layout_marginTop="5dp"
android:paddingTop="@dimen/padding_normal" android:paddingTop="@dimen/padding_normal"
tools:listitem="@layout/view_app_list" /> tools:listitem="@layout/view_app_list" />
</RelativeLayout> </RelativeLayout>
@@ -57,6 +58,5 @@
android:layout_gravity="center_horizontal|bottom" android:layout_gravity="center_horizontal|bottom"
android:layout_marginBottom="@dimen/margin_normal" android:layout_marginBottom="@dimen/margin_normal"
android:text="@string/action_filter" android:text="@string/action_filter"
app:iconPadding="@dimen/padding_small"
app:icon="@drawable/ic_filter" /> app:icon="@drawable/ic_filter" />
</androidx.coordinatorlayout.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>

3
app/src/main/res/layout/sheet_app_menu.xml
View File

@@ -27,9 +27,8 @@
android:id="@+id/navigation_view" android:id="@+id/navigation_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="@dimen/margin_small"
android:background="@color/colorTransparent" android:background="@color/colorTransparent"
android:padding="@dimen/padding_small"
app:elevation="0dp" app:elevation="0dp"
app:itemTextAppearance="@style/TextAppearance.Aurora.Line1"
app:menu="@menu/menu_app" /> app:menu="@menu/menu_app" />
</FrameLayout> </FrameLayout>

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

@@ -27,15 +27,12 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical"
android:padding="@dimen/padding_normal">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:layout_marginTop="@dimen/margin_large"
android:layout_marginBottom="@dimen/margin_large"
android:paddingStart="@dimen/padding_large"
android:paddingEnd="@dimen/padding_large">
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/img_icon" android:id="@+id/img_icon"
@@ -87,9 +84,7 @@
<com.google.android.material.chip.ChipGroup <com.google.android.material.chip.ChipGroup
android:id="@+id/top_tab_group" android:id="@+id/top_tab_group"
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:paddingEnd="@dimen/padding_large">
<com.google.android.material.chip.Chip <com.google.android.material.chip.Chip
android:id="@+id/chip_favourite" android:id="@+id/chip_favourite"
@@ -115,10 +110,9 @@
</HorizontalScrollView> </HorizontalScrollView>
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
style="@style/Widget.Material3.Button.UnelevatedButton" style="@style/Widget.Material3.Button"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/height_button" android:layout_height="wrap_content"
android:layout_margin="@dimen/margin_large"
android:text="@string/action_install" /> android:text="@string/action_install" />
</LinearLayout> </LinearLayout>
</FrameLayout> </FrameLayout>

3
app/src/main/res/layout/sheet_download_menu.xml
View File

@@ -27,9 +27,8 @@
android:id="@+id/navigation_view" android:id="@+id/navigation_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="@dimen/margin_small"
android:background="@color/colorTransparent" android:background="@color/colorTransparent"
android:padding="@dimen/padding_small"
app:elevation="0dp" app:elevation="0dp"
app:itemTextAppearance="@style/TextAppearance.Aurora.Line1"
app:menu="@menu/menu_download_single" /> app:menu="@menu/menu_download_single" />
</FrameLayout> </FrameLayout>

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

@@ -22,97 +22,92 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"> app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
<androidx.core.widget.NestedScrollView <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="@dimen/padding_medium" android:orientation="vertical">
android:scrollbars="none">
<LinearLayout <com.google.android.material.bottomsheet.BottomSheetDragHandleView
android:id="@+id/drag_handle"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:scrollbars="none">
<androidx.appcompat.widget.AppCompatTextView <LinearLayout
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_rating"
android:textAppearance="@style/TextAppearance.Aurora.SubTitle" />
<com.google.android.material.chip.ChipGroup
android:id="@+id/rating_chips"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp" android:divider="@drawable/divider"
android:paddingStart="8dp" android:orientation="vertical"
android:paddingEnd="8dp" android:padding="@dimen/padding_normal"
app:chipSpacingHorizontal="@dimen/margin_small" android:showDividers="middle">
app:chipSpacingVertical="@dimen/margin_xsmall"
app:selectionRequired="true"
app:singleSelection="true" />
<androidx.appcompat.widget.AppCompatTextView <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_downloads"
android:textAppearance="@style/TextAppearance.Aurora.SubTitle" />
<com.google.android.material.chip.ChipGroup
android:id="@+id/download_chips"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:paddingStart="8dp"
android:paddingEnd="8dp"
app:chipSpacingHorizontal="@dimen/margin_small"
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/AppTheme.FilterChip"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/action_filter_gsf_dependent_apps" /> android:text="@string/action_filter_rating"
android:textAppearance="@style/TextAppearance.Aurora.SubTitle" />
<com.google.android.material.chip.Chip <com.google.android.material.chip.ChipGroup
android:id="@+id/filter_paid" android:id="@+id/rating_chips"
style="@style/AppTheme.FilterChip" android:layout_width="match_parent"
android:layout_height="wrap_content"
app:chipSpacingHorizontal="@dimen/margin_small"
app:chipSpacingVertical="@dimen/margin_xsmall"
app:selectionRequired="true"
app:singleSelection="true" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/action_filter_paid_apps" /> android:text="@string/action_filter_downloads"
android:textAppearance="@style/TextAppearance.Aurora.SubTitle" />
<com.google.android.material.chip.Chip <com.google.android.material.chip.ChipGroup
android:id="@+id/filter_ads" android:id="@+id/download_chips"
style="@style/AppTheme.FilterChip" android:layout_width="match_parent"
android:layout_height="wrap_content"
app:chipSpacingHorizontal="@dimen/margin_small"
app:chipSpacingVertical="@dimen/margin_xsmall"
app:selectionRequired="true"
app:singleSelection="true" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/action_filter_apps_with_ads" /> android:text="@string/action_filter_misc"
android:textAppearance="@style/TextAppearance.Aurora.SubTitle" />
</com.google.android.material.chip.ChipGroup> <com.google.android.material.chip.ChipGroup
</LinearLayout> android:layout_width="match_parent"
</androidx.core.widget.NestedScrollView> android:layout_height="wrap_content">
<com.google.android.material.chip.Chip
android:id="@+id/filter_gfs"
style="@style/AppTheme.FilterChip"
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/AppTheme.FilterChip"
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/AppTheme.FilterChip"
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>
</LinearLayout>
</FrameLayout> </FrameLayout>

59
app/src/main/res/layout/sheet_install_error.xml
View File

@@ -29,38 +29,39 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/padding_normal">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/img_icon"
android:layout_width="@dimen/icon_size_category"
android:layout_height="@dimen/icon_size_category"
android:layout_centerVertical="true"
tools:src="@drawable/bg_placeholder" />
<TextView
android:id="@+id/txt_header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/margin_normal"
android:layout_marginBottom="@dimen/margin_normal"
android:layout_toEndOf="@id/img_icon"
android:maxLines="1"
android:text="@string/title_installer"
android:textAlignment="viewStart"
android:textAppearance="@style/TextAppearance.Aurora.SubTitle" />
</RelativeLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:divider="@drawable/divider"
android:orientation="vertical" android:orientation="vertical"
android:padding="@dimen/padding_large" android:paddingStart="@dimen/padding_normal"
android:showDividers="middle"> android:paddingEnd="@dimen/padding_normal"
android:paddingBottom="@dimen/padding_normal">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/img_icon"
android:layout_width="@dimen/icon_size_category"
android:layout_height="@dimen/icon_size_category"
android:layout_centerVertical="true"
tools:src="@drawable/bg_placeholder" />
<TextView
android:id="@+id/txt_header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/margin_normal"
android:layout_marginBottom="@dimen/margin_normal"
android:layout_toEndOf="@id/img_icon"
android:maxLines="1"
android:text="@string/title_installer"
android:textAlignment="viewStart"
android:textAppearance="@style/TextAppearance.Aurora.SubTitle" />
</RelativeLayout>
<TextView <TextView
android:id="@+id/txt_line1" android:id="@+id/txt_line1"
@@ -114,4 +115,4 @@
android:text="@string/action_ok" /> android:text="@string/action_ok" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</FrameLayout> </FrameLayout>

31
app/src/main/res/layout/sheet_network.xml
View File

@@ -23,20 +23,20 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"> app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
<androidx.constraintlayout.widget.ConstraintLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical"
android:paddingBottom="@dimen/padding_normal">
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/img" android:id="@+id/img"
android:layout_width="@dimen/icon_size_avatar" android:layout_width="@dimen/icon_size_large"
android:layout_height="@dimen/icon_size_avatar" android:layout_height="@dimen/icon_size_large"
android:layout_marginTop="@dimen/margin_xlarge" android:layout_marginTop="@dimen/margin_xlarge"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_network" app:srcCompat="@drawable/ic_network"
app:tint="?android:attr/colorControlNormal" /> app:tint="?colorAccent" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/txt_warning" android:id="@+id/txt_warning"
@@ -44,18 +44,13 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/title_no_network" android:text="@string/title_no_network"
android:textAlignment="center" android:textAlignment="center" />
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/img" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/btn_action" android:id="@+id/btn_action"
style="@style/Widget.Material3.Button.TonalButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/check_connectivity" android:text="@string/check_connectivity" />
app:layout_constraintEnd_toEndOf="parent" </LinearLayout>
app:layout_constraintStart_toStartOf="parent" </FrameLayout>
app:layout_constraintTop_toBottomOf="@+id/txt_warning" />
</androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout>