transformation @string

app/src/main/java/com/example/myhabitat/CreationOuvertureActivity.java

@@ -13,6 +13,7 @@ import habitat.*;
 import org.json.JSONObject;
 
 import java.io.*;
+import java.time.Duration;
 
 public class CreationOuvertureActivity extends AppCompatActivity{
 
@@ -286,11 +287,12 @@ public class CreationOuvertureActivity extends AppCompatActivity{
     public void confirmer(View view) {
         Ouverture ouverture = new Ouverture(pieceDepart.getMurOrientation(orientationPieceDepart), pieceArrivee.getMurOrientation(orientationPieceArrivee), rectDepart, rectArrivee);
         habitat.addOuverture(ouverture);
-        //On re-set correctement les murs (pas besoin finalemnt...)
-        Log.i("testGetMur2", ouverture.getMurDepart().getPiece()+"");
-        Log.i("testGetMur2", ouverture.getMurArrivee().getPiece()+"");
+
+        Toast.makeText(getBaseContext(), "Ouverture créée !", Toast.LENGTH_SHORT).show();
 
         enregistrement();
+        finish();
+
     }
 
     public void enregistrement(){

app/src/main/java/com/example/myhabitat/MainActivity.java

@@ -99,7 +99,6 @@ public class MainActivity extends AppCompatActivity {
     }
 
     public void ouvrirJSON(){
-        //habitat.reset();
         habitat = new Habitat();
         FileInputStream fis = null;
         try {

app/src/main/java/com/example/myhabitat/ModeConceptionActivity.java

@@ -7,6 +7,7 @@ import android.provider.MediaStore;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
 import android.widget.*;
@@ -121,11 +122,10 @@ public class ModeConceptionActivity extends AppCompatActivity {
             ll.addView(editText);
             for(Mur mur : piece.getMurs()){
                 LinearLayout llMur = new LinearLayout(this);
-                llMur.setOrientation(LinearLayout.HORIZONTAL);
+                //llMur.setGravity(Gravity.CENTER_HORIZONTAL);
                 ImageButton imageButton = new ImageButton(this);
                 imageButton.setMaxHeight(50);
                 imageButton.setMaxWidth(50);
-                //imageButton.setImageBitmap(mur.getPhoto());
 
                 //On récupère la photo
                 FileInputStream fis = null;

app/src/main/java/com/example/myhabitat/ModeImmersionActivity.java

@@ -185,6 +185,7 @@ public class ModeImmersionActivity extends AppCompatActivity implements SensorEv
             try {
                 canvas = surfaceView.getHolder().lockCanvas();
                 synchronized (surfaceView.getHolder()) {
+                    canvas.drawColor(0, PorterDuff.Mode.CLEAR);
                     for(Rect rect : rectangles){
                         canvas.drawRect(rect, myPaint);
                     }

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

@@ -30,7 +30,7 @@
             app:layout_constraintHorizontal_bias="0.892"/>
 
     <TextView
-            android:text="Direction"
+            android:text="@string/direction"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/textView4"
@@ -41,7 +41,7 @@
             app:layout_constraintHorizontal_bias="0.83"/>
 
     <TextView
-            android:text="Piece de Depart"
+            android:text="@string/piecededepart"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/textViewDepart"
@@ -53,7 +53,7 @@
             app:layout_constraintVertical_bias="0.484"/>
 
     <TextView
-            android:text="Piece d'Arrivee"
+            android:text="@string/piecedarrivee"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/textViewArrivee"
@@ -85,7 +85,7 @@
             app:layout_constraintHorizontal_bias="1.0"/>
 
     <TextView
-            android:text="Direction"
+            android:text="@string/direction"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/textView3"
@@ -116,7 +116,7 @@
             app:layout_constraintHorizontal_bias="0.0"/>
 
     <Button
-            android:text="Selectionner"
+            android:text="@string/selectionner"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/buttonSDepart"
@@ -128,7 +128,7 @@
             app:layout_constraintHorizontal_bias="0.419"/>
 
     <Button
-            android:text="Selectionner"
+            android:text="@string/selectionner"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/buttonSArrivee"
@@ -139,7 +139,7 @@
             android:layout_marginTop="16dp"/>
 
     <Button
-            android:text="Confirmer"
+            android:text="@string/confirmer"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/buttonConfirmer"

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

@@ -8,7 +8,7 @@
         tools:context=".MainActivity">
 
     <Button
-            android:text="Mode Conception"
+            android:text="@string/modeconception"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/buttonConception"
@@ -29,7 +29,7 @@
             app:layout_constraintTop_toTopOf="parent"/>
 
     <Button
-            android:text="Mode Immersion"
+            android:text="@string/modeimmersion"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/buttonImmersion"

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

@@ -26,7 +26,7 @@
     </ScrollView>
 
     <Button
-            android:text="Confirmer"
+            android:text="@string/confirmer"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/button"
@@ -37,7 +37,7 @@
             />
 
     <Button
-            android:text="Ajouter une ouverture"
+            android:text="@string/ajouteruneouverture"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/button2"
@@ -48,7 +48,7 @@
             android:layout_marginTop="24dp"/>
 
     <Button
-            android:text="Ajouter une piece"
+            android:text="@string/ajouterunepiece"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/addPiece"

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

@@ -43,11 +43,12 @@
             android:id="@+id/surfaceView"/>
 
     <TextView
-            android:text="TextView"
+            android:text="@string/textview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/textViewPiece"
             tools:layout_editor_absoluteX="176dp"
             app:layout_constraintTop_toBottomOf="@+id/imageViewMur"
-            app:layout_constraintBottom_toBottomOf="parent"/>
+            app:layout_constraintBottom_toBottomOf="parent"
+            tools:ignore="MissingConstraints"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">MyHabitat</string>
+    <string name="title_activity_scrolling">ScrollingActivity</string>
+    <string name="large_text">large_text</string>
+    <string name="action_settings">Settings</string>
+    <string name="direction">Direction</string>
+    <string name="piecededepart">Starting Room</string>
+    <string name="piecedarrivee">Ending Room</string>
+    <string name="selectionner">Select</string>
+    <string name="confirmer">Submit</string>
+    <string name="modeconception">Design Mode</string>
+    <string name="modeimmersion">Immersive Mode</string>
+    <string name="ajouteruneouverture">Add an opening</string>
+    <string name="ajouterunepiece">Add a room</string>
+</resources>
\ No newline at end of file

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

@@ -91,4 +91,14 @@
         "when a user tries to pick up one of cards.\n\n"
     </string>
     <string name="action_settings">Settings</string>
+    <string name="direction">Direction</string>
+    <string name="piecededepart">Piece De Depart</string>
+    <string name="piecedarrivee">Piece d\'Arrivee</string>
+    <string name="selectionner">Selectionner</string>
+    <string name="confirmer">Confirmer</string>
+    <string name="modeconception">Mode Conception</string>
+    <string name="modeimmersion">Mode Immersion</string>
+    <string name="ajouteruneouverture">Ajouter une ouverture</string>
+    <string name="ajouterunepiece">Ajouter une piece</string>
+    <string name="textview">TextView</string>
 </resources>
\ No newline at end of file