mirror of
https://github.com/vector-im/element-android.git
synced 2024-11-16 02:05:06 +08:00
Remove redundant view group
This commit is contained in:
parent
293811220d
commit
b9c1aa6ded
@ -1,92 +1,86 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<androidx.core.widget.NestedScrollView 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"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:background="?colorSurface"
|
android:background="?colorSurface">
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<androidx.core.widget.NestedScrollView
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
<LinearLayout
|
<im.vector.app.core.ui.views.BottomSheetActionButton
|
||||||
|
android:id="@+id/gallery"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="vertical">
|
app:actionTitle="@string/attachment_type_selector_gallery"
|
||||||
|
app:leftIcon="@drawable/ic_attachment_gallery"
|
||||||
|
app:tint="?colorPrimary"
|
||||||
|
app:titleTextColor="?vctr_content_primary" />
|
||||||
|
|
||||||
<im.vector.app.core.ui.views.BottomSheetActionButton
|
<im.vector.app.core.ui.views.BottomSheetActionButton
|
||||||
android:id="@+id/gallery"
|
android:id="@+id/stickers"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
app:actionTitle="@string/attachment_type_selector_gallery"
|
app:actionTitle="@string/attachment_type_selector_sticker"
|
||||||
app:leftIcon="@drawable/ic_attachment_gallery"
|
app:leftIcon="@drawable/ic_attachment_sticker"
|
||||||
app:tint="?colorPrimary"
|
app:tint="?colorPrimary"
|
||||||
app:titleTextColor="?vctr_content_primary" />
|
app:titleTextColor="?vctr_content_primary" />
|
||||||
|
|
||||||
<im.vector.app.core.ui.views.BottomSheetActionButton
|
<im.vector.app.core.ui.views.BottomSheetActionButton
|
||||||
android:id="@+id/stickers"
|
android:id="@+id/file"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
app:actionTitle="@string/attachment_type_selector_sticker"
|
app:actionTitle="@string/attachment_type_selector_file"
|
||||||
app:leftIcon="@drawable/ic_attachment_sticker"
|
app:leftIcon="@drawable/ic_attachment_file"
|
||||||
app:tint="?colorPrimary"
|
app:tint="?colorPrimary"
|
||||||
app:titleTextColor="?vctr_content_primary" />
|
app:titleTextColor="?vctr_content_primary" />
|
||||||
|
|
||||||
<im.vector.app.core.ui.views.BottomSheetActionButton
|
<im.vector.app.core.ui.views.BottomSheetActionButton
|
||||||
android:id="@+id/file"
|
android:id="@+id/voiceBroadcast"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
app:actionTitle="@string/attachment_type_selector_file"
|
app:actionTitle="@string/attachment_type_selector_voice_broadcast"
|
||||||
app:leftIcon="@drawable/ic_attachment_file"
|
app:leftIcon="@drawable/ic_attachment_voice_broadcast"
|
||||||
app:tint="?colorPrimary"
|
app:tint="?colorPrimary"
|
||||||
app:titleTextColor="?vctr_content_primary" />
|
app:titleTextColor="?vctr_content_primary" />
|
||||||
|
|
||||||
<im.vector.app.core.ui.views.BottomSheetActionButton
|
<im.vector.app.core.ui.views.BottomSheetActionButton
|
||||||
android:id="@+id/voiceBroadcast"
|
android:id="@+id/poll"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
app:actionTitle="@string/attachment_type_selector_voice_broadcast"
|
app:actionTitle="@string/attachment_type_selector_poll"
|
||||||
app:leftIcon="@drawable/ic_attachment_voice_broadcast"
|
app:leftIcon="@drawable/ic_attachment_poll"
|
||||||
app:tint="?colorPrimary"
|
app:tint="?colorPrimary"
|
||||||
app:titleTextColor="?vctr_content_primary" />
|
app:titleTextColor="?vctr_content_primary" />
|
||||||
|
|
||||||
<im.vector.app.core.ui.views.BottomSheetActionButton
|
<im.vector.app.core.ui.views.BottomSheetActionButton
|
||||||
android:id="@+id/poll"
|
android:id="@+id/location"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
app:actionTitle="@string/attachment_type_selector_poll"
|
app:actionTitle="@string/attachment_type_selector_location"
|
||||||
app:leftIcon="@drawable/ic_attachment_poll"
|
app:leftIcon="@drawable/ic_attachment_location"
|
||||||
app:tint="?colorPrimary"
|
app:tint="?colorPrimary"
|
||||||
app:titleTextColor="?vctr_content_primary" />
|
app:titleTextColor="?vctr_content_primary" />
|
||||||
|
|
||||||
<im.vector.app.core.ui.views.BottomSheetActionButton
|
<im.vector.app.core.ui.views.BottomSheetActionButton
|
||||||
android:id="@+id/location"
|
android:id="@+id/camera"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
app:actionTitle="@string/attachment_type_selector_location"
|
app:actionTitle="@string/attachment_type_selector_camera"
|
||||||
app:leftIcon="@drawable/ic_attachment_location"
|
app:leftIcon="@drawable/ic_attachment_camera"
|
||||||
app:tint="?colorPrimary"
|
app:tint="?colorPrimary"
|
||||||
app:titleTextColor="?vctr_content_primary" />
|
app:titleTextColor="?vctr_content_primary" />
|
||||||
|
|
||||||
<im.vector.app.core.ui.views.BottomSheetActionButton
|
<im.vector.app.core.ui.views.BottomSheetActionButton
|
||||||
android:id="@+id/camera"
|
android:id="@+id/contact"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
app:actionTitle="@string/attachment_type_selector_camera"
|
app:actionTitle="@string/attachment_type_selector_contact"
|
||||||
app:leftIcon="@drawable/ic_attachment_camera"
|
app:leftIcon="@drawable/ic_attachment_contact_white_24dp"
|
||||||
app:tint="?colorPrimary"
|
app:tint="?colorPrimary"
|
||||||
app:titleTextColor="?vctr_content_primary" />
|
app:titleTextColor="?vctr_content_primary" />
|
||||||
|
|
||||||
<im.vector.app.core.ui.views.BottomSheetActionButton
|
</LinearLayout>
|
||||||
android:id="@+id/contact"
|
</androidx.core.widget.NestedScrollView>
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
app:actionTitle="@string/attachment_type_selector_contact"
|
|
||||||
app:leftIcon="@drawable/ic_attachment_contact_white_24dp"
|
|
||||||
app:tint="?colorPrimary"
|
|
||||||
app:titleTextColor="?vctr_content_primary" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
</androidx.core.widget.NestedScrollView>
|
|
||||||
</LinearLayout>
|
|
||||||
|
Loading…
Reference in New Issue
Block a user