Simplify layouts - [1/2]

This commit is contained in:
Rahul Patel
2024-07-20 03:39:24 +05:30
parent 37e50706e7
commit 496486fb37
20 changed files with 140 additions and 208 deletions

View File

@@ -29,7 +29,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:clipToPadding="false" android:clipToPadding="false"
app:itemSpacing="@dimen/margin_normal"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:stackFromEnd="false" app:stackFromEnd="false"
tools:listitem="@layout/view_app_list" /> tools:listitem="@layout/view_app_list" />

View File

@@ -40,7 +40,6 @@
android:layout_below="@+id/toolbar" android:layout_below="@+id/toolbar"
android:clipToPadding="true" android:clipToPadding="true"
android:paddingBottom="@dimen/height_bottom_adj" android:paddingBottom="@dimen/height_bottom_adj"
app:itemSpacing="@dimen/margin_normal"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:stackFromEnd="false" /> app:stackFromEnd="false" />
</RelativeLayout> </RelativeLayout>

View File

@@ -28,7 +28,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingBottom="@dimen/height_bottom_adj" android:paddingBottom="@dimen/height_bottom_adj"
app:itemSpacing="@dimen/margin_normal"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:stackFromEnd="false" /> app:stackFromEnd="false" />
</RelativeLayout> </RelativeLayout>

View File

@@ -28,7 +28,6 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:clipToPadding="false" android:clipToPadding="false"
android:paddingBottom="@dimen/height_bottom_adj" android:paddingBottom="@dimen/height_bottom_adj"
app:itemSpacing="@dimen/padding_small"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:stackFromEnd="false" /> app:stackFromEnd="false" />
</RelativeLayout> </RelativeLayout>

View File

@@ -32,15 +32,14 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/layout_action_toolbar" android:layout_below="@id/layout_action_toolbar"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:paddingStart="@dimen/margin_large" android:paddingStart="@dimen/margin_normal"
android:paddingEnd="@dimen/margin_large" android:paddingEnd="@dimen/margin_normal"
android:paddingBottom="@dimen/padding_small"
app:tabGravity="fill" app:tabGravity="fill"
app:tabIndicator="@drawable/tab_indicator" app:tabIndicator="@drawable/tab_indicator"
app:tabIndicatorHeight="2dp" app:tabIndicatorHeight="2dp"
app:tabMode="scrollable" app:tabMode="scrollable"
app:tabPaddingEnd="@dimen/padding_normal" app:tabPaddingEnd="@dimen/padding_small"
app:tabPaddingStart="@dimen/padding_normal" app:tabPaddingStart="@dimen/padding_small"
app:tabTextAppearance="@style/TextAppearance.Aurora.Tab.Title" /> app:tabTextAppearance="@style/TextAppearance.Aurora.Tab.Title" />
<androidx.viewpager2.widget.ViewPager2 <androidx.viewpager2.widget.ViewPager2

View File

@@ -34,7 +34,6 @@
android:layout_below="@+id/layout_toolbar_action" android:layout_below="@+id/layout_toolbar_action"
android:clipToPadding="true" android:clipToPadding="true"
android:paddingBottom="@dimen/height_bottom_adj" android:paddingBottom="@dimen/height_bottom_adj"
app:itemSpacing="@dimen/margin_normal"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:stackFromEnd="false" /> app:stackFromEnd="false" />
</RelativeLayout> </RelativeLayout>

View File

@@ -46,7 +46,6 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_below="@+id/divider" android:layout_below="@+id/divider"
android:paddingTop="@dimen/padding_normal" android:paddingTop="@dimen/padding_normal"
app:itemSpacing="@dimen/margin_normal"
tools:listitem="@layout/view_app_list" /> tools:listitem="@layout/view_app_list" />
</RelativeLayout> </RelativeLayout>

View File

@@ -29,7 +29,6 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:clipToPadding="true" android:clipToPadding="true"
android:paddingBottom="@dimen/height_bottom_adj" android:paddingBottom="@dimen/height_bottom_adj"
app:itemSpacing="@dimen/margin_normal"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:stackFromEnd="false" /> app:stackFromEnd="false" />
</RelativeLayout> </RelativeLayout>

View File

@@ -45,7 +45,6 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:clipToPadding="false" android:clipToPadding="false"
android:paddingBottom="@dimen/height_bottom_adj" android:paddingBottom="@dimen/height_bottom_adj"
app:itemSpacing="@dimen/margin_normal"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:stackFromEnd="false" app:stackFromEnd="false"
tools:listitem="@layout/view_app_list" /> tools:listitem="@layout/view_app_list" />

View File

@@ -153,7 +153,6 @@
android:orientation="vertical" android:orientation="vertical"
android:overScrollMode="never" android:overScrollMode="never"
android:scrollbars="none" android:scrollbars="none"
app:itemSpacing="@dimen/margin_normal"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:itemCount="4" tools:itemCount="4"
tools:listitem="@layout/view_review" /> tools:listitem="@layout/view_review" />

View File

@@ -19,6 +19,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:padding="@dimen/padding_xsmall"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
@@ -26,9 +27,7 @@
android:id="@+id/img_icon" android:id="@+id/img_icon"
android:layout_width="@dimen/icon_size_cluster" android:layout_width="@dimen/icon_size_cluster"
android:layout_height="@dimen/icon_size_cluster" android:layout_height="@dimen/icon_size_cluster"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"/>
android:layout_marginStart="@dimen/padding_xsmall"
android:layout_marginEnd="@dimen/padding_xsmall" />
<TextView <TextView
android:id="@+id/txt_name" android:id="@+id/txt_name"

View File

@@ -22,8 +22,10 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?selectableItemBackground" android:background="?selectableItemBackground"
android:paddingStart="@dimen/padding_small" android:paddingStart="@dimen/padding_medium"
android:paddingEnd="@dimen/padding_xsmall"> android:paddingTop="@dimen/padding_xsmall"
android:paddingEnd="@dimen/padding_small"
android:paddingBottom="@dimen/padding_xsmall">
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/img_icon" android:id="@+id/img_icon"

View File

@@ -28,15 +28,14 @@
android:id="@+id/card" android:id="@+id/card"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical"
android:padding="@dimen/padding_xsmall">
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/img_icon" android:id="@+id/img_icon"
android:layout_width="@dimen/icon_size_cluster" android:layout_width="@dimen/icon_size_cluster"
android:layout_height="@dimen/icon_size_cluster" android:layout_height="@dimen/icon_size_cluster"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginStart="@dimen/padding_xsmall"
android:layout_marginEnd="@dimen/padding_xsmall"
android:background="@drawable/bg_rounded" /> android:background="@drawable/bg_rounded" />
<TextView <TextView

View File

@@ -22,122 +22,105 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/layout_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?selectableItemBackground" android:background="?selectableItemBackground"
android:orientation="vertical" android:orientation="vertical"
android:paddingStart="@dimen/padding_normal" android:paddingStart="@dimen/padding_medium"
android:paddingEnd="@dimen/padding_small"> android:paddingTop="@dimen/padding_small"
android:paddingEnd="@dimen/padding_small"
android:paddingBottom="@dimen/padding_small">
<FrameLayout <RelativeLayout
android:id="@+id/expansion_header" android:id="@+id/head_flipper"
android:layout_width="match_parent" android:layout_width="@dimen/icon_size_medium"
android:layout_height="wrap_content"> android:layout_height="@dimen/icon_size_medium">
<RelativeLayout <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/layout_content" android:id="@+id/img_icon"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="match_parent"
android:layout_centerInParent="true" />
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progress_download"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerInParent="true"
android:visibility="gone"
app:indicatorSize="@dimen/icon_size_medium"
app:trackThickness="3dp"
tools:progress="40" />
</RelativeLayout>
<RelativeLayout <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/head_flipper" android:id="@+id/txt_line1"
android:layout_width="@dimen/icon_size_medium" android:layout_width="match_parent"
android:layout_height="@dimen/icon_size_medium"> android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_normal"
android:layout_toStartOf="@+id/headerIndicator"
android:layout_toEndOf="@id/head_flipper"
android:ellipsize="end"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.Aurora.Line1" />
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/img_icon" android:id="@+id/txt_line2"
android:layout_width="@dimen/icon_size_medium" android:layout_width="fill_parent"
android:layout_height="@dimen/icon_size_medium" /> android:layout_height="wrap_content"
android:layout_below="@+id/txt_line1"
android:layout_alignStart="@+id/txt_line1"
android:layout_alignEnd="@id/txt_line1"
android:ellipsize="end"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.Aurora.Line3" />
<com.google.android.material.progressindicator.CircularProgressIndicator <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/progress_download" android:id="@+id/txt_line3"
android:layout_width="@dimen/icon_size_medium" android:layout_width="fill_parent"
android:layout_height="@dimen/icon_size_medium" android:layout_height="wrap_content"
android:layout_centerInParent="true" android:layout_below="@+id/txt_line2"
android:visibility="gone" android:layout_alignStart="@+id/txt_line1"
app:indicatorSize="@dimen/icon_size_medium" android:layout_alignEnd="@id/txt_line1"
app:trackThickness="3dp" android:ellipsize="end"
tools:progress="40" /> android:singleLine="true"
</RelativeLayout> android:textAppearance="@style/TextAppearance.Aurora.Line3" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/txt_line1" android:id="@+id/txt_line4"
android:layout_width="match_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_normal" android:layout_below="@+id/txt_line3"
android:layout_toStartOf="@+id/headerIndicator" android:layout_alignStart="@+id/txt_line1"
android:layout_toEndOf="@id/head_flipper" android:layout_alignEnd="@id/txt_line1"
android:ellipsize="end" android:ellipsize="end"
android:singleLine="true" android:singleLine="true"
android:textAppearance="@style/TextAppearance.Aurora.Line1" /> android:textAppearance="@style/TextAppearance.Aurora.Line3" />
<androidx.appcompat.widget.AppCompatTextView <com.google.android.material.button.MaterialButton
android:id="@+id/txt_line2" android:id="@+id/headerIndicator"
android:layout_width="fill_parent" style="@style/Widget.Material3.Button.IconButton"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_below="@+id/txt_line1" android:layout_height="wrap_content"
android:layout_alignStart="@+id/txt_line1" android:layout_alignTop="@id/txt_line1"
android:layout_alignEnd="@id/txt_line1" android:layout_toStartOf="@id/btn_action"
android:ellipsize="end" android:contentDescription="@string/details_changelog"
android:singleLine="true" app:icon="@drawable/ic_arrow_down" />
android:textAppearance="@style/TextAppearance.Aurora.Line3" />
<androidx.appcompat.widget.AppCompatTextView <com.aurora.store.view.custom.layouts.button.UpdateButton
android:id="@+id/txt_line3" android:id="@+id/btn_action"
android:layout_width="fill_parent" android:layout_width="120dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/txt_line2" android:layout_alignTop="@id/txt_line1"
android:layout_alignStart="@+id/txt_line1" android:layout_alignParentEnd="true"
android:layout_alignEnd="@id/txt_line1" android:gravity="center" />
android:ellipsize="end"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.Aurora.Line3" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/txt_line4"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/txt_line3"
android:layout_alignStart="@+id/txt_line1"
android:layout_alignEnd="@id/txt_line1"
android:ellipsize="end"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.Aurora.Line3" />
<com.google.android.material.button.MaterialButton
android:id="@+id/headerIndicator"
style="@style/Widget.Material3.Button.IconButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/layout_action"
android:layout_toStartOf="@id/layout_action"
android:contentDescription="@string/details_changelog"
app:icon="@drawable/ic_arrow_down" />
<LinearLayout
android:id="@+id/layout_action"
android:layout_width="115dp"
android:layout_height="@dimen/height_button"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:gravity="center"
android:orientation="horizontal">
<com.aurora.store.view.custom.layouts.button.UpdateButton
android:id="@+id/btn_action"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</RelativeLayout>
</FrameLayout>
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/txt_changelog" android:id="@+id/txt_changelog"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/expansion_header" android:layout_below="@id/txt_line4"
android:layout_marginTop="@dimen/margin_small"
android:background="@drawable/bg_changelog" android:background="@drawable/bg_changelog"
android:ellipsize="end" android:ellipsize="end"
android:minHeight="?actionBarSize" android:minHeight="?actionBarSize"

View File

@@ -21,8 +21,8 @@
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="wrap_content" android:layout_height="wrap_content"
android:paddingStart="@dimen/padding_small" android:padding="@dimen/padding_small"
android:paddingEnd="@dimen/padding_small"> >
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/img_background" android:id="@+id/img_background"
@@ -40,8 +40,6 @@
android:layout_toEndOf="@id/img_background" android:layout_toEndOf="@id/img_background"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="2" android:maxLines="2"
android:paddingStart="@dimen/padding_small"
android:paddingEnd="@dimen/padding_small"
android:textSize="16sp" android:textSize="16sp"
tools:text="Category" /> tools:text="Category" />
</RelativeLayout> </RelativeLayout>

View File

@@ -21,8 +21,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingStart="@dimen/padding_normal" android:padding="@dimen/padding_small">
android:paddingEnd="@dimen/padding_small">
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/line1" android:id="@+id/line1"
@@ -38,8 +37,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/line1" android:layout_below="@+id/line1"
android:layout_alignStart="@id/line1" android:layout_alignStart="@id/line1"
android:layout_alignEnd="@id/line1" android:layout_alignEnd="@id/line1" />
android:layout_marginTop="@dimen/margin_xxsmall" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/line3" android:id="@+id/line3"
@@ -48,14 +46,13 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/line2" android:layout_below="@+id/line2"
android:layout_alignStart="@id/line1" android:layout_alignStart="@id/line1"
android:layout_alignEnd="@id/line1" android:layout_alignEnd="@id/line1" />
android:layout_marginTop="@dimen/margin_xxsmall" />
<com.google.android.material.checkbox.MaterialCheckBox <com.google.android.material.checkbox.MaterialCheckBox
android:id="@+id/checkbox" android:id="@+id/checkbox"
android:layout_width="@dimen/icon_size_category" android:layout_width="@dimen/icon_size_category"
android:layout_height="@dimen/icon_size_category" android:layout_height="@dimen/icon_size_category"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_centerInParent="true" android:layout_centerVertical="true"
android:minWidth="0dp" /> android:minWidth="0dp" />
</RelativeLayout> </RelativeLayout>

View File

@@ -22,33 +22,22 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/layout" android:id="@+id/layout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:paddingStart="@dimen/padding_medium"
android:paddingTop="@dimen/padding_xsmall"
android:paddingEnd="@dimen/padding_small"
android:paddingBottom="@dimen/padding_xsmall">
<LinearLayout <TextView
android:id="@+id/txt_title"
style="@style/AuroraTextStyle.Subtitle.Alt"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginTop="@dimen/margin_small"
android:layout_toStartOf="@id/img_action" android:layout_toStartOf="@id/img_action"
android:orientation="horizontal"> android:ellipsize="end"
android:maxLines="1"
<View tools:text="Header" />
android:layout_width="4dp"
android:layout_height="match_parent"
android:layout_marginStart="@dimen/padding_normal"
android:background="?colorAccent" />
<TextView
android:id="@+id/txt_title"
style="@style/AuroraTextStyle.Subtitle.Alt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/padding_normal"
android:ellipsize="end"
android:gravity="center_vertical"
android:maxLines="1"
tools:text="Header" />
</LinearLayout>
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/img_action" android:id="@+id/img_action"
@@ -58,8 +47,8 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginStart="@dimen/margin_small" android:layout_marginStart="@dimen/margin_small"
android:background="?selectableItemBackgroundBorderless" android:background="?selectableItemBackgroundBorderless"
android:padding="@dimen/padding_xsmall"
android:contentDescription="@string/expand" android:contentDescription="@string/expand"
android:padding="@dimen/padding_xsmall"
app:srcCompat="@drawable/ic_arrow_right" app:srcCompat="@drawable/ic_arrow_right"
app:tint="?android:textColorPrimary" /> app:tint="?android:textColorPrimary" />
</RelativeLayout> </RelativeLayout>

View File

@@ -27,33 +27,22 @@
<RelativeLayout <RelativeLayout
android:id="@+id/layout" android:id="@+id/layout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:paddingStart="@dimen/padding_medium"
android:paddingTop="@dimen/padding_xsmall"
android:paddingEnd="@dimen/padding_small"
android:paddingBottom="@dimen/padding_xsmall">
<LinearLayout <TextView
android:id="@+id/txt_title"
style="@style/AuroraTextStyle.Subtitle.Alt"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginTop="@dimen/margin_small"
android:layout_toStartOf="@id/img_action" android:layout_toStartOf="@id/img_action"
android:orientation="horizontal"> android:background="?colorShimmer"
android:ellipsize="end"
<View android:maxLines="1" />
android:layout_width="4dp"
android:layout_height="match_parent"
android:layout_marginStart="@dimen/padding_normal"
android:background="?colorShimmer" />
<TextView
android:id="@+id/txt_title"
style="@style/AuroraTextStyle.Subtitle.Alt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/padding_normal"
android:background="?colorShimmer"
android:ellipsize="end"
android:gravity="center_vertical"
android:maxLines="1" />
</LinearLayout>
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/img_action" android:id="@+id/img_action"
@@ -61,10 +50,10 @@
android:layout_height="@dimen/icon_size_category" android:layout_height="@dimen/icon_size_category"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_margin="@dimen/margin_small" android:layout_marginStart="@dimen/margin_small"
android:background="?selectableItemBackgroundBorderless" android:background="?selectableItemBackgroundBorderless"
android:padding="@dimen/padding_xsmall"
android:contentDescription="@string/expand" android:contentDescription="@string/expand"
android:padding="@dimen/padding_xsmall"
app:srcCompat="@drawable/ic_arrow_right" app:srcCompat="@drawable/ic_arrow_right"
app:tint="?colorShimmer" /> app:tint="?colorShimmer" />
</RelativeLayout> </RelativeLayout>

View File

@@ -20,42 +20,30 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/layout" android:id="@+id/layout"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:paddingStart="@dimen/padding_medium"
android:paddingTop="@dimen/padding_xsmall"
android:paddingEnd="@dimen/padding_small"
android:paddingBottom="@dimen/padding_xsmall">
<LinearLayout <TextView
android:id="@+id/txt_title"
style="@style/AuroraTextStyle.Subtitle.Alt"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginTop="@dimen/margin_small"
android:layout_toStartOf="@id/btn_action" android:layout_toStartOf="@id/btn_action"
android:orientation="horizontal"> android:ellipsize="end"
android:gravity="center_vertical"
<View android:maxLines="1"
android:layout_width="4dp" tools:text="Header" />
android:layout_height="match_parent"
android:layout_marginStart="@dimen/padding_normal"
android:background="?colorAccent" />
<TextView
android:id="@+id/txt_title"
style="@style/AuroraTextStyle.Subtitle.Alt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/padding_normal"
android:ellipsize="end"
android:gravity="center_vertical"
android:maxLines="1"
tools:text="Header" />
</LinearLayout>
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/btn_action" android:id="@+id/btn_action"
android:layout_width="wrap_content" android:layout_width="120dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_marginHorizontal="@dimen/margin_small" android:layout_centerVertical="true"
android:layout_marginVertical="@dimen/margin_xsmall"
android:text="@string/action_update_all" /> android:text="@string/action_update_all" />
</RelativeLayout> </RelativeLayout>

View File

@@ -21,8 +21,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingStart="@dimen/padding_normal" android:padding="@dimen/padding_small">
android:paddingEnd="@dimen/padding_small">
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/line1" android:id="@+id/line1"
@@ -39,7 +38,6 @@
android:layout_below="@+id/line1" android:layout_below="@+id/line1"
android:layout_alignStart="@id/line1" android:layout_alignStart="@id/line1"
android:layout_alignEnd="@id/line1" android:layout_alignEnd="@id/line1"
android:layout_marginTop="@dimen/margin_xxsmall"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:textDirection="locale" /> android:textDirection="locale" />
@@ -48,6 +46,6 @@
android:layout_width="@dimen/icon_size_category" android:layout_width="@dimen/icon_size_category"
android:layout_height="@dimen/icon_size_category" android:layout_height="@dimen/icon_size_category"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_centerInParent="true" android:layout_centerVertical="true"
android:minWidth="0dp" /> android:minWidth="0dp" />
</RelativeLayout> </RelativeLayout>