From a81eb0c66ab8faf681aaf6ac4c8ffd12a1f8b24a Mon Sep 17 00:00:00 2001
From: JulietteSCHILLING <juliette.schilling2@etu.univ-lorraine.fr>
Date: Sun, 6 Nov 2022 15:23:52 +0100
Subject: [PATCH] activation mode immersion ok
---
.idea/misc.xml | 1 +
app/src/main/AndroidManifest.xml | 42 +++++++++----------
.../com/example/myhabitat/MainActivity.java | 16 +++++++
.../myhabitat/ModeImmersionActivity.java | 20 +++++++++
4 files changed, 58 insertions(+), 21 deletions(-)
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 598e1ad..27ac2e8 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,6 +3,7 @@
<component name="DesignSurface">
<option name="filePathToZoomLevelMap">
<map>
+ <entry key="app/src/main/res/layout/activity_boussole.xml" value="0.3098958333333333" />
<entry key="app/src/main/res/layout/activity_main.xml" value="0.15104166666666666" />
<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" />
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c380773..8ca2d9d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,35 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="com.example.myhabitat" >
+ xmlns:tools="http://schemas.android.com/tools"
+ package="com.example.myhabitat">
<uses-feature
- android:name="android.hardware.camera"
- android:required="true" />
+ android:name="android.hardware.camera"
+ android:required="true"/>
<application
- android:allowBackup="true"
- android:dataExtractionRules="@xml/data_extraction_rules"
- android:fullBackupContent="@xml/backup_rules"
- android:icon="@mipmap/ic_launcher"
- android:label="@string/app_name"
- android:roundIcon="@mipmap/ic_launcher_round"
- android:supportsRtl="true"
- android:theme="@style/Theme.MyHabitat"
- tools:targetApi="31" >
+ android:allowBackup="true"
+ android:dataExtractionRules="@xml/data_extraction_rules"
+ android:fullBackupContent="@xml/backup_rules"
+ android:icon="@mipmap/ic_launcher"
+ android:label="@string/app_name"
+ android:roundIcon="@mipmap/ic_launcher_round"
+ android:supportsRtl="true"
+ android:theme="@style/Theme.MyHabitat"
+ tools:targetApi="31">
<activity
- android:name=".ModeConceptionActivity"
- android:exported="false" />
+ android:name=".ModeConceptionActivity"
+ android:exported="false"/>
<activity
- android:name=".ModeImmersionActivity"
- android:exported="false" />
+ android:name=".ModeImmersionActivity"
+ android:exported="false"/>
<activity
- android:name=".MainActivity"
- android:exported="true" >
+ android:name=".MainActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
+ <action android:name="android.intent.action.MAIN"/>
- <category android:name="android.intent.category.LAUNCHER" />
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
diff --git a/app/src/main/java/com/example/myhabitat/MainActivity.java b/app/src/main/java/com/example/myhabitat/MainActivity.java
index 85ca98f..084dd95 100644
--- a/app/src/main/java/com/example/myhabitat/MainActivity.java
+++ b/app/src/main/java/com/example/myhabitat/MainActivity.java
@@ -3,6 +3,7 @@ package com.example.myhabitat;
import android.content.Intent;
import android.util.Log;
import android.view.View;
+import android.widget.Button;
import android.widget.TextView;
import androidx.activity.result.ActivityResult;
import androidx.activity.result.ActivityResultCallback;
@@ -55,12 +56,21 @@ public class MainActivity extends AppCompatActivity {
*/
+
+
textView = findViewById(R.id.textTest);
ouvrirJSON();
textView.setText(habitat.toString());
+ Button b = findViewById(R.id.buttonImmersion);
+ if(habitat.getPieces().size() == 0) {
+ b.setEnabled(false);
+ }else{
+ b.setEnabled(true);
+ }
+
}
public void conception(View view) {
@@ -141,6 +151,12 @@ public class MainActivity extends AppCompatActivity {
@Override
protected void onPostResume() {
ouvrirJSON();
+ Button b = findViewById(R.id.buttonImmersion);
+ if(habitat.getPieces().size() == 0) {
+ b.setEnabled(false);
+ }else{
+ b.setEnabled(true);
+ }
super.onPostResume();
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/myhabitat/ModeImmersionActivity.java b/app/src/main/java/com/example/myhabitat/ModeImmersionActivity.java
index 49ebc8a..e0db0ed 100644
--- a/app/src/main/java/com/example/myhabitat/ModeImmersionActivity.java
+++ b/app/src/main/java/com/example/myhabitat/ModeImmersionActivity.java
@@ -121,6 +121,26 @@ public class ModeImmersionActivity extends AppCompatActivity implements SensorEv
}
}
+ public void afficheSud(View view){
+ murEnCours = pieceEnCours.getMurOrientation(Orientation.SUD);
+ afficheMur();
+ }
+
+ public void afficheNord(View view){
+ murEnCours = pieceEnCours.getMurOrientation(Orientation.NORD);
+ afficheMur();
+ }
+
+ public void afficheEst(View view){
+ murEnCours = pieceEnCours.getMurOrientation(Orientation.EST);
+ afficheMur();
+ }
+
+ public void afficheOuest(View view){
+ murEnCours = pieceEnCours.getMurOrientation(Orientation.OUEST);
+ afficheMur();
+ }
+
@Override
public void onSensorChanged(SensorEvent event) {
// On récupère l'angle
--
GitLab