add init shuffled to PlayerRoleActivity and margin to RoleDialog

IamRezaMousavi · Mar 22, 2024 · 6fa1044 · 6fa1044
1 parent 52f7ca7
commit 6fa1044
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 3 deletions.
diff --git a/app/src/main/kotlin/com/github/iamrezamousavi/mafia/view/PlayerRoleActivity.kt b/app/src/main/kotlin/com/github/iamrezamousavi/mafia/view/PlayerRoleActivity.kt
@@ -19,6 +19,8 @@ class PlayerRoleActivity : AppCompatActivity() {
         binding = ActivityPlayerRoleBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
+        roleShuffled()
+
         playerRoleAdapter = PlayerRoleAdapter(
             SharedData.getPlayers(),
             onSelect = { player ->
@@ -37,7 +39,7 @@ class PlayerRoleActivity : AppCompatActivity() {
         binding.peopleRoleToolBar.setOnMenuItemClickListener { menuItem ->
             when (menuItem.itemId) {
                 R.id.menuItemRefresh -> {
-                    SharedData.shuffled()
+                    roleShuffled()
                     Toast.makeText(this, R.string.refresh, Toast.LENGTH_SHORT).show()
                     true
                 }
@@ -48,4 +50,10 @@ class PlayerRoleActivity : AppCompatActivity() {
             }
         }
     }
+
+    private fun roleShuffled() {
+        for (i in 1..2) {
+            SharedData.shuffled()
+        }
+    }
 }
diff --git a/app/src/main/kotlin/com/github/iamrezamousavi/mafia/view/RoleActivity.kt b/app/src/main/kotlin/com/github/iamrezamousavi/mafia/view/RoleActivity.kt
@@ -96,7 +96,7 @@ class RoleActivity : AppCompatActivity() {
                 val intent = Intent(this, PlayerRoleActivity::class.java)
                 startActivity(intent)
             } else {
-                Toast.makeText(this, "Players and Roles doesn't match", Toast.LENGTH_SHORT).show()
+                Toast.makeText(this, R.string.roles_not_match, Toast.LENGTH_SHORT).show()
             }
         }
     }

diff --git a/app/src/main/res/layout/dialog_role.xml b/app/src/main/res/layout/dialog_role.xml
@@ -11,7 +11,8 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:layout_margin="10dp">
 
         <TextView
             android:id="@+id/titleText"
@@ -42,6 +43,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="16dp"
+            android:gravity="center"
             android:text="@string/simple_citizen_desc"
             android:textColor="@color/md_theme_onSecondaryContainer"
             app:layout_constraintEnd_toEndOf="parent"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -9,6 +9,7 @@
     <string name="settings">تنظیمات</string>
 
     <string name="player_not_enough">حداقل ۳ نفر باید انتخاب کنید</string>
+    <string name="roles_not_match">Players and Roles doesn\'t match</string>
     <string name="select_all">انتخاب همه</string>
     <string name="delete_player">حذف بازیکن</string>
     <string name="refresh">تازه کردن</string>

diff --git a/app/src/test/kotlin/com/github/iamrezamousavi/mafia/utils/SharedDataTest.kt b/app/src/test/kotlin/com/github/iamrezamousavi/mafia/utils/SharedDataTest.kt
@@ -58,6 +58,23 @@ class SharedDataTest {
         assertNotEquals(sharedData.getRoles(), roles)
     }
 
+    @Test
+    fun test_two_shuffled() {
+        val roles = arrayListOf(
+            Role(name = R.string.simple_citizen),
+            Role(name = R.string.doctor),
+            Role(name = R.string.detective),
+            Role(name = R.string.simple_mafia),
+            Role(name = R.string.godfather),
+        )
+        sharedData.setRoles(roles)
+
+        sharedData.shuffled()
+        sharedData.shuffled()
+
+        assertNotEquals(sharedData.getRoles(), roles)
+    }
+
     @Test
     fun test_get_role() {
         val players = arrayListOf(