体验优化

Author: bihe0832

BasePuzzleGame/src/main/java/com/bihe0832/android/base/puzzle/ui/PuzzleGameMainFragment.kt

@@ -57,10 +57,10 @@ class PuzzleGameMainFragment : BaseFragment() {
             override fun onGameSuccess(level: Int, gameMode: GameMode) {
                 ThreadManager.getInstance().runOnUIThread {
                     CommonDialog(context).apply {
-                        title = "挑战成功"
+                        title = getString(R.string.success_title)
                         setHtmlContent("你已完成<b><font color='#38ADFF'> " + gameMode.desc + " </font>的 $level 级</b>挑战，要换张图继续么？")
-                        negative = "继续当前"
-                        positive = "换张图"
+                        negative = getString(R.string.success_negative)
+                        positive = getString(R.string.success_positive)
                         setShouldCanceled(true)
                         setOnClickBottomListener(object : OnDialogListener {
                             override fun onPositiveClick() {
@@ -89,13 +89,13 @@ class PuzzleGameMainFragment : BaseFragment() {
             }
         })
         PuzzleGameManager.changeGameMode(GameMode.getGameMode(Config.readConfig(CONFIG_PUZZLE_MODE, GameMode.NORMAL.ordinal)))
-        PuzzleGameManager.changeGameLevel(Config.readConfig(CONFIG_PUZZLE_LEVEL, 3))
+        PuzzleGameManager.changeGameLevel(Config.readConfig(CONFIG_PUZZLE_LEVEL, 1))
         updateLevetText()
         updateGameModeText()
         updatePreviewImg()
         addLevel.setOnClickListener {
             if (PuzzleGameManager.getLevel() == PuzzleGameManager.getMaxLevel()) {
-                ZixieContext.showLongToastJustAPPFront("已到达最高等级")
+                ZixieContext.showLongToastJustAPPFront(getString(R.string.top_level))
                 it.isEnabled = false
             } else {
                 PuzzleGameManager.addLevel()
@@ -105,7 +105,7 @@ class PuzzleGameMainFragment : BaseFragment() {
 
         reduceLevel.setOnClickListener {
             if (PuzzleGameManager.getLevel() == PuzzleGameManager.getMinLevel()) {
-                ZixieContext.showLongToastJustAPPFront("已到达最低等级")
+                ZixieContext.showLongToastJustAPPFront(getString(R.string.bottom_level))
                 it.isEnabled = false
             } else {
                 PuzzleGameManager.reduceLevel()
@@ -128,10 +128,10 @@ class PuzzleGameMainFragment : BaseFragment() {
     }
 
     private fun updateLevetText() {
-        game_level.text = "难度等级：" + PuzzleGameManager.getLevel()
+        game_level.text = String.format(getString(R.string.game_level), PuzzleGameManager.getLevel())
     }
 
     private fun updateGameModeText() {
-        game_mode.text = "游戏模式：" + PuzzleGameManager.getGameMode().desc
+        game_mode.text = String.format(getString(R.string.game_mode), PuzzleGameManager.getGameMode().desc)
     }
 }

BasePuzzleGame/src/main/res/layout/fragment_puzzle_game_main.xml

@@ -59,7 +59,7 @@
 
         <Button
                 android:id="@+id/changeMode"
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="@drawable/game_button_bg"
                 android:textColor="@color/white"
@@ -74,7 +74,7 @@
 
         <Button
                 android:id="@+id/reduceLevel"
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="@drawable/game_button_bg"
                 android:textColor="@color/white"
@@ -84,14 +84,11 @@
                 app:layout_constraintTop_toTopOf="@+id/changeMode"
                 app:layout_constraintBottom_toBottomOf="@+id/changeMode"
                 app:layout_constraintEnd_toStartOf="@id/addLevel"
-                android:layout_marginLeft="32dp"
-                android:layout_marginRight="32dp"
-
                 android:text="降低难度" />
 
         <Button
                 android:id="@+id/addLevel"
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="@drawable/game_button_bg"
                 android:textColor="@color/white"

BasePuzzleGame/src/main/res/values/strings.xml

@@ -1,12 +1,9 @@
 <resources>
-    <string name="app_name">PuzzleGame</string>
-    <string name="game_mode_normal">普通模式</string>
-    <string name="game_mode_exchange">交换模式</string>
-    <string name="already_the_most_level">已经是最高等级</string>
-    <string name="already_the_less_level">已经是最低等级</string>
-    <string name="success">成功！</string>
-    <string name="success_description">你已经完成拼图，是否挑战下一个等级？</string>
-    <string name="next_level">下一等级</string>
-    <string name="cancel">取消</string>
-
+    <string name="game_mode">游戏模式：%1$s</string>
+    <string name="game_level">难度等级： %1$s 级</string>
+    <string name="top_level">当前已经是最高难度</string>
+    <string name="bottom_level">当前已经是最低难度</string>
+    <string name="success_title">挑战成功</string>
+    <string name="success_negative">继续当前</string>
+    <string name="success_positive">换张图</string>
 </resources>