Skip to content

Normalize layout padding shorthands #246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 19, 2025
Merged

Normalize layout padding shorthands #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/res/layout-sw600dp/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@
app:layout_constraintStart_toEndOf="@id/nav_view"
app:layout_constraintTop_toBottomOf="@id/app_bar_layout"
app:navGraph="@navigation/mobile_navigation" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
3 changes: 2 additions & 1 deletion app/src/main/res/layout/activity_alert_dialog.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
style="@style/Widget.Material3.ExtendedFloatingActionButton.Icon.Surface"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="24dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="24dp"
android:contentDescription="@string/tooltip_show_java_code_snippet"
android:text="@string/show_code"
android:tooltipText="@string/tooltip_show_java_code_snippet"
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/res/layout/activity_android_history.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingHorizontal="24dp"
android:paddingTop="24dp"
android:paddingBottom="24dp">
android:paddingVertical="24dp">

<com.google.android.material.textview.MaterialTextView
android:id="@+id/text_view_history"
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/res/layout/activity_android_start_project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingHorizontal="24dp"
android:paddingTop="24dp"
android:paddingBottom="24dp">
android:paddingVertical="24dp">

<com.google.android.material.textview.MaterialTextView
android:id="@+id/text_view_first_step"
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/activity_bottom_navigation.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
style="@style/Widget.Material3.ExtendedFloatingActionButton.Icon.Surface"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="24dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="24dp"
android:contentDescription="@string/tooltip_show_java_code_snippet"
android:text="@string/show_code"
android:tooltipText="@string/tooltip_show_java_code_snippet"
Expand Down
87 changes: 43 additions & 44 deletions app/src/main/res/layout/activity_buttons.xml
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 10 additions & 14 deletions app/src/main/res/layout/activity_chronometer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,35 +15,34 @@

<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingHorizontal="24dp">

<com.google.android.material.textview.MaterialTextView
style="@style/TextAppearance.Material3.HeadlineLarge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="24dp"
android:text="@string/description" />

<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="24dp"
app:cardCornerRadius="24dp">
android:layout_marginVertical="24dp"
app:cardCornerRadius="24dp"
app:contentPadding="24dp">

<com.google.android.material.textview.MaterialTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="24dp"
android:text="@string/summary_chronometer" />
</com.google.android.material.card.MaterialCardView>

<com.google.android.material.textview.MaterialTextView
style="@style/TextAppearance.Material3.HeadlineLarge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:text="@string/layout_preview" />

<Chronometer
Expand All @@ -52,7 +51,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="24dp"
android:layout_marginVertical="24dp"
android:text="00:00"
tools:ignore="HardcodedText" />

Expand All @@ -61,27 +60,23 @@
style="@style/Widget.Material3.Button.ElevatedButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="24dp"
android:text="@string/start" />

<com.google.android.material.button.MaterialButton
android:id="@+id/button_stop"
style="@style/Widget.Material3.Button.ElevatedButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="24dp"
android:text="@string/stop" />

<com.google.android.material.button.MaterialButton
android:id="@+id/button_reset"
style="@style/Widget.Material3.Button.ElevatedButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="24dp"
android:layout_marginVertical="24dp"
android:text="@string/reset" />
</androidx.appcompat.widget.LinearLayoutCompat>
</me.zhanghai.android.fastscroll.FastScrollScrollView>
Expand All @@ -91,7 +86,8 @@
style="@style/Widget.Material3.ExtendedFloatingActionButton.Icon.Surface"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="24dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="24dp"
android:contentDescription="@string/tooltip_show_java_code_snippet"
android:text="@string/show_code"
android:textSize="14sp"
Expand Down
26 changes: 13 additions & 13 deletions app/src/main/res/layout/activity_clock.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,79 +16,78 @@
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:orientation="vertical"
android:paddingHorizontal="24dp">

<com.google.android.material.textview.MaterialTextView
style="@style/TextAppearance.Material3.HeadlineLarge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="24dp"
android:text="@string/description" />

<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="24dp"
app:cardCornerRadius="24dp">
android:layout_marginVertical="24dp"
app:cardCornerRadius="24dp"
app:contentPadding="24dp">

<com.google.android.material.textview.MaterialTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="24dp"
android:text="@string/summary_clocks" />
</com.google.android.material.card.MaterialCardView>

<com.google.android.material.textview.MaterialTextView
style="@style/TextAppearance.Material3.HeadlineLarge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:text="@string/layout_preview" />

<com.google.android.material.textview.MaterialTextView
android:id="@+id/simpleAnalogClockText"
style="@style/TextAppearance.Material3.HeadlineSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="24dp"
android:layout_marginVertical="24dp"
android:text="@string/clock_analog" />

<AnalogClock
android:id="@+id/simpleAnalogClock"
android:layout_width="wrap_content"
android:layout_height="108dp"
android:layout_gravity="center"
android:layout_margin="24dp" />
android:layout_marginVertical="24dp" />

<com.google.android.material.textview.MaterialTextView
style="@style/TextAppearance.Material3.HeadlineSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="24dp"
android:layout_marginVertical="24dp"
android:text="@string/clock_digital" />

<DigitalClock
android:id="@+id/digital_clock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="24dp" />
android:layout_marginVertical="24dp" />

<com.google.android.material.textview.MaterialTextView
android:id="@+id/simpleTextClockText"
style="@style/TextAppearance.Material3.HeadlineSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="24dp"
android:layout_marginVertical="24dp"
android:text="@string/clock_text" />

<TextClock
android:id="@+id/simpleTextClock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="24dp" />
android:layout_marginVertical="24dp" />
</androidx.appcompat.widget.LinearLayoutCompat>
</me.zhanghai.android.fastscroll.FastScrollScrollView>

Expand All @@ -97,7 +96,8 @@
style="@style/Widget.Material3.ExtendedFloatingActionButton.Icon.Surface"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="24dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="24dp"
android:contentDescription="@string/tooltip_show_java_code_snippet"
android:text="@string/show_code"
android:textSize="14sp"
Expand Down
14 changes: 8 additions & 6 deletions app/src/main/res/layout/activity_date_picker.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:paddingHorizontal="24dp"
android:paddingTop="24dp">

<com.google.android.material.textview.MaterialTextView
android:id="@+id/currentDateTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="24dp"
android:layout_marginBottom="24dp"
android:drawableStart="@drawable/ic_date_range"
android:text="@string/current_date"
android:textColor="?attr/colorAccent"
Expand All @@ -24,7 +26,7 @@
style="@style/Widget.Material3.Button.ElevatedButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="24dp"
android:layout_marginTop="24dp"
android:text="@string/change_date"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
Expand All @@ -35,7 +37,7 @@
android:id="@+id/dateTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="24dp"
android:layout_marginBottom="24dp"
android:textSize="24sp"
app:layout_constraintBottom_toTopOf="@id/changeDateButton"
app:layout_constraintEnd_toEndOf="parent"
Expand All @@ -46,7 +48,7 @@
style="@style/Widget.Material3.ExtendedFloatingActionButton.Icon.Surface"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="24dp"
android:layout_marginBottom="24dp"
android:contentDescription="@string/tooltip_show_java_code_snippet"
android:text="@string/show_code"
android:textSize="14sp"
Expand All @@ -55,4 +57,4 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
tools:targetApi="26" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
8 changes: 4 additions & 4 deletions app/src/main/res/layout/activity_grid_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@
android:id="@+id/grid_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="24dp"
android:layout_marginHorizontal="24dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="80dp"
android:columnWidth="48dp"
android:numColumns="auto_fit" />
Expand All @@ -22,7 +21,8 @@
style="@style/Widget.Material3.ExtendedFloatingActionButton.Icon.Surface"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="24dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="24dp"
android:contentDescription="@string/tooltip_show_java_code_snippet"
android:text="@string/show_code"
android:textSize="14sp"
Expand All @@ -31,4 +31,4 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
tools:targetApi="26" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
11 changes: 6 additions & 5 deletions app/src/main/res/layout/activity_help.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:paddingHorizontal="24dp"
android:paddingVertical="24dp">

<com.google.android.material.textview.MaterialTextView
android:id="@+id/text_view_faq"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="24dp"
android:layout_marginBottom="24dp"
android:text="@string/faq"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
Expand All @@ -19,7 +21,7 @@
style="@style/Widget.Material3.CardView.Filled"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_margin="24dp"
android:layout_marginBottom="24dp"
app:layout_constraintBottom_toTopOf="@id/frame_layout_feedback"
app:layout_constraintTop_toBottomOf="@id/text_view_faq">

Expand All @@ -33,6 +35,5 @@
android:id="@+id/frame_layout_feedback"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="24dp"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
Loading