Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d3e32a2 authored by Stefan Niedermann's avatar Stefan Niedermann
Browse files

Material 3: Simplify paddings and margins

parent 855ede81
Loading
Loading
Loading
Loading
+2 −4
Original line number Diff line number Diff line
@@ -16,8 +16,7 @@
            android:id="@+id/toolbar"
            android:layout_width="match_parent"
            android:layout_height="?attr/actionBarSize"
            android:layout_marginStart="@dimen/spacer_activity_sides"
            android:layout_marginEnd="@dimen/spacer_activity_sides"
            android:layout_marginHorizontal="@dimen/spacer_activity_sides"
            app:contentInsetStartWithNavigation="0dp"
            app:navigationIcon="@drawable/ic_arrow_back_grey600_24dp"
            app:titleMarginStart="0dp"
@@ -36,7 +35,6 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:background="?attr/colorPrimary"
        android:paddingStart="@dimen/spacer_1x"
        android:paddingEnd="@dimen/spacer_1x" />
        android:paddingHorizontal="@dimen/spacer_1x" />

</LinearLayout>
 No newline at end of file
+1 −2
Original line number Diff line number Diff line
@@ -15,8 +15,7 @@
            android:id="@+id/toolbar"
            android:layout_width="match_parent"
            android:layout_height="?attr/actionBarSize"
            android:layout_marginStart="@dimen/spacer_activity_sides"
            android:layout_marginEnd="@dimen/spacer_activity_sides"
            android:layout_marginHorizontal="@dimen/spacer_activity_sides"
            app:contentInsetStartWithNavigation="0dp"
            app:navigationIcon="@drawable/ic_arrow_back_grey600_24dp"
            app:titleMarginStart="0dp"
+3 −6
Original line number Diff line number Diff line
@@ -11,8 +11,7 @@
        android:id="@+id/toolbar"
        android:layout_width="match_parent"
        android:layout_height="?attr/actionBarSize"
        android:layout_marginStart="@dimen/spacer_activity_sides"
        android:layout_marginEnd="@dimen/spacer_activity_sides"
        android:layout_marginHorizontal="@dimen/spacer_activity_sides"
        app:contentInsetStartWithNavigation="0dp"
        app:elevation="4dp"
        app:titleMarginStart="0dp"
@@ -56,8 +55,7 @@
            <HorizontalScrollView
                android:layout_width="match_parent"
                android:layout_height="0dp"
                android:layout_marginStart="@dimen/spacer_2x"
                android:layout_marginEnd="@dimen/spacer_2x"
                android:layout_marginHorizontal="@dimen/spacer_2x"
                android:layout_weight="1">

                <TextView
@@ -95,8 +93,7 @@
            style="@style/Widget.Material3.Button"
            android:layout_width="wrap_content"
            android:layout_height="match_parent"
            android:layout_marginTop="6dp"
            android:layout_marginBottom="6dp"
            android:layout_marginVertical="6dp"
            android:layout_weight=".5"
            android:text="@string/simple_copy"
            app:backgroundTint="@color/defaultBrand"
+2 −4
Original line number Diff line number Diff line
@@ -16,8 +16,7 @@
            android:id="@+id/toolbar"
            android:layout_width="match_parent"
            android:layout_height="?attr/actionBarSize"
            android:layout_marginStart="@dimen/spacer_activity_sides"
            android:layout_marginEnd="@dimen/spacer_activity_sides"
            android:layout_marginHorizontal="@dimen/spacer_activity_sides"
            app:contentInsetStartWithNavigation="0dp"
            app:navigationIcon="@drawable/ic_arrow_back_grey600_24dp"
            app:title="@string/action_formatting_help"
@@ -34,8 +33,7 @@
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginStart="@dimen/spacer_activity_sides"
            android:layout_marginEnd="@dimen/spacer_activity_sides"
            android:layout_marginHorizontal="@dimen/spacer_activity_sides"
            android:orientation="vertical"
            android:padding="@dimen/spacer_2x">

+2 −4
Original line number Diff line number Diff line
@@ -43,10 +43,8 @@
            android:layout_height="wrap_content"
            android:layout_below="@id/welcome_text"
            android:layout_centerHorizontal="true"
            android:paddingStart="32dp"
            android:paddingTop="24dp"
            android:paddingEnd="32dp"
            android:paddingBottom="24dp"
            android:paddingHorizontal="32dp"
            android:paddingVertical="@dimen/spacer_3x"
            android:text="@string/choose_account"
            app:backgroundTint="@color/defaultBrand" />

Loading