diff --git a/.idea/misc.xml b/.idea/misc.xml
index 24dd4c6f7d1926f115a8a770e13defd6cbc796cd..0ce607ed14b68f30b948cc1bd1f935ae41a953d8 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,7 +5,7 @@
<map>
<entry key="app/src/main/res/layout/activity_boussole.xml" value="0.3098958333333333" />
<entry key="app/src/main/res/layout/activity_creation_ouverture.xml" value="0.35625" />
- <entry key="app/src/main/res/layout/activity_main.xml" value="0.15104166666666666" />
+ <entry key="app/src/main/res/layout/activity_main.xml" value="0.33" />
<entry key="app/src/main/res/layout/activity_mode_conception.xml" value="0.32864583333333336" />
<entry key="app/src/main/res/layout/activity_mode_immersion.xml" value="0.3333333333333333" />
<entry key="app/src/main/res/layout/activity_pieces.xml" value="0.19464720194647203" />
@@ -14,6 +14,9 @@
</map>
</option>
</component>
+ <component name="JavadocGenerationManager">
+ <option name="OUTPUT_DIRECTORY" value="$PROJECT_DIR$/../../.." />
+ </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="corretto-11" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
diff --git a/app/build.gradle b/app/build.gradle
index 0ca0e70c2a1011443bc5b03b2d008a98b68aa25c..733bcac051d44a8c9fdc5b640e234585e3c5109c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -35,7 +35,10 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.5.1'
implementation 'com.google.android.material:material:1.7.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+ implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.25'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+ implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.19'
+
}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/myhabitat/MainActivity.java b/app/src/main/java/com/example/myhabitat/MainActivity.java
index 829de1181f7ef0c546076ef94fdfb0dce3f2fc43..e8677e85eb5cf732d8bae40d0a2fda63aa1eb4b7 100644
--- a/app/src/main/java/com/example/myhabitat/MainActivity.java
+++ b/app/src/main/java/com/example/myhabitat/MainActivity.java
@@ -33,11 +33,11 @@ public class MainActivity extends AppCompatActivity {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
- textView = findViewById(R.id.textTest);
+ //textView = findViewById(R.id.textTest);
ouvrirJSON();
- textView.setText(habitat.toString());
+ //textView.setText(habitat.toString());
Button b = findViewById(R.id.buttonImmersion);
if(habitat.getPieces().size() == 0) {
@@ -106,7 +106,7 @@ public class MainActivity extends AppCompatActivity {
}else{
Log.i("testJSON", "pbm ouverture");
}
- textView.setText(habitat.toString());
+ //textView.setText(habitat.toString());
}
/**
diff --git a/app/src/main/java/com/example/myhabitat/ModeImmersionActivity.java b/app/src/main/java/com/example/myhabitat/ModeImmersionActivity.java
index e0ccdc0a7bbe2fb92ce3442b5fbe095bed648033..997198d2e9212cbea92528d2678d56ecb4e70e16 100644
--- a/app/src/main/java/com/example/myhabitat/ModeImmersionActivity.java
+++ b/app/src/main/java/com/example/myhabitat/ModeImmersionActivity.java
@@ -24,10 +24,10 @@ import java.util.ArrayList;
import java.util.HashMap;
public class ModeImmersionActivity extends AppCompatActivity implements SensorEventListener {
- Habitat habitat;
- Mur murEnCours;
- Piece pieceEnCours;
- TextView textViewPiece;
+ private Habitat habitat;
+ private Mur murEnCours;
+ private Piece pieceEnCours;
+ private TextView textViewPiece;
private SensorManager sensorManager;
private ImageView imageViewBoussole;
private float debut = 0;
diff --git a/app/src/main/java/habitat/Habitat.java b/app/src/main/java/habitat/Habitat.java
index b8650554b357efff251f22a2e08d44f971549044..70d7f1f7024d1520b384053de256aa0d78897e04 100644
--- a/app/src/main/java/habitat/Habitat.java
+++ b/app/src/main/java/habitat/Habitat.java
@@ -1,15 +1,11 @@
package habitat;
-import android.graphics.Rect;
import android.os.Parcel;
import android.os.Parcelable;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
-import outils.FabriqueId;
-
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Objects;
public class Habitat implements Parcelable {
diff --git a/app/src/main/res/drawable/diagrammedeclasse.png b/app/src/main/res/drawable/diagrammedeclasse.png
new file mode 100644
index 0000000000000000000000000000000000000000..65dcafe2421132b033e4ff0cfeb8080c9cb07de8
Binary files /dev/null and b/app/src/main/res/drawable/diagrammedeclasse.png differ
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 2c5d01f914151336c45a9420859e11f1fd9779c1..606631dae344bf4fe8424dc8ce08f2a29e8a7ffc 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -16,17 +16,9 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"/>
-
- <TextView
- android:text="TextView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:id="@+id/textTest"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintBottom_toTopOf="@+id/buttonConception"
- app:layout_constraintTop_toTopOf="parent"/>
+ app:layout_constraintHorizontal_bias="0.476"
+ app:layout_constraintVertical_bias="0.131"/>
<Button
android:text="@string/modeimmersion"
@@ -40,4 +32,15 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintHorizontal_bias="0.498"
app:layout_constraintVertical_bias="0.156"/>
+
+ <pl.droidsonroids.gif.GifImageView
+ android:layout_width="373dp"
+ android:layout_height="394dp"
+ android:src="@drawable/cube"
+ app:layout_constraintBottom_toBottomOf="parent"
+ tools:ignore="MissingConstraints"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/buttonImmersion"/>
+
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 4e04c6928e68df92c44320562ce60c6a169733c3..7208e44819d851b8da8a1a4ce437a6f239f3421b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,6 +4,9 @@ plugins {
id 'com.android.library' version '7.2.0' apply false
}
+
+
+
task clean(type: Delete) {
delete rootProject.buildDir
}
\ No newline at end of file