From 42ad53708d96f7e8576e9eecea2ec335dac3ac48 Mon Sep 17 00:00:00 2001
From: Corewala <corewala@tutanota.com>
Date: Sat, 8 Jan 2022 13:35:20 -0500
Subject: [PATCH] Titles are shown in dialogs

---
 app/src/main/res/layout/dialog_about.xml      | 27 +++++++---
 app/src/main/res/layout/dialog_bookmarks.xml  | 10 ++++
 .../main/res/layout/dialog_content_image.xml  | 49 ++++++++++-------
 .../main/res/layout/dialog_content_text.xml   | 27 +++++++---
 app/src/main/res/layout/dialog_history.xml    | 52 ++++++++++++-------
 app/src/main/res/values-fr/strings.xml        |  2 +
 app/src/main/res/values/strings.xml           |  2 +
 7 files changed, 113 insertions(+), 56 deletions(-)

diff --git a/app/src/main/res/layout/dialog_about.xml b/app/src/main/res/layout/dialog_about.xml
index 3ee388a..119a3aa 100644
--- a/app/src/main/res/layout/dialog_about.xml
+++ b/app/src/main/res/layout/dialog_about.xml
@@ -12,14 +12,25 @@
         android:paddingTop="@dimen/default_margin">
 
         <androidx.appcompat.widget.AppCompatImageButton
-            android:id="@+id/close_tab_dialog"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_alignParentStart="true"
-            android:layout_margin="@dimen/button_margin"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:src="@drawable/vector_close" />
+                android:id="@+id/close_tab_dialog"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_alignParentStart="true"
+                android:background="?android:attr/selectableItemBackgroundBorderless"
+                android:src="@drawable/vector_close" android:layout_marginTop="@dimen/button_margin"
+                android:layout_marginStart="@dimen/button_margin" android:layout_marginEnd="@dimen/button_margin"
+                android:layout_marginBottom="@dimen/button_margin"/>
+
+        <android.widget.TextView
+                android:id="@+id/header_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toRightOf="@id/close_tab_dialog"
+                android:layout_marginLeft="@dimen/screen_margin"
+                android:textSize="@dimen/h3_text_size"
+                android:text="@string/about"/>
 
     </RelativeLayout>
     <androidx.core.widget.NestedScrollView
diff --git a/app/src/main/res/layout/dialog_bookmarks.xml b/app/src/main/res/layout/dialog_bookmarks.xml
index 5c1d3af..cf43063 100644
--- a/app/src/main/res/layout/dialog_bookmarks.xml
+++ b/app/src/main/res/layout/dialog_bookmarks.xml
@@ -21,6 +21,16 @@
                 android:layout_marginStart="@dimen/button_margin" android:layout_marginEnd="@dimen/button_margin"
                 android:layout_marginBottom="@dimen/button_margin"/>
 
+        <android.widget.TextView
+                android:id="@+id/header_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toRightOf="@id/close_tab_dialog"
+                android:layout_marginLeft="@dimen/screen_margin"
+                android:textSize="@dimen/h3_text_size"
+                android:text="@string/bookmarks"/>
+
         <androidx.appcompat.widget.AppCompatImageButton
                 android:id="@+id/bookmark_overflow"
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/dialog_content_image.xml b/app/src/main/res/layout/dialog_content_image.xml
index d2add3c..4c72e65 100644
--- a/app/src/main/res/layout/dialog_content_image.xml
+++ b/app/src/main/res/layout/dialog_content_image.xml
@@ -13,30 +13,39 @@
         />
 
     <RelativeLayout
-        android:id="@+id/header"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="@dimen/default_margin">
+            android:id="@+id/header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="@dimen/default_margin">
 
         <androidx.appcompat.widget.AppCompatImageButton
-            android:id="@+id/close_image_content_dialog"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_alignParentStart="true"
-            android:layout_margin="@dimen/button_margin"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:src="@drawable/vector_close" />
+                android:id="@+id/close_image_content_dialog"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_alignParentStart="true"
+                android:layout_margin="@dimen/button_margin"
+                android:background="?android:attr/selectableItemBackgroundBorderless"
+                android:src="@drawable/vector_close"/>
+
+        <android.widget.TextView
+                android:id="@+id/header_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="48dp"
+                android:textSize="24sp"
+                android:text="@string/image"/>
 
         <androidx.appcompat.widget.AppCompatImageButton
-            android:id="@+id/image_overflow"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_alignParentEnd="true"
-            android:layout_margin="@dimen/button_margin"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:src="@drawable/vector_overflow" />
+                android:id="@+id/image_overflow"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_alignParentEnd="true"
+                android:layout_margin="@dimen/button_margin"
+                android:background="?android:attr/selectableItemBackgroundBorderless"
+                android:src="@drawable/vector_overflow"/>
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/dialog_content_text.xml b/app/src/main/res/layout/dialog_content_text.xml
index fac2245..1740351 100644
--- a/app/src/main/res/layout/dialog_content_text.xml
+++ b/app/src/main/res/layout/dialog_content_text.xml
@@ -11,14 +11,25 @@
         android:paddingTop="@dimen/default_margin">
 
         <androidx.appcompat.widget.AppCompatImageButton
-            android:id="@+id/close_text_content_dialog"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_alignParentStart="true"
-            android:layout_margin="@dimen/button_margin"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:src="@drawable/vector_close" />
+                android:id="@+id/close_text_content_dialog"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_alignParentStart="true"
+                android:background="?android:attr/selectableItemBackgroundBorderless"
+                android:src="@drawable/vector_close" android:layout_marginTop="@dimen/button_margin"
+                android:layout_marginStart="@dimen/button_margin" android:layout_marginEnd="@dimen/button_margin"
+                android:layout_marginBottom="@dimen/button_margin"/>
+
+        <android.widget.TextView
+                android:id="@+id/header_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toRightOf="@id/close_text_content_dialog"
+                android:layout_marginLeft="@dimen/screen_margin"
+                android:textSize="@dimen/h3_text_size"
+                android:text="@string/text"/>
 
         <androidx.appcompat.widget.AppCompatImageButton
             android:id="@+id/history_overflow"
diff --git a/app/src/main/res/layout/dialog_history.xml b/app/src/main/res/layout/dialog_history.xml
index a22b3da..11748fb 100644
--- a/app/src/main/res/layout/dialog_history.xml
+++ b/app/src/main/res/layout/dialog_history.xml
@@ -11,30 +11,42 @@
         android:paddingTop="@dimen/default_margin">
 
         <androidx.appcompat.widget.AppCompatImageButton
-            android:id="@+id/close_tab_dialog"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_alignParentStart="true"
-            android:layout_margin="@dimen/button_margin"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:src="@drawable/vector_close" />
+                android:id="@+id/close_tab_dialog"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_alignParentStart="true"
+                android:background="?android:attr/selectableItemBackgroundBorderless"
+                android:src="@drawable/vector_close" android:layout_marginTop="@dimen/button_margin"
+                android:layout_marginStart="@dimen/button_margin" android:layout_marginEnd="@dimen/button_margin"
+                android:layout_marginBottom="@dimen/button_margin"/>
+
+        <android.widget.TextView
+                android:id="@+id/header_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toRightOf="@id/close_tab_dialog"
+                android:layout_marginLeft="@dimen/screen_margin"
+                android:textSize="@dimen/h3_text_size"
+                android:text="@string/history"/>
 
         <androidx.appcompat.widget.AppCompatImageButton
-            android:id="@+id/history_overflow"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_alignParentEnd="true"
-            android:layout_margin="@dimen/button_margin"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:src="@drawable/vector_overflow" />
+                android:id="@+id/history_overflow"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_alignParentEnd="true"
+                android:background="?android:attr/selectableItemBackgroundBorderless"
+                android:src="@drawable/vector_overflow" android:layout_marginTop="@dimen/button_margin"
+                android:layout_marginStart="@dimen/button_margin" android:layout_marginEnd="@dimen/button_margin"
+                android:layout_marginBottom="@dimen/button_margin"/>
 
     </RelativeLayout>
     <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/history_recycler"
-        android:layout_below="@+id/header"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+            android:id="@+id/history_recycler"
+            android:layout_below="@+id/header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index d3f3854..e521295 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -28,6 +28,8 @@
     <string name="page_backlinks">Liens de retour</string>
     <string name="add_bookmark">Ajouter marque-page</string>
     <string name="bookmarks">Marque-pages</string>
+    <string name="image">Image</string>
+    <string name="text">Texte</string>
     <string name="name">Nom</string>
     <string name="gemini_uri">URL Gemini</string>
     <string name="edit">Éditer</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 11063e3..5f4b58d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -28,6 +28,8 @@
     <string name="page_backlinks">Backlinks</string>
     <string name="add_bookmark">Add Bookmark</string>
     <string name="bookmarks">Bookmarks</string>
+    <string name="image">Image</string>
+    <string name="text">Text</string>
     <string name="name">Name</string>
     <string name="gemini_uri">Gemini URL</string>
     <string name="edit">Edit</string>