Skip to content
This repository was archived by the owner on Jan 5, 2023. It is now read-only.

Commit 124068c

Browse files
committed
Fix some settings item styles
Change-Id: I6ace3747325b99e73637742066e274b29766266b
1 parent 46a9f63 commit 124068c

File tree

3 files changed

+15
-14
lines changed

3 files changed

+15
-14
lines changed

mobile/src/main/res/layout/fragment_settings.xml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -158,11 +158,12 @@
158158

159159
<TextView
160160
android:id="@+id/version_build_number"
161-
android:layout_width="wrap_content"
161+
android:layout_width="match_parent"
162162
android:layout_height="wrap_content"
163163
android:gravity="start|center_vertical"
164-
android:minHeight="48dp"
165-
android:padding="@dimen/margin_normal"
164+
android:minHeight="?listPreferredItemHeightSmall"
165+
android:paddingEnd="?listPreferredItemPaddingEnd"
166+
android:paddingStart="?listPreferredItemPaddingStart"
166167
android:textAppearance="?textAppearanceBody2"
167168
app:versionName="@{BuildConfig.VERSION_NAME}" />
168169

@@ -172,12 +173,10 @@
172173
android:layout_gravity="center"
173174
android:layout_marginTop="@dimen/margin_normal"
174175
android:drawablePadding="@dimen/margin_small"
175-
android:drawableStart="@drawable/ic_logo_components"
176176
android:gravity="center"
177-
android:paddingEnd="@dimen/margin_normal"
178-
android:paddingStart="@dimen/margin_normal"
179177
android:text="@string/built_with_material_components"
180-
android:textAppearance="?attr/textAppearanceBody1" />
178+
android:textAppearance="?attr/textAppearanceBody1"
179+
app:drawableStartCompat="@drawable/ic_logo_components" />
181180

182181
</LinearLayout>
183182

mobile/src/main/res/layout/item_generic_section_header.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
android:layout_height="wrap_content"
3131
android:gravity="start|center_vertical"
3232
android:minHeight="?actionBarSize"
33-
android:paddingLeft="@{ sectionHeader.useHorizontalPadding ? @dimen/margin_normal : 0 }"
34-
android:paddingRight="@{ sectionHeader.useHorizontalPadding ? @dimen/margin_normal : 0 }"
33+
android:paddingEnd="@{ sectionHeader.useHorizontalPadding ? @dimen/margin_normal : 0 }"
34+
android:paddingStart="@{ sectionHeader.useHorizontalPadding ? @dimen/margin_normal : 0 }"
3535
android:textAlignment="viewStart"
3636
android:textAppearance="@style/TextAppearance.IOSched.Overline"
3737
android:text="@{sectionHeader.titleId}"

mobile/src/main/res/values/styles.xml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@
255255
<item name="android:gravity">center_vertical</item>
256256
<item name="android:minHeight">?listPreferredItemHeightSmall</item>
257257
<item name="android:paddingBottom">@dimen/spacing_normal</item>
258-
<item name="android:paddingRight">?listPreferredItemPaddingEnd</item>
258+
<item name="android:paddingEnd">?listPreferredItemPaddingEnd</item>
259259
<item name="android:paddingStart">?listPreferredItemPaddingStart</item>
260260
<item name="android:paddingTop">@dimen/spacing_normal</item>
261261
<item name="android:textColor">?android:textColorPrimary</item>
@@ -265,8 +265,7 @@
265265

266266
<style name="Widget.IOSched.AccountDialog.ManageAccountButton" parent="Widget.MaterialComponents.Button.OutlinedButton">
267267
<item name="android:textColor">?android:textColorSecondary</item>
268-
<item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.MaterialComponents.Chip
269-
</item>
268+
<item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.MaterialComponents.Chip</item>
270269
</style>
271270

272271
<!-- Onboarding -->
@@ -329,7 +328,10 @@
329328
<item name="android:background">@null</item>
330329
<item name="android:foreground">?selectableItemBackground</item>
331330
<item name="android:minHeight">?android:attr/listPreferredItemHeightSmall</item>
332-
<item name="android:padding">@dimen/margin_normal</item>
331+
<item name="android:paddingBottom">@dimen/spacing_normal</item>
332+
<item name="android:paddingEnd">?listPreferredItemPaddingEnd</item>
333+
<item name="android:paddingStart">?listPreferredItemPaddingStart</item>
334+
<item name="android:paddingTop">@dimen/spacing_normal</item>
333335
<item name="android:textAlignment">viewStart</item>
334336
<item name="switchPadding">@dimen/margin_small</item>
335337
<item name="switchTextAppearance">?attr/textAppearanceBody2</item>
@@ -340,7 +342,7 @@
340342
<item name="android:gravity">start|center_vertical</item>
341343
<item name="android:minHeight">?listPreferredItemHeightSmall</item>
342344
<item name="android:paddingBottom">@dimen/spacing_normal</item>
343-
<item name="android:paddingRight">?listPreferredItemPaddingEnd</item>
345+
<item name="android:paddingEnd">?listPreferredItemPaddingEnd</item>
344346
<item name="android:paddingStart">?listPreferredItemPaddingStart</item>
345347
<item name="android:paddingTop">@dimen/spacing_normal</item>
346348
<item name="android:textAlignment">viewStart</item>

0 commit comments

Comments
 (0)