diff --git a/code/app/src/main/java/projet/iut/jeu_de_la_vie/model/Manager.java b/code/app/src/main/java/projet/iut/jeu_de_la_vie/model/Manager.java index d3060af..8dcee5f 100644 --- a/code/app/src/main/java/projet/iut/jeu_de_la_vie/model/Manager.java +++ b/code/app/src/main/java/projet/iut/jeu_de_la_vie/model/Manager.java @@ -11,6 +11,7 @@ import projet.iut.jeu_de_la_vie.model.cellule.Cellule; import projet.iut.jeu_de_la_vie.model.cellulesVivantes.CellulesVivantes; import projet.iut.jeu_de_la_vie.model.plateau.Plateau; + /** * Point d'entré du model * @author Yohann Breuil @@ -22,7 +23,6 @@ public class Manager implements ObserverBDJ { private IBoucleDeJeu boucleDeJeu; private ChangeurRegle changeurRegle; private boolean jeuLance; - private FragmentPlateau fragmentPlateau; public Manager(){ @@ -127,12 +127,4 @@ public class Manager implements ObserverBDJ { public void setCellsColor(int color){ Cellule.setLivingColor(color); } - - public FragmentPlateau getFragmentPlateau() { - return fragmentPlateau; - } - - public void setFragmentPlateau(FragmentPlateau fragmentPlateau) { - this.fragmentPlateau = fragmentPlateau; - } } diff --git a/code/app/src/main/java/projet/iut/jeu_de_la_vie/view/LauncherActivity.java b/code/app/src/main/java/projet/iut/jeu_de_la_vie/view/LauncherActivity.java index c66e74e..7fd02bd 100644 --- a/code/app/src/main/java/projet/iut/jeu_de_la_vie/view/LauncherActivity.java +++ b/code/app/src/main/java/projet/iut/jeu_de_la_vie/view/LauncherActivity.java @@ -1,30 +1,23 @@ package projet.iut.jeu_de_la_vie.view; import android.content.Intent; -import android.content.Context; import android.graphics.Color; import android.os.Bundle; import android.text.Editable; import android.util.Log; import android.view.View; import android.widget.Button; -import android.widget.CheckBox; import android.widget.EditText; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; -import androidx.constraintlayout.widget.ConstraintLayout; -import androidx.constraintlayout.widget.ConstraintSet; - -import java.awt.font.NumericShaper; -import java.util.List; import projet.iut.jeu_de_la_vie.R; -import projet.iut.jeu_de_la_vie.model.FragmentPlateau; import projet.iut.jeu_de_la_vie.model.Manager; import projet.iut.jeu_de_la_vie.model.cellule.Cellule; -import projet.iut.jeu_de_la_vie.model.plateau.Plateau; +import projet.iut.jeu_de_la_vie.view.fragment.FragmentPlateau; +import projet.iut.jeu_de_la_vie.view.fragment.MenuFragment; public class LauncherActivity extends AppCompatActivity { @@ -42,6 +35,7 @@ public class LauncherActivity extends AppCompatActivity { super.onCreate(savedInstanceState); manager = new Manager(); setContentView(R.layout.jeu_de_la_vie); + FragmentPlateau fragmentPlateau = (FragmentPlateau) getSupportFragmentManager().findFragmentById(R.id.fragmentContainerViewId); /* //très moche à enlever plus tard start = findViewById(R.id.startButton); @@ -70,10 +64,7 @@ public class LauncherActivity extends AppCompatActivity { manager.getActualiseurCellule().getArbitre().getPlateau().getCell(0, 1).setAlive(true); }); */ - getSupportFragmentManager().beginTransaction().add(R.id.fragmentContainerView,FragmentPlateau.class,null).commit(); - FragmentPlateau frag = new FragmentPlateau(); - getSupportFragmentManager().putFragment(new Bundle(),"main",frag); - manager.setFragmentPlateau(frag); + getSupportFragmentManager().beginTransaction().add(R.id.menuView,MenuFragment.class,null).commit(); } public void updateGame (){ @@ -83,8 +74,8 @@ public class LauncherActivity extends AppCompatActivity { @Override protected void onStart (){ super.onStart(); - FragmentPlateau fragment = new FragmentPlateau(); - fragment.setPlateau(manager.getActualiseurCellule().getArbitre().getPlateau()); + //FragmentPlateau fragment = new FragmentPlateau(); + //fragment.setPlateau(manager.getActualiseurCellule().getArbitre().getPlateau()); } @Override @@ -113,9 +104,10 @@ public class LauncherActivity extends AppCompatActivity { Log.d("d", "" + manager.getNumberOfLines()); Log.d("d", "" + manager.getNomberOfColumns()); Log.d("d", "" + Cellule.getLivingColor()); - Intent intent = new Intent(this, GameActivity.class); - startActivity(intent); + //Intent intent = new Intent(this, GameActivity.class); + //startActivity(intent); //setContentView(new PlateauView(this, manager.getNomberOfColumns() ,manager.getNumberOfLines())); + getSupportFragmentManager().beginTransaction().replace(R.id.fragmentContainerViewId, MenuFragment.class,null).commit(); } public void setCellsRed(View view){ int red = Color.RED; diff --git a/code/app/src/main/java/projet/iut/jeu_de_la_vie/model/FragmentPlateau.java b/code/app/src/main/java/projet/iut/jeu_de_la_vie/view/fragment/FragmentPlateau.java similarity index 87% rename from code/app/src/main/java/projet/iut/jeu_de_la_vie/model/FragmentPlateau.java rename to code/app/src/main/java/projet/iut/jeu_de_la_vie/view/fragment/FragmentPlateau.java index c367fc6..1486b63 100644 --- a/code/app/src/main/java/projet/iut/jeu_de_la_vie/model/FragmentPlateau.java +++ b/code/app/src/main/java/projet/iut/jeu_de_la_vie/view/fragment/FragmentPlateau.java @@ -1,4 +1,4 @@ -package projet.iut.jeu_de_la_vie.model; +package projet.iut.jeu_de_la_vie.view.fragment; import android.content.Context; import android.os.Bundle; @@ -14,7 +14,7 @@ import projet.iut.jeu_de_la_vie.R; import projet.iut.jeu_de_la_vie.model.plateau.Plateau; public class FragmentPlateau extends Fragment { - +/* private Plateau plateau; public Plateau getPlateau() { @@ -24,9 +24,9 @@ public class FragmentPlateau extends Fragment { public void setPlateau(Plateau plateau) { this.plateau = plateau; } - +*/ public FragmentPlateau(){ - super(R.layout.vue_jeu_tmp); //<-- lui passer la future vue du jeu + super(R.layout.game_activity); //<-- lui passer la future vue du jeu } @Override diff --git a/code/app/src/main/java/projet/iut/jeu_de_la_vie/view/fragment/MenuFragment.java b/code/app/src/main/java/projet/iut/jeu_de_la_vie/view/fragment/MenuFragment.java new file mode 100644 index 0000000..56e6065 --- /dev/null +++ b/code/app/src/main/java/projet/iut/jeu_de_la_vie/view/fragment/MenuFragment.java @@ -0,0 +1,11 @@ +package projet.iut.jeu_de_la_vie.view.fragment; + +import androidx.fragment.app.Fragment; + +import projet.iut.jeu_de_la_vie.R; + +public class MenuFragment extends Fragment { + public MenuFragment() { + super(R.layout.menu_principal); + } +} diff --git a/code/app/src/main/res/layout/jeu_de_la_vie.xml b/code/app/src/main/res/layout/jeu_de_la_vie.xml index a915d6d..1dad239 100644 --- a/code/app/src/main/res/layout/jeu_de_la_vie.xml +++ b/code/app/src/main/res/layout/jeu_de_la_vie.xml @@ -6,8 +6,8 @@ android:layout_height="match_parent"> diff --git a/doc/uml/classes.mdj b/doc/uml/classes.mdj index 277d1fd..54e4b82 100644 --- a/doc/uml/classes.mdj +++ b/doc/uml/classes.mdj @@ -111,6 +111,17 @@ } } ], + "containedViews": [ + { + "$ref": "AAAAAAF/aa/1n/hvAOk=" + }, + { + "$ref": "AAAAAAF/abFsswMLNLo=" + }, + { + "$ref": "AAAAAAF/aemuPRnhvSY=" + } + ], "font": "Arial;13;0", "containerChangeable": true, "left": 352, @@ -12435,6 +12446,259 @@ "$ref": "AAAAAAF+U4dezJG2dos=" } }, + { + "_type": "UMLClassView", + "_id": "AAAAAAF/abJjnQdXa/A=", + "_parent": { + "$ref": "AAAAAAF9f+tPc98FthE=" + }, + "model": { + "$ref": "AAAAAAF/abJjnQdV2Ic=" + }, + "subViews": [ + { + "_type": "UMLNameCompartmentView", + "_id": "AAAAAAF/abJjnQdYTIc=", + "_parent": { + "$ref": "AAAAAAF/abJjnQdXa/A=" + }, + "model": { + "$ref": "AAAAAAF/abJjnQdV2Ic=" + }, + "subViews": [ + { + "_type": "LabelView", + "_id": "AAAAAAF/abJjnQdZbDY=", + "_parent": { + "$ref": "AAAAAAF/abJjnQdYTIc=" + }, + "visible": false, + "font": "Arial;13;0", + "height": 13 + }, + { + "_type": "LabelView", + "_id": "AAAAAAF/abJjnQdaNoQ=", + "_parent": { + "$ref": "AAAAAAF/abJjnQdYTIc=" + }, + "font": "Arial;13;1", + "left": 805, + "top": 231, + "width": 214.2587890625, + "height": 13, + "text": "PlateauView" + }, + { + "_type": "LabelView", + "_id": "AAAAAAF/abJjnQdbvwQ=", + "_parent": { + "$ref": "AAAAAAF/abJjnQdYTIc=" + }, + "visible": false, + "font": "Arial;13;0", + "width": 81.6181640625, + "height": 13, + "text": "(from classes)" + }, + { + "_type": "LabelView", + "_id": "AAAAAAF/abJjngdc5kg=", + "_parent": { + "$ref": "AAAAAAF/abJjnQdYTIc=" + }, + "visible": false, + "font": "Arial;13;0", + "height": 13, + "horizontalAlignment": 1 + } + ], + "font": "Arial;13;0", + "left": 800, + "top": 224, + "width": 224.2587890625, + "height": 25, + "stereotypeLabel": { + "$ref": "AAAAAAF/abJjnQdZbDY=" + }, + "nameLabel": { + "$ref": "AAAAAAF/abJjnQdaNoQ=" + }, + "namespaceLabel": { + "$ref": "AAAAAAF/abJjnQdbvwQ=" + }, + "propertyLabel": { + "$ref": "AAAAAAF/abJjngdc5kg=" + } + }, + { + "_type": "UMLAttributeCompartmentView", + "_id": "AAAAAAF/abJjngdd6EQ=", + "_parent": { + "$ref": "AAAAAAF/abJjnQdXa/A=" + }, + "model": { + "$ref": "AAAAAAF/abJjnQdV2Ic=" + }, + "subViews": [ + { + "_type": "UMLAttributeView", + "_id": "AAAAAAF/abK3QwnOA4U=", + "_parent": { + "$ref": "AAAAAAF/abJjngdd6EQ=" + }, + "model": { + "$ref": "AAAAAAF/abK26QmhzQA=" + }, + "font": "Arial;13;0", + "left": 805, + "top": 254, + "width": 214.2587890625, + "height": 13, + "text": "-colors: HashMap", + "horizontalAlignment": 0 + }, + { + "_type": "UMLAttributeView", + "_id": "AAAAAAF/abQgdQ3ISt0=", + "_parent": { + "$ref": "AAAAAAF/abJjngdd6EQ=" + }, + "model": { + "$ref": "AAAAAAF/abQgMA2bBgc=" + }, + "font": "Arial;13;0", + "left": 805, + "top": 269, + "width": 214.2587890625, + "height": 13, + "text": "-paint: Paint", + "horizontalAlignment": 0 + }, + { + "_type": "UMLAttributeView", + "_id": "AAAAAAF/abSCrg/Idok=", + "_parent": { + "$ref": "AAAAAAF/abJjngdd6EQ=" + }, + "model": { + "$ref": "AAAAAAF/abSCaA+bVCE=" + }, + "font": "Arial;13;0", + "left": 805, + "top": 284, + "width": 214.2587890625, + "height": 13, + "text": "-colones: int", + "horizontalAlignment": 0 + }, + { + "_type": "UMLAttributeView", + "_id": "AAAAAAF/abTYrRLEhgI=", + "_parent": { + "$ref": "AAAAAAF/abJjngdd6EQ=" + }, + "model": { + "$ref": "AAAAAAF/abTYaRKXP80=" + }, + "font": "Arial;13;0", + "left": 805, + "top": 299, + "width": 214.2587890625, + "height": 13, + "text": "-lignes: int", + "horizontalAlignment": 0 + }, + { + "_type": "UMLAttributeView", + "_id": "AAAAAAF/abUNohYVLTA=", + "_parent": { + "$ref": "AAAAAAF/abJjngdd6EQ=" + }, + "model": { + "$ref": "AAAAAAF/abUNYBXoIgE=" + }, + "font": "Arial;13;0", + "left": 805, + "top": 314, + "width": 214.2587890625, + "height": 13, + "text": "+deathColor: int", + "horizontalAlignment": 0 + } + ], + "font": "Arial;13;0", + "left": 800, + "top": 249, + "width": 224.2587890625, + "height": 83 + }, + { + "_type": "UMLOperationCompartmentView", + "_id": "AAAAAAF/abJjngder+4=", + "_parent": { + "$ref": "AAAAAAF/abJjnQdXa/A=" + }, + "model": { + "$ref": "AAAAAAF/abJjnQdV2Ic=" + }, + "font": "Arial;13;0", + "left": 800, + "top": 332, + "width": 224.2587890625, + "height": 10 + }, + { + "_type": "UMLReceptionCompartmentView", + "_id": "AAAAAAF/abJjngdfGR4=", + "_parent": { + "$ref": "AAAAAAF/abJjnQdXa/A=" + }, + "model": { + "$ref": "AAAAAAF/abJjnQdV2Ic=" + }, + "visible": false, + "font": "Arial;13;0", + "width": 10, + "height": 10 + }, + { + "_type": "UMLTemplateParameterCompartmentView", + "_id": "AAAAAAF/abJjngdgHNU=", + "_parent": { + "$ref": "AAAAAAF/abJjnQdXa/A=" + }, + "model": { + "$ref": "AAAAAAF/abJjnQdV2Ic=" + }, + "visible": false, + "font": "Arial;13;0", + "width": 10, + "height": 10 + } + ], + "font": "Arial;13;0", + "containerChangeable": true, + "left": 800, + "top": 224, + "width": 224.2587890625, + "height": 118, + "nameCompartment": { + "$ref": "AAAAAAF/abJjnQdYTIc=" + }, + "attributeCompartment": { + "$ref": "AAAAAAF/abJjngdd6EQ=" + }, + "operationCompartment": { + "$ref": "AAAAAAF/abJjngder+4=" + }, + "receptionCompartment": { + "$ref": "AAAAAAF/abJjngdfGR4=" + }, + "templateParameterCompartment": { + "$ref": "AAAAAAF/abJjngdgHNU=" + } + }, { "_type": "UMLClassView", "_id": "AAAAAAF/aa/1n/hvAOk=", @@ -12463,6 +12727,8 @@ }, "visible": false, "font": "Arial;13;0", + "left": 1368, + "top": 480, "height": 13 }, { @@ -12472,8 +12738,8 @@ "$ref": "AAAAAAF/aa/1n/hwTwY=" }, "font": "Arial;13;1", - "left": 437, - "top": 223, + "left": 893, + "top": 383, "width": 101.55615234375, "height": 13, "text": "GameActivity" @@ -12486,6 +12752,8 @@ }, "visible": false, "font": "Arial;13;0", + "left": 1368, + "top": 480, "width": 81.6181640625, "height": 13, "text": "(from views)" @@ -12498,13 +12766,15 @@ }, "visible": false, "font": "Arial;13;0", + "left": 1368, + "top": 480, "height": 13, "horizontalAlignment": 1 } ], "font": "Arial;13;0", - "left": 432, - "top": 216, + "left": 888, + "top": 376, "width": 111.55615234375, "height": 25, "stereotypeLabel": { @@ -12540,8 +12810,8 @@ "$ref": "AAAAAAF/abCayf68A4U=" }, "font": "Arial;13;0", - "left": 437, - "top": 246, + "left": 893, + "top": 406, "width": 101.55615234375, "height": 13, "text": "-plateau: Plateau", @@ -12549,8 +12819,8 @@ } ], "font": "Arial;13;0", - "left": 432, - "top": 241, + "left": 888, + "top": 401, "width": 111.55615234375, "height": 23 }, @@ -12564,8 +12834,8 @@ "$ref": "AAAAAAF/aa/1n/htojs=" }, "font": "Arial;13;0", - "left": 432, - "top": 264, + "left": 888, + "top": 424, "width": 111.55615234375, "height": 10 }, @@ -12580,6 +12850,8 @@ }, "visible": false, "font": "Arial;13;0", + "left": 912, + "top": 320, "width": 10, "height": 10 }, @@ -12594,14 +12866,19 @@ }, "visible": false, "font": "Arial;13;0", + "left": 912, + "top": 320, "width": 10, "height": 10 } ], + "containerView": { + "$ref": "AAAAAAF9f+yPI98LSVA=" + }, "font": "Arial;13;0", "containerChangeable": true, - "left": 432, - "top": 216, + "left": 888, + "top": 376, "width": 111.55615234375, "height": 58, "nameCompartment": { @@ -12619,71 +12896,772 @@ "templateParameterCompartment": { "$ref": "AAAAAAF/aa/1oPh4BZw=" } - } - ] - }, - { - "_type": "UMLPackage", - "_id": "AAAAAAF9f+yPIt8J6pI=", - "_parent": { - "$ref": "AAAAAAF9f+tPc98Erm4=" - }, - "name": "views", - "ownedElements": [ - { - "_type": "UMLDependency", - "_id": "AAAAAAF9mX57rACacnQ=", - "_parent": { - "$ref": "AAAAAAF9f+yPIt8J6pI=" - }, - "source": { - "$ref": "AAAAAAF9f+yPIt8J6pI=" - }, - "target": { - "$ref": "AAAAAAF9mVQlT+VH1co=" - } }, { - "_type": "UMLClass", - "_id": "AAAAAAF/aa/1n/htojs=", + "_type": "UMLClassView", + "_id": "AAAAAAF/abFsswMLNLo=", "_parent": { - "$ref": "AAAAAAF9f+yPIt8J6pI=" + "$ref": "AAAAAAF9f+tPc98FthE=" }, - "name": "GameActivity", - "attributes": [ + "model": { + "$ref": "AAAAAAF/abFsswMJNgU=" + }, + "subViews": [ { - "_type": "UMLAttribute", - "_id": "AAAAAAF/abCayf68A4U=", + "_type": "UMLNameCompartmentView", + "_id": "AAAAAAF/abFsswMMHk0=", "_parent": { - "$ref": "AAAAAAF/aa/1n/htojs=" + "$ref": "AAAAAAF/abFsswMLNLo=" }, - "name": "plateau", - "visibility": "private", - "type": { - "$ref": "AAAAAAF9mVSOqOWOL84=" - } - } - ] - } - ] - }, - { - "_type": "UMLPackage", - "_id": "AAAAAAF9f+1j3t9So+g=", - "_parent": { - "$ref": "AAAAAAF9f+tPc98Erm4=" - }, - "name": "launcher", - "ownedElements": [ - { - "_type": "UMLClass", - "_id": "AAAAAAF9f+2nUd9vzLI=", - "_parent": { - "$ref": "AAAAAAF9f+1j3t9So+g=" - }, - "name": "Launcher", - "ownedElements": [ - { + "model": { + "$ref": "AAAAAAF/abFsswMJNgU=" + }, + "subViews": [ + { + "_type": "LabelView", + "_id": "AAAAAAF/abFsswMNYAw=", + "_parent": { + "$ref": "AAAAAAF/abFsswMMHk0=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 768, + "top": -240, + "height": 13 + }, + { + "_type": "LabelView", + "_id": "AAAAAAF/abFsswMOhi8=", + "_parent": { + "$ref": "AAAAAAF/abFsswMMHk0=" + }, + "font": "Arial;13;1", + "left": 893, + "top": 143, + "width": 117.431640625, + "height": 13, + "text": "LauncherActivity" + }, + { + "_type": "LabelView", + "_id": "AAAAAAF/abFsswMPbyY=", + "_parent": { + "$ref": "AAAAAAF/abFsswMMHk0=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 768, + "top": -240, + "width": 81.6181640625, + "height": 13, + "text": "(from views)" + }, + { + "_type": "LabelView", + "_id": "AAAAAAF/abFsswMQhss=", + "_parent": { + "$ref": "AAAAAAF/abFsswMMHk0=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 768, + "top": -240, + "height": 13, + "horizontalAlignment": 1 + } + ], + "font": "Arial;13;0", + "left": 888, + "top": 136, + "width": 127.431640625, + "height": 25, + "stereotypeLabel": { + "$ref": "AAAAAAF/abFsswMNYAw=" + }, + "nameLabel": { + "$ref": "AAAAAAF/abFsswMOhi8=" + }, + "namespaceLabel": { + "$ref": "AAAAAAF/abFsswMPbyY=" + }, + "propertyLabel": { + "$ref": "AAAAAAF/abFsswMQhss=" + } + }, + { + "_type": "UMLAttributeCompartmentView", + "_id": "AAAAAAF/abFsswMR7oE=", + "_parent": { + "$ref": "AAAAAAF/abFsswMLNLo=" + }, + "model": { + "$ref": "AAAAAAF/abFsswMJNgU=" + }, + "subViews": [ + { + "_type": "UMLAttributeView", + "_id": "AAAAAAF/abGtbwWCd4E=", + "_parent": { + "$ref": "AAAAAAF/abFsswMR7oE=" + }, + "model": { + "$ref": "AAAAAAF/abGtKQVVrtw=" + }, + "font": "Arial;13;0", + "left": 893, + "top": 166, + "width": 117.431640625, + "height": 13, + "text": "-manager: Manager", + "horizontalAlignment": 0 + } + ], + "font": "Arial;13;0", + "left": 888, + "top": 161, + "width": 127.431640625, + "height": 23 + }, + { + "_type": "UMLOperationCompartmentView", + "_id": "AAAAAAF/abFsswMSIbc=", + "_parent": { + "$ref": "AAAAAAF/abFsswMLNLo=" + }, + "model": { + "$ref": "AAAAAAF/abFsswMJNgU=" + }, + "font": "Arial;13;0", + "left": 888, + "top": 184, + "width": 127.431640625, + "height": 10 + }, + { + "_type": "UMLReceptionCompartmentView", + "_id": "AAAAAAF/abFstAMT0oc=", + "_parent": { + "$ref": "AAAAAAF/abFsswMLNLo=" + }, + "model": { + "$ref": "AAAAAAF/abFsswMJNgU=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 512, + "top": -160, + "width": 10, + "height": 10 + }, + { + "_type": "UMLTemplateParameterCompartmentView", + "_id": "AAAAAAF/abFstAMUlpI=", + "_parent": { + "$ref": "AAAAAAF/abFsswMLNLo=" + }, + "model": { + "$ref": "AAAAAAF/abFsswMJNgU=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 512, + "top": -160, + "width": 10, + "height": 10 + } + ], + "containerView": { + "$ref": "AAAAAAF9f+yPI98LSVA=" + }, + "font": "Arial;13;0", + "containerChangeable": true, + "left": 888, + "top": 136, + "width": 127.431640625, + "height": 58, + "nameCompartment": { + "$ref": "AAAAAAF/abFsswMMHk0=" + }, + "attributeCompartment": { + "$ref": "AAAAAAF/abFsswMR7oE=" + }, + "operationCompartment": { + "$ref": "AAAAAAF/abFsswMSIbc=" + }, + "receptionCompartment": { + "$ref": "AAAAAAF/abFstAMT0oc=" + }, + "templateParameterCompartment": { + "$ref": "AAAAAAF/abFstAMUlpI=" + } + }, + { + "_type": "UMLPackageView", + "_id": "AAAAAAF/aemuPRnhvSY=", + "_parent": { + "$ref": "AAAAAAF9f+tPc98FthE=" + }, + "model": { + "$ref": "AAAAAAF/aemuNxnfEeE=" + }, + "subViews": [ + { + "_type": "UMLNameCompartmentView", + "_id": "AAAAAAF/aemuQBniIsE=", + "_parent": { + "$ref": "AAAAAAF/aemuPRnhvSY=" + }, + "model": { + "$ref": "AAAAAAF/aemuNxnfEeE=" + }, + "subViews": [ + { + "_type": "LabelView", + "_id": "AAAAAAF/aemuQRnjal8=", + "_parent": { + "$ref": "AAAAAAF/aemuQBniIsE=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -640, + "top": -464, + "height": 13 + }, + { + "_type": "LabelView", + "_id": "AAAAAAF/aemuQhnkxPw=", + "_parent": { + "$ref": "AAAAAAF/aemuQBniIsE=" + }, + "font": "Arial;13;1", + "left": 365, + "top": 190, + "width": 303, + "height": 13, + "text": "fragment" + }, + { + "_type": "LabelView", + "_id": "AAAAAAF/aemuQhnlSo8=", + "_parent": { + "$ref": "AAAAAAF/aemuQBniIsE=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -640, + "top": -464, + "width": 81.6181640625, + "height": 13, + "text": "(from views)" + }, + { + "_type": "LabelView", + "_id": "AAAAAAF/aemuQhnmeVU=", + "_parent": { + "$ref": "AAAAAAF/aemuQBniIsE=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -640, + "top": -464, + "height": 13, + "horizontalAlignment": 1 + } + ], + "font": "Arial;13;0", + "left": 360, + "top": 183, + "width": 313, + "height": 25, + "stereotypeLabel": { + "$ref": "AAAAAAF/aemuQRnjal8=" + }, + "nameLabel": { + "$ref": "AAAAAAF/aemuQhnkxPw=" + }, + "namespaceLabel": { + "$ref": "AAAAAAF/aemuQhnlSo8=" + }, + "propertyLabel": { + "$ref": "AAAAAAF/aemuQhnmeVU=" + } + } + ], + "containerView": { + "$ref": "AAAAAAF9f+yPI98LSVA=" + }, + "containedViews": [ + { + "$ref": "AAAAAAF/acgwKBgTJLc=" + } + ], + "font": "Arial;13;0", + "containerChangeable": true, + "left": 360, + "top": 168, + "width": 313, + "height": 233, + "nameCompartment": { + "$ref": "AAAAAAF/aemuQBniIsE=" + } + }, + { + "_type": "UMLClassView", + "_id": "AAAAAAF/acgwKBgTJLc=", + "_parent": { + "$ref": "AAAAAAF9f+tPc98FthE=" + }, + "model": { + "$ref": "AAAAAAF/acgwKBgRXTQ=" + }, + "subViews": [ + { + "_type": "UMLNameCompartmentView", + "_id": "AAAAAAF/acgwKBgU4qI=", + "_parent": { + "$ref": "AAAAAAF/acgwKBgTJLc=" + }, + "model": { + "$ref": "AAAAAAF/acgwKBgRXTQ=" + }, + "subViews": [ + { + "_type": "LabelView", + "_id": "AAAAAAF/acgwKBgVusw=", + "_parent": { + "$ref": "AAAAAAF/acgwKBgU4qI=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -376, + "top": -432, + "height": 13 + }, + { + "_type": "LabelView", + "_id": "AAAAAAF/acgwKBgWato=", + "_parent": { + "$ref": "AAAAAAF/acgwKBgU4qI=" + }, + "font": "Arial;13;1", + "left": 397, + "top": 223, + "width": 105.47265625, + "height": 13, + "text": "FragmentPlateau" + }, + { + "_type": "LabelView", + "_id": "AAAAAAF/acgwKBgXmNs=", + "_parent": { + "$ref": "AAAAAAF/acgwKBgU4qI=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -376, + "top": -432, + "width": 89.57177734375, + "height": 13, + "text": "(from fragment)" + }, + { + "_type": "LabelView", + "_id": "AAAAAAF/acgwKBgY2Kk=", + "_parent": { + "$ref": "AAAAAAF/acgwKBgU4qI=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -376, + "top": -432, + "height": 13, + "horizontalAlignment": 1 + } + ], + "font": "Arial;13;0", + "left": 392, + "top": 216, + "width": 115.47265625, + "height": 25, + "stereotypeLabel": { + "$ref": "AAAAAAF/acgwKBgVusw=" + }, + "nameLabel": { + "$ref": "AAAAAAF/acgwKBgWato=" + }, + "namespaceLabel": { + "$ref": "AAAAAAF/acgwKBgXmNs=" + }, + "propertyLabel": { + "$ref": "AAAAAAF/acgwKBgY2Kk=" + } + }, + { + "_type": "UMLAttributeCompartmentView", + "_id": "AAAAAAF/acgwKBgZslU=", + "_parent": { + "$ref": "AAAAAAF/acgwKBgTJLc=" + }, + "model": { + "$ref": "AAAAAAF/acgwKBgRXTQ=" + }, + "font": "Arial;13;0", + "left": 392, + "top": 241, + "width": 115.47265625, + "height": 10 + }, + { + "_type": "UMLOperationCompartmentView", + "_id": "AAAAAAF/acgwKBgaGQs=", + "_parent": { + "$ref": "AAAAAAF/acgwKBgTJLc=" + }, + "model": { + "$ref": "AAAAAAF/acgwKBgRXTQ=" + }, + "font": "Arial;13;0", + "left": 392, + "top": 251, + "width": 115.47265625, + "height": 10 + }, + { + "_type": "UMLReceptionCompartmentView", + "_id": "AAAAAAF/acgwKBgb9rY=", + "_parent": { + "$ref": "AAAAAAF/acgwKBgTJLc=" + }, + "model": { + "$ref": "AAAAAAF/acgwKBgRXTQ=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -312, + "top": -280, + "width": 10, + "height": 10 + }, + { + "_type": "UMLTemplateParameterCompartmentView", + "_id": "AAAAAAF/acgwKBgcvxQ=", + "_parent": { + "$ref": "AAAAAAF/acgwKBgTJLc=" + }, + "model": { + "$ref": "AAAAAAF/acgwKBgRXTQ=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -312, + "top": -280, + "width": 10, + "height": 10 + } + ], + "containerView": { + "$ref": "AAAAAAF/aemuPRnhvSY=" + }, + "font": "Arial;13;0", + "containerChangeable": true, + "left": 392, + "top": 216, + "width": 115.47265625, + "height": 45, + "nameCompartment": { + "$ref": "AAAAAAF/acgwKBgU4qI=" + }, + "attributeCompartment": { + "$ref": "AAAAAAF/acgwKBgZslU=" + }, + "operationCompartment": { + "$ref": "AAAAAAF/acgwKBgaGQs=" + }, + "receptionCompartment": { + "$ref": "AAAAAAF/acgwKBgb9rY=" + }, + "templateParameterCompartment": { + "$ref": "AAAAAAF/acgwKBgcvxQ=" + } + }, + { + "_type": "UMLClassView", + "_id": "AAAAAAF/aepcYyhQJFw=", + "_parent": { + "$ref": "AAAAAAF9f+tPc98FthE=" + }, + "model": { + "$ref": "AAAAAAF/aepcYihO4Yc=" + }, + "subViews": [ + { + "_type": "UMLNameCompartmentView", + "_id": "AAAAAAF/aepcYyhR5mg=", + "_parent": { + "$ref": "AAAAAAF/aepcYyhQJFw=" + }, + "model": { + "$ref": "AAAAAAF/aepcYihO4Yc=" + }, + "subViews": [ + { + "_type": "LabelView", + "_id": "AAAAAAF/aepcYyhS7DA=", + "_parent": { + "$ref": "AAAAAAF/aepcYyhR5mg=" + }, + "visible": false, + "font": "Arial;13;0", + "height": 13 + }, + { + "_type": "LabelView", + "_id": "AAAAAAF/aepcYyhT7IE=", + "_parent": { + "$ref": "AAAAAAF/aepcYyhR5mg=" + }, + "font": "Arial;13;1", + "left": 525, + "top": 335, + "width": 93.1708984375, + "height": 13, + "text": "MenuFragment" + }, + { + "_type": "LabelView", + "_id": "AAAAAAF/aepcYyhUI6g=", + "_parent": { + "$ref": "AAAAAAF/aepcYyhR5mg=" + }, + "visible": false, + "font": "Arial;13;0", + "width": 89.57177734375, + "height": 13, + "text": "(from fragment)" + }, + { + "_type": "LabelView", + "_id": "AAAAAAF/aepcYyhV3so=", + "_parent": { + "$ref": "AAAAAAF/aepcYyhR5mg=" + }, + "visible": false, + "font": "Arial;13;0", + "height": 13, + "horizontalAlignment": 1 + } + ], + "font": "Arial;13;0", + "left": 520, + "top": 328, + "width": 103.1708984375, + "height": 25, + "stereotypeLabel": { + "$ref": "AAAAAAF/aepcYyhS7DA=" + }, + "nameLabel": { + "$ref": "AAAAAAF/aepcYyhT7IE=" + }, + "namespaceLabel": { + "$ref": "AAAAAAF/aepcYyhUI6g=" + }, + "propertyLabel": { + "$ref": "AAAAAAF/aepcYyhV3so=" + } + }, + { + "_type": "UMLAttributeCompartmentView", + "_id": "AAAAAAF/aepcYyhWsIw=", + "_parent": { + "$ref": "AAAAAAF/aepcYyhQJFw=" + }, + "model": { + "$ref": "AAAAAAF/aepcYihO4Yc=" + }, + "font": "Arial;13;0", + "left": 520, + "top": 353, + "width": 103.1708984375, + "height": 10 + }, + { + "_type": "UMLOperationCompartmentView", + "_id": "AAAAAAF/aepcYyhXK9Y=", + "_parent": { + "$ref": "AAAAAAF/aepcYyhQJFw=" + }, + "model": { + "$ref": "AAAAAAF/aepcYihO4Yc=" + }, + "font": "Arial;13;0", + "left": 520, + "top": 363, + "width": 103.1708984375, + "height": 10 + }, + { + "_type": "UMLReceptionCompartmentView", + "_id": "AAAAAAF/aepcYyhYnaI=", + "_parent": { + "$ref": "AAAAAAF/aepcYyhQJFw=" + }, + "model": { + "$ref": "AAAAAAF/aepcYihO4Yc=" + }, + "visible": false, + "font": "Arial;13;0", + "width": 10, + "height": 10 + }, + { + "_type": "UMLTemplateParameterCompartmentView", + "_id": "AAAAAAF/aepcYyhZzp0=", + "_parent": { + "$ref": "AAAAAAF/aepcYyhQJFw=" + }, + "model": { + "$ref": "AAAAAAF/aepcYihO4Yc=" + }, + "visible": false, + "font": "Arial;13;0", + "width": 10, + "height": 10 + } + ], + "font": "Arial;13;0", + "containerChangeable": true, + "left": 520, + "top": 328, + "width": 103.1708984375, + "height": 45, + "nameCompartment": { + "$ref": "AAAAAAF/aepcYyhR5mg=" + }, + "attributeCompartment": { + "$ref": "AAAAAAF/aepcYyhWsIw=" + }, + "operationCompartment": { + "$ref": "AAAAAAF/aepcYyhXK9Y=" + }, + "receptionCompartment": { + "$ref": "AAAAAAF/aepcYyhYnaI=" + }, + "templateParameterCompartment": { + "$ref": "AAAAAAF/aepcYyhZzp0=" + } + } + ] + }, + { + "_type": "UMLPackage", + "_id": "AAAAAAF9f+yPIt8J6pI=", + "_parent": { + "$ref": "AAAAAAF9f+tPc98Erm4=" + }, + "name": "views", + "ownedElements": [ + { + "_type": "UMLDependency", + "_id": "AAAAAAF9mX57rACacnQ=", + "_parent": { + "$ref": "AAAAAAF9f+yPIt8J6pI=" + }, + "source": { + "$ref": "AAAAAAF9f+yPIt8J6pI=" + }, + "target": { + "$ref": "AAAAAAF9mVQlT+VH1co=" + } + }, + { + "_type": "UMLClass", + "_id": "AAAAAAF/aa/1n/htojs=", + "_parent": { + "$ref": "AAAAAAF9f+yPIt8J6pI=" + }, + "name": "GameActivity", + "attributes": [ + { + "_type": "UMLAttribute", + "_id": "AAAAAAF/abCayf68A4U=", + "_parent": { + "$ref": "AAAAAAF/aa/1n/htojs=" + }, + "name": "plateau", + "visibility": "private", + "type": { + "$ref": "AAAAAAF9mVSOqOWOL84=" + } + } + ] + }, + { + "_type": "UMLClass", + "_id": "AAAAAAF/abFsswMJNgU=", + "_parent": { + "$ref": "AAAAAAF9f+yPIt8J6pI=" + }, + "name": "LauncherActivity", + "attributes": [ + { + "_type": "UMLAttribute", + "_id": "AAAAAAF/abGtKQVVrtw=", + "_parent": { + "$ref": "AAAAAAF/abFsswMJNgU=" + }, + "name": "manager", + "visibility": "private", + "type": { + "$ref": "AAAAAAF9mawnSwtAdco=" + } + } + ] + }, + { + "_type": "UMLPackage", + "_id": "AAAAAAF/aemuNxnfEeE=", + "_parent": { + "$ref": "AAAAAAF9f+yPIt8J6pI=" + }, + "name": "fragment", + "ownedElements": [ + { + "_type": "UMLClass", + "_id": "AAAAAAF/acgwKBgRXTQ=", + "_parent": { + "$ref": "AAAAAAF/aemuNxnfEeE=" + }, + "name": "FragmentPlateau" + }, + { + "_type": "UMLClass", + "_id": "AAAAAAF/aepcYihO4Yc=", + "_parent": { + "$ref": "AAAAAAF/aemuNxnfEeE=" + }, + "name": "MenuFragment" + } + ] + } + ] + }, + { + "_type": "UMLPackage", + "_id": "AAAAAAF9f+1j3t9So+g=", + "_parent": { + "$ref": "AAAAAAF9f+tPc98Erm4=" + }, + "name": "launcher", + "ownedElements": [ + { + "_type": "UMLClass", + "_id": "AAAAAAF9f+2nUd9vzLI=", + "_parent": { + "$ref": "AAAAAAF9f+1j3t9So+g=" + }, + "name": "Launcher", + "ownedElements": [ + { "_type": "UMLDependency", "_id": "AAAAAAF9vYatuYkl9t8=", "_parent": { @@ -15173,6 +16151,65 @@ } } ] + }, + { + "_type": "UMLClass", + "_id": "AAAAAAF/abJjnQdV2Ic=", + "_parent": { + "$ref": "AAAAAAF9f+tPc98Erm4=" + }, + "name": "PlateauView", + "attributes": [ + { + "_type": "UMLAttribute", + "_id": "AAAAAAF/abK26QmhzQA=", + "_parent": { + "$ref": "AAAAAAF/abJjnQdV2Ic=" + }, + "name": "colors", + "visibility": "private", + "type": "HashMap" + }, + { + "_type": "UMLAttribute", + "_id": "AAAAAAF/abQgMA2bBgc=", + "_parent": { + "$ref": "AAAAAAF/abJjnQdV2Ic=" + }, + "name": "paint", + "visibility": "private", + "type": "Paint" + }, + { + "_type": "UMLAttribute", + "_id": "AAAAAAF/abSCaA+bVCE=", + "_parent": { + "$ref": "AAAAAAF/abJjnQdV2Ic=" + }, + "name": "colones", + "visibility": "private", + "type": "int" + }, + { + "_type": "UMLAttribute", + "_id": "AAAAAAF/abTYaRKXP80=", + "_parent": { + "$ref": "AAAAAAF/abJjnQdV2Ic=" + }, + "name": "lignes", + "visibility": "private", + "type": "int" + }, + { + "_type": "UMLAttribute", + "_id": "AAAAAAF/abUNYBXoIgE=", + "_parent": { + "$ref": "AAAAAAF/abJjnQdV2Ic=" + }, + "name": "deathColor", + "type": "int" + } + ] } ] }