From 38163c33a32979f7b7ac5dca283f3bc457e5b071 Mon Sep 17 00:00:00 2001 From: cmclark00 Date: Tue, 1 Apr 2025 05:06:38 -0400 Subject: [PATCH 1/5] Fix namespace and applicationId in build.gradle to match package structure --- README.md | 4 +- app/build.gradle | 9 +++-- app/proguard-rules.pro | 10 ++--- app/src/main/AndroidManifest.xml | 4 +- .../HighScoreEntryActivity.kt | 14 +++---- .../HighScoresActivity.kt | 13 +++---- .../MainActivity.kt | 37 +++++++++---------- .../StatsActivity.kt | 10 ++--- .../ThemeManager.kt | 2 +- .../accessibility/GameAccessibilityHelper.kt | 8 ++-- .../audio/GameMusic.kt | 4 +- .../game/GameHaptics.kt | 2 +- .../game/GameLifecycleManager.kt | 12 +++--- .../game/GameView.kt | 13 +++---- .../game/GamepadController.kt | 6 +-- .../game/HoldPieceView.kt | 5 +-- .../game/NextPieceView.kt | 2 +- .../game/TitleScreen.kt | 10 ++--- .../model/GameBoard.kt | 2 +- .../model/HighScore.kt | 2 +- .../model/HighScoreAdapter.kt | 4 +- .../model/HighScoreManager.kt | 4 +- .../model/PlayerProgressionManager.kt | 5 +-- .../model/StatsManager.kt | 4 +- .../model/Tetromino.kt | 2 +- .../ui/BlockSkinSelector.kt | 6 +-- .../ui/GameUIManager.kt | 10 ++--- .../ui/LevelBadge.kt | 2 +- .../ui/ProgressionScreen.kt | 6 +-- .../ui/ThemeSelector.kt | 7 ++-- .../ui/XPProgressBar.kt | 4 +- .../main/res/layout-land/activity_main.xml | 20 +++++----- app/src/main/res/layout/activity_main.xml | 18 ++++----- .../main/res/layout/progression_screen.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- app/src/main/res/values/styles.xml | 4 +- app/src/main/res/xml/shortcuts.xml | 8 ++-- settings.gradle | 2 +- tatus | 12 +++--- 39 files changed, 134 insertions(+), 157 deletions(-) rename app/src/main/java/com/{mintris => pixelmintdrop}/HighScoreEntryActivity.kt (93%) rename app/src/main/java/com/{mintris => pixelmintdrop}/HighScoresActivity.kt (94%) rename app/src/main/java/com/{mintris => pixelmintdrop}/MainActivity.kt (98%) rename app/src/main/java/com/{mintris => pixelmintdrop}/StatsActivity.kt (96%) rename app/src/main/java/com/{mintris => pixelmintdrop}/ThemeManager.kt (92%) rename app/src/main/java/com/{mintris => pixelmintdrop}/accessibility/GameAccessibilityHelper.kt (97%) rename app/src/main/java/com/{mintris => pixelmintdrop}/audio/GameMusic.kt (98%) rename app/src/main/java/com/{mintris => pixelmintdrop}/game/GameHaptics.kt (99%) rename app/src/main/java/com/{mintris => pixelmintdrop}/game/GameLifecycleManager.kt (93%) rename app/src/main/java/com/{mintris => pixelmintdrop}/game/GameView.kt (99%) rename app/src/main/java/com/{mintris => pixelmintdrop}/game/GamepadController.kt (99%) rename app/src/main/java/com/{mintris => pixelmintdrop}/game/HoldPieceView.kt (97%) rename app/src/main/java/com/{mintris => pixelmintdrop}/game/NextPieceView.kt (99%) rename app/src/main/java/com/{mintris => pixelmintdrop}/game/TitleScreen.kt (98%) rename app/src/main/java/com/{mintris => pixelmintdrop}/model/GameBoard.kt (99%) rename app/src/main/java/com/{mintris => pixelmintdrop}/model/HighScore.kt (79%) rename app/src/main/java/com/{mintris => pixelmintdrop}/model/HighScoreAdapter.kt (97%) rename app/src/main/java/com/{mintris => pixelmintdrop}/model/HighScoreManager.kt (93%) rename app/src/main/java/com/{mintris => pixelmintdrop}/model/PlayerProgressionManager.kt (99%) rename app/src/main/java/com/{mintris => pixelmintdrop}/model/StatsManager.kt (98%) rename app/src/main/java/com/{mintris => pixelmintdrop}/model/Tetromino.kt (99%) rename app/src/main/java/com/{mintris => pixelmintdrop}/ui/BlockSkinSelector.kt (99%) rename app/src/main/java/com/{mintris => pixelmintdrop}/ui/GameUIManager.kt (95%) rename app/src/main/java/com/{mintris => pixelmintdrop}/ui/LevelBadge.kt (98%) rename app/src/main/java/com/{mintris => pixelmintdrop}/ui/ProgressionScreen.kt (99%) rename app/src/main/java/com/{mintris => pixelmintdrop}/ui/ThemeSelector.kt (99%) rename app/src/main/java/com/{mintris => pixelmintdrop}/ui/XPProgressBar.kt (98%) diff --git a/README.md b/README.md index 2a67a0f..29b8edd 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Mintris +# pixelmintdrop A modern Tetris implementation for Android, featuring smooth animations, responsive controls, and a beautiful minimalist design. @@ -219,7 +219,7 @@ private fun onGameOver(score: Long) { 1. Clone the repository: ```bash -git clone https://github.com/cmclark00/mintris.git +git clone https://github.com/cmclark00/pixelmintdrop.git ``` 2. Open the project in Android Studio diff --git a/app/build.gradle b/app/build.gradle index 21d6285..45c83db 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,13 +4,13 @@ plugins { } android { - namespace 'com.mintris' - compileSdk 34 + namespace "com.pixelmintdrop" + compileSdk 35 defaultConfig { - applicationId "com.mintris" + applicationId "com.pixelmintdrop" minSdk 30 - targetSdk 34 + targetSdk 35 versionCode 1 versionName "1.0" @@ -27,6 +27,7 @@ android { buildFeatures { viewBinding true + dataBinding true } compileOptions { diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 403e50d..461f647 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -6,17 +6,17 @@ # http://developer.android.com/guide/developing/tools/proguard.html # Keep models intact --keep class com.mintris.model.** { *; } +-keep class com.pixelmintdrop.model.** { *; } # Keep game classes intact to prevent issues --keep class com.mintris.game.** { *; } +-keep class com.pixelmintdrop.game.** { *; } # Preserve critical classes that might be used through reflection --keep class com.mintris.audio.GameMusic { *; } --keep class com.mintris.ui.** { *; } +-keep class com.pixelmintdrop.audio.GameMusic { *; } +-keep class com.pixelmintdrop.ui.** { *; } # Keep all public methods in the MainActivity --keepclassmembers class com.mintris.MainActivity { +-keepclassmembers class com.pixelmintdrop.MainActivity { public *; } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3322422..0d57748 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,11 +12,11 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/Theme.Mintris"> + android:theme="@style/Theme.pixelmintdrop"> = 5 setOnCheckedChangeListener { _, isChecked -> isRandomModeEnabled = isChecked - getSharedPreferences("com.mintris.preferences", Context.MODE_PRIVATE) + getSharedPreferences("com.com.pixelmintgames.pixelmintdrop.preferences", Context.MODE_PRIVATE) .edit() .putBoolean("random_mode_enabled", isChecked) .apply() @@ -1211,7 +1210,7 @@ class MainActivity : AppCompatActivity(), * Check if user has seen the gamepad help */ private fun hasSeenGamepadHelp(): Boolean { - val prefs = getSharedPreferences("com.mintris.preferences", Context.MODE_PRIVATE) + val prefs = getSharedPreferences("com.com.pixelmintgames.pixelmintdrop.preferences", Context.MODE_PRIVATE) return prefs.getBoolean("has_seen_gamepad_help", false) } @@ -1219,7 +1218,7 @@ class MainActivity : AppCompatActivity(), * Mark that user has seen the gamepad help */ private fun markGamepadHelpSeen() { - val prefs = getSharedPreferences("com.mintris.preferences", Context.MODE_PRIVATE) + val prefs = getSharedPreferences("com.com.pixelmintgames.pixelmintdrop.preferences", Context.MODE_PRIVATE) prefs.edit().putBoolean("has_seen_gamepad_help", true).apply() } diff --git a/app/src/main/java/com/mintris/StatsActivity.kt b/app/src/main/java/com/pixelmintdrop/StatsActivity.kt similarity index 96% rename from app/src/main/java/com/mintris/StatsActivity.kt rename to app/src/main/java/com/pixelmintdrop/StatsActivity.kt index c7d2e0e..09b9b9c 100644 --- a/app/src/main/java/com/mintris/StatsActivity.kt +++ b/app/src/main/java/com/pixelmintdrop/StatsActivity.kt @@ -1,13 +1,11 @@ -package com.mintris +package com.pixelmintdrop import android.os.Bundle -import android.widget.Button -import android.widget.TextView import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity -import com.mintris.databinding.ActivityStatsBinding -import com.mintris.model.StatsManager -import com.mintris.model.PlayerProgressionManager +import com.pixelmintdrop.databinding.ActivityStatsBinding +import com.pixelmintdrop.model.StatsManager +import com.pixelmintdrop.model.PlayerProgressionManager import android.graphics.Color import java.text.SimpleDateFormat import java.util.* diff --git a/app/src/main/java/com/mintris/ThemeManager.kt b/app/src/main/java/com/pixelmintdrop/ThemeManager.kt similarity index 92% rename from app/src/main/java/com/mintris/ThemeManager.kt rename to app/src/main/java/com/pixelmintdrop/ThemeManager.kt index 56ce224..b2d1e1f 100644 --- a/app/src/main/java/com/mintris/ThemeManager.kt +++ b/app/src/main/java/com/pixelmintdrop/ThemeManager.kt @@ -1,4 +1,4 @@ -package com.mintris +package com.pixelmintdrop import android.graphics.Color diff --git a/app/src/main/java/com/mintris/accessibility/GameAccessibilityHelper.kt b/app/src/main/java/com/pixelmintdrop/accessibility/GameAccessibilityHelper.kt similarity index 97% rename from app/src/main/java/com/mintris/accessibility/GameAccessibilityHelper.kt rename to app/src/main/java/com/pixelmintdrop/accessibility/GameAccessibilityHelper.kt index 450e47f..ae962b3 100644 --- a/app/src/main/java/com/mintris/accessibility/GameAccessibilityHelper.kt +++ b/app/src/main/java/com/pixelmintdrop/accessibility/GameAccessibilityHelper.kt @@ -1,4 +1,4 @@ -package com.mintris.accessibility +package com.pixelmintdrop.accessibility import android.content.Context import android.os.Build @@ -8,9 +8,9 @@ import android.view.accessibility.AccessibilityManager import android.widget.ImageButton import android.widget.TextView import androidx.core.view.ViewCompat -import com.mintris.R -import com.mintris.game.GameView -import com.mintris.model.TetrominoType +import com.pixelmintdrop.R +import com.pixelmintdrop.game.GameView +import com.pixelmintdrop.model.TetrominoType /** * Helper class to improve the game's accessibility for users with visual impairments diff --git a/app/src/main/java/com/mintris/audio/GameMusic.kt b/app/src/main/java/com/pixelmintdrop/audio/GameMusic.kt similarity index 98% rename from app/src/main/java/com/mintris/audio/GameMusic.kt rename to app/src/main/java/com/pixelmintdrop/audio/GameMusic.kt index cca3244..38a8615 100644 --- a/app/src/main/java/com/mintris/audio/GameMusic.kt +++ b/app/src/main/java/com/pixelmintdrop/audio/GameMusic.kt @@ -1,11 +1,11 @@ -package com.mintris.audio +package com.pixelmintdrop.audio import android.content.Context import android.media.MediaPlayer import android.media.AudioAttributes import android.os.Build import android.util.Log -import com.mintris.R +import com.pixelmintdrop.R class GameMusic(private val context: Context) { private var mediaPlayer: MediaPlayer? = null diff --git a/app/src/main/java/com/mintris/game/GameHaptics.kt b/app/src/main/java/com/pixelmintdrop/game/GameHaptics.kt similarity index 99% rename from app/src/main/java/com/mintris/game/GameHaptics.kt rename to app/src/main/java/com/pixelmintdrop/game/GameHaptics.kt index 731ac8b..9f55369 100644 --- a/app/src/main/java/com/mintris/game/GameHaptics.kt +++ b/app/src/main/java/com/pixelmintdrop/game/GameHaptics.kt @@ -1,4 +1,4 @@ -package com.mintris.game +package com.pixelmintdrop.game import android.content.Context import android.os.Build diff --git a/app/src/main/java/com/mintris/game/GameLifecycleManager.kt b/app/src/main/java/com/pixelmintdrop/game/GameLifecycleManager.kt similarity index 93% rename from app/src/main/java/com/mintris/game/GameLifecycleManager.kt rename to app/src/main/java/com/pixelmintdrop/game/GameLifecycleManager.kt index 76bc96b..f998875 100644 --- a/app/src/main/java/com/mintris/game/GameLifecycleManager.kt +++ b/app/src/main/java/com/pixelmintdrop/game/GameLifecycleManager.kt @@ -1,13 +1,13 @@ -package com.mintris.game +package com.pixelmintdrop.game import android.content.Context import android.content.SharedPreferences import android.os.Bundle import com.google.gson.Gson -import com.mintris.audio.GameMusic -import com.mintris.model.GameBoard -import com.mintris.model.HighScoreManager -import com.mintris.model.StatsManager +import com.pixelmintdrop.audio.GameMusic +import com.pixelmintdrop.model.GameBoard +import com.pixelmintdrop.model.HighScoreManager +import com.pixelmintdrop.model.StatsManager /** * Handles the game's lifecycle events to ensure proper resource management @@ -15,7 +15,7 @@ import com.mintris.model.StatsManager */ class GameLifecycleManager(private val context: Context) { private val sharedPreferences: SharedPreferences = - context.getSharedPreferences("com.mintris.game_state", Context.MODE_PRIVATE) + context.getSharedPreferences("com.com.pixelmintgames.pixelmintdrop.game_state", Context.MODE_PRIVATE) private val gson = Gson() /** diff --git a/app/src/main/java/com/mintris/game/GameView.kt b/app/src/main/java/com/pixelmintdrop/game/GameView.kt similarity index 99% rename from app/src/main/java/com/mintris/game/GameView.kt rename to app/src/main/java/com/pixelmintdrop/game/GameView.kt index e85f665..b9cc1c9 100644 --- a/app/src/main/java/com/mintris/game/GameView.kt +++ b/app/src/main/java/com/pixelmintdrop/game/GameView.kt @@ -1,4 +1,4 @@ -package com.mintris.game +package com.pixelmintdrop.game import android.animation.ValueAnimator import android.content.Context @@ -20,11 +20,10 @@ import android.view.View import android.view.animation.LinearInterpolator import android.hardware.display.DisplayManager import android.view.Display -import com.mintris.model.GameBoard -import com.mintris.model.Tetromino -import com.mintris.model.TetrominoType +import com.pixelmintdrop.model.GameBoard +import com.pixelmintdrop.model.Tetromino +import com.pixelmintdrop.model.TetrominoType import kotlin.math.abs -import kotlin.math.min /** * GameView that renders the Tetris game and handles touch input @@ -216,7 +215,7 @@ class GameView @JvmOverloads constructor( pause() // Load saved block skin - val prefs = context.getSharedPreferences("mintris_progression", Context.MODE_PRIVATE) + val prefs = context.getSharedPreferences("pixelmintdrop_progression", Context.MODE_PRIVATE) currentBlockSkin = prefs.getString("selected_block_skin", "block_skin_1") ?: "block_skin_1" // Connect our callbacks to the GameBoard @@ -329,7 +328,7 @@ class GameView @JvmOverloads constructor( } // Save the selection to SharedPreferences - val prefs = context.getSharedPreferences("mintris_progression", Context.MODE_PRIVATE) + val prefs = context.getSharedPreferences("pixelmintdrop_progression", Context.MODE_PRIVATE) prefs.edit().putString("selected_block_skin", skinId).commit() // Force a refresh of the view diff --git a/app/src/main/java/com/mintris/game/GamepadController.kt b/app/src/main/java/com/pixelmintdrop/game/GamepadController.kt similarity index 99% rename from app/src/main/java/com/mintris/game/GamepadController.kt rename to app/src/main/java/com/pixelmintdrop/game/GamepadController.kt index 906758d..3c15a92 100644 --- a/app/src/main/java/com/mintris/game/GamepadController.kt +++ b/app/src/main/java/com/pixelmintdrop/game/GamepadController.kt @@ -1,4 +1,4 @@ -package com.mintris.game +package com.pixelmintdrop.game import android.os.SystemClock import android.view.InputDevice @@ -8,13 +8,11 @@ import android.util.Log import android.content.Context import android.os.Build import android.os.VibrationEffect -import android.view.InputDevice.MotionRange -import android.os.Vibrator import android.os.Handler import android.os.Looper /** - * GamepadController handles gamepad input for the Mintris game. + * GamepadController handles gamepad input for the pixelmintdrop game. * Supports multiple gamepad types including: * - Microsoft Xbox controllers * - Sony PlayStation controllers diff --git a/app/src/main/java/com/mintris/game/HoldPieceView.kt b/app/src/main/java/com/pixelmintdrop/game/HoldPieceView.kt similarity index 97% rename from app/src/main/java/com/mintris/game/HoldPieceView.kt rename to app/src/main/java/com/pixelmintdrop/game/HoldPieceView.kt index 6f51022..ae7272c 100644 --- a/app/src/main/java/com/mintris/game/HoldPieceView.kt +++ b/app/src/main/java/com/pixelmintdrop/game/HoldPieceView.kt @@ -1,4 +1,4 @@ -package com.mintris.game +package com.pixelmintdrop.game import android.content.Context import android.graphics.BlurMaskFilter @@ -7,8 +7,7 @@ import android.graphics.Color import android.graphics.Paint import android.util.AttributeSet import android.view.View -import com.mintris.model.GameBoard -import com.mintris.model.Tetromino +import com.pixelmintdrop.model.GameBoard import kotlin.math.min /** diff --git a/app/src/main/java/com/mintris/game/NextPieceView.kt b/app/src/main/java/com/pixelmintdrop/game/NextPieceView.kt similarity index 99% rename from app/src/main/java/com/mintris/game/NextPieceView.kt rename to app/src/main/java/com/pixelmintdrop/game/NextPieceView.kt index c82fe2c..d7502b5 100644 --- a/app/src/main/java/com/mintris/game/NextPieceView.kt +++ b/app/src/main/java/com/pixelmintdrop/game/NextPieceView.kt @@ -1,4 +1,4 @@ -package com.mintris.game +package com.pixelmintdrop.game import android.content.Context import android.graphics.Canvas diff --git a/app/src/main/java/com/mintris/game/TitleScreen.kt b/app/src/main/java/com/pixelmintdrop/game/TitleScreen.kt similarity index 98% rename from app/src/main/java/com/mintris/game/TitleScreen.kt rename to app/src/main/java/com/pixelmintdrop/game/TitleScreen.kt index 324f81b..dee6d08 100644 --- a/app/src/main/java/com/mintris/game/TitleScreen.kt +++ b/app/src/main/java/com/pixelmintdrop/game/TitleScreen.kt @@ -1,4 +1,4 @@ -package com.mintris.game +package com.pixelmintdrop.game import android.content.Context import android.graphics.Canvas @@ -10,9 +10,9 @@ import android.view.MotionEvent import android.view.View import java.util.Random import android.util.Log -import com.mintris.model.HighScoreManager -import com.mintris.model.HighScore -import com.mintris.model.PlayerProgressionManager +import com.pixelmintdrop.model.HighScoreManager +import com.pixelmintdrop.model.HighScore +import com.pixelmintdrop.model.PlayerProgressionManager import kotlin.math.abs import androidx.core.graphics.withTranslation import androidx.core.graphics.withScale @@ -240,7 +240,7 @@ class TitleScreen @JvmOverloads constructor( // Draw title val titleY = height * 0.4f - canvas.drawText("mintris", width / 2f, titleY, titlePaint) + canvas.drawText("Pixel Mint Drop", width / 2f, titleY, titlePaint) // Draw high scores using pre-allocated manager val highScores: List = highScoreManager.getHighScores() diff --git a/app/src/main/java/com/mintris/model/GameBoard.kt b/app/src/main/java/com/pixelmintdrop/model/GameBoard.kt similarity index 99% rename from app/src/main/java/com/mintris/model/GameBoard.kt rename to app/src/main/java/com/pixelmintdrop/model/GameBoard.kt index 61bcf11..bf20b4d 100644 --- a/app/src/main/java/com/mintris/model/GameBoard.kt +++ b/app/src/main/java/com/pixelmintdrop/model/GameBoard.kt @@ -1,4 +1,4 @@ -package com.mintris.model +package com.pixelmintdrop.model import android.util.Log diff --git a/app/src/main/java/com/mintris/model/HighScore.kt b/app/src/main/java/com/pixelmintdrop/model/HighScore.kt similarity index 79% rename from app/src/main/java/com/mintris/model/HighScore.kt rename to app/src/main/java/com/pixelmintdrop/model/HighScore.kt index b4b6295..ef70516 100644 --- a/app/src/main/java/com/mintris/model/HighScore.kt +++ b/app/src/main/java/com/pixelmintdrop/model/HighScore.kt @@ -1,4 +1,4 @@ -package com.mintris.model +package com.pixelmintdrop.model data class HighScore( val name: String, diff --git a/app/src/main/java/com/mintris/model/HighScoreAdapter.kt b/app/src/main/java/com/pixelmintdrop/model/HighScoreAdapter.kt similarity index 97% rename from app/src/main/java/com/mintris/model/HighScoreAdapter.kt rename to app/src/main/java/com/pixelmintdrop/model/HighScoreAdapter.kt index de4ec52..bcbae60 100644 --- a/app/src/main/java/com/mintris/model/HighScoreAdapter.kt +++ b/app/src/main/java/com/pixelmintdrop/model/HighScoreAdapter.kt @@ -1,4 +1,4 @@ -package com.mintris.model +package com.pixelmintdrop.model import android.graphics.Color import android.view.LayoutInflater @@ -6,7 +6,7 @@ import android.view.View import android.view.ViewGroup import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.mintris.R +import com.pixelmintdrop.R class HighScoreAdapter : RecyclerView.Adapter() { private var highScores: List = emptyList() diff --git a/app/src/main/java/com/mintris/model/HighScoreManager.kt b/app/src/main/java/com/pixelmintdrop/model/HighScoreManager.kt similarity index 93% rename from app/src/main/java/com/mintris/model/HighScoreManager.kt rename to app/src/main/java/com/pixelmintdrop/model/HighScoreManager.kt index 6fd7df9..bf35f52 100644 --- a/app/src/main/java/com/mintris/model/HighScoreManager.kt +++ b/app/src/main/java/com/pixelmintdrop/model/HighScoreManager.kt @@ -1,4 +1,4 @@ -package com.mintris.model +package com.pixelmintdrop.model import android.content.Context import android.content.SharedPreferences @@ -12,7 +12,7 @@ class HighScoreManager(private val context: Context) { private val type: Type = object : TypeToken>() {}.type companion object { - private const val PREFS_NAME = "mintris_highscores" + private const val PREFS_NAME = "pixelmintdrop_highscores" private const val KEY_HIGHSCORES = "highscores" private const val MAX_HIGHSCORES = 5 } diff --git a/app/src/main/java/com/mintris/model/PlayerProgressionManager.kt b/app/src/main/java/com/pixelmintdrop/model/PlayerProgressionManager.kt similarity index 99% rename from app/src/main/java/com/mintris/model/PlayerProgressionManager.kt rename to app/src/main/java/com/pixelmintdrop/model/PlayerProgressionManager.kt index a395bb7..3e0a568 100644 --- a/app/src/main/java/com/mintris/model/PlayerProgressionManager.kt +++ b/app/src/main/java/com/pixelmintdrop/model/PlayerProgressionManager.kt @@ -1,8 +1,7 @@ -package com.mintris.model +package com.pixelmintdrop.model import android.content.Context import android.content.SharedPreferences -import com.mintris.R import kotlin.math.pow import kotlin.math.roundToInt import kotlin.math.min @@ -292,7 +291,7 @@ class PlayerProgressionManager(context: Context) { } companion object { - private const val PREFS_NAME = "mintris_progression" + private const val PREFS_NAME = "pixelmintdrop_progression" private const val KEY_PLAYER_LEVEL = "player_level" private const val KEY_PLAYER_XP = "player_xp" private const val KEY_TOTAL_XP_EARNED = "total_xp_earned" diff --git a/app/src/main/java/com/mintris/model/StatsManager.kt b/app/src/main/java/com/pixelmintdrop/model/StatsManager.kt similarity index 98% rename from app/src/main/java/com/mintris/model/StatsManager.kt rename to app/src/main/java/com/pixelmintdrop/model/StatsManager.kt index cc5272f..89de6a0 100644 --- a/app/src/main/java/com/mintris/model/StatsManager.kt +++ b/app/src/main/java/com/pixelmintdrop/model/StatsManager.kt @@ -1,4 +1,4 @@ -package com.mintris.model +package com.pixelmintdrop.model import android.content.Context import android.content.SharedPreferences @@ -179,7 +179,7 @@ class StatsManager(context: Context) { } companion object { - private const val PREFS_NAME = "mintris_stats" + private const val PREFS_NAME = "pixelmintdrop_stats" private const val KEY_TOTAL_GAMES = "total_games" private const val KEY_TOTAL_SCORE = "total_score" private const val KEY_TOTAL_LINES = "total_lines" diff --git a/app/src/main/java/com/mintris/model/Tetromino.kt b/app/src/main/java/com/pixelmintdrop/model/Tetromino.kt similarity index 99% rename from app/src/main/java/com/mintris/model/Tetromino.kt rename to app/src/main/java/com/pixelmintdrop/model/Tetromino.kt index 54bafb2..6f2d708 100644 --- a/app/src/main/java/com/mintris/model/Tetromino.kt +++ b/app/src/main/java/com/pixelmintdrop/model/Tetromino.kt @@ -1,4 +1,4 @@ -package com.mintris.model +package com.pixelmintdrop.model /** * Represents a Tetris piece (Tetromino) diff --git a/app/src/main/java/com/mintris/ui/BlockSkinSelector.kt b/app/src/main/java/com/pixelmintdrop/ui/BlockSkinSelector.kt similarity index 99% rename from app/src/main/java/com/mintris/ui/BlockSkinSelector.kt rename to app/src/main/java/com/pixelmintdrop/ui/BlockSkinSelector.kt index d2c7d35..3e1e1c9 100644 --- a/app/src/main/java/com/mintris/ui/BlockSkinSelector.kt +++ b/app/src/main/java/com/pixelmintdrop/ui/BlockSkinSelector.kt @@ -1,4 +1,4 @@ -package com.mintris.ui +package com.pixelmintdrop.ui import android.content.Context import android.graphics.Color @@ -9,9 +9,7 @@ import android.widget.FrameLayout import android.widget.GridLayout import android.widget.TextView import androidx.cardview.widget.CardView -import com.mintris.R -import com.mintris.model.PlayerProgressionManager -import android.animation.ValueAnimator +import com.pixelmintdrop.R import android.graphics.drawable.GradientDrawable /** diff --git a/app/src/main/java/com/mintris/ui/GameUIManager.kt b/app/src/main/java/com/pixelmintdrop/ui/GameUIManager.kt similarity index 95% rename from app/src/main/java/com/mintris/ui/GameUIManager.kt rename to app/src/main/java/com/pixelmintdrop/ui/GameUIManager.kt index 586a13e..41fa22f 100644 --- a/app/src/main/java/com/mintris/ui/GameUIManager.kt +++ b/app/src/main/java/com/pixelmintdrop/ui/GameUIManager.kt @@ -1,14 +1,10 @@ -package com.mintris.ui +package com.pixelmintdrop.ui import android.content.Context import android.graphics.Color import android.view.View -import android.widget.ImageButton -import android.widget.TextView -import com.mintris.R -import com.mintris.databinding.ActivityMainBinding -import com.mintris.model.PlayerProgressionManager -import kotlin.math.roundToInt +import com.pixelmintdrop.databinding.ActivityMainBinding +import com.pixelmintdrop.model.PlayerProgressionManager /** * Handles UI updates and state management for the game interface diff --git a/app/src/main/java/com/mintris/ui/LevelBadge.kt b/app/src/main/java/com/pixelmintdrop/ui/LevelBadge.kt similarity index 98% rename from app/src/main/java/com/mintris/ui/LevelBadge.kt rename to app/src/main/java/com/pixelmintdrop/ui/LevelBadge.kt index 67665e4..3213417 100644 --- a/app/src/main/java/com/mintris/ui/LevelBadge.kt +++ b/app/src/main/java/com/pixelmintdrop/ui/LevelBadge.kt @@ -1,4 +1,4 @@ -package com.mintris.ui +package com.pixelmintdrop.ui import android.content.Context import android.graphics.Canvas diff --git a/app/src/main/java/com/mintris/ui/ProgressionScreen.kt b/app/src/main/java/com/pixelmintdrop/ui/ProgressionScreen.kt similarity index 99% rename from app/src/main/java/com/mintris/ui/ProgressionScreen.kt rename to app/src/main/java/com/pixelmintdrop/ui/ProgressionScreen.kt index 117a440..07d55cc 100644 --- a/app/src/main/java/com/mintris/ui/ProgressionScreen.kt +++ b/app/src/main/java/com/pixelmintdrop/ui/ProgressionScreen.kt @@ -1,4 +1,4 @@ -package com.mintris.ui +package com.pixelmintdrop.ui import android.animation.AnimatorSet import android.animation.ObjectAnimator @@ -12,8 +12,8 @@ import android.view.animation.OvershootInterpolator import android.widget.LinearLayout import android.widget.TextView import androidx.cardview.widget.CardView -import com.mintris.R -import com.mintris.model.PlayerProgressionManager +import com.pixelmintdrop.R +import com.pixelmintdrop.model.PlayerProgressionManager /** * Screen that displays player progression, XP gain, and unlocked rewards diff --git a/app/src/main/java/com/mintris/ui/ThemeSelector.kt b/app/src/main/java/com/pixelmintdrop/ui/ThemeSelector.kt similarity index 99% rename from app/src/main/java/com/mintris/ui/ThemeSelector.kt rename to app/src/main/java/com/pixelmintdrop/ui/ThemeSelector.kt index ece7cd4..059fd6c 100644 --- a/app/src/main/java/com/mintris/ui/ThemeSelector.kt +++ b/app/src/main/java/com/pixelmintdrop/ui/ThemeSelector.kt @@ -1,4 +1,4 @@ -package com.mintris.ui +package com.pixelmintdrop.ui import android.content.Context import android.graphics.Color @@ -9,9 +9,8 @@ import android.widget.FrameLayout import android.widget.GridLayout import android.widget.TextView import androidx.cardview.widget.CardView -import com.mintris.R -import com.mintris.model.PlayerProgressionManager -import android.animation.ValueAnimator +import com.pixelmintdrop.R +import com.pixelmintdrop.model.PlayerProgressionManager import android.graphics.drawable.GradientDrawable import android.util.Log diff --git a/app/src/main/java/com/mintris/ui/XPProgressBar.kt b/app/src/main/java/com/pixelmintdrop/ui/XPProgressBar.kt similarity index 98% rename from app/src/main/java/com/mintris/ui/XPProgressBar.kt rename to app/src/main/java/com/pixelmintdrop/ui/XPProgressBar.kt index 930da2f..f752e75 100644 --- a/app/src/main/java/com/mintris/ui/XPProgressBar.kt +++ b/app/src/main/java/com/pixelmintdrop/ui/XPProgressBar.kt @@ -1,4 +1,4 @@ -package com.mintris.ui +package com.pixelmintdrop.ui import android.animation.ValueAnimator import android.content.Context @@ -9,8 +9,6 @@ import android.graphics.RectF import android.util.AttributeSet import android.view.View import android.view.animation.AccelerateDecelerateInterpolator -import androidx.core.content.ContextCompat -import com.mintris.R /** * Custom progress bar for displaying player XP with animation capabilities diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml index f4a4d50..582437e 100644 --- a/app/src/main/res/layout-land/activity_main.xml +++ b/app/src/main/res/layout-land/activity_main.xml @@ -28,7 +28,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> - @@ -72,7 +72,7 @@ app:layout_constraintEnd_toEndOf="parent" android:layout_marginTop="24dp"/> - - - - - - - @@ -683,7 +683,7 @@ android:paddingBottom="32dp"> - - - @@ -33,7 +33,7 @@ - - @@ -136,7 +136,7 @@ - - - @@ -567,7 +567,7 @@ android:textAllCaps="false" android:singleLine="true" /> - @@ -592,14 +592,14 @@ android:paddingBottom="32dp"> - - - - mintris + Pixel Mint Drop game over score level diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index ea37314..a280be0 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,7 +1,7 @@ - -