From 36e923695d292625ca6056c2a1630df0de5e6c2c Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 14 Aug 2019 19:55:37 +0200
Subject: [PATCH] Small layout fix

---
 .../layout/include_message_attachments.xml    |  2 -
 .../res/layout/include_message_calendar.xml   |  2 -
 .../res/layout/include_message_headers.xml    |  2 -
 .../res/layout/include_message_images.xml     |  2 -
 .../res/layout/include_message_navigation.xml | 53 -------------------
 app/src/main/res/menu/action_message.xml      | 28 ----------
 6 files changed, 89 deletions(-)
 delete mode 100644 app/src/main/res/layout/include_message_navigation.xml
 delete mode 100644 app/src/main/res/menu/action_message.xml

diff --git a/app/src/main/res/layout/include_message_attachments.xml b/app/src/main/res/layout/include_message_attachments.xml
index 5e5cda2723..12e5a987fb 100644
--- a/app/src/main/res/layout/include_message_attachments.xml
+++ b/app/src/main/res/layout/include_message_attachments.xml
@@ -8,9 +8,7 @@
         android:id="@+id/vSeparatorAttachments"
         android:layout_width="0dp"
         android:layout_height="1dp"
-        android:layout_marginStart="6dp"
         android:layout_marginTop="3dp"
-        android:layout_marginEnd="6dp"
         android:background="?attr/colorSeparator"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/include_message_calendar.xml b/app/src/main/res/layout/include_message_calendar.xml
index a3f9f632a3..459616429b 100644
--- a/app/src/main/res/layout/include_message_calendar.xml
+++ b/app/src/main/res/layout/include_message_calendar.xml
@@ -10,9 +10,7 @@
         android:id="@+id/vSeparatorCalendar"
         android:layout_width="0dp"
         android:layout_height="1dp"
-        android:layout_marginStart="6dp"
         android:layout_marginTop="3dp"
-        android:layout_marginEnd="6dp"
         android:background="?attr/colorSeparator"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/include_message_headers.xml b/app/src/main/res/layout/include_message_headers.xml
index 788b95c0f1..c203ca4131 100644
--- a/app/src/main/res/layout/include_message_headers.xml
+++ b/app/src/main/res/layout/include_message_headers.xml
@@ -8,9 +8,7 @@
         android:id="@+id/vSeparatorHeaders"
         android:layout_width="0dp"
         android:layout_height="1dp"
-        android:layout_marginStart="6dp"
         android:layout_marginTop="3dp"
-        android:layout_marginEnd="6dp"
         android:background="?attr/colorSeparator"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/include_message_images.xml b/app/src/main/res/layout/include_message_images.xml
index 897fbe2a20..8d74ca1e63 100644
--- a/app/src/main/res/layout/include_message_images.xml
+++ b/app/src/main/res/layout/include_message_images.xml
@@ -8,9 +8,7 @@
         android:id="@+id/vSeparatorImages"
         android:layout_width="0dp"
         android:layout_height="1dp"
-        android:layout_marginStart="6dp"
         android:layout_marginTop="3dp"
-        android:layout_marginEnd="6dp"
         android:background="?attr/colorSeparator"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/include_message_navigation.xml b/app/src/main/res/layout/include_message_navigation.xml
deleted file mode 100644
index f61dd32ca9..0000000000
--- a/app/src/main/res/layout/include_message_navigation.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <com.google.android.material.bottomnavigation.BottomNavigationView
-        android:id="@+id/bnvActions"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="3dp"
-        android:background="?attr/colorSeparator"
-        app:itemIconTint="@color/bottomnav_foreground"
-        app:itemTextColor="@color/bottomnav_foreground"
-        app:labelVisibilityMode="labeled"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:menu="@menu/action_message" />
-
-    <ImageButton
-        android:id="@+id/ibDecrypt"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="3dp"
-        android:layout_marginEnd="6dp"
-        android:contentDescription="@string/title_decrypt"
-        android:src="@drawable/baseline_no_encryption_24"
-        app:layout_constraintEnd_toStartOf="@+id/ibImages"
-        app:layout_constraintTop_toBottomOf="@id/bnvActions" />
-
-    <ImageButton
-        android:id="@+id/ibImages"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="3dp"
-        android:layout_marginEnd="6dp"
-        android:contentDescription="@string/title_legend_show_images"
-        android:src="@drawable/baseline_image_24"
-        app:layout_constraintEnd_toStartOf="@+id/ibFull"
-        app:layout_constraintTop_toBottomOf="@id/bnvActions" />
-
-    <ImageButton
-        android:id="@+id/ibFull"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="3dp"
-        android:layout_marginEnd="6dp"
-        android:contentDescription="@string/title_legend_show_full"
-        android:src="@drawable/baseline_fullscreen_24"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/bnvActions" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/action_message.xml b/app/src/main/res/menu/action_message.xml
deleted file mode 100644
index e774cd6505..0000000000
--- a/app/src/main/res/menu/action_message.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/action_more"
-        android:icon="@drawable/baseline_more_vert_24"
-        android:title="@string/title_more" />
-
-    <item
-        android:id="@+id/action_delete"
-        android:icon="@drawable/baseline_delete_24"
-        android:title="@string/title_trash" />
-
-    <item
-        android:id="@+id/action_move"
-        android:icon="@drawable/baseline_folder_24"
-        android:title="@string/title_move" />
-
-    <item
-        android:id="@+id/action_archive"
-        android:icon="@drawable/baseline_archive_24"
-        android:title="@string/title_archive" />
-
-    <item
-        android:id="@+id/action_reply"
-        android:icon="@drawable/baseline_reply_24"
-        android:title="@string/title_reply" />
-</menu>