Fix namespace and applicationId in build.gradle to match package structure

This commit is contained in:
cmclark00 2025-04-01 05:06:38 -04:00
parent f5f135ff27
commit 38163c33a3
39 changed files with 134 additions and 157 deletions

View file

@ -1,4 +1,4 @@
# Mintris # pixelmintdrop
A modern Tetris implementation for Android, featuring smooth animations, responsive controls, and a beautiful minimalist design. 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: 1. Clone the repository:
```bash ```bash
git clone https://github.com/cmclark00/mintris.git git clone https://github.com/cmclark00/pixelmintdrop.git
``` ```
2. Open the project in Android Studio 2. Open the project in Android Studio

View file

@ -4,13 +4,13 @@ plugins {
} }
android { android {
namespace 'com.mintris' namespace "com.pixelmintdrop"
compileSdk 34 compileSdk 35
defaultConfig { defaultConfig {
applicationId "com.mintris" applicationId "com.pixelmintdrop"
minSdk 30 minSdk 30
targetSdk 34 targetSdk 35
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
@ -27,6 +27,7 @@ android {
buildFeatures { buildFeatures {
viewBinding true viewBinding true
dataBinding true
} }
compileOptions { compileOptions {

View file

@ -6,17 +6,17 @@
# http://developer.android.com/guide/developing/tools/proguard.html # http://developer.android.com/guide/developing/tools/proguard.html
# Keep models intact # Keep models intact
-keep class com.mintris.model.** { *; } -keep class com.pixelmintdrop.model.** { *; }
# Keep game classes intact to prevent issues # 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 # Preserve critical classes that might be used through reflection
-keep class com.mintris.audio.GameMusic { *; } -keep class com.pixelmintdrop.audio.GameMusic { *; }
-keep class com.mintris.ui.** { *; } -keep class com.pixelmintdrop.ui.** { *; }
# Keep all public methods in the MainActivity # Keep all public methods in the MainActivity
-keepclassmembers class com.mintris.MainActivity { -keepclassmembers class com.pixelmintdrop.MainActivity {
public *; public *;
} }

View file

@ -12,11 +12,11 @@
android:label="@string/app_name" android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round" android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/Theme.Mintris"> android:theme="@style/Theme.pixelmintdrop">
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
android:exported="true" android:exported="true"
android:theme="@style/Theme.Mintris.NoActionBar" android:theme="@style/Theme.pixelmintdrop.NoActionBar"
android:immersive="true" android:immersive="true"
android:resizeableActivity="false" android:resizeableActivity="false"
android:excludeFromRecents="false" android:excludeFromRecents="false"

View file

@ -1,16 +1,12 @@
package com.mintris package com.pixelmintdrop
import android.app.Activity import android.app.Activity
import android.os.Bundle import android.os.Bundle
import android.widget.Button
import android.widget.EditText
import android.widget.TextView
import android.view.View
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import com.mintris.databinding.HighScoreEntryBinding import com.pixelmintdrop.databinding.HighScoreEntryBinding
import com.mintris.model.HighScore import com.pixelmintdrop.model.HighScore
import com.mintris.model.HighScoreManager import com.pixelmintdrop.model.HighScoreManager
import com.mintris.model.PlayerProgressionManager import com.pixelmintdrop.model.PlayerProgressionManager
import android.graphics.Color import android.graphics.Color
import android.view.KeyEvent import android.view.KeyEvent
import android.view.InputDevice import android.view.InputDevice

View file

@ -1,15 +1,12 @@
package com.mintris package com.pixelmintdrop
import android.os.Bundle import android.os.Bundle
import android.widget.Button
import android.widget.TextView
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView import com.pixelmintdrop.databinding.HighScoresBinding
import com.mintris.databinding.HighScoresBinding import com.pixelmintdrop.model.HighScoreAdapter
import com.mintris.model.HighScoreAdapter import com.pixelmintdrop.model.HighScoreManager
import com.mintris.model.HighScoreManager import com.pixelmintdrop.model.PlayerProgressionManager
import com.mintris.model.PlayerProgressionManager
import android.graphics.Color import android.graphics.Color
import android.util.Log import android.util.Log
import android.view.KeyEvent import android.view.KeyEvent

View file

@ -1,4 +1,4 @@
package com.mintris package com.pixelmintdrop
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
@ -9,18 +9,18 @@ import android.os.Vibrator
import android.view.View import android.view.View
import android.view.HapticFeedbackConstants import android.view.HapticFeedbackConstants
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import com.mintris.databinding.ActivityMainBinding import com.pixelmintdrop.databinding.ActivityMainBinding
import com.mintris.game.GameHaptics import com.pixelmintdrop.game.GameHaptics
import com.mintris.game.GameView import com.pixelmintdrop.game.GameView
import com.mintris.game.TitleScreen import com.pixelmintdrop.game.TitleScreen
import com.mintris.model.GameBoard import com.pixelmintdrop.model.GameBoard
import com.mintris.audio.GameMusic import com.pixelmintdrop.audio.GameMusic
import com.mintris.model.HighScoreManager import com.pixelmintdrop.model.HighScoreManager
import com.mintris.model.PlayerProgressionManager import com.pixelmintdrop.model.PlayerProgressionManager
import com.mintris.model.StatsManager import com.pixelmintdrop.model.StatsManager
import com.mintris.ui.ProgressionScreen import com.pixelmintdrop.ui.ProgressionScreen
import com.mintris.ui.ThemeSelector import com.pixelmintdrop.ui.ThemeSelector
import com.mintris.ui.BlockSkinSelector import com.pixelmintdrop.ui.BlockSkinSelector
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.* import java.util.*
import android.graphics.Color import android.graphics.Color
@ -32,12 +32,11 @@ import android.view.KeyEvent
import android.os.Handler import android.os.Handler
import android.os.Looper import android.os.Looper
import android.view.MotionEvent import android.view.MotionEvent
import com.mintris.game.GamepadController import com.pixelmintdrop.game.GamepadController
import android.view.InputDevice import android.view.InputDevice
import android.widget.Toast import android.widget.Toast
import android.content.BroadcastReceiver import android.content.BroadcastReceiver
import android.content.IntentFilter import android.content.IntentFilter
import android.app.AlertDialog
import android.graphics.drawable.ColorDrawable import android.graphics.drawable.ColorDrawable
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import android.widget.Button import android.widget.Button
@ -153,7 +152,7 @@ class MainActivity : AppCompatActivity(),
pauseMenuScrollView = binding.pauseMenuScrollView pauseMenuScrollView = binding.pauseMenuScrollView
// Load random mode setting // Load random mode setting
isRandomModeEnabled = getSharedPreferences("com.mintris.preferences", Context.MODE_PRIVATE) isRandomModeEnabled = getSharedPreferences("com.com.pixelmintgames.pixelmintdrop.preferences", Context.MODE_PRIVATE)
.getBoolean("random_mode_enabled", false) .getBoolean("random_mode_enabled", false)
// Initialize gamepad controller // Initialize gamepad controller
@ -624,7 +623,7 @@ class MainActivity : AppCompatActivity(),
isEnabled = progressionManager.getPlayerLevel() >= 5 isEnabled = progressionManager.getPlayerLevel() >= 5
setOnCheckedChangeListener { _, isChecked -> setOnCheckedChangeListener { _, isChecked ->
isRandomModeEnabled = isChecked isRandomModeEnabled = isChecked
getSharedPreferences("com.mintris.preferences", Context.MODE_PRIVATE) getSharedPreferences("com.com.pixelmintgames.pixelmintdrop.preferences", Context.MODE_PRIVATE)
.edit() .edit()
.putBoolean("random_mode_enabled", isChecked) .putBoolean("random_mode_enabled", isChecked)
.apply() .apply()
@ -1211,7 +1210,7 @@ class MainActivity : AppCompatActivity(),
* Check if user has seen the gamepad help * Check if user has seen the gamepad help
*/ */
private fun hasSeenGamepadHelp(): Boolean { 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) return prefs.getBoolean("has_seen_gamepad_help", false)
} }
@ -1219,7 +1218,7 @@ class MainActivity : AppCompatActivity(),
* Mark that user has seen the gamepad help * Mark that user has seen the gamepad help
*/ */
private fun markGamepadHelpSeen() { 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() prefs.edit().putBoolean("has_seen_gamepad_help", true).apply()
} }

View file

@ -1,13 +1,11 @@
package com.mintris package com.pixelmintdrop
import android.os.Bundle import android.os.Bundle
import android.widget.Button
import android.widget.TextView
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import com.mintris.databinding.ActivityStatsBinding import com.pixelmintdrop.databinding.ActivityStatsBinding
import com.mintris.model.StatsManager import com.pixelmintdrop.model.StatsManager
import com.mintris.model.PlayerProgressionManager import com.pixelmintdrop.model.PlayerProgressionManager
import android.graphics.Color import android.graphics.Color
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.* import java.util.*

View file

@ -1,4 +1,4 @@
package com.mintris package com.pixelmintdrop
import android.graphics.Color import android.graphics.Color

View file

@ -1,4 +1,4 @@
package com.mintris.accessibility package com.pixelmintdrop.accessibility
import android.content.Context import android.content.Context
import android.os.Build import android.os.Build
@ -8,9 +8,9 @@ import android.view.accessibility.AccessibilityManager
import android.widget.ImageButton import android.widget.ImageButton
import android.widget.TextView import android.widget.TextView
import androidx.core.view.ViewCompat import androidx.core.view.ViewCompat
import com.mintris.R import com.pixelmintdrop.R
import com.mintris.game.GameView import com.pixelmintdrop.game.GameView
import com.mintris.model.TetrominoType import com.pixelmintdrop.model.TetrominoType
/** /**
* Helper class to improve the game's accessibility for users with visual impairments * Helper class to improve the game's accessibility for users with visual impairments

View file

@ -1,11 +1,11 @@
package com.mintris.audio package com.pixelmintdrop.audio
import android.content.Context import android.content.Context
import android.media.MediaPlayer import android.media.MediaPlayer
import android.media.AudioAttributes import android.media.AudioAttributes
import android.os.Build import android.os.Build
import android.util.Log import android.util.Log
import com.mintris.R import com.pixelmintdrop.R
class GameMusic(private val context: Context) { class GameMusic(private val context: Context) {
private var mediaPlayer: MediaPlayer? = null private var mediaPlayer: MediaPlayer? = null

View file

@ -1,4 +1,4 @@
package com.mintris.game package com.pixelmintdrop.game
import android.content.Context import android.content.Context
import android.os.Build import android.os.Build

View file

@ -1,13 +1,13 @@
package com.mintris.game package com.pixelmintdrop.game
import android.content.Context import android.content.Context
import android.content.SharedPreferences import android.content.SharedPreferences
import android.os.Bundle import android.os.Bundle
import com.google.gson.Gson import com.google.gson.Gson
import com.mintris.audio.GameMusic import com.pixelmintdrop.audio.GameMusic
import com.mintris.model.GameBoard import com.pixelmintdrop.model.GameBoard
import com.mintris.model.HighScoreManager import com.pixelmintdrop.model.HighScoreManager
import com.mintris.model.StatsManager import com.pixelmintdrop.model.StatsManager
/** /**
* Handles the game's lifecycle events to ensure proper resource management * 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) { class GameLifecycleManager(private val context: Context) {
private val sharedPreferences: SharedPreferences = 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() private val gson = Gson()
/** /**

View file

@ -1,4 +1,4 @@
package com.mintris.game package com.pixelmintdrop.game
import android.animation.ValueAnimator import android.animation.ValueAnimator
import android.content.Context import android.content.Context
@ -20,11 +20,10 @@ import android.view.View
import android.view.animation.LinearInterpolator import android.view.animation.LinearInterpolator
import android.hardware.display.DisplayManager import android.hardware.display.DisplayManager
import android.view.Display import android.view.Display
import com.mintris.model.GameBoard import com.pixelmintdrop.model.GameBoard
import com.mintris.model.Tetromino import com.pixelmintdrop.model.Tetromino
import com.mintris.model.TetrominoType import com.pixelmintdrop.model.TetrominoType
import kotlin.math.abs import kotlin.math.abs
import kotlin.math.min
/** /**
* GameView that renders the Tetris game and handles touch input * GameView that renders the Tetris game and handles touch input
@ -216,7 +215,7 @@ class GameView @JvmOverloads constructor(
pause() pause()
// Load saved block skin // 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" currentBlockSkin = prefs.getString("selected_block_skin", "block_skin_1") ?: "block_skin_1"
// Connect our callbacks to the GameBoard // Connect our callbacks to the GameBoard
@ -329,7 +328,7 @@ class GameView @JvmOverloads constructor(
} }
// Save the selection to SharedPreferences // 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() prefs.edit().putString("selected_block_skin", skinId).commit()
// Force a refresh of the view // Force a refresh of the view

View file

@ -1,4 +1,4 @@
package com.mintris.game package com.pixelmintdrop.game
import android.os.SystemClock import android.os.SystemClock
import android.view.InputDevice import android.view.InputDevice
@ -8,13 +8,11 @@ import android.util.Log
import android.content.Context import android.content.Context
import android.os.Build import android.os.Build
import android.os.VibrationEffect import android.os.VibrationEffect
import android.view.InputDevice.MotionRange
import android.os.Vibrator
import android.os.Handler import android.os.Handler
import android.os.Looper 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: * Supports multiple gamepad types including:
* - Microsoft Xbox controllers * - Microsoft Xbox controllers
* - Sony PlayStation controllers * - Sony PlayStation controllers

View file

@ -1,4 +1,4 @@
package com.mintris.game package com.pixelmintdrop.game
import android.content.Context import android.content.Context
import android.graphics.BlurMaskFilter import android.graphics.BlurMaskFilter
@ -7,8 +7,7 @@ import android.graphics.Color
import android.graphics.Paint import android.graphics.Paint
import android.util.AttributeSet import android.util.AttributeSet
import android.view.View import android.view.View
import com.mintris.model.GameBoard import com.pixelmintdrop.model.GameBoard
import com.mintris.model.Tetromino
import kotlin.math.min import kotlin.math.min
/** /**

View file

@ -1,4 +1,4 @@
package com.mintris.game package com.pixelmintdrop.game
import android.content.Context import android.content.Context
import android.graphics.Canvas import android.graphics.Canvas

View file

@ -1,4 +1,4 @@
package com.mintris.game package com.pixelmintdrop.game
import android.content.Context import android.content.Context
import android.graphics.Canvas import android.graphics.Canvas
@ -10,9 +10,9 @@ import android.view.MotionEvent
import android.view.View import android.view.View
import java.util.Random import java.util.Random
import android.util.Log import android.util.Log
import com.mintris.model.HighScoreManager import com.pixelmintdrop.model.HighScoreManager
import com.mintris.model.HighScore import com.pixelmintdrop.model.HighScore
import com.mintris.model.PlayerProgressionManager import com.pixelmintdrop.model.PlayerProgressionManager
import kotlin.math.abs import kotlin.math.abs
import androidx.core.graphics.withTranslation import androidx.core.graphics.withTranslation
import androidx.core.graphics.withScale import androidx.core.graphics.withScale
@ -240,7 +240,7 @@ class TitleScreen @JvmOverloads constructor(
// Draw title // Draw title
val titleY = height * 0.4f 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 // Draw high scores using pre-allocated manager
val highScores: List<HighScore> = highScoreManager.getHighScores() val highScores: List<HighScore> = highScoreManager.getHighScores()

View file

@ -1,4 +1,4 @@
package com.mintris.model package com.pixelmintdrop.model
import android.util.Log import android.util.Log

View file

@ -1,4 +1,4 @@
package com.mintris.model package com.pixelmintdrop.model
data class HighScore( data class HighScore(
val name: String, val name: String,

View file

@ -1,4 +1,4 @@
package com.mintris.model package com.pixelmintdrop.model
import android.graphics.Color import android.graphics.Color
import android.view.LayoutInflater import android.view.LayoutInflater
@ -6,7 +6,7 @@ import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.TextView import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.mintris.R import com.pixelmintdrop.R
class HighScoreAdapter : RecyclerView.Adapter<HighScoreAdapter.HighScoreViewHolder>() { class HighScoreAdapter : RecyclerView.Adapter<HighScoreAdapter.HighScoreViewHolder>() {
private var highScores: List<HighScore> = emptyList() private var highScores: List<HighScore> = emptyList()

View file

@ -1,4 +1,4 @@
package com.mintris.model package com.pixelmintdrop.model
import android.content.Context import android.content.Context
import android.content.SharedPreferences import android.content.SharedPreferences
@ -12,7 +12,7 @@ class HighScoreManager(private val context: Context) {
private val type: Type = object : TypeToken<List<HighScore>>() {}.type private val type: Type = object : TypeToken<List<HighScore>>() {}.type
companion object { 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 KEY_HIGHSCORES = "highscores"
private const val MAX_HIGHSCORES = 5 private const val MAX_HIGHSCORES = 5
} }

View file

@ -1,8 +1,7 @@
package com.mintris.model package com.pixelmintdrop.model
import android.content.Context import android.content.Context
import android.content.SharedPreferences import android.content.SharedPreferences
import com.mintris.R
import kotlin.math.pow import kotlin.math.pow
import kotlin.math.roundToInt import kotlin.math.roundToInt
import kotlin.math.min import kotlin.math.min
@ -292,7 +291,7 @@ class PlayerProgressionManager(context: Context) {
} }
companion object { 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_LEVEL = "player_level"
private const val KEY_PLAYER_XP = "player_xp" private const val KEY_PLAYER_XP = "player_xp"
private const val KEY_TOTAL_XP_EARNED = "total_xp_earned" private const val KEY_TOTAL_XP_EARNED = "total_xp_earned"

View file

@ -1,4 +1,4 @@
package com.mintris.model package com.pixelmintdrop.model
import android.content.Context import android.content.Context
import android.content.SharedPreferences import android.content.SharedPreferences
@ -179,7 +179,7 @@ class StatsManager(context: Context) {
} }
companion object { 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_GAMES = "total_games"
private const val KEY_TOTAL_SCORE = "total_score" private const val KEY_TOTAL_SCORE = "total_score"
private const val KEY_TOTAL_LINES = "total_lines" private const val KEY_TOTAL_LINES = "total_lines"

View file

@ -1,4 +1,4 @@
package com.mintris.model package com.pixelmintdrop.model
/** /**
* Represents a Tetris piece (Tetromino) * Represents a Tetris piece (Tetromino)

View file

@ -1,4 +1,4 @@
package com.mintris.ui package com.pixelmintdrop.ui
import android.content.Context import android.content.Context
import android.graphics.Color import android.graphics.Color
@ -9,9 +9,7 @@ import android.widget.FrameLayout
import android.widget.GridLayout import android.widget.GridLayout
import android.widget.TextView import android.widget.TextView
import androidx.cardview.widget.CardView import androidx.cardview.widget.CardView
import com.mintris.R import com.pixelmintdrop.R
import com.mintris.model.PlayerProgressionManager
import android.animation.ValueAnimator
import android.graphics.drawable.GradientDrawable import android.graphics.drawable.GradientDrawable
/** /**

View file

@ -1,14 +1,10 @@
package com.mintris.ui package com.pixelmintdrop.ui
import android.content.Context import android.content.Context
import android.graphics.Color import android.graphics.Color
import android.view.View import android.view.View
import android.widget.ImageButton import com.pixelmintdrop.databinding.ActivityMainBinding
import android.widget.TextView import com.pixelmintdrop.model.PlayerProgressionManager
import com.mintris.R
import com.mintris.databinding.ActivityMainBinding
import com.mintris.model.PlayerProgressionManager
import kotlin.math.roundToInt
/** /**
* Handles UI updates and state management for the game interface * Handles UI updates and state management for the game interface

View file

@ -1,4 +1,4 @@
package com.mintris.ui package com.pixelmintdrop.ui
import android.content.Context import android.content.Context
import android.graphics.Canvas import android.graphics.Canvas

View file

@ -1,4 +1,4 @@
package com.mintris.ui package com.pixelmintdrop.ui
import android.animation.AnimatorSet import android.animation.AnimatorSet
import android.animation.ObjectAnimator import android.animation.ObjectAnimator
@ -12,8 +12,8 @@ import android.view.animation.OvershootInterpolator
import android.widget.LinearLayout import android.widget.LinearLayout
import android.widget.TextView import android.widget.TextView
import androidx.cardview.widget.CardView import androidx.cardview.widget.CardView
import com.mintris.R import com.pixelmintdrop.R
import com.mintris.model.PlayerProgressionManager import com.pixelmintdrop.model.PlayerProgressionManager
/** /**
* Screen that displays player progression, XP gain, and unlocked rewards * Screen that displays player progression, XP gain, and unlocked rewards

View file

@ -1,4 +1,4 @@
package com.mintris.ui package com.pixelmintdrop.ui
import android.content.Context import android.content.Context
import android.graphics.Color import android.graphics.Color
@ -9,9 +9,8 @@ import android.widget.FrameLayout
import android.widget.GridLayout import android.widget.GridLayout
import android.widget.TextView import android.widget.TextView
import androidx.cardview.widget.CardView import androidx.cardview.widget.CardView
import com.mintris.R import com.pixelmintdrop.R
import com.mintris.model.PlayerProgressionManager import com.pixelmintdrop.model.PlayerProgressionManager
import android.animation.ValueAnimator
import android.graphics.drawable.GradientDrawable import android.graphics.drawable.GradientDrawable
import android.util.Log import android.util.Log

View file

@ -1,4 +1,4 @@
package com.mintris.ui package com.pixelmintdrop.ui
import android.animation.ValueAnimator import android.animation.ValueAnimator
import android.content.Context import android.content.Context
@ -9,8 +9,6 @@ import android.graphics.RectF
import android.util.AttributeSet import android.util.AttributeSet
import android.view.View import android.view.View
import android.view.animation.AccelerateDecelerateInterpolator import android.view.animation.AccelerateDecelerateInterpolator
import androidx.core.content.ContextCompat
import com.mintris.R
/** /**
* Custom progress bar for displaying player XP with animation capabilities * Custom progress bar for displaying player XP with animation capabilities

View file

@ -28,7 +28,7 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<com.mintris.game.GameView <com.pixelmintdrop.game.GameView
android:id="@+id/gameView" android:id="@+id/gameView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent" />
@ -72,7 +72,7 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="24dp"/> android:layout_marginTop="24dp"/>
<com.mintris.game.HoldPieceView <com.pixelmintdrop.game.HoldPieceView
android:id="@+id/holdPieceView" android:id="@+id/holdPieceView"
android:layout_width="80dp" android:layout_width="80dp"
android:layout_height="80dp" android:layout_height="80dp"
@ -125,7 +125,7 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="24dp"/> android:layout_marginTop="24dp"/>
<com.mintris.game.NextPieceView <com.pixelmintdrop.game.NextPieceView
android:id="@+id/nextPieceView" android:id="@+id/nextPieceView"
android:layout_width="80dp" android:layout_width="80dp"
android:layout_height="80dp" android:layout_height="80dp"
@ -188,7 +188,7 @@
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<!-- Title Screen --> <!-- Title Screen -->
<com.mintris.game.TitleScreen <com.pixelmintdrop.game.TitleScreen
android:id="@+id/titleScreen" android:id="@+id/titleScreen"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
@ -198,7 +198,7 @@
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<!-- Progression Screen --> <!-- Progression Screen -->
<com.mintris.ui.ProgressionScreen <com.pixelmintdrop.ui.ProgressionScreen
android:id="@+id/progressionScreen" android:id="@+id/progressionScreen"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
@ -209,7 +209,7 @@
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<!-- Theme Selector --> <!-- Theme Selector -->
<com.mintris.ui.ThemeSelector <com.pixelmintdrop.ui.ThemeSelector
android:id="@+id/themeSelector" android:id="@+id/themeSelector"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
@ -220,7 +220,7 @@
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<!-- Block Skin Selector --> <!-- Block Skin Selector -->
<com.mintris.ui.BlockSkinSelector <com.pixelmintdrop.ui.BlockSkinSelector
android:id="@+id/blockSkinSelector" android:id="@+id/blockSkinSelector"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
@ -655,7 +655,7 @@
android:textAllCaps="false" android:textAllCaps="false"
android:singleLine="true" /> android:singleLine="true" />
<com.mintris.ui.LevelBadge <com.pixelmintdrop.ui.LevelBadge
android:id="@+id/customizationLevelBadge" android:id="@+id/customizationLevelBadge"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" /> android:layout_height="48dp" />
@ -683,7 +683,7 @@
android:paddingBottom="32dp"> android:paddingBottom="32dp">
<!-- Theme Selector --> <!-- Theme Selector -->
<com.mintris.ui.ThemeSelector <com.pixelmintdrop.ui.ThemeSelector
android:id="@+id/customizationThemeSelector" android:id="@+id/customizationThemeSelector"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -691,7 +691,7 @@
android:focusableInTouchMode="true" /> android:focusableInTouchMode="true" />
<!-- Block Skin Selector --> <!-- Block Skin Selector -->
<com.mintris.ui.BlockSkinSelector <com.pixelmintdrop.ui.BlockSkinSelector
android:id="@+id/customizationBlockSkinSelector" android:id="@+id/customizationBlockSkinSelector"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"

View file

@ -19,7 +19,7 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<com.mintris.game.GameView <com.pixelmintdrop.game.GameView
android:id="@+id/gameView" android:id="@+id/gameView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent" />
@ -33,7 +33,7 @@
</FrameLayout> </FrameLayout>
<!-- Title Screen --> <!-- Title Screen -->
<com.mintris.game.TitleScreen <com.pixelmintdrop.game.TitleScreen
android:id="@+id/titleScreen" android:id="@+id/titleScreen"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
@ -116,7 +116,7 @@
android:fontFamily="sans-serif" android:fontFamily="sans-serif"
android:layout_marginBottom="4dp" /> android:layout_marginBottom="4dp" />
<com.mintris.game.NextPieceView <com.pixelmintdrop.game.NextPieceView
android:id="@+id/nextPieceView" android:id="@+id/nextPieceView"
android:layout_width="80dp" android:layout_width="80dp"
android:layout_height="80dp" /> android:layout_height="80dp" />
@ -136,7 +136,7 @@
</LinearLayout> </LinearLayout>
<!-- Hold Piece Preview --> <!-- Hold Piece Preview -->
<com.mintris.game.HoldPieceView <com.pixelmintdrop.game.HoldPieceView
android:id="@+id/holdPieceView" android:id="@+id/holdPieceView"
android:layout_width="60dp" android:layout_width="60dp"
android:layout_height="60dp" android:layout_height="60dp"
@ -289,7 +289,7 @@
</LinearLayout> </LinearLayout>
<!-- Player Progression Screen --> <!-- Player Progression Screen -->
<com.mintris.ui.ProgressionScreen <com.pixelmintdrop.ui.ProgressionScreen
android:id="@+id/progressionScreen" android:id="@+id/progressionScreen"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
@ -328,7 +328,7 @@
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:textAllCaps="false" /> android:textAllCaps="false" />
<com.mintris.ui.LevelBadge <com.pixelmintdrop.ui.LevelBadge
android:id="@+id/pauseLevelBadge" android:id="@+id/pauseLevelBadge"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" /> android:layout_height="48dp" />
@ -567,7 +567,7 @@
android:textAllCaps="false" android:textAllCaps="false"
android:singleLine="true" /> android:singleLine="true" />
<com.mintris.ui.LevelBadge <com.pixelmintdrop.ui.LevelBadge
android:id="@+id/customizationLevelBadge" android:id="@+id/customizationLevelBadge"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" /> android:layout_height="48dp" />
@ -592,14 +592,14 @@
android:paddingBottom="32dp"> android:paddingBottom="32dp">
<!-- Theme Selector --> <!-- Theme Selector -->
<com.mintris.ui.ThemeSelector <com.pixelmintdrop.ui.ThemeSelector
android:id="@+id/customizationThemeSelector" android:id="@+id/customizationThemeSelector"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="16dp" /> android:layout_marginBottom="16dp" />
<!-- Block Skin Selector --> <!-- Block Skin Selector -->
<com.mintris.ui.BlockSkinSelector <com.pixelmintdrop.ui.BlockSkinSelector
android:id="@+id/customizationBlockSkinSelector" android:id="@+id/customizationBlockSkinSelector"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"

View file

@ -30,7 +30,7 @@
android:gravity="center" android:gravity="center"
android:layout_marginBottom="24dp" /> android:layout_marginBottom="24dp" />
<com.mintris.ui.XPProgressBar <com.pixelmintdrop.ui.XPProgressBar
android:id="@+id/xp_progress_bar" android:id="@+id/xp_progress_bar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="50dp"

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="app_name">mintris</string> <string name="app_name">Pixel Mint Drop</string>
<string name="game_over">game over</string> <string name="game_over">game over</string>
<string name="score">score</string> <string name="score">score</string>
<string name="level">level</string> <string name="level">level</string>

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<!-- Base application theme --> <!-- Base application theme -->
<style name="Theme.Mintris" parent="Theme.MaterialComponents.DayNight.DarkActionBar"> <style name="Theme.pixelmintdrop" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
<item name="colorPrimary">@color/white</item> <item name="colorPrimary">@color/white</item>
<item name="colorPrimaryDark">@color/black</item> <item name="colorPrimaryDark">@color/black</item>
<item name="colorAccent">@color/white</item> <item name="colorAccent">@color/white</item>
@ -11,7 +11,7 @@
</style> </style>
<!-- No action bar theme --> <!-- No action bar theme -->
<style name="Theme.Mintris.NoActionBar"> <style name="Theme.pixelmintdrop.NoActionBar">
<item name="windowActionBar">false</item> <item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item> <item name="windowNoTitle">true</item>
<item name="android:windowFullscreen">true</item> <item name="android:windowFullscreen">true</item>

View file

@ -8,8 +8,8 @@
android:shortcutLongLabel="@string/shortcut_new_game_long_label"> android:shortcutLongLabel="@string/shortcut_new_game_long_label">
<intent <intent
android:action="android.intent.action.VIEW" android:action="android.intent.action.VIEW"
android:targetPackage="com.mintris" android:targetPackage="com.pixelmintdrop"
android:targetClass="com.mintris.MainActivity"> android:targetClass="com.pixelmintdrop.MainActivity">
<extra android:name="action" android:value="new_game" /> <extra android:name="action" android:value="new_game" />
</intent> </intent>
<categories android:name="android.shortcut.conversation" /> <categories android:name="android.shortcut.conversation" />
@ -23,8 +23,8 @@
android:shortcutLongLabel="@string/shortcut_high_scores_long_label"> android:shortcutLongLabel="@string/shortcut_high_scores_long_label">
<intent <intent
android:action="android.intent.action.VIEW" android:action="android.intent.action.VIEW"
android:targetPackage="com.mintris" android:targetPackage="com.pixelmintdrop"
android:targetClass="com.mintris.HighScoresActivity" /> android:targetClass="com.pixelmintdrop.HighScoresActivity" />
<categories android:name="android.shortcut.conversation" /> <categories android:name="android.shortcut.conversation" />
</shortcut> </shortcut>
</shortcuts> </shortcuts>

View file

@ -1,2 +1,2 @@
rootProject.name = "Mintris" rootProject.name = "pixelmintdrop"
include ':app' include ':app'

12
tatus
View file

@ -1,8 +1,8 @@
app/src/main/java/com/mintris/MainActivity.kt app/src/main/java/com/pixelmintdrop/MainActivity.kt
app/src/main/java/com/mintris/audio/GameMusic.kt app/src/main/java/com/pixelmintdrop/audio/GameMusic.kt
app/src/main/java/com/mintris/model/PlayerProgressionManager.kt app/src/main/java/com/pixelmintdrop/model/PlayerProgressionManager.kt
app/src/main/java/com/mintris/ui/ProgressionScreen.kt app/src/main/java/com/pixelmintdrop/ui/ProgressionScreen.kt
app/src/main/java/com/mintris/ui/ThemeSelector.kt app/src/main/java/com/pixelmintdrop/ui/ThemeSelector.kt
app/src/main/java/com/mintris/ui/XPProgressBar.kt app/src/main/java/com/pixelmintdrop/ui/XPProgressBar.kt
app/src/main/res/drawable/rounded_button.xml app/src/main/res/drawable/rounded_button.xml
app/src/main/res/layout/progression_screen.xml app/src/main/res/layout/progression_screen.xml