diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000000000000000000000000000000000000..77a660723d77a38144967ae565a81d91e708ac43 Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ diff --git a/app/src/main/java/fr/ul/projet/AccesActivity.java b/app/src/main/java/fr/ul/projet/AccesActivity.java index 204aece9c8483debfc0c80d37023005171777e7c..225a01de06a9a5ce4f21422eac42fe132d759aa9 100644 --- a/app/src/main/java/fr/ul/projet/AccesActivity.java +++ b/app/src/main/java/fr/ul/projet/AccesActivity.java @@ -82,7 +82,7 @@ public class AccesActivity extends AppCompatActivity { imageView.setOnRectangleClickListener(new DrawableImageView.OnRectangleClickListener() { @Override public void onRectangleClick(int rectangleId) { - Toast.makeText(AccesActivity.this, "Accès à la pièce " + AccesActivity.this.modele.getPieces().get(rectangleId).getNom(), Toast.LENGTH_SHORT).show(); + Toast.makeText(AccesActivity.this, getString(R.string.destAcces, AccesActivity.this.modele.getPieces().get(rectangleId).getNom()) , Toast.LENGTH_SHORT).show(); } }); diff --git a/app/src/main/java/fr/ul/projet/MainActivity.java b/app/src/main/java/fr/ul/projet/MainActivity.java index 2adca7a41c99f6599fe41dcef3af635685949a84..4d9de6d789b974672d0a6e56b47ab25db616eb02 100644 --- a/app/src/main/java/fr/ul/projet/MainActivity.java +++ b/app/src/main/java/fr/ul/projet/MainActivity.java @@ -59,7 +59,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe intent.putExtra("modele", modele); launcher.launch(intent); } else{ - Toast.makeText(MainActivity.this, "Impossible de charger le modèle", Toast.LENGTH_LONG).show(); + Toast.makeText(MainActivity.this, getString(R.string.erreurChar), Toast.LENGTH_LONG).show(); } } } @@ -80,13 +80,13 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe public void nouveauModele(){ AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle("Entrez un nom pour votre modèle"); + builder.setTitle(getString(R.string.nomModele)); final EditText input = new EditText(this); builder.setView(input); // Bouton de validation - builder.setPositiveButton("OK", new DialogInterface.OnClickListener(){ + builder.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener(){ @Override public void onClick(DialogInterface dialog, int which){ String userInput = input.getText().toString(); @@ -98,7 +98,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe }); // Bouton d'annulatiopn - builder.setNegativeButton("Annuler", new DialogInterface.OnClickListener(){ + builder.setNegativeButton(getString(R.string.annuler), new DialogInterface.OnClickListener(){ @Override public void onClick(DialogInterface dialog, int which){ dialog.cancel(); @@ -109,11 +109,11 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe public void ouvrirModele(){ AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle("Sélectionner un fichier"); - builder.setMessage("Voulez-vous choisir un fihcier ?"); + builder.setTitle(getString(R.string.selecFichier)); + builder.setMessage(getString(R.string.fichier)); // Bouton de validation - builder.setPositiveButton("Choisir", new DialogInterface.OnClickListener(){ + builder.setPositiveButton(getString(R.string.choisir), new DialogInterface.OnClickListener(){ @Override public void onClick(DialogInterface dialog, int which){ openFileChooser(); @@ -121,7 +121,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe }); // Bouton d'annulatiopn - builder.setNegativeButton("Annuler", new DialogInterface.OnClickListener(){ + builder.setNegativeButton(getString(R.string.annuler), new DialogInterface.OnClickListener(){ @Override public void onClick(DialogInterface dialog, int which){ dialog.dismiss(); @@ -138,7 +138,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe intent.putExtra(Intent.EXTRA_MIME_TYPES, new String[]{"application/json"}); intent.putExtra(Intent.EXTRA_LOCAL_ONLY, true); - launcher.launch(Intent.createChooser(intent, "Sélectionner un fichier")); + launcher.launch(Intent.createChooser(intent, getString(R.string.selecFichier))); } public String getFileName(Uri uri){ diff --git a/app/src/main/java/fr/ul/projet/ModeleActivity.java b/app/src/main/java/fr/ul/projet/ModeleActivity.java index e7beadb3e2e2070963eaaa16c2ba6b95a875ea75..8adb021b68ca85ebda0808e2992f92f2afed9055 100644 --- a/app/src/main/java/fr/ul/projet/ModeleActivity.java +++ b/app/src/main/java/fr/ul/projet/ModeleActivity.java @@ -49,9 +49,6 @@ public class ModeleActivity extends AppCompatActivity { TextView textView = findViewById(R.id.textView); textView.setText(this.modele.getNom()); - if (this.modele.getPieceCourante() != null && this.modele.getPieceCourante().getPhotoNord() != null){ - Log.i("PHOTOOOOO", this.modele.getPieceCourante().getPhotoNord().getPath()); - } afficherPieces(); ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.create), (v, insets) -> { @@ -93,13 +90,13 @@ public class ModeleActivity extends AppCompatActivity { public void nouvellePiece(View v){ AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle("Entrez un nom pour votre pièce"); + builder.setTitle(getString(R.string.nomPiece)); final EditText input = new EditText(this); builder.setView(input); // Bouton de validation - builder.setPositiveButton("OK", new DialogInterface.OnClickListener(){ + builder.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener(){ @Override public void onClick(DialogInterface dialog, int which){ String userInput = input.getText().toString(); @@ -111,7 +108,7 @@ public class ModeleActivity extends AppCompatActivity { }); // Bouton d'annulatiopn - builder.setNegativeButton("Annuler", new DialogInterface.OnClickListener(){ + builder.setNegativeButton(getString(R.string.annuler), new DialogInterface.OnClickListener(){ @Override public void onClick(DialogInterface dialog, int which){ dialog.cancel(); @@ -143,13 +140,13 @@ public class ModeleActivity extends AppCompatActivity { outputStream.write(this.modele.toJson().getBytes()); outputStream.flush(); outputStream.close(); - Toast.makeText(context, "Fichier enregistré avec succès : " + this.modele.getFichierJson(), Toast.LENGTH_LONG).show(); + Toast.makeText(context, getString(R.string.successFile, this.modele.getFichierJson()), Toast.LENGTH_LONG).show(); } } catch (IOException e) { - Toast.makeText(context, "Erreur d'écriture du fichier", Toast.LENGTH_SHORT).show(); + Toast.makeText(context, getString(R.string.errorFile), Toast.LENGTH_SHORT).show(); } } else { - Toast.makeText(context, "Impossible de créer le fichier", Toast.LENGTH_SHORT).show(); + Toast.makeText(context, getString(R.string.erreurCreer), Toast.LENGTH_SHORT).show(); } } } diff --git a/app/src/main/java/fr/ul/projet/PieceActivity.java b/app/src/main/java/fr/ul/projet/PieceActivity.java index 19cb813a063d132bad11604cd1fb5ea4e1cb145a..8178da2720e6a98248be5d4d7660d0a9be85f9ed 100644 --- a/app/src/main/java/fr/ul/projet/PieceActivity.java +++ b/app/src/main/java/fr/ul/projet/PieceActivity.java @@ -55,19 +55,19 @@ public class PieceActivity extends AppCompatActivity { case "Nord": this.modele.modifierPieceCourante(this.piece.getNom(), imageUri, this.piece.getPhotoSud(), this.piece.getPhotoEst(), this.piece.getPhotoOuest()); //this.piece.setPhotoNord(imageUri); - Toast.makeText(this, "Photo Nord importée avec succés" + this.piece.getPhotoNord().getPath() + "ah", Toast.LENGTH_LONG).show(); + Toast.makeText(this, getString(R.string.nordImport), Toast.LENGTH_LONG).show(); break; case "Sud": this.piece.setPhotoSud(imageUri); - Toast.makeText(this, "Photo Sud importée avec succés", Toast.LENGTH_LONG).show(); + Toast.makeText(this, getString(R.string.sudImport), Toast.LENGTH_LONG).show(); break; case "Est": this.piece.setPhotoEst(imageUri); - Toast.makeText(this, "Photo Est importée avec succés", Toast.LENGTH_LONG).show(); + Toast.makeText(this, getString(R.string.estImport), Toast.LENGTH_LONG).show(); break; case "Ouest": this.piece.setPhotoOuest(imageUri); - Toast.makeText(this, "Photo Ouest importée avec succés", Toast.LENGTH_LONG).show(); + Toast.makeText(this, getString(R.string.ouestImport), Toast.LENGTH_LONG).show(); break; } } @@ -83,19 +83,19 @@ public class PieceActivity extends AppCompatActivity { case "Nord": this.modele.modifierPieceCourante(this.piece.getNom(), this.photoUri, this.piece.getPhotoSud(), this.piece.getPhotoEst(), this.piece.getPhotoOuest()); //this.piece.setPhotoNord(this.photoUri); - Toast.makeText(this, "Photo Nord importée avec succés" + this.modele.getPieceCourante().getId(), Toast.LENGTH_LONG).show(); + Toast.makeText(this, getString(R.string.nordImport), Toast.LENGTH_LONG).show(); break; case "Sud": this.piece.setPhotoSud(this.photoUri); - Toast.makeText(this, "Photo Sud importée avec succés", Toast.LENGTH_LONG).show(); + Toast.makeText(this, getString(R.string.sudImport), Toast.LENGTH_LONG).show(); break; case "Est": this.piece.setPhotoEst(this.photoUri); - Toast.makeText(this, "Photo Est importée avec succés", Toast.LENGTH_LONG).show(); + Toast.makeText(this, getString(R.string.estImport), Toast.LENGTH_LONG).show(); break; case "Ouest": this.piece.setPhotoOuest(this.photoUri); - Toast.makeText(this, "Photo Ouest importée avec succés", Toast.LENGTH_LONG).show(); + Toast.makeText(this, getString(R.string.ouestImport), Toast.LENGTH_LONG).show(); break; } } @@ -183,8 +183,8 @@ public class PieceActivity extends AppCompatActivity { public void selectionImageDialog(){ AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle("Choisir une option") - .setItems(new String[]{"Prendre une photo", "Séléctionner une photo", "Ajouter un accès","Annuler"}, (dialog, which) -> { + builder.setTitle(getString(R.string.choixOption)) + .setItems(new String[]{getString(R.string.prendrePhoto), getString(R.string.selecPhoto), getString(R.string.ajoutAcces),getString(R.string.annuler)}, (dialog, which) -> { if (which == 0){ this.prendrePhoto(); } else if (which == 1){ @@ -212,7 +212,7 @@ public class PieceActivity extends AppCompatActivity { }else{ - Toast.makeText(this, "Vous devez ajouter la photo avant d'ajouter un accés", Toast.LENGTH_LONG).show(); + Toast.makeText(this, getString(R.string.addBeforeAcces), Toast.LENGTH_LONG).show(); } } }) @@ -221,7 +221,7 @@ public class PieceActivity extends AppCompatActivity { private void creationAcces(){ if (this.modele.getPieces().size() == 1){ - Toast.makeText(this, "Aucune pièce à accéder.", Toast.LENGTH_LONG).show(); + Toast.makeText(this, getString(R.string.zeroPieces), Toast.LENGTH_LONG).show(); }else{ List<String> piecesList = new ArrayList<>(); for (Map.Entry<Integer, Piece> entry : this.modele.getPieces().entrySet()){ @@ -233,13 +233,13 @@ public class PieceActivity extends AppCompatActivity { String[] piecesArray = piecesList.toArray(new String[0]); AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle("Choisir une pièce de destination") + builder.setTitle(getString(R.string.pieceDest)) .setItems(piecesArray, (dialog1, which1) -> { String selectedPiece = piecesArray[which1]; - String[] directions = {"Nord", "Sud", "Est", "Ouest"}; + String[] directions = {getString(R.string.cardN), getString(R.string.cardS), getString(R.string.cardE), getString(R.string.cardO)}; AlertDialog.Builder builder2 = new AlertDialog.Builder(this); - builder2.setTitle("Choisir une direction") + builder2.setTitle(getString(R.string.choixDir)) .setItems(directions, (dialog2, which2) ->{ switch (directions[which2]){ case "Nord": @@ -252,7 +252,7 @@ public class PieceActivity extends AppCompatActivity { intent.putExtra("pieceDest", this.modele.getPieceByNom(selectedPiece)); launcher.launch(intent); }else{ - Toast.makeText(PieceActivity.this, "Destination incorrecte. Ajouter une photo d'arrivée", Toast.LENGTH_LONG).show(); + Toast.makeText(PieceActivity.this, getString(R.string.erreurDest), Toast.LENGTH_LONG).show(); } break; case "Sud": @@ -265,7 +265,7 @@ public class PieceActivity extends AppCompatActivity { intent.putExtra("pieceDest", this.modele.getPieceByNom(selectedPiece)); launcher.launch(intent); }else{ - Toast.makeText(PieceActivity.this, "Destination incorrecte. Ajouter une photo d'arrivée", Toast.LENGTH_LONG).show(); + Toast.makeText(PieceActivity.this, getString(R.string.erreurDest), Toast.LENGTH_LONG).show(); } break; case "Est": @@ -278,7 +278,7 @@ public class PieceActivity extends AppCompatActivity { intent.putExtra("pieceDest", this.modele.getPieceByNom(selectedPiece)); launcher.launch(intent); }else{ - Toast.makeText(PieceActivity.this, "Destination incorrecte. Ajouter une photo d'arrivée", Toast.LENGTH_LONG).show(); + Toast.makeText(PieceActivity.this, getString(R.string.erreurDest), Toast.LENGTH_LONG).show(); } break; case "Ouest": @@ -291,7 +291,7 @@ public class PieceActivity extends AppCompatActivity { intent.putExtra("pieceDest", this.modele.getPieceByNom(selectedPiece)); launcher.launch(intent); }else{ - Toast.makeText(PieceActivity.this, "Destination incorrecte. Ajouter une photo d'arrivée", Toast.LENGTH_LONG).show(); + Toast.makeText(PieceActivity.this, getString(R.string.erreurDest), Toast.LENGTH_LONG).show(); } break; } diff --git a/app/src/main/java/fr/ul/projet/modele/Modele.java b/app/src/main/java/fr/ul/projet/modele/Modele.java index 66a01d8274363b0c1bbe1efa6ec6bbab5de93caf..516dee700be2ec82695387da7c8722949cf0d3e7 100644 --- a/app/src/main/java/fr/ul/projet/modele/Modele.java +++ b/app/src/main/java/fr/ul/projet/modele/Modele.java @@ -393,6 +393,7 @@ public class Modele implements Parcelable{ e.printStackTrace(); } + System.out.println(modeleJson.toString()); return modeleJson.toString(); } diff --git a/app/src/main/java/fr/ul/projet/modele/Piece.java b/app/src/main/java/fr/ul/projet/modele/Piece.java index c8f5e17567046698d94fed2814b1455428f6e9e2..72a6ac9ca017c00ac179e086f683994ca26ef52a 100644 --- a/app/src/main/java/fr/ul/projet/modele/Piece.java +++ b/app/src/main/java/fr/ul/projet/modele/Piece.java @@ -169,10 +169,10 @@ public class Piece implements Parcelable { try{ piece.put("id", this.getId()); piece.put("nom", this.getNom()); - piece.put("cheminPhotoNord", this.getPhotoNord().getPath()); - piece.put("cheminPhotoSud", this.getPhotoSud().getPath()); - piece.put("cheminPhotoEst", this.getPhotoEst().getPath()); - piece.put("cheminPhotoOuest", this.getPhotoOuest().getPath()); + piece.put("cheminPhotoNord", this.getPhotoNord() == null ? "" : this.getPhotoNord().getPath()); + piece.put("cheminPhotoSud", this.getPhotoNord() == null ? "" : this.getPhotoSud().getPath()); + piece.put("cheminPhotoEst", this.getPhotoNord() == null ? "" : this.getPhotoEst().getPath()); + piece.put("cheminPhotoOuest", this.getPhotoNord() == null ? "" : this.getPhotoOuest().getPath()); } catch (Exception e) { e.printStackTrace(); } diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml index 07d5da9cbf141911847041df5d7b87f0dd5ef9d4..ca3826a46ce070f906d0d3fbe6987df882134381 100644 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -1,170 +1,74 @@ <?xml version="1.0" encoding="utf-8"?> -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="108dp" +<vector android:height="108dp" + android:width="108dp" + android:viewportHeight="108" android:viewportWidth="108" - android:viewportHeight="108"> - <path - android:fillColor="#3DDC84" - android:pathData="M0,0h108v108h-108z" /> - <path - android:fillColor="#00000000" - android:pathData="M9,0L9,108" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M19,0L19,108" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M29,0L29,108" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M39,0L39,108" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M49,0L49,108" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M59,0L59,108" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M69,0L69,108" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M79,0L79,108" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M89,0L89,108" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M99,0L99,108" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M0,9L108,9" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M0,19L108,19" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M0,29L108,29" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M0,39L108,39" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M0,49L108,49" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M0,59L108,59" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M0,69L108,69" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M0,79L108,79" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M0,89L108,89" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M0,99L108,99" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M19,29L89,29" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M19,39L89,39" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M19,49L89,49" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M19,59L89,59" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M19,69L89,69" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M19,79L89,79" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M29,19L29,89" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M39,19L39,89" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M49,19L49,89" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M59,19L59,89" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M69,19L69,89" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M79,19L79,89" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> + xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="#3DDC84" + android:pathData="M0,0h108v108h-108z"/> + <path android:fillColor="#00000000" android:pathData="M9,0L9,108" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M19,0L19,108" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M29,0L29,108" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M39,0L39,108" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M49,0L49,108" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M59,0L59,108" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M69,0L69,108" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M79,0L79,108" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M89,0L89,108" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M99,0L99,108" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M0,9L108,9" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M0,19L108,19" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M0,29L108,29" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M0,39L108,39" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M0,49L108,49" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M0,59L108,59" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M0,69L108,69" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M0,79L108,79" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M0,89L108,89" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M0,99L108,99" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M19,29L89,29" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M19,39L89,39" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M19,49L89,49" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M19,59L89,59" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M19,69L89,69" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M19,79L89,79" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M29,19L29,89" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M39,19L39,89" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M49,19L49,89" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M59,19L59,89" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M69,19L69,89" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M79,19L79,89" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> </vector> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6f3b755bf50c6b03d8714a9c6184705e6a08389f..c4a603d4cce78b2fbd8094bd0224d4778bc8c976 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> - <background android:drawable="@drawable/ic_launcher_background" /> - <foreground android:drawable="@drawable/ic_launcher_foreground" /> - <monochrome android:drawable="@drawable/ic_launcher_foreground" /> + <background android:drawable="@drawable/ic_launcher_background"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> </adaptive-icon> \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755bf50c6b03d8714a9c6184705e6a08389f..c4a603d4cce78b2fbd8094bd0224d4778bc8c976 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> - <background android:drawable="@drawable/ic_launcher_background" /> - <foreground android:drawable="@drawable/ic_launcher_foreground" /> - <monochrome android:drawable="@drawable/ic_launcher_foreground" /> + <background android:drawable="@drawable/ic_launcher_background"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> </adaptive-icon> \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp index c209e78ecd372343283f4157dcfd918ec5165bb3..a50ab3bd24a7fdd7fb4f064af2205a6d9c461dd7 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.webp and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000000000000000000000000000000000000..f04c8a738ac28d340a9a651ab1ef68abf0773c1f Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp index b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9..f19190627ea87cee0dca7e6c042b8553f69154e6 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp index 4f0f1d64e58ba64d180ce43ee13bf9a17835fbca..2440df9a04fbc07dc2c8046651342315c725a513 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.webp and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000000000000000000000000000000000000..4f9e1fd0c2b9d965327cbb66eae7843ad978fc8d Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp index 62b611da081676d42f6c3f78a2c91e7bcedddedb..36b0c812b3b69a613a9018d24af05e6ea4506b73 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp index 948a3070fe34c611c42c0d3ad3013a0dce358be0..5eb803240bc62cf14dbb030b6397d5cc7b641c93 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000000000000000000000000000000000000..1bfe8d45397a00a2a8a2e33cbe36897d7d6f09c3 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp index 1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f..f4af78dbf646eac2c9179e0edfe8b0a6b01241af 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp index 28d4b77f9f036a47549d47db79c16788749dca10..21ead26cb84b67bd20de12f270551f93ffa01377 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000000000000000000000000000000000000..b40fc38d8e89fb008509fe0c78e1beaff5efe933 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp index 9287f5083623b375139afb391af71cc533a7dd37..041e367fe5f98a7055138c64da2cae8e315853ee 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp index aa7d6427e6fa1074b79ccd52ef67ac15c5637e85..913a2446f1fee95b7d03ba51353cadd026d1ca33 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000000000000000000000000000000000000..d67acdc2973b84a2398452744e746f6268dbc59f Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp index 9126ae37cbc3587421d6889eadd1d91fbf1994d4..a59f673868d910bf3a6d0bbff84d74cbbf912448 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index c8524cd961d27b6695e755c6ef2d4d58cf38431e..981fabedd0276898e260a533134fafeb4e4d8628 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -2,4 +2,6 @@ <resources> <color name="black">#FF000000</color> <color name="white">#FFFFFFFF</color> + <color name="my_light_primary">#3498DB</color> + <color name="my_light_secondary">#E74C3C</color> </resources> \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index eb02253c20983ccbfbd216c07736820bc3ecd4aa..80beabfac9b11f49790d5bb73a4e50f3f715fac5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -16,4 +16,33 @@ <string name="piece_nom">%1$s : %2$s</string> <string name="acces">%1$s : %2$s (%3$s)</string> <string name="boutonAcces">Ajouter un accés</string> + <string name="erreurChar">Impossible de charger le modèle</string> + <string name="destAcces">Accès à la pièce %1$s</string> + <string name="nomModele">Entrez un nom pour votre modèle</string> + <string name="nomPiece">Entrez un nom pour votre pièce</string> + <string name="ok">OK</string> + <string name="annuler">Annuler</string> + <string name="selecFichier">Sélectionner un fichier</string> + <string name="fichier">Voulez-vous choisir un fichier ?</string> + <string name="choisir">Choisir</string> + <string name="successFile">Fichier enregistré avec succès : %1$s</string> + <string name="errorFile">Erreur d\'écriture du fichier</string> + <string name="erreurCreer">Impossible de créer le fichier</string> + <string name="nordImport">Photo Nord importée avec succés</string> + <string name="sudImport">Photo Sud importée avec succés</string> + <string name="estImport">Photo Est importée avec succés</string> + <string name="ouestImport">Photo Ouest importée avec succés</string> + <string name="choixOption">Choisir une option</string> + <string name="prendrePhoto">Prendre une photo</string> + <string name="selecPhoto">Séléctionner une photo</string> + <string name="ajoutAcces">Ajouter un accès</string> + <string name="zeroPieces">Aucune pièce à accéder</string> + <string name="pieceDest">Choisir une pièce de destination</string> + <string name="choixDir">Choisir une direction</string> + <string name="erreurDest">Destination incorrecte. AJouter une photo d\'arrivée</string> + <string name="addBeforeAcces">Vous devez ajouter la photo avant d\'ajouter un accés</string> + <string name="cardN">Nord</string> + <string name="cardS">Sud</string> + <string name="cardE">Est</string> + <string name="cardO">Ouest</string> </resources> \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index d647e669f55dcb6a91f59ab4d6d75db0b9f960ce..12ace25b13768f74dc18054d89df2dd60604090a 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -3,6 +3,8 @@ <style name="Base.Theme.PROJET" parent="Theme.Material3.DayNight.NoActionBar"> <!-- Customize your light theme here. --> <!-- <item name="colorPrimary">@color/my_light_primary</item> --> + <item name="colorPrimary">@color/my_light_primary</item> + <item name="colorSecondary">@color/my_light_secondary</item> </style> <style name="Theme.PROJET" parent="Base.Theme.PROJET" />