diff --git a/.idea/misc.xml b/.idea/misc.xml index 598e1ad960188a39a12ff68f5e7f65f1096f4298..27ac2e83b8cd1111eb41e4a6ba539a69bdc954fd 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 c380773c1be52650635f8be0d5545c23ab59acbb..8ca2d9d8c2d78a1a30df60a252406f576d614936 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 85ca98f984c5b612b4d808aad62f7c6715bb9044..084dd9507fe5840543568d6b6a0fdb6275bfc32d 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 49ebc8a6e14b151a60056b9d594fe2972df81c31..e0db0ed28ec461fad34bfa7625f9c2d24bb6e16e 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