Skip to content
Snippets Groups Projects
Commit 164acb73 authored by SCHILLING Juliette's avatar SCHILLING Juliette
Browse files

ajout gif

parent dce46b4d
Branches
No related tags found
No related merge requests found
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<map> <map>
<entry key="app/src/main/res/layout/activity_boussole.xml" value="0.3098958333333333" /> <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_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_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_mode_immersion.xml" value="0.3333333333333333" />
<entry key="app/src/main/res/layout/activity_pieces.xml" value="0.19464720194647203" /> <entry key="app/src/main/res/layout/activity_pieces.xml" value="0.19464720194647203" />
...@@ -14,6 +14,9 @@ ...@@ -14,6 +14,9 @@
</map> </map>
</option> </option>
</component> </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"> <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" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
......
...@@ -35,7 +35,10 @@ dependencies { ...@@ -35,7 +35,10 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.5.1' implementation 'androidx.appcompat:appcompat:1.5.1'
implementation 'com.google.android.material:material:1.7.0' implementation 'com.google.android.material:material:1.7.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.25'
testImplementation 'junit:junit:4.13.2' testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' 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
...@@ -33,11 +33,11 @@ public class MainActivity extends AppCompatActivity { ...@@ -33,11 +33,11 @@ public class MainActivity extends AppCompatActivity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main); setContentView(R.layout.activity_main);
textView = findViewById(R.id.textTest); //textView = findViewById(R.id.textTest);
ouvrirJSON(); ouvrirJSON();
textView.setText(habitat.toString()); //textView.setText(habitat.toString());
Button b = findViewById(R.id.buttonImmersion); Button b = findViewById(R.id.buttonImmersion);
if(habitat.getPieces().size() == 0) { if(habitat.getPieces().size() == 0) {
...@@ -106,7 +106,7 @@ public class MainActivity extends AppCompatActivity { ...@@ -106,7 +106,7 @@ public class MainActivity extends AppCompatActivity {
}else{ }else{
Log.i("testJSON", "pbm ouverture"); Log.i("testJSON", "pbm ouverture");
} }
textView.setText(habitat.toString()); //textView.setText(habitat.toString());
} }
/** /**
......
...@@ -24,10 +24,10 @@ import java.util.ArrayList; ...@@ -24,10 +24,10 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
public class ModeImmersionActivity extends AppCompatActivity implements SensorEventListener { public class ModeImmersionActivity extends AppCompatActivity implements SensorEventListener {
Habitat habitat; private Habitat habitat;
Mur murEnCours; private Mur murEnCours;
Piece pieceEnCours; private Piece pieceEnCours;
TextView textViewPiece; private TextView textViewPiece;
private SensorManager sensorManager; private SensorManager sensorManager;
private ImageView imageViewBoussole; private ImageView imageViewBoussole;
private float debut = 0; private float debut = 0;
......
package habitat; package habitat;
import android.graphics.Rect;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
import outils.FabriqueId;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Objects; import java.util.Objects;
public class Habitat implements Parcelable { public class Habitat implements Parcelable {
......
app/src/main/res/drawable/diagrammedeclasse.png

293 KiB

...@@ -16,17 +16,9 @@ ...@@ -16,17 +16,9 @@
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="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_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.476"
app:layout_constraintBottom_toTopOf="@+id/buttonConception" app:layout_constraintVertical_bias="0.131"/>
app:layout_constraintTop_toTopOf="parent"/>
<Button <Button
android:text="@string/modeimmersion" android:text="@string/modeimmersion"
...@@ -40,4 +32,15 @@ ...@@ -40,4 +32,15 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintHorizontal_bias="0.498" app:layout_constraintHorizontal_bias="0.498"
app:layout_constraintVertical_bias="0.156"/> 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> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
...@@ -4,6 +4,9 @@ plugins { ...@@ -4,6 +4,9 @@ plugins {
id 'com.android.library' version '7.2.0' apply false id 'com.android.library' version '7.2.0' apply false
} }
task clean(type: Delete) { task clean(type: Delete) {
delete rootProject.buildDir delete rootProject.buildDir
} }
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment