lovis_ix/Pilldroid
1
1
Fork 0
mirror of https://github.com/jfoucry/Pilldroid.git synced 2024-11-22 04:29:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'feature/new_input_dialog' into develop

Browse source
This commit is contained in:
jacques 2022-08-01 08:37:15 +02:00
commit 2b13134d47
5 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/res/layout/drug_detail_activity.xml
View file

@ -51,7 +51,6 @@
android:layout_marginTop="?attr/actionBarSize" android:layout_marginTop="?attr/actionBarSize"
android:layout_marginBottom="?attr/actionBarSize" android:layout_marginBottom="?attr/actionBarSize"
android:layout_marginEnd="@dimen/fab_margin" android:layout_marginEnd="@dimen/fab_margin"
android:backgroundTint="@android:color/transparent"
android:contentDescription="@string/save_button" android:contentDescription="@string/save_button"
android:src="@drawable/ic_save_black_24dp" android:src="@drawable/ic_save_black_24dp"
app:backgroundTint="@android:color/transparent"/> app:backgroundTint="@android:color/transparent"/>

9
app/src/main/res/layout/input_dialog.xml
View file

@ -16,13 +16,12 @@
<EditText <EditText
android:id="@+id/edittext" android:id="@+id/edittext"
android:layout_width="200dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:autofillHints="@string/enter_cip_13_here" android:autofillHints="@string/enter_cip_13_here"
android:background="@drawable/rounded_corner"
android:hint="@string/enter_cip_13_here" android:hint="@string/enter_cip_13_here"
android:inputType="number" android:inputType="number"
android:minHeight="48dp" android:minHeight="48dp"
@ -31,13 +30,13 @@
<TextView <TextView
android:id="@+id/startcip13" android:id="@+id/startcip13"
android:layout_width="100dp" android:layout_width="wrap_content"
android:layout_height="32dp" android:layout_height="wrap_content"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginStart="29dp" android:layout_marginStart="29dp"
android:layout_marginTop="52dp" android:layout_marginTop="52dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="39dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:layout_toStartOf="@+id/edittext" android:layout_toStartOf="@+id/edittext"
android:ems="10" android:ems="10"

1
app/src/main/res/layout/value_input.xml
View file

@ -29,7 +29,6 @@
android:layout_height="50dp" android:layout_height="50dp"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:background="@drawable/rounded_corner"
android:ems="10" android:ems="10"
android:gravity="end|fill_vertical" android:gravity="end|fill_vertical"
android:inputType="numberDecimal" android:inputType="numberDecimal"

2
app/src/main/res/values-fr-rFR/strings.xml
View file

@ -19,7 +19,7 @@
<string name="detail_view">Vue de détail</string> <string name="detail_view">Vue de détail</string>
<string name="save_button">Enregistrer</string> <string name="save_button">Enregistrer</string>
<string name="flashlightButton">Allumer/Eteindre le Flash</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> <string name="enter_cip_13">Saisir le code CIP 13</string>
<!-- Slide Strings --> <!-- Slide Strings -->

6
app/src/main/res/values/strings.xml
View file

@ -18,7 +18,7 @@
<string name="detail_view">Detail view</string> <string name="detail_view">Detail view</string>
<string name="save_button">Save</string> <string name="save_button">Save</string>
<string name="flashlightButton">Toggle Flash</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="enter_cip_13">Enter CIP 13</string>
<string name="channel_description" translatable="false">Pilldroid_NotificationChannel</string> <string name="channel_description" translatable="false">Pilldroid_NotificationChannel</string>
<string name="channel_name" translatable="false">PilldroidChannel</string> <string name="channel_name" translatable="false">PilldroidChannel</string>
@ -43,7 +43,7 @@
<string name="the_plus_icon">The plus icon</string> <string name="the_plus_icon">The plus icon</string>
<string name="slide4_desc">In order to find the CIP13</string> <string name="slide4_desc">In order to find the CIP13</string>
<string name="happy_face">Happy face</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="qr_code_icon">qr-code icon</string>
<string name="neutral_face">neutral face</string> <string name="neutral_face">neutral face</string>
<string name="unhappy_face">unhappy face</string> <string name="unhappy_face">unhappy face</string>
@ -65,7 +65,7 @@
<string name="Value">Value</string> <string name="Value">Value</string>
<string name="label">Label</string> <string name="label">Label</string>
<string name="drug_list">Drug\'s attributes</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="cancelled_scan">Scan canceled</string>
<string name="missing_camera_permission">Missing camera permission</string> <string name="missing_camera_permission">Missing camera permission</string>
<string name="Yes">Yes, I understood</string> <string name="Yes">Yes, I understood</string>