divers fix

app/src/main/java/fr/svpro/radiomercure/MainActivity.java

@@ -140,7 +140,7 @@ public class MainActivity extends AppCompatActivity {
         });
         dialogOptBattery.setNegativeButton(R.string.dialog_button_non, (dialog1, id) -> {
             // User cancelled the dialog
-            Toast.makeText(this, "Annulation par l'utilisateur", Toast.LENGTH_SHORT).show();
+            Toast.makeText(this, R.string.battery_annul, Toast.LENGTH_SHORT).show();
         });
         AlertDialog alertDialog = dialogOptBattery.create();
 
@@ -200,13 +200,13 @@ public class MainActivity extends AppCompatActivity {
     private void createDialog()
     {
         dialog=new Dialog(this);
-        dialog.setTitle("A Propos de l'Application");
+        dialog.setTitle(R.string.dialog_about_titre);
         dialog.setContentView(R.layout.about_dialog);
 
         tv_close= (TextView) dialog.findViewById(R.id.tv_close);
         tv_version = (TextView) dialog.findViewById(R.id.tv_version);
         tv_close.setOnClickListener(v -> dialog.dismiss());
-        tv_version.setText("RADIO MERCURE - Version " + versionName);
+        tv_version.setText(getString(R.string.app_version) + versionName);
     }
 
 

app/src/main/res/layout/form_mail.xml

@@ -6,6 +6,30 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="162dp"
+            android:layout_height="106dp"
+            android:layout_gravity="center"
+            android:paddingTop="20dp"
+            app:srcCompat="@drawable/devanture_radiomercure" />
+
+        <TextView
+            android:id="@+id/tv_adresse"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:text="@string/adresse_radio"
+            android:textAlignment="center"
+            android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
+            android:textStyle="bold" />
+    </LinearLayout>
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -16,11 +40,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/colorPrimaryVariant"
-            android:text="@string/titre_mail"
+            android:text="@string/menu_mail"
             android:textAlignment="center"
             android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
             android:textColor="@color/white"
             android:textSize="30dp"
+            android:layout_marginTop="10dp"
             android:textStyle="bold" />
 
         <EditText
@@ -30,6 +55,9 @@
             android:inputType="textPersonName"
             android:minHeight="48dp"
             android:hint="@string/etSujet_hint"
+            android:layout_marginTop="10dp"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
             tools:ignore="HardcodedText" />
 
         <EditText
@@ -40,6 +68,8 @@
             android:inputType="textMultiLine"
             android:lines="10"
             android:minHeight="48dp"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
             android:hint="@string/etMessage_hint"/>
 
         <Button
@@ -48,16 +78,10 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:drawableLeft="@android:drawable/ic_menu_send"
+            android:minHeight="48dp"
             android:text="Envoyer" />
 
 
     </LinearLayout>
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-
-    </LinearLayout>
 </LinearLayout>

app/src/main/res/values/strings.xml

@@ -2,7 +2,7 @@
     <string name="app_name">Radio Mercure</string>
     <string name="menu_exit">Quitter</string>
     <string name="menu_phone">Appeler la Radio</string>
-    <string name="menu_mail">Contactez-nous</string>
+    <string name="menu_mail">Nous Contacter</string>
     <string name="menu_live">Ecouter en direct</string>
     <string name="menu_reload">Relancer...</string>
     <string name="menu_about">A Propos...</string>
@@ -22,9 +22,15 @@
     <string name="dialog_button_oui">Oui</string>
     <string name="dialog_button_non">Non</string>
     <string name="et_err">Veuillez renseigner ce cbamp !</string>
-    <string name="titre_mail">Contactez-nous</string>
     <string name="etSujet_hint">Sujet de votre message</string>
     <string name="etMessage_hint">Votre message</string>
     <string name="mailclient_err">Aucun client mail trouvé !!</string>
+    <string name="battery_annul">Annulation par l\'utilisateur</string>
+    <string name="dialog_about_titre">A Propos de l\'Application</string>
+    <string name="app_version">\"RADIO MERCURE - Version \"</string>
+    <string name="adresse_radio"><![CDATA[Radio Mercure\n
+    2 Bd Aristide Briand\n
+    60000 BEAUVAIS
+]]></string>
 
 </resources>