From f31c68193acd0be6851a434ce82f6559e680f440 Mon Sep 17 00:00:00 2001
From: Daniele Verducci <daniele.verducci@ichibi.eu>
Date: Wed, 27 Nov 2024 07:45:43 +0100
Subject: [PATCH] Graphics edits

---
 app/src/main/res/drawable/textview_background.xml | 12 ++++++++++++
 app/src/main/res/layout/activity_settings.xml     |  9 ++++++---
 app/src/main/res/layout/dialog_notes.xml          |  8 ++++++--
 app/src/main/res/layout/more_events_popup.xml     |  4 ++++
 app/src/main/res/layout/number_edit_dialog.xml    |  3 ++-
 app/src/main/res/values-it/strings.xml            |  5 +++--
 app/src/main/res/values/strings.xml               |  5 +++--
 app/src/main/res/values/themes.xml                |  8 +++++++-
 8 files changed, 43 insertions(+), 11 deletions(-)
 create mode 100644 app/src/main/res/drawable/textview_background.xml

diff --git a/app/src/main/res/drawable/textview_background.xml b/app/src/main/res/drawable/textview_background.xml
new file mode 100644
index 0000000..3ac8e0d
--- /dev/null
+++ b/app/src/main/res/drawable/textview_background.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke
+        android:width="2dp"
+        android:color="@color/grey" />
+    <corners android:radius="10dp" />
+    <padding
+        android:bottom="10dp"
+        android:left="20dp"
+        android:right="20dp"
+        android:top="10dp" />
+</shape>
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 1da01c8..e80fd5e 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -68,7 +68,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="30dp"
                 android:hint="@string/settings_storage_dav_url_hint"
-                android:inputType="textUri"/>
+                android:inputType="textUri"
+                android:background="@drawable/textview_background"/>
 
             <TextView
                 android:layout_width="match_parent"
@@ -83,7 +84,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="30dp"
-                android:inputType="textEmailAddress"/>
+                android:inputType="textEmailAddress"
+                android:background="@drawable/textview_background"/>
 
             <TextView
                 android:layout_width="match_parent"
@@ -98,7 +100,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="30dp"
-                android:inputType="textPassword"/>
+                android:inputType="textPassword"
+                android:background="@drawable/textview_background"/>
 
             <com.google.android.material.progressindicator.LinearProgressIndicator
                 android:id="@+id/progress_indicator"
diff --git a/app/src/main/res/layout/dialog_notes.xml b/app/src/main/res/layout/dialog_notes.xml
index 997050a..6d30a5e 100644
--- a/app/src/main/res/layout/dialog_notes.xml
+++ b/app/src/main/res/layout/dialog_notes.xml
@@ -11,13 +11,17 @@
         android:layout_height="wrap_content"
         android:lines="1"
         android:inputType="number"
-        android:hint="@string/log_notes_dialog_qty_hint"/>
+        android:hint="@string/log_notes_dialog_qty_hint"
+        android:background="@drawable/textview_background"/>
 
     <EditText
         android:id="@+id/notes_edittext"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
         android:gravity="top"
-        android:lines="10"/>
+        android:lines="10"
+        android:hint="@string/log_notes_dialog_note_hint"
+        android:background="@drawable/textview_background"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/more_events_popup.xml b/app/src/main/res/layout/more_events_popup.xml
index ba4598f..5775004 100644
--- a/app/src/main/res/layout/more_events_popup.xml
+++ b/app/src/main/res/layout/more_events_popup.xml
@@ -16,6 +16,7 @@
                 android:layout_height="match_parent"
                 android:padding="20dp"
                 android:background="@drawable/button_background"
+                style="@style/OverflowMenuText"
                 android:text="@string/overflow_event_medicine"/>
 
             <TextView
@@ -25,6 +26,7 @@
                 android:layout_marginTop="10dp"
                 android:padding="20dp"
                 android:background="@drawable/button_background"
+                style="@style/OverflowMenuText"
                 android:text="@string/overflow_event_enema"/>
 
             <TextView
@@ -34,6 +36,7 @@
                 android:layout_marginTop="10dp"
                 android:padding="20dp"
                 android:background="@drawable/button_background"
+                style="@style/OverflowMenuText"
                 android:text="@string/overflow_event_note"/>
 
 
@@ -51,6 +54,7 @@
                 android:layout_marginTop="10dp"
                 android:padding="20dp"
                 android:background="@drawable/button_background"
+                style="@style/OverflowMenuText"
                 android:text="@string/overflow_event_custom"/>
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/number_edit_dialog.xml b/app/src/main/res/layout/number_edit_dialog.xml
index 3abeb31..b36f24d 100644
--- a/app/src/main/res/layout/number_edit_dialog.xml
+++ b/app/src/main/res/layout/number_edit_dialog.xml
@@ -11,7 +11,8 @@
         android:layout_width="150dp"
         android:layout_height="wrap_content"
         android:inputType="number"
-        android:hint="0"/>
+        android:hint="0"
+        android:background="@drawable/textview_background"/>
 
     <TextView
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 9ea6dd9..8fb3456 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -13,7 +13,7 @@
     <string name="overflow_event_medicine">💊 Medicina</string>
     <string name="overflow_event_enema">🪠 Clistere</string>
     <string name="overflow_event_note">📝 Nota</string>
-    <string name="overflow_event_custom">➕ Aggiungi evento personalizzato</string>
+    <string name="overflow_event_custom">➕ Personalizzato</string>
 
     <string name="event_bottle_desc">Biberon</string>
     <string name="event_scale_desc">Pesata</string>
@@ -69,7 +69,8 @@
 
     <string name="log_notes_dialog_description">Note:</string>
     <string name="log_medicine_dialog_description">Nome della medicina, quantità, formato, note…:</string>
-    <string name="log_notes_dialog_qty_hint">Quantità (numero intero), o lascia vuoto</string>
+    <string name="log_notes_dialog_qty_hint">Quantità, o vuoto</string>
+    <string name="log_notes_dialog_note_hint">Inserisci le note</string>
 
     <string name="dialog_event_detail_title">Dettaglio evento</string>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 719adea..64b64eb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -37,7 +37,7 @@
     <string name="overflow_event_medicine">💊 Medicine</string>
     <string name="overflow_event_enema">🪠 Enema</string>
     <string name="overflow_event_note">📝 Note</string>
-    <string name="overflow_event_custom">➕ Add custom event</string>
+    <string name="overflow_event_custom">➕ Add custom</string>
 
     <string name="toast_event_added">Event logged</string>
     <string name="toast_logbook_saved">Logbook saved</string>
@@ -81,7 +81,8 @@
 
     <string name="log_notes_dialog_description">Notes:</string>
     <string name="log_medicine_dialog_description">Medicine name, quantity, type, notes…:</string>
-    <string name="log_notes_dialog_qty_hint">Integer quantity, or leave blank</string>
+    <string name="log_notes_dialog_qty_hint">Quantity (or empty)</string>
+    <string name="log_notes_dialog_note_hint">Write some notes</string>
 
     <string name="measurement_unit_liquid_base_metric" translatable="false">ml</string>
     <string name="measurement_unit_weight_base_metric" translatable="false">g</string>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index bc0b267..561038d 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Theme.LunaTracker" parent="Theme.AppCompat.NoActionBar" />
+    <style name="Theme.LunaTracker" parent="Theme.AppCompat.NoActionBar">
+        <item name="colorAccent">@color/accent</item>
+    </style>
+
+    <style name="OverflowMenuText">
+        <item name="android:textSize">20sp</item>
+    </style>
 </resources>
\ No newline at end of file