This commit is contained in:
Bilou 2023-03-31 15:46:35 +02:00
parent 06a93d373f
commit 64cfead736
523 changed files with 1748 additions and 47268 deletions

BIN
app.zip

Binary file not shown.

1
app/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/build

View File

@ -3,11 +3,11 @@ plugins {
} }
android { android {
namespace 'com.example.tamere' namespace 'com.example.jmastermind'
compileSdk 33 compileSdk 33
defaultConfig { defaultConfig {
applicationId "com.example.tamere" applicationId "com.example.jmastermind"
minSdk 19 minSdk 19
targetSdk 33 targetSdk 33
versionCode 1 versionCode 1
@ -26,7 +26,7 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8
} }
buildToolsVersion '33.0.1' buildToolsVersion '33.0.0'
} }
dependencies { dependencies {

View File

@ -1,4 +1,4 @@
package com.example.tamere; package com.example.jmastermind;
import android.content.Context; import android.content.Context;
@ -21,6 +21,6 @@ public class ExampleInstrumentedTest {
public void useAppContext() { public void useAppContext() {
// Context of the app under test. // Context of the app under test.
Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
assertEquals("com.example.tamere", appContext.getPackageName()); assertEquals("com.example.jmastermind", appContext.getPackageName());
} }
} }

View File

@ -1,30 +1,30 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"> xmlns:tools="http://schemas.android.com/tools">
<application <application
android:allowBackup="true" android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules" android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules" android:fullBackupContent="@xml/backup_rules"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/Theme.Tamere" android:theme="@style/Theme.JMastermind"
tools:targetApi="31"> tools:targetApi="31">
<activity
<activity android:name=".MainActivity"
android:name=".MainActivity" android:exported="true">
android:exported="true"> <intent-filter>
<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>
</intent-filter> </activity>
</activity>
<activity
<activity android:name=".Game.SoloGame"
android:name=".GameRobot" android:exported="true">
android:exported="true"> </activity>
</activity> </application>
</application>
</manifest> </manifest>

View File

@ -0,0 +1,10 @@
package com.example.jmastermind.Deck;
import android.graphics.Color;
import java.util.List;
public interface Deck {
public abstract List<Integer> getDeck();
public abstract String displayComb();
}

View File

@ -0,0 +1,100 @@
package com.example.jmastermind.Deck;
import android.graphics.Color;
import java.util.LinkedList;
import java.util.List;
import java.util.Objects;
public class DeckCheck implements Deck {
private List<Integer> deck;
private Deck lambda;
private Deck winner;
public DeckCheck(Deck lambda, Deck winner) {
this.deck = new LinkedList<>();
this.lambda = lambda;
this.winner = winner;
}
public Deck doCheck() {
this.deck = new LinkedList<>();
List<Integer> winner = this.winner.getDeck();
List<Integer> lambda = this.lambda.getDeck();
for(int i = 0; i <= winner.size()-1; i++) {
Integer win = winner.get(i);
Integer lam = lambda.get(i);
if(Objects.equals(win, lam)) {
this.deck.add(Color.BLACK);
} else {
if(winner.contains(lam)) {
this.deck.add(Color.WHITE);
} else {
this.deck.add(Color.GRAY);
}
}
}
Deck check = new DeckLambda(
this.deck.get(0),
this.deck.get(1),
this.deck.get(2),
this.deck.get(3)
);
return check;
}
@Override
public List<Integer> getDeck() {
return this.deck;
}
@Override
public String displayComb() {
StringBuilder sb = new StringBuilder();
for(int i = 0; i <= this.deck.size()-1; i++) {
switch(this.deck.get(i)) {
case Color.BLACK: {
sb.append("Noir").append(", ");
break;
}
case Color.WHITE: {
sb.append("Blanc").append(", ");
break;
}
case Color.GRAY: {
sb.append("Gris").append(", ");
break;
}
case Color.GREEN: {
sb.append("Vert").append(", ");
break;
}
case Color.RED: {
sb.append("Rouge").append(", ");
break;
}
case Color.YELLOW: {
sb.append("Jaune").append(", ");
break;
}
case Color.BLUE: {
sb.append("Bleu").append(", ");
break;
}
}
}
return sb.toString();
}
}

View File

@ -0,0 +1,68 @@
package com.example.jmastermind.Deck;
import android.graphics.Color;
import java.util.LinkedList;
import java.util.List;
public class DeckLambda implements Deck{
List<Integer> deck;
public DeckLambda(Integer c1, Integer c2, Integer c3, Integer c4) {
this.deck = new LinkedList<>();
this.deck.add(c1);
this.deck.add(c2);
this.deck.add(c3);
this.deck.add(c4);
}
@Override
public List<Integer> getDeck() {
return this.deck;
}
@Override
public String displayComb() {
StringBuilder sb = new StringBuilder();
for(int i = 0; i <= this.deck.size()-1; i++) {
switch(this.deck.get(i)) {
case Color.BLACK: {
sb.append("Noir").append(", ");
break;
}
case Color.WHITE: {
sb.append("Blanc").append(", ");
break;
}
case Color.GREEN: {
sb.append("Vert").append(", ");
break;
}
case Color.RED: {
sb.append("Rouge").append(", ");
break;
}
case Color.YELLOW: {
sb.append("Jaune").append(", ");
break;
}
case Color.BLUE: {
sb.append("Bleu").append(", ");
break;
}
case Color.GRAY: {
sb.append("Gris").append(", ");
break;
}
}
}
return sb.toString();
}
}

View File

@ -0,0 +1,69 @@
package com.example.jmastermind.Deck;
import android.graphics.Color;
import java.util.LinkedList;
import java.util.List;
public class DeckWinner implements Deck{
List<Integer> deck;
public DeckWinner(Integer c1, Integer c2, Integer c3, Integer c4) {
this.deck = new LinkedList<>();
this.deck.add(c1);
this.deck.add(c2);
this.deck.add(c3);
this.deck.add(c4);
}
@Override
public List<Integer> getDeck() {
return this.deck;
}
@Override
public String displayComb() {
StringBuilder sb = new StringBuilder();
for(int i = 0; i <= this.deck.size()-1; i++) {
switch(this.deck.get(i)) {
case Color.BLACK: {
sb.append("Noir").append(", ");
break;
}
case Color.WHITE: {
sb.append("Blanc").append(", ");
break;
}
case Color.GREEN: {
sb.append("Vert").append(", ");
break;
}
case Color.RED: {
sb.append("Rouge").append(", ");
break;
}
case Color.YELLOW: {
sb.append("Jaune").append(", ");
break;
}
case Color.BLUE: {
sb.append("Bleu").append(", ");
break;
}
case Color.GRAY: {
sb.append("Gris").append(", ");
break;
}
}
}
return sb.toString();
}
}

View File

@ -0,0 +1,162 @@
package com.example.jmastermind.Events;
import android.graphics.Color;
import android.view.View;
import android.widget.TextView;
import androidx.appcompat.app.AppCompatActivity;
import com.example.jmastermind.Deck.Deck;
import com.example.jmastermind.Deck.DeckCheck;
import com.example.jmastermind.Deck.DeckLambda;
import com.example.jmastermind.Game.Popup;
import com.example.jmastermind.Geometrics.Circle;
import com.example.jmastermind.R;
import org.w3c.dom.Text;
import java.util.LinkedList;
import java.util.List;
public class ColorSelectorEvent extends View implements View.OnClickListener {
private AppCompatActivity context;
/**
* [0] = x
* [1] = y
* */
private int[] coords;
private Deck winner;
private int tentative;
public ColorSelectorEvent(AppCompatActivity context, Deck winner) {
super(context);
this.context = context;
this.winner = winner;
this.coords = new int[]{1, 1};
this.tentative = 10;
}
@Override
public void onClick(View view) {
int idOfClickedColor = view.getId();
Circle circleClicked = (Circle) this.context.findViewById(idOfClickedColor);
int colorChoosed = circleClicked.getColor();
int id = this.context.getResources()
.getIdentifier("normalCircle" + this.coords[0] + this.coords[1], "id", this.context.getPackageName());
Circle c = this.context.findViewById(id);
switch(colorChoosed) {
case Color.RED: {
c.setColor(Color.RED);
break;
}
case Color.GREEN: {
c.setColor(Color.GREEN);
break;
}
case Color.BLUE: {
c.setColor(Color.BLUE);
break;
}
case Color.YELLOW: {
c.setColor(Color.YELLOW);
break;
}
case Color.BLACK: {
c.setColor(Color.BLACK);
break;
}
case Color.WHITE: {
c.setColor(Color.WHITE);
break;
}
case Color.GRAY: {
c.setColor(Color.GRAY);
break;
}
default: {
break;
}
}
if(this.coords[1] < 4) {
this.coords[1]++;
}
}
public void goNext() {
List<Integer> listOfColors = new LinkedList<>();
for(int i = 1; i <= 4; i++) {
int id = this.context.getResources()
.getIdentifier("normalCircle" + this.coords[0] + i, "id", this.context.getPackageName());
Circle c = this.context.findViewById(id);
listOfColors.add(c.getColor());
}
Deck lambda = new DeckLambda(
listOfColors.get(0),
listOfColors.get(1),
listOfColors.get(2),
listOfColors.get(3)
);
DeckCheck checker = new DeckCheck(lambda, this.winner);
Deck checkerPions = checker.doCheck();
List<Integer> checkColors = checkerPions.getDeck();
int countOfBlack = 0;
for(int i = 1; i <= 4; i++) {
int id = this.context.getResources()
.getIdentifier("checkCircle" + this.coords[0] + i, "id", this.context.getPackageName());
Circle c = this.context.findViewById(id);
c.setColor(checkColors.get(i-1));
if(checkColors.get(i-1) == Color.BLACK) {
countOfBlack++;
}
}
if(countOfBlack == 4) {
String[] opts = new String[] {
"Rejouer",
"Voir votre jeu",
"Retourner au menu"
};
Popup popup = new Popup(this.context, opts, true, (10 - this.tentative + 1));
popup.show();
}
this.tentative--;
TextView tx = (TextView) this.context.findViewById(R.id.counter);
tx.setText("Tentative rest. \n" + this.tentative);
tx.invalidate();
this.coords[1] = 1;
this.coords[0]++;
}
public void resetCombi() {
for(int i = 1; i <= this.coords[1]; i++) {
int id = this.context.getResources()
.getIdentifier("normalCircle" + this.coords[0] + i, "id", this.context.getPackageName());
Circle c = this.context.findViewById(id);
c.setColor(Color.GRAY);
}
this.coords[1] = 1;
}
}

View File

@ -0,0 +1,33 @@
package com.example.jmastermind.Events;
import android.content.Context;
import android.view.View;
import android.widget.Button;
import androidx.appcompat.app.AppCompatActivity;
import com.example.jmastermind.Game.Controller;
public class ControlEvent extends View implements View.OnClickListener {
private final AppCompatActivity context;
private Controller controller;
public ControlEvent(AppCompatActivity context, Controller controller) {
super(context);
this.context = context;
this.controller = controller;
}
@Override
public void onClick(View view) {
int idOfButton = view.getId();
Button btnClicked = (Button) this.context.findViewById(idOfButton);
CharSequence text = btnClicked.getText();
if ("Valider".equals(text)) {
this.controller.viewValidate();
} else if ("Effacer".equals(text)) {
this.controller.viewReset();
}
}
}

View File

@ -1,20 +1,21 @@
package com.example.tamere.Events; package com.example.jmastermind.Events;
import android.content.Intent; import android.content.Intent;
import android.view.View; import android.view.View;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import com.example.tamere.GameRobot;
public class MenuEvent implements View.OnClickListener { public class MenuEvent implements View.OnClickListener {
private Class option;
private AppCompatActivity ac; private AppCompatActivity ac;
public MenuEvent(AppCompatActivity ac) { public MenuEvent(AppCompatActivity ac, Class option) {
this.ac = ac; this.ac = ac;
this.option = option;
} }
@Override @Override
public void onClick(View view) { public void onClick(View view) {
Intent i = new Intent(this.ac, GameRobot.class); Intent i = new Intent(this.ac, this.option);
this.ac.startActivity(i); this.ac.startActivity(i);
} }
} }

View File

@ -0,0 +1,40 @@
package com.example.jmastermind.Events;
import android.content.DialogInterface;
import android.content.Intent;
import androidx.appcompat.app.AppCompatActivity;
import com.example.jmastermind.Game.Popup;
import com.example.jmastermind.Game.SoloGame;
import com.example.jmastermind.MainActivity;
public class PopupEvent implements DialogInterface.OnClickListener {
private AppCompatActivity context;
public PopupEvent(AppCompatActivity context) {
this.context = context;
}
@Override
public void onClick(DialogInterface dialogInterface, int i) {
switch(i) {
case 0: {
Intent a = new Intent(this.context, SoloGame.class);
this.context.startActivity(a);
break;
}
case 1: {
dialogInterface.cancel();
break;
}
case 2: {
Intent c = new Intent(this.context, MainActivity.class);
this.context.startActivity(c);
break;
}
}
}
}

View File

@ -0,0 +1,52 @@
package com.example.jmastermind.Game;
import android.graphics.Color;
import androidx.appcompat.app.AppCompatActivity;
import com.example.jmastermind.Deck.Deck;
import com.example.jmastermind.Deck.DeckWinner;
import com.example.jmastermind.Events.ColorSelectorEvent;
import com.example.jmastermind.Events.ControlEvent;
import java.util.Random;
public class Controller {
private Vuew vuew;
private Model model;
private AppCompatActivity context;
private ColorSelectorEvent event;
private ControlEvent controlEvent;
public Controller(AppCompatActivity context, int mode) {
this.context = context;
this.controlEvent = new ControlEvent(this.context, this);
this.model = new Model(this.context);
this.model.init();
if(mode == 0) {
this.model.genWinner();
Deck winner = this.model.getWinner();
System.out.println(winner.displayComb());
this.event = new ColorSelectorEvent(this.context, winner);
}
this.vuew = new Vuew(
this.context,
this.model.getListOfNormalCircle(),
this.model.getListOfCheckCircle(),
this.event,
this.controlEvent
);
this.vuew.init();
}
public void viewValidate() {
this.event.goNext();
}
public void viewReset() {
this.event.resetCombi();
}
}

View File

@ -0,0 +1,116 @@
package com.example.jmastermind.Game;
import android.graphics.Color;
import android.view.View;
import androidx.appcompat.app.AppCompatActivity;
import com.example.jmastermind.Deck.DeckWinner;
import com.example.jmastermind.Geometrics.Circle;
import java.util.LinkedList;
import java.util.List;
import java.util.Random;
public class Model extends View {
private List<Circle> listOfNormalCircle;
private List<Circle> listOfCheckCircle;
private DeckWinner winner;
private AppCompatActivity context;
public Model(AppCompatActivity context) {
super(context);
this.context = context;
this.listOfNormalCircle = new LinkedList<>();
this.listOfCheckCircle = new LinkedList<>();
this.winner = null;
}
public void genWinner() {
Integer[] color = new Integer[]{0, 0, 0, 0};
for(int i = 0; i <= 3; i++) {
Random rand = new Random();
int ran = rand.nextInt(6) + 1;
switch(ran) {
case 1: {
color[i] = Color.RED;
break;
}
case 2: {
color[i] = Color.YELLOW;
break;
}
case 3: {
color[i] = Color.BLUE;
break;
}
case 4: {
color[i] = Color.GREEN;
break;
}
case 5: {
color[i] = Color.WHITE;
break;
}
case 6: {
color[i] = Color.BLACK;
break;
}
case 7: {
color[i] = Color.GRAY;
break;
}
default: {
break;
}
}
}
this.winner = new DeckWinner(color[1], color[0], color[2], color[3]);
}
public DeckWinner getWinner() {
return this.winner;
}
public Boolean init() {
try {
for(int i = 1; i <= 10; i++) {
for(int j = 1; j <= 4; j++) {
int normalId = this.context.getResources().
getIdentifier("normalCircle" + i + j, "id", this.context.getPackageName());
Circle normal = this.context.findViewById(normalId);
int checkId = this.context.getResources()
.getIdentifier("checkCircle" + i + j, "id", this.context.getPackageName());
Circle check = this.context.findViewById(checkId);
this.listOfNormalCircle.add(normal);
this.listOfCheckCircle.add(check);
}
}
return true;
} catch(ArrayIndexOutOfBoundsException e) {
System.out.println("[!] Probleme lors de l'initiliation du model (ArrayIndexOutOfBoundsException).");
return false;
} catch(NullPointerException e) {
System.out.println("[!] Probleme lors de l'initiliation du model (NullPointerException).");
return false;
}
}
public List<Circle> getListOfNormalCircle() {
return this.listOfNormalCircle;
}
public List<Circle> getListOfCheckCircle() {
return this.listOfCheckCircle;
}
}

View File

@ -0,0 +1,4 @@
package com.example.jmastermind.Game;
public class MultiGame {
}

View File

@ -0,0 +1,23 @@
package com.example.jmastermind.Game;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
import com.example.jmastermind.Events.PopupEvent;
public class Popup extends AlertDialog.Builder {
private AppCompatActivity context;
public Popup(AppCompatActivity context, String[] options, Boolean isWinner, int tentative) {
super(context);
this.context = context;
if(isWinner) {
this.setTitle("Félicitation ! Vous avez gagner en : " + tentative + " coup(s).");
} else {
this.setTitle("Perdu !");
}
this.setItems(options, new PopupEvent(this.context));
}
}

View File

@ -0,0 +1,17 @@
package com.example.jmastermind.Game;
import android.os.Bundle;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import com.example.jmastermind.R;
public class SoloGame extends AppCompatActivity {
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.game);
Controller controller = new Controller(this, 0);
}
}

View File

@ -0,0 +1,75 @@
package com.example.jmastermind.Game;
import android.graphics.Color;
import android.widget.Button;
import androidx.appcompat.app.AppCompatActivity;
import com.example.jmastermind.Events.ColorSelectorEvent;
import com.example.jmastermind.Events.ControlEvent;
import com.example.jmastermind.Geometrics.Circle;
import com.example.jmastermind.R;
import java.util.List;
public class Vuew {
private ColorSelectorEvent event;
private List<Circle> normalCircle;
private List<Circle> checkedCircle;
private AppCompatActivity context;
private ControlEvent controlEvent;
public Vuew(AppCompatActivity context, List<Circle> normalCircle, List<Circle> checkCircle, ColorSelectorEvent event, ControlEvent controlEvent) {
this.context = context;
this.normalCircle = normalCircle;
this.checkedCircle = checkCircle;
this.event = event;
this.controlEvent = controlEvent;
}
public Boolean init() {
try {
Circle yellow = (Circle) this.context.findViewById(R.id.yellow);
yellow.setColor(Color.YELLOW);
yellow.setOnClickListener(this.event);
Circle red = (Circle) this.context.findViewById(R.id.red);
red.setColor(Color.RED);
red.setOnClickListener(this.event);
Circle green = (Circle) this.context.findViewById(R.id.green);
green.setColor(Color.GREEN);
green.setOnClickListener(this.event);
Circle blue = (Circle) this.context.findViewById(R.id.blue);
blue.setColor(Color.BLUE);
blue.setOnClickListener(this.event);
Circle gray = (Circle) this.context.findViewById(R.id.gray);
gray.setColor(Color.GRAY);
gray.setOnClickListener(this.event);
Circle white = (Circle) this.context.findViewById(R.id.white);
white.setColor(Color.WHITE);
white.setOnClickListener(this.event);
Circle black = (Circle) this.context.findViewById(R.id.black);
black.setColor(Color.BLACK);
black.setOnClickListener(this.event);
Button validate = (Button) this.context.findViewById(R.id.validate);
validate.setOnClickListener(this.controlEvent);
Button reset = (Button) this.context.findViewById(R.id.reset);
reset.setOnClickListener(this.controlEvent);
return true;
} catch(NullPointerException e) {
System.out.println("[!] Probleme lors de l'initiliation de la vue (NullPointerException).");
return false;
} catch(ArrayIndexOutOfBoundsException e) {
System.out.println("[!] Probleme lors de l'initiliation de la vue (ArrayIndexOutOfBoundsException).");
return false;
}
}
}

View File

@ -1,41 +1,42 @@
package com.example.tamere.Geometrics; package com.example.jmastermind.Geometrics;
import android.content.Context; import android.content.Context;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.Paint; import android.graphics.Color;
import android.view.View; import android.graphics.Paint;
import android.util.AttributeSet;
public class Circle extends View { import android.view.View;
private Paint picasso;
private int color; import androidx.annotation.Nullable;
private Boolean canModify;
public class Circle extends View {
public Circle(Context context, int color, Boolean canModify) { private Paint picasso;
super(context); private int color;
this.color = color;
this.canModify = canModify; public Circle(Context context, @Nullable AttributeSet attrs) {
this.picasso = new Paint(); super(context, attrs);
} this.color = Color.GRAY;
this.picasso = new Paint();
public int getColor() { }
return this.color;
} public int getColor() {
return this.color;
public void setColor(int c) { }
if(this.canModify) {
this.color = c; public void setColor(int c) {
} this.color = c;
} this.invalidate();
}
@Override
protected void onDraw(Canvas canvas) { @Override
super.onDraw(canvas); protected void onDraw(Canvas canvas) {
super.onDraw(canvas);
int centerX = getWidth() / 2;
int centerY = getHeight() / 2; int centerX = getWidth() / 2;
int radius = Math.min(centerX, centerY); int centerY = getHeight() / 2;
int radius = Math.min(centerX, centerY);
this.picasso.setColor(this.color);
canvas.drawCircle(centerX, centerY, radius, this.picasso); this.picasso.setColor(this.color);
} canvas.drawCircle(centerX, centerY, radius, this.picasso);
} }
}

View File

@ -0,0 +1,22 @@
package com.example.jmastermind;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import android.widget.Button;
import com.example.jmastermind.Events.MenuEvent;
import com.example.jmastermind.Game.*;
public class MainActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.menu);
Button btnSoloGame = (Button) findViewById(R.id.robotselect);
btnSoloGame.setOnClickListener(new MenuEvent(this, SoloGame.class));
Button btnMultiGame = (Button) findViewById(R.id.jcjselect);
btnMultiGame.setOnClickListener(new MenuEvent(this, MultiGame.class));
}
}

File diff suppressed because it is too large Load Diff

View File

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

View File

Before

Width:  |  Height:  |  Size: 982 B

After

Width:  |  Height:  |  Size: 982 B

View File

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

View File

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

View File

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

View File

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

View File

@ -1,6 +1,6 @@
<resources xmlns:tools="http://schemas.android.com/tools"> <resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. --> <!-- Base application theme. -->
<style name="Theme.Tamere" parent="Theme.MaterialComponents.DayNight.DarkActionBar"> <style name="Theme.JMastermind" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
<!-- Primary brand color. --> <!-- Primary brand color. -->
<item name="colorPrimary">@color/purple_200</item> <item name="colorPrimary">@color/purple_200</item>
<item name="colorPrimaryVariant">@color/purple_700</item> <item name="colorPrimaryVariant">@color/purple_700</item>

View File

@ -7,5 +7,4 @@
<color name="teal_700">#FF018786</color> <color name="teal_700">#FF018786</color>
<color name="black">#FF000000</color> <color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color> <color name="white">#FFFFFFFF</color>
<color name="violetfonce">#C71585</color>
</resources> </resources>

View File

@ -0,0 +1,3 @@
<resources>
<string name="app_name">JMastermind</string>
</resources>

View File

@ -1,6 +1,6 @@
<resources xmlns:tools="http://schemas.android.com/tools"> <resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. --> <!-- Base application theme. -->
<style name="Theme.Tamere" parent="Theme.MaterialComponents.DayNight.DarkActionBar"> <style name="Theme.JMastermind" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
<!-- Primary brand color. --> <!-- Primary brand color. -->
<item name="colorPrimary">@color/purple_500</item> <item name="colorPrimary">@color/purple_500</item>
<item name="colorPrimaryVariant">@color/purple_700</item> <item name="colorPrimaryVariant">@color/purple_700</item>

View File

@ -1,4 +1,4 @@
package com.example.tamere; package com.example.jmastermind;
import org.junit.Test; import org.junit.Test;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

View File

@ -1,155 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><!--Created with JFLAP 7.1.--><structure>&#13;
<type>fa</type>&#13;
<automaton>&#13;
<!--The list of states.-->&#13;
<state id="0" name="0">&#13;
<x>75.0</x>&#13;
<y>123.0</y>&#13;
<initial/>&#13;
</state>&#13;
<state id="1" name="1">&#13;
<x>280.0</x>&#13;
<y>120.0</y>&#13;
</state>&#13;
<state id="2" name="3">&#13;
<x>515.0</x>&#13;
<y>386.0</y>&#13;
</state>&#13;
<state id="3" name="2">&#13;
<x>426.0</x>&#13;
<y>224.0</y>&#13;
</state>&#13;
<state id="4" name="q4">&#13;
<x>255.0</x>&#13;
<y>399.0</y>&#13;
<label>P</label>&#13;
</state>&#13;
<state id="5" name="4">&#13;
<x>632.0</x>&#13;
<y>246.0</y>&#13;
<label>V</label>&#13;
<final/>&#13;
</state>&#13;
<!--The list of transitions.-->&#13;
<transition>&#13;
<from>0</from>&#13;
<to>4</to>&#13;
<read>r</read>&#13;
</transition>&#13;
<transition>&#13;
<from>2</from>&#13;
<to>4</to>&#13;
<read>r</read>&#13;
</transition>&#13;
<transition>&#13;
<from>1</from>&#13;
<to>4</to>&#13;
<read>n</read>&#13;
</transition>&#13;
<transition>&#13;
<from>0</from>&#13;
<to>4</to>&#13;
<read>v</read>&#13;
</transition>&#13;
<transition>&#13;
<from>3</from>&#13;
<to>4</to>&#13;
<read>b</read>&#13;
</transition>&#13;
<transition>&#13;
<from>1</from>&#13;
<to>4</to>&#13;
<read>j</read>&#13;
</transition>&#13;
<transition>&#13;
<from>1</from>&#13;
<to>4</to>&#13;
<read>bl</read>&#13;
</transition>&#13;
<transition>&#13;
<from>3</from>&#13;
<to>4</to>&#13;
<read>n</read>&#13;
</transition>&#13;
<transition>&#13;
<from>2</from>&#13;
<to>4</to>&#13;
<read>y</read>&#13;
</transition>&#13;
<transition>&#13;
<from>3</from>&#13;
<to>4</to>&#13;
<read>j</read>&#13;
</transition>&#13;
<transition>&#13;
<from>1</from>&#13;
<to>4</to>&#13;
<read>b</read>&#13;
</transition>&#13;
<transition>&#13;
<from>3</from>&#13;
<to>4</to>&#13;
<read>v</read>&#13;
</transition>&#13;
<transition>&#13;
<from>2</from>&#13;
<to>4</to>&#13;
<read>b</read>&#13;
</transition>&#13;
<transition>&#13;
<from>3</from>&#13;
<to>4</to>&#13;
<read>r</read>&#13;
</transition>&#13;
<transition>&#13;
<from>0</from>&#13;
<to>4</to>&#13;
<read>bl</read>&#13;
</transition>&#13;
<transition>&#13;
<from>0</from>&#13;
<to>4</to>&#13;
<read>j</read>&#13;
</transition>&#13;
<transition>&#13;
<from>1</from>&#13;
<to>3</to>&#13;
<read>r</read>&#13;
</transition>&#13;
<transition>&#13;
<from>2</from>&#13;
<to>4</to>&#13;
<read>bl</read>&#13;
</transition>&#13;
<transition>&#13;
<from>1</from>&#13;
<to>4</to>&#13;
<read>v</read>&#13;
</transition>&#13;
<transition>&#13;
<from>0</from>&#13;
<to>4</to>&#13;
<read>n</read>&#13;
</transition>&#13;
<transition>&#13;
<from>0</from>&#13;
<to>1</to>&#13;
<read>b</read>&#13;
</transition>&#13;
<transition>&#13;
<from>2</from>&#13;
<to>5</to>&#13;
<read>v</read>&#13;
</transition>&#13;
<transition>&#13;
<from>2</from>&#13;
<to>4</to>&#13;
<read>n</read>&#13;
</transition>&#13;
<transition>&#13;
<from>3</from>&#13;
<to>2</to>&#13;
<read>bl</read>&#13;
</transition>&#13;
</automaton>&#13;
</structure>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 47 KiB

Some files were not shown because too many files have changed in this diff Show More