refactor: 软件包移位

Jim-shop · May 12, 2023 · 32bea43 · 32bea43
1 parent a0d67cd
commit 32bea43
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 15 deletions.
diff --git a/app/src/main/java/net/imshit/aircraftwar/element/aircraft/enemy/BossEnemy.kt b/app/src/main/java/net/imshit/aircraftwar/element/aircraft/enemy/BossEnemy.kt
@@ -1,7 +1,7 @@
 package net.imshit.aircraftwar.element.aircraft.enemy
 
 import net.imshit.aircraftwar.element.prop.Props
-import net.imshit.aircraftwar.logic.GameEvents
+import net.imshit.aircraftwar.logic.data.GameEvents
 import net.imshit.aircraftwar.logic.game.Games
 import net.imshit.aircraftwar.logic.generate.prop.PropGenerateStrategies
 

diff --git a/app/src/main/java/net/imshit/aircraftwar/element/aircraft/enemy/Enemies.kt b/app/src/main/java/net/imshit/aircraftwar/element/aircraft/enemy/Enemies.kt
@@ -5,8 +5,8 @@ import net.imshit.aircraftwar.element.bullet.EnemyBullet
 import net.imshit.aircraftwar.element.prop.Props
 import net.imshit.aircraftwar.element.shoot.enemy.EnemyShootStrategies
 import net.imshit.aircraftwar.element.shoot.enemy.EnemyShootStrategyFactory
-import net.imshit.aircraftwar.logic.EnemyListener
-import net.imshit.aircraftwar.logic.GameEvents
+import net.imshit.aircraftwar.logic.data.EnemyListener
+import net.imshit.aircraftwar.logic.data.GameEvents
 import net.imshit.aircraftwar.logic.game.Games
 
 sealed class Enemies(

diff --git a/app/src/main/java/net/imshit/aircraftwar/element/bullet/EnemyBullet.kt b/app/src/main/java/net/imshit/aircraftwar/element/bullet/EnemyBullet.kt
@@ -1,7 +1,7 @@
 package net.imshit.aircraftwar.element.bullet
 
-import net.imshit.aircraftwar.logic.EnemyListener
-import net.imshit.aircraftwar.logic.GameEvents
+import net.imshit.aircraftwar.logic.data.EnemyListener
+import net.imshit.aircraftwar.logic.data.GameEvents
 import net.imshit.aircraftwar.logic.game.Games
 
 class EnemyBullet(

diff --git a/app/src/main/java/net/imshit/aircraftwar/element/prop/BombProp.kt b/app/src/main/java/net/imshit/aircraftwar/element/prop/BombProp.kt
@@ -1,6 +1,6 @@
 package net.imshit.aircraftwar.element.prop
 
-import net.imshit.aircraftwar.logic.GameEvents
+import net.imshit.aircraftwar.logic.data.GameEvents
 import net.imshit.aircraftwar.logic.game.Games
 
 class BombProp(

diff --git a/app/src/main/java/net/imshit/aircraftwar/gui/GameActivity.kt b/app/src/main/java/net/imshit/aircraftwar/gui/GameActivity.kt
@@ -19,7 +19,7 @@ import com.google.android.material.textfield.TextInputLayout
 import com.google.android.material.textfield.TextInputLayout.END_ICON_CLEAR_TEXT
 import net.imshit.aircraftwar.R
 import net.imshit.aircraftwar.databinding.ActivityGameBinding
-import net.imshit.aircraftwar.logic.Difficulty
+import net.imshit.aircraftwar.logic.data.Difficulty
 import net.imshit.aircraftwar.logic.game.Games
 
 class GameActivity : AppCompatActivity() {

diff --git a/app/src/main/java/net/imshit/aircraftwar/gui/MainActivity.kt b/app/src/main/java/net/imshit/aircraftwar/gui/MainActivity.kt
@@ -5,7 +5,7 @@ import androidx.appcompat.app.AppCompatActivity
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import net.imshit.aircraftwar.R
 import net.imshit.aircraftwar.databinding.ActivityMainBinding
-import net.imshit.aircraftwar.logic.Difficulty
+import net.imshit.aircraftwar.logic.data.Difficulty
 
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {

diff --git a/app/src/main/java/net/imshit/aircraftwar/gui/ScoreboardActivity.kt b/app/src/main/java/net/imshit/aircraftwar/gui/ScoreboardActivity.kt
@@ -5,7 +5,7 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import net.imshit.aircraftwar.databinding.ActivityScoreboardBinding
-import net.imshit.aircraftwar.logic.Difficulty
+import net.imshit.aircraftwar.logic.data.Difficulty
 
 class ScoreboardActivity : AppCompatActivity() {
     companion object {

diff --git a/...et/imshit/aircraftwar/logic/Difficulty.kt → ...shit/aircraftwar/logic/data/Difficulty.kt b/...et/imshit/aircraftwar/logic/Difficulty.kt → ...shit/aircraftwar/logic/data/Difficulty.kt
@@ -1,4 +1,4 @@
-package net.imshit.aircraftwar.logic
+package net.imshit.aircraftwar.logic.data
 
 enum class Difficulty {
     EASY, MEDIUM, HARD

diff --git a/...imshit/aircraftwar/logic/EnemyListener.kt → ...t/aircraftwar/logic/data/EnemyListener.kt b/...imshit/aircraftwar/logic/EnemyListener.kt → ...t/aircraftwar/logic/data/EnemyListener.kt
@@ -1,4 +1,4 @@
-package net.imshit.aircraftwar.logic
+package net.imshit.aircraftwar.logic.data
 
 interface EnemyListener {
     fun notify(e: GameEvents)

diff --git a/...et/imshit/aircraftwar/logic/GameEvents.kt → ...shit/aircraftwar/logic/data/GameEvents.kt b/...et/imshit/aircraftwar/logic/GameEvents.kt → ...shit/aircraftwar/logic/data/GameEvents.kt
@@ -1,4 +1,4 @@
-package net.imshit.aircraftwar.logic
+package net.imshit.aircraftwar.logic.data
 
 enum class GameEvents {
     BOMB_ACTIVATE

diff --git a/app/src/main/java/net/imshit/aircraftwar/logic/game/Games.kt b/app/src/main/java/net/imshit/aircraftwar/logic/game/Games.kt
@@ -21,9 +21,9 @@ import net.imshit.aircraftwar.element.bullet.Bullets
 import net.imshit.aircraftwar.element.bullet.EnemyBullet
 import net.imshit.aircraftwar.element.bullet.HeroBullet
 import net.imshit.aircraftwar.element.prop.Props
-import net.imshit.aircraftwar.logic.Difficulty
-import net.imshit.aircraftwar.logic.EnemyListener
-import net.imshit.aircraftwar.logic.GameEvents
+import net.imshit.aircraftwar.logic.data.Difficulty
+import net.imshit.aircraftwar.logic.data.EnemyListener
+import net.imshit.aircraftwar.logic.data.GameEvents
 import net.imshit.aircraftwar.logic.generate.enemy.EnemyGenerateStrategies
 import net.imshit.aircraftwar.util.music.BasicMusicStrategy
 import net.imshit.aircraftwar.util.music.BgmType