From 9635a71b0dd4fd4b5abbd4479fda11feb83b6f84 Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Wed, 3 Nov 2021 21:45:25 +0100
Subject: [PATCH] improve menu text and send button design

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
---
 .../main/res/layout/activity_take_picture.xml | 28 ++++++++++---------
 app/src/main/res/values/strings.xml           |  4 ++-
 app/src/main/res/values/styles.xml            | 15 ++++++++++
 3 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/app/src/main/res/layout/activity_take_picture.xml b/app/src/main/res/layout/activity_take_picture.xml
index 402583e80..b3a9c7709 100644
--- a/app/src/main/res/layout/activity_take_picture.xml
+++ b/app/src/main/res/layout/activity_take_picture.xml
@@ -109,7 +109,7 @@
         android:layout_alignParentTop="true"
         android:layout_alignParentEnd="true"
         android:layout_marginBottom="12dp"
-        android:contentDescription="@string/take_photo_switch_camera"
+        android:contentDescription="@string/take_photo_retake_photo"
         android:insetLeft="0dp"
         android:insetTop="0dp"
         android:insetRight="0dp"
@@ -117,7 +117,7 @@
         android:padding="0dp"
         android:tint="@android:color/white"
         android:visibility="gone"
-        app:backgroundTint="@color/colorPrimary"
+        app:backgroundTint="#99121212"
         app:cornerRadius="@dimen/button_corner_radius"
         app:elevation="0dp"
         app:icon="@drawable/ic_refresh"
@@ -146,26 +146,28 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/send"
-        style="@style/Widget.AppTheme.Button.IconButton"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
         android:layout_alignParentEnd="true"
-        android:layout_marginBottom="12dp"
         android:contentDescription="@string/take_photo_switch_camera"
-        android:insetLeft="0dp"
-        android:insetTop="0dp"
-        android:insetRight="0dp"
-        android:insetBottom="0dp"
-        android:padding="0dp"
+        android:paddingStart="24dp"
+        android:paddingTop="16dp"
+        android:paddingEnd="24dp"
+        android:paddingBottom="16dp"
+        android:text="@string/take_photo_send"
+        android:textAllCaps="false"
+        android:textColor="@color/white"
+        android:textSize="16sp"
+        android:theme="@style/Button.Primary"
         android:tint="@android:color/white"
         android:visibility="gone"
         app:backgroundTint="@color/colorPrimary"
-        app:cornerRadius="@dimen/button_corner_radius"
+        app:cornerRadius="48dp"
         app:elevation="0dp"
         app:icon="@drawable/ic_send"
         app:iconGravity="textStart"
-        app:iconPadding="0dp"
+        app:iconPadding="8dp"
         app:iconSize="24dp"
         app:iconTint="@color/white"
         app:layout_constraintBottom_toBottomOf="@id/takePhoto"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8f8b266cb..5eb55da4d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -389,7 +389,7 @@
     <!-- Upload -->
     <string name="nc_add_file">Add to conversation</string>
     <string name="nc_upload_local_file">Upload local file</string>
-    <string name="nc_upload_picture_from_cam">Upload from camera</string>
+    <string name="nc_upload_picture_from_cam">Take photo</string>
     <string name="nc_upload_from_cloud">Share from %1$s</string>
     <string name="nc_upload_failed">Sorry, upload failed</string>
     <string name="nc_upload_choose_local_files">Choose files</string>
@@ -476,7 +476,9 @@
 
     <string name="take_photo">Take a photo</string>
     <string name="take_photo_switch_camera">Switch camera</string>
+    <string name="take_photo_retake_photo">Re-take photo</string>
     <string name="take_photo_toggle_torch">Toggle torch</string>
+    <string name="take_photo_send">Send</string>
     <string name="take_photo_error_deleting_picture">Error taking picture</string>
     <string name="take_photo_permission">Taking a photo is not possible without permissions</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 20773f336..b10c1bedf 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -115,6 +115,21 @@
         <item name="searchHintIcon">@null</item>
     </style>
 
+    <style name="Button" parent="Widget.MaterialComponents.Button.UnelevatedButton">
+        <item name="colorButtonNormal">@color/colorPrimary</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="android:typeface">sans</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="Button.Primary" parent="Button">
+        <item name="colorButtonNormal">@color/colorPrimary</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:typeface">sans</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
     <style name="Widget.AppTheme.Button.IconButton" parent="Widget.MaterialComponents.Button.TextButton">
         <item name="android:minWidth">0dp</item>
         <item name="android:insetLeft">0dp</item>