Fix small regression on margin

This commit is contained in:
Benoit Marty 2021-06-11 12:40:15 +02:00
parent 1364140895
commit c26a341645
1 changed files with 135 additions and 130 deletions

View File

@ -1,162 +1,167 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
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:layout_marginStart="8dp" android:paddingStart="8dp"
android:layout_marginEnd="8dp" android:paddingEnd="8dp">
android:background="@drawable/bg_attachment_type_selector"
android:orientation="vertical"
android:paddingTop="16dp"
android:paddingBottom="16dp">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_margin="16dp" android:background="@drawable/bg_attachment_type_selector"
android:baselineAligned="false" android:orientation="vertical"
android:orientation="horizontal" android:paddingTop="16dp"
android:weightSum="3"> android:paddingBottom="16dp"
tools:ignore="UselessParent">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_weight="1" android:layout_margin="16dp"
android:gravity="center" android:baselineAligned="false"
android:orientation="vertical"> android:orientation="horizontal"
android:weightSum="3">
<ImageButton <LinearLayout
android:id="@+id/attachmentCameraButton" android:layout_width="match_parent"
style="@style/AttachmentTypeSelectorButton" android:layout_height="wrap_content"
android:contentDescription="@string/attachment_type_camera" android:layout_weight="1"
android:src="@drawable/ic_attachment_camera_white_24dp" android:gravity="center"
tools:background="?colorPrimary" /> android:orientation="vertical">
<TextView <ImageButton
style="@style/AttachmentTypeSelectorLabel" android:id="@+id/attachmentCameraButton"
android:importantForAccessibility="no" style="@style/AttachmentTypeSelectorButton"
android:text="@string/attachment_type_camera" /> android:contentDescription="@string/attachment_type_camera"
android:src="@drawable/ic_attachment_camera_white_24dp"
tools:background="?colorPrimary" />
<TextView
style="@style/AttachmentTypeSelectorLabel"
android:importantForAccessibility="no"
android:text="@string/attachment_type_camera" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<ImageButton
android:id="@+id/attachmentGalleryButton"
style="@style/AttachmentTypeSelectorButton"
android:contentDescription="@string/attachment_type_gallery"
android:src="@drawable/ic_attachment_gallery_white_24dp"
tools:background="?colorPrimary" />
<TextView
style="@style/AttachmentTypeSelectorLabel"
android:importantForAccessibility="no"
android:text="@string/attachment_type_gallery" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<ImageButton
android:id="@+id/attachmentFileButton"
style="@style/AttachmentTypeSelectorButton"
android:contentDescription="@string/attachment_type_file"
android:src="@drawable/ic_attachment_file_white_24dp"
tools:background="?colorPrimary" />
<TextView
style="@style/AttachmentTypeSelectorLabel"
android:importantForAccessibility="no"
android:text="@string/attachment_type_file" />
</LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_weight="1" android:layout_margin="16dp"
android:gravity="center" android:baselineAligned="false"
android:orientation="vertical"> android:orientation="horizontal"
android:weightSum="3">
<ImageButton <LinearLayout
android:id="@+id/attachmentGalleryButton" android:layout_width="match_parent"
style="@style/AttachmentTypeSelectorButton" android:layout_height="wrap_content"
android:contentDescription="@string/attachment_type_gallery" android:layout_weight="1"
android:src="@drawable/ic_attachment_gallery_white_24dp" android:gravity="center"
tools:background="?colorPrimary" /> android:orientation="vertical">
<TextView <ImageButton
style="@style/AttachmentTypeSelectorLabel" android:id="@+id/attachmentAudioButton"
android:importantForAccessibility="no" style="@style/AttachmentTypeSelectorButton"
android:text="@string/attachment_type_gallery" /> android:contentDescription="@string/attachment_type_audio"
android:src="@drawable/ic_attachment_audio_white_24dp"
tools:background="?colorPrimary" />
</LinearLayout> <TextView
style="@style/AttachmentTypeSelectorLabel"
android:importantForAccessibility="no"
android:text="@string/attachment_type_audio" />
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center" android:gravity="center"
android:orientation="vertical"> android:orientation="vertical">
<ImageButton <ImageButton
android:id="@+id/attachmentFileButton" android:id="@+id/attachmentContactButton"
style="@style/AttachmentTypeSelectorButton" style="@style/AttachmentTypeSelectorButton"
android:contentDescription="@string/attachment_type_file" android:contentDescription="@string/attachment_type_contact"
android:src="@drawable/ic_attachment_file_white_24dp" android:src="@drawable/ic_attachment_contact_white_24dp"
tools:background="?colorPrimary" /> tools:background="?colorPrimary" />
<TextView <TextView
style="@style/AttachmentTypeSelectorLabel" style="@style/AttachmentTypeSelectorLabel"
android:importantForAccessibility="no" android:importantForAccessibility="no"
android:text="@string/attachment_type_file" /> android:text="@string/attachment_type_contact" />
</LinearLayout> </LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="16dp"
android:baselineAligned="false"
android:orientation="horizontal"
android:weightSum="3">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<ImageButton
android:id="@+id/attachmentAudioButton"
style="@style/AttachmentTypeSelectorButton"
android:contentDescription="@string/attachment_type_audio"
android:src="@drawable/ic_attachment_audio_white_24dp"
tools:background="?colorPrimary" />
<TextView
style="@style/AttachmentTypeSelectorLabel"
android:importantForAccessibility="no"
android:text="@string/attachment_type_audio" />
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center" android:gravity="center"
android:orientation="vertical"> android:orientation="vertical">
<ImageButton <ImageButton
android:id="@+id/attachmentContactButton" android:id="@+id/attachmentStickersButton"
style="@style/AttachmentTypeSelectorButton" style="@style/AttachmentTypeSelectorButton"
android:contentDescription="@string/attachment_type_contact" android:contentDescription="@string/attachment_type_sticker"
android:src="@drawable/ic_attachment_contact_white_24dp" android:src="@drawable/ic_attachment_stickers_white_24dp"
tools:background="?colorPrimary" /> tools:background="?colorPrimary" />
<TextView <TextView
style="@style/AttachmentTypeSelectorLabel" style="@style/AttachmentTypeSelectorLabel"
android:importantForAccessibility="no" android:importantForAccessibility="no"
android:text="@string/attachment_type_contact" /> android:text="@string/attachment_type_sticker" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<ImageButton
android:id="@+id/attachmentStickersButton"
style="@style/AttachmentTypeSelectorButton"
android:contentDescription="@string/attachment_type_sticker"
android:src="@drawable/ic_attachment_stickers_white_24dp"
tools:background="?colorPrimary" />
<TextView
style="@style/AttachmentTypeSelectorLabel"
android:importantForAccessibility="no"
android:text="@string/attachment_type_sticker" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</FrameLayout>
</LinearLayout>