From 8bbf7464b3bfe9c2e82871116a93a00c48a73448 Mon Sep 17 00:00:00 2001
From: jacques <jacques+commit@foucry.net>
Date: Mon, 1 Aug 2022 08:32:46 +0200
Subject: [PATCH] Minor changes in input interface, remove unused file.

---
 .../main/res/layout/drug_detail_activity.xml  |  1 -
 app/src/main/res/layout/input_dialog.xml      |  9 ++++---
 app/src/main/res/layout/input_dialog_old.xml  | 24 -------------------
 app/src/main/res/layout/value_input.xml       |  1 -
 app/src/main/res/values-fr-rFR/strings.xml    |  2 +-
 app/src/main/res/values/strings.xml           |  6 ++---
 6 files changed, 8 insertions(+), 35 deletions(-)
 delete mode 100644 app/src/main/res/layout/input_dialog_old.xml

diff --git a/app/src/main/res/layout/drug_detail_activity.xml b/app/src/main/res/layout/drug_detail_activity.xml
index 30815da..ecf8bda 100644
--- a/app/src/main/res/layout/drug_detail_activity.xml
+++ b/app/src/main/res/layout/drug_detail_activity.xml
@@ -51,7 +51,6 @@
         android:layout_marginTop="?attr/actionBarSize"
         android:layout_marginBottom="?attr/actionBarSize"
         android:layout_marginEnd="@dimen/fab_margin"
-        android:backgroundTint="@android:color/transparent"
         android:contentDescription="@string/save_button"
         android:src="@drawable/ic_save_black_24dp"
         app:backgroundTint="@android:color/transparent"/>
diff --git a/app/src/main/res/layout/input_dialog.xml b/app/src/main/res/layout/input_dialog.xml
index 08d3aab..31cf8b7 100644
--- a/app/src/main/res/layout/input_dialog.xml
+++ b/app/src/main/res/layout/input_dialog.xml
@@ -16,13 +16,12 @@
 
     <EditText
         android:id="@+id/edittext"
-        android:layout_width="200dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
         android:layout_marginEnd="16dp"
         android:autofillHints="@string/enter_cip_13_here"
-        android:background="@drawable/rounded_corner"
         android:hint="@string/enter_cip_13_here"
         android:inputType="number"
         android:minHeight="48dp"
@@ -31,13 +30,13 @@
 
     <TextView
         android:id="@+id/startcip13"
-        android:layout_width="100dp"
-        android:layout_height="32dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_alignParentStart="true"
         android:layout_centerVertical="true"
         android:layout_marginStart="29dp"
         android:layout_marginTop="52dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginEnd="39dp"
         android:layout_marginBottom="16dp"
         android:layout_toStartOf="@+id/edittext"
         android:ems="10"
diff --git a/app/src/main/res/layout/input_dialog_old.xml b/app/src/main/res/layout/input_dialog_old.xml
deleted file mode 100644
index 8375b29..0000000
--- a/app/src/main/res/layout/input_dialog_old.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:padding="10dp">
-
-    <TextView
-        android:id="@+id/textView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/enter_cip_13"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-    <EditText
-        android:id="@+id/edittext"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/enter_cip_13_here"
-        android:background="@drawable/rounded_corner"
-        android:inputType="number"
-        android:padding="10dp"
-        android:autofillHints="@string/enter_cip_13_here" />
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/value_input.xml b/app/src/main/res/layout/value_input.xml
index d310784..7c850fe 100644
--- a/app/src/main/res/layout/value_input.xml
+++ b/app/src/main/res/layout/value_input.xml
@@ -29,7 +29,6 @@
         android:layout_height="50dp"
         android:layout_alignParentTop="true"
         android:layout_alignParentEnd="true"
-        android:background="@drawable/rounded_corner"
         android:ems="10"
         android:gravity="end|fill_vertical"
         android:inputType="numberDecimal"
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 635b50e..ffdfbd6 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -19,7 +19,7 @@
     <string name="detail_view">Vue de détail</string>
     <string name="save_button">Enregistrer</string>
     <string name="flashlightButton">Allumer/Eteindre le Flash</string>
-    <string name="enter_cip_13_here">Saisir le code CIP 13 ici..</string>
+    <string name="enter_cip_13_here">Saisir la fin du code CIP 13 ici..</string>
     <string name="enter_cip_13">Saisir le code CIP 13</string>
 
     <!-- Slide Strings -->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 529100a..1d58c5e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -18,7 +18,7 @@
     <string name="detail_view">Detail view</string>
     <string name="save_button">Save</string>
     <string name="flashlightButton">Toggle Flash</string>
-    <string name="enter_cip_13_here">Enter CIP 13 here..</string>
+    <string name="enter_cip_13_here">Enter end of CIP 13 here..</string>
     <string name="enter_cip_13">Enter CIP 13</string>
     <string name="channel_description" translatable="false">Pilldroid_NotificationChannel</string>
     <string name="channel_name" translatable="false">PilldroidChannel</string>
@@ -43,7 +43,7 @@
     <string name="the_plus_icon">The plus icon</string>
     <string name="slide4_desc">In order to find the CIP13</string>
     <string name="happy_face">Happy face</string>
-    <string name="barcode_icon">Barre code icon</string>
+    <string name="barcode_icon">Bar code icon</string>
     <string name="qr_code_icon">qr-code icon</string>
     <string name="neutral_face">neutral face</string>
     <string name="unhappy_face">unhappy face</string>
@@ -65,7 +65,7 @@
     <string name="Value">Value</string>
     <string name="label">Label</string>
     <string name="drug_list">Drug\'s attributes</string>
-    <string name="notInterpreted">Barre code cannot be interpreted</string>
+    <string name="notInterpreted">Bar code cannot be interpreted</string>
     <string name="cancelled_scan">Scan canceled</string>
     <string name="missing_camera_permission">Missing camera permission</string>
     <string name="Yes">Yes, I understood</string>