Merge branch 'testApp' of https://codefirst.iut.uca.fr/git/StudentBros/StudentBros into testApp

StudentBros/app/src/main/java/uca/iutinfo/studentbros/data/Stub.kt

@@ -6,7 +6,7 @@ class Stub : IDataManager {
 
     override fun getPlayer(): Player {
         val thePowerOfLove = StandardPowerUp(0f,0f,0f,0f,0f,0f, false, false, mapOf("pow-standard" to "lien pow-standard"), "lien pow-standard", "standard")
-        return Player(400f,300f,700f,650f,0f,80f, false, true, mapOf("standard" to "lien standard"), "lien standard", 3, thePowerOfLove)
+        return Player(400f,300f,700f,600f,0f,80f, false, true, mapOf("standard" to "lien standard"), "lien standard", 3, thePowerOfLove)
     }
     override fun getLevel(niveau : Int): Level {
 
@@ -17,12 +17,7 @@ class Stub : IDataManager {
             //sol
             level1.add(
                 ConcreteBlock(
-                    6600F,
+                    6600F,00F,200F,0F,0F, 0F,
-                    000F,
-                    200F,
-                    0F,
-                    0F,
-                    0F,
                     isImmortal = false,
                     isVisible = true,
                     emptyMap(),
@@ -31,12 +26,7 @@ class Stub : IDataManager {
             )
             level1.add(
                 ConcreteBlock(
-                    8300F,
+                    8300F,6900F,200F,0F,0F,0F,
-                    6900F,
-                    200F,
-                    0F,
-                    0F,
-                    0F,
                     isImmortal = false,
                     isVisible = true,
                     emptyMap(),
@@ -45,12 +35,7 @@ class Stub : IDataManager {
             )
             level1.add(
                 ConcreteBlock(
-                    15500F,
+                    15500F,8700F,200F,0F,0F,0F,
-                    8700F,
-                    200F,
-                    0F,
-                    0F,
-                    0F,
                     isImmortal = false,
                     isVisible = true,
                     emptyMap(),
@@ -59,12 +44,7 @@ class Stub : IDataManager {
             )
             level1.add(
                 ConcreteBlock(
-                    25000F,
+                    25000F,15800F,200F,0F,0F,0F,
-                    15800F,
-                    200F,
-                    0F,
-                    0F,
-                    0F,
                     isImmortal = false,
                     isVisible = true,
                     emptyMap(),

StudentBros/app/src/main/res/values/strings.xml

@@ -1,3 +1,6 @@
 <resources>
     <string name="app_name">StudentBros</string>
+    <string name="jouer">Jouer</string>
+    <string name="classements">Classements</string>
+    <string name="studentbros">StudentBros</string>
 </resources>