diff --git a/test_sae_contenue_juste_le_main/src/main/assets/puzzles/puzzle10.xml b/test_sae_contenue_juste_le_main/src/main/assets/puzzles/puzzle10.xml index ba1f181..b1e0791 100644 --- a/test_sae_contenue_juste_le_main/src/main/assets/puzzles/puzzle10.xml +++ b/test_sae_contenue_juste_le_main/src/main/assets/puzzles/puzzle10.xml @@ -1,57 +1,58 @@ - - - + + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + + + + + + + + + + + + + \ No newline at end of file diff --git a/test_sae_contenue_juste_le_main/src/main/assets/puzzles/puzzle12.xml b/test_sae_contenue_juste_le_main/src/main/assets/puzzles/puzzle12.xml index 6c756c0..4a10d37 100644 --- a/test_sae_contenue_juste_le_main/src/main/assets/puzzles/puzzle12.xml +++ b/test_sae_contenue_juste_le_main/src/main/assets/puzzles/puzzle12.xml @@ -1,47 +1,63 @@ - - - + + + + - + + - + - - - + + + + - - - + + + + - - - + + + + - - - + + + + - - - + + + + - - - + + + + - - - + + + + - - - + + + + - - - + + + + + + + + + diff --git a/test_sae_contenue_juste_le_main/src/main/assets/puzzles/puzzle13.xml b/test_sae_contenue_juste_le_main/src/main/assets/puzzles/puzzle13.xml index fcf53b9..3af9804 100644 --- a/test_sae_contenue_juste_le_main/src/main/assets/puzzles/puzzle13.xml +++ b/test_sae_contenue_juste_le_main/src/main/assets/puzzles/puzzle13.xml @@ -1,50 +1,67 @@ - - - + + + + - - - + + + + - - - - - + + - + - - - + + + + - - - + + + + - - - + + + + - - + + + + + + + + + + + + + + + + + + - - - - - - + + + - - - + + + + - - - + + + + \ No newline at end of file diff --git a/test_sae_contenue_juste_le_main/src/main/java/com/example/flow_free/FlowFreeView.java b/test_sae_contenue_juste_le_main/src/main/java/com/example/flow_free/FlowFreeView.java index ab25e05..132ec9d 100644 --- a/test_sae_contenue_juste_le_main/src/main/java/com/example/flow_free/FlowFreeView.java +++ b/test_sae_contenue_juste_le_main/src/main/java/com/example/flow_free/FlowFreeView.java @@ -280,6 +280,11 @@ private void printBoardToLog() { board[row][col] = -selectedColor; // ✅ Remplit avec l’id du point de départ path.add(new int[]{row, col}); // 🔁 On suit le chemin mais un seul id invalidate(); // 🖌️ Redessine la vue + + + + + } } diff --git a/test_sae_contenue_juste_le_main/src/main/java/com/example/flow_free/MainActivity.java b/test_sae_contenue_juste_le_main/src/main/java/com/example/flow_free/MainActivity.java index fadef6b..22b6d30 100644 --- a/test_sae_contenue_juste_le_main/src/main/java/com/example/flow_free/MainActivity.java +++ b/test_sae_contenue_juste_le_main/src/main/java/com/example/flow_free/MainActivity.java @@ -58,9 +58,9 @@ public class MainActivity extends Activity { }); // Bouton paramètres - settingsButton.setOnClickListener(v -> { - Intent intent = new Intent(MainActivity.this, SettingsActivity.class); - startActivity(intent); - }); + settingsButton.setOnClickListener(new listener(this,SettingsActivity.class)); + + + } } diff --git a/test_sae_contenue_juste_le_main/src/main/java/com/example/flow_free/MenuActivity.java b/test_sae_contenue_juste_le_main/src/main/java/com/example/flow_free/MenuActivity.java index e68d396..1250215 100644 --- a/test_sae_contenue_juste_le_main/src/main/java/com/example/flow_free/MenuActivity.java +++ b/test_sae_contenue_juste_le_main/src/main/java/com/example/flow_free/MenuActivity.java @@ -9,15 +9,17 @@ import android.widget.Button; public class MenuActivity extends Activity { private Button Bjouer; + private listener view; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_menu); Bjouer = findViewById(R.id.Bjouer); - Bjouer.setOnClickListener(view -> { - Intent intent = new Intent(MenuActivity.this, MainActivity.class); - startActivity(intent); - }); + Bjouer.setOnClickListener(new listener(this,MainActivity.class)); + + + + } diff --git a/test_sae_contenue_juste_le_main/src/main/java/com/example/flow_free/RulesActivity.java b/test_sae_contenue_juste_le_main/src/main/java/com/example/flow_free/RulesActivity.java new file mode 100644 index 0000000..309b3cc --- /dev/null +++ b/test_sae_contenue_juste_le_main/src/main/java/com/example/flow_free/RulesActivity.java @@ -0,0 +1,4 @@ +package com.example.flow_free; + +public class RulesActivity { +} diff --git a/test_sae_contenue_juste_le_main/src/main/java/com/example/flow_free/listener.java b/test_sae_contenue_juste_le_main/src/main/java/com/example/flow_free/listener.java new file mode 100644 index 0000000..1bcc63b --- /dev/null +++ b/test_sae_contenue_juste_le_main/src/main/java/com/example/flow_free/listener.java @@ -0,0 +1,22 @@ +package com.example.flow_free; + +import android.content.Context; +import android.content.Intent; +import android.view.View; + +public class listener implements View.OnClickListener { + + private final Context context; + private final Class targetActivity; + + public listener(Context context, Class targetActivity) { + this.context = context; + this.targetActivity = targetActivity; + } + + @Override + public void onClick(View v) { + Intent intent = new Intent(context, targetActivity); + context.startActivity(intent); + } +} \ No newline at end of file