mirror of
https://github.com/cmclark00/mintris.git
synced 2025-05-17 23:55:21 +01:00
Enhance landscape support: Add click handlers for theme and block skin selectors, improve UI layout in landscape mode
This commit is contained in:
Corey
parent
94e8d313c2
commit
b481fb4e80
8 changed files with 1042 additions and 42 deletions
|
|
@ -15,7 +15,6 @@
|
||||||
<activity
|
<activity
|
||||||
android:name=".MainActivity"
|
android:name=".MainActivity"
|
||||||
android:exported="true"
|
android:exported="true"
|
||||||
android:screenOrientation="portrait"
|
|
||||||
android:theme="@style/Theme.Mintris.NoActionBar"
|
android:theme="@style/Theme.Mintris.NoActionBar"
|
||||||
android:immersive="true"
|
android:immersive="true"
|
||||||
android:resizeableActivity="false"
|
android:resizeableActivity="false"
|
||||||
|
|
|
||||||
|
|
@ -133,6 +133,19 @@ class MainActivity : AppCompatActivity() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Set up landscape mode theme selector if available
|
||||||
|
val inPauseThemeSelector = findViewById<ThemeSelector>(R.id.inPauseThemeSelector)
|
||||||
|
inPauseThemeSelector?.onThemeSelected = { themeId: String ->
|
||||||
|
// Apply the new theme
|
||||||
|
applyTheme(themeId)
|
||||||
|
|
||||||
|
// Provide haptic feedback
|
||||||
|
gameHaptics.vibrateForPieceLock()
|
||||||
|
|
||||||
|
// Refresh the pause menu
|
||||||
|
showPauseMenu()
|
||||||
|
}
|
||||||
|
|
||||||
// Set up block skin selector
|
// Set up block skin selector
|
||||||
blockSkinSelector.onBlockSkinSelected = { skinId: String ->
|
blockSkinSelector.onBlockSkinSelected = { skinId: String ->
|
||||||
// Apply the new block skin
|
// Apply the new block skin
|
||||||
|
|
@ -145,6 +158,19 @@ class MainActivity : AppCompatActivity() {
|
||||||
gameHaptics.vibrateForPieceLock()
|
gameHaptics.vibrateForPieceLock()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Set up landscape mode block skin selector if available
|
||||||
|
val inPauseBlockSkinSelector = findViewById<BlockSkinSelector>(R.id.inPauseBlockSkinSelector)
|
||||||
|
inPauseBlockSkinSelector?.onBlockSkinSelected = { skinId: String ->
|
||||||
|
// Apply the new block skin
|
||||||
|
gameView.setBlockSkin(skinId)
|
||||||
|
|
||||||
|
// Save the selection
|
||||||
|
progressionManager.setSelectedBlockSkin(skinId)
|
||||||
|
|
||||||
|
// Provide haptic feedback
|
||||||
|
gameHaptics.vibrateForPieceLock()
|
||||||
|
}
|
||||||
|
|
||||||
// Set up title screen
|
// Set up title screen
|
||||||
titleScreen.onStartGame = {
|
titleScreen.onStartGame = {
|
||||||
titleScreen.visibility = View.GONE
|
titleScreen.visibility = View.GONE
|
||||||
|
|
@ -437,8 +463,8 @@ class MainActivity : AppCompatActivity() {
|
||||||
binding.resumeButton.visibility = View.GONE
|
binding.resumeButton.visibility = View.GONE
|
||||||
|
|
||||||
// Update level badge
|
// Update level badge
|
||||||
binding.pauseLevelBadge.setLevel(progressionManager.getPlayerLevel())
|
binding.pauseLevelBadge?.setLevel(progressionManager.getPlayerLevel())
|
||||||
binding.pauseLevelBadge.setThemeColor(getThemeColor(currentTheme))
|
binding.pauseLevelBadge?.setThemeColor(getThemeColor(currentTheme))
|
||||||
|
|
||||||
// Get theme color
|
// Get theme color
|
||||||
val textColor = getThemeColor(currentTheme)
|
val textColor = getThemeColor(currentTheme)
|
||||||
|
|
@ -461,26 +487,41 @@ class MainActivity : AppCompatActivity() {
|
||||||
binding.resumeButton.setTextColor(textColor)
|
binding.resumeButton.setTextColor(textColor)
|
||||||
binding.highScoresButton.setTextColor(textColor)
|
binding.highScoresButton.setTextColor(textColor)
|
||||||
binding.statsButton.setTextColor(textColor)
|
binding.statsButton.setTextColor(textColor)
|
||||||
binding.pauseLevelText.setTextColor(textColor)
|
binding.pauseLevelText?.setTextColor(textColor)
|
||||||
binding.pauseLevelUpButton.setTextColor(textColor)
|
binding.pauseLevelUpButton.setTextColor(textColor)
|
||||||
binding.pauseLevelDownButton.setTextColor(textColor)
|
binding.pauseLevelDownButton.setTextColor(textColor)
|
||||||
binding.settingsButton.setTextColor(textColor)
|
binding.settingsButton.setTextColor(textColor)
|
||||||
binding.musicToggle.setColorFilter(textColor)
|
binding.musicToggle.setColorFilter(textColor)
|
||||||
|
|
||||||
// Apply theme colors to text elements
|
// Apply theme colors to text elements
|
||||||
binding.settingsTitle.setTextColor(textColor)
|
binding.settingsTitle?.setTextColor(textColor)
|
||||||
binding.selectLevelText.setTextColor(textColor)
|
binding.selectLevelText.setTextColor(textColor)
|
||||||
binding.musicText.setTextColor(textColor)
|
binding.musicText.setTextColor(textColor)
|
||||||
|
|
||||||
// Update theme selector
|
// Update theme selector - handle both standard and landscape versions
|
||||||
updateThemeSelector()
|
updateThemeSelector()
|
||||||
|
|
||||||
// Update block skin selector
|
// Handle landscape mode theme selectors (using null-safe calls)
|
||||||
|
val inPauseThemeSelector = findViewById<ThemeSelector>(R.id.inPauseThemeSelector)
|
||||||
|
inPauseThemeSelector?.updateThemes(
|
||||||
|
unlockedThemes = progressionManager.getUnlockedThemes(),
|
||||||
|
currentTheme = currentTheme
|
||||||
|
)
|
||||||
|
|
||||||
|
// Update block skin selector - handle both standard and landscape versions
|
||||||
blockSkinSelector.updateBlockSkins(
|
blockSkinSelector.updateBlockSkins(
|
||||||
progressionManager.getUnlockedBlocks(),
|
progressionManager.getUnlockedBlocks(),
|
||||||
gameView.getCurrentBlockSkin(),
|
gameView.getCurrentBlockSkin(),
|
||||||
progressionManager.getPlayerLevel()
|
progressionManager.getPlayerLevel()
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// Handle landscape mode block skin selectors (using null-safe calls)
|
||||||
|
val inPauseBlockSkinSelector = findViewById<BlockSkinSelector>(R.id.inPauseBlockSkinSelector)
|
||||||
|
inPauseBlockSkinSelector?.updateBlockSkins(
|
||||||
|
progressionManager.getUnlockedBlocks(),
|
||||||
|
gameView.getCurrentBlockSkin(),
|
||||||
|
progressionManager.getPlayerLevel()
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -1019,6 +1019,16 @@ class GameView @JvmOverloads constructor(
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Define the game board boundaries
|
||||||
|
val boardRight = boardLeft + (gameBoard.width * blockSize)
|
||||||
|
val boardBottom = boardTop + (gameBoard.height * blockSize)
|
||||||
|
|
||||||
|
// Determine if touch is on left side, right side, or within board area
|
||||||
|
val isLeftSide = event.x < boardLeft
|
||||||
|
val isRightSide = event.x > boardRight
|
||||||
|
val isWithinBoard = event.x >= boardLeft && event.x <= boardRight &&
|
||||||
|
event.y >= boardTop && event.y <= boardBottom
|
||||||
|
|
||||||
when (event.action) {
|
when (event.action) {
|
||||||
MotionEvent.ACTION_DOWN -> {
|
MotionEvent.ACTION_DOWN -> {
|
||||||
startX = event.x
|
startX = event.x
|
||||||
|
|
@ -1051,6 +1061,50 @@ class GameView @JvmOverloads constructor(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Special handling for landscape mode - side controls
|
||||||
|
if (isLeftSide) {
|
||||||
|
// Left side controls - move left
|
||||||
|
if (deltaY < -blockSize * minMovementThreshold) {
|
||||||
|
// Swipe up on left side - rotate
|
||||||
|
if (currentTime - lastRotationTime >= rotationCooldown) {
|
||||||
|
gameBoard.rotate()
|
||||||
|
lastRotationTime = currentTime
|
||||||
|
gameHaptics?.vibrateForPieceMove()
|
||||||
|
invalidate()
|
||||||
|
}
|
||||||
|
} else if (deltaY > blockSize * minMovementThreshold) {
|
||||||
|
// Swipe down on left side - move left
|
||||||
|
gameBoard.moveLeft()
|
||||||
|
lastTouchY = event.y
|
||||||
|
if (currentTime - lastMoveTime >= moveCooldown) {
|
||||||
|
gameHaptics?.vibrateForPieceMove()
|
||||||
|
lastMoveTime = currentTime
|
||||||
|
}
|
||||||
|
invalidate()
|
||||||
|
}
|
||||||
|
} else if (isRightSide) {
|
||||||
|
// Right side controls - move right
|
||||||
|
if (deltaY < -blockSize * minMovementThreshold) {
|
||||||
|
// Swipe up on right side - hold piece
|
||||||
|
if (currentTime - lastHoldTime >= holdCooldown) {
|
||||||
|
gameBoard.holdPiece()
|
||||||
|
lastHoldTime = currentTime
|
||||||
|
gameHaptics?.vibrateForPieceMove()
|
||||||
|
invalidate()
|
||||||
|
}
|
||||||
|
} else if (deltaY > blockSize * minMovementThreshold) {
|
||||||
|
// Swipe down on right side - move right
|
||||||
|
gameBoard.moveRight()
|
||||||
|
lastTouchY = event.y
|
||||||
|
if (currentTime - lastMoveTime >= moveCooldown) {
|
||||||
|
gameHaptics?.vibrateForPieceMove()
|
||||||
|
lastMoveTime = currentTime
|
||||||
|
}
|
||||||
|
invalidate()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Standard touch controls for main board area or portrait mode
|
||||||
|
else {
|
||||||
// Handle movement based on locked direction
|
// Handle movement based on locked direction
|
||||||
when (lockedDirection) {
|
when (lockedDirection) {
|
||||||
Direction.HORIZONTAL -> {
|
Direction.HORIZONTAL -> {
|
||||||
|
|
@ -1084,12 +1138,39 @@ class GameView @JvmOverloads constructor(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
MotionEvent.ACTION_UP -> {
|
MotionEvent.ACTION_UP -> {
|
||||||
val deltaX = event.x - startX
|
val deltaX = event.x - startX
|
||||||
val deltaY = event.y - startY
|
val deltaY = event.y - startY
|
||||||
val moveTime = currentTime - lastTapTime
|
val moveTime = currentTime - lastTapTime
|
||||||
|
|
||||||
|
// Special handling for taps on game board or sides
|
||||||
|
if (moveTime < minTapTime * 1.5 &&
|
||||||
|
abs(deltaY) < maxTapMovement * 1.5 &&
|
||||||
|
abs(deltaX) < maxTapMovement * 1.5) {
|
||||||
|
|
||||||
|
if (isLeftSide) {
|
||||||
|
// Tap on left side - move left
|
||||||
|
gameBoard.moveLeft()
|
||||||
|
gameHaptics?.vibrateForPieceMove()
|
||||||
|
invalidate()
|
||||||
|
} else if (isRightSide) {
|
||||||
|
// Tap on right side - move right
|
||||||
|
gameBoard.moveRight()
|
||||||
|
gameHaptics?.vibrateForPieceMove()
|
||||||
|
invalidate()
|
||||||
|
} else if (isWithinBoard && currentTime - lastRotationTime >= rotationCooldown) {
|
||||||
|
// Tap on board - rotate
|
||||||
|
gameBoard.rotate()
|
||||||
|
lastRotationTime = currentTime
|
||||||
|
gameHaptics?.vibrateForPieceMove()
|
||||||
|
invalidate()
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
// Long swipe handling for hard drops and holds
|
||||||
// Check for hold gesture (swipe up)
|
// Check for hold gesture (swipe up)
|
||||||
if (deltaY < -blockSize * minHoldDistance &&
|
if (deltaY < -blockSize * minHoldDistance &&
|
||||||
abs(deltaX) / abs(deltaY) < 0.5f) {
|
abs(deltaX) / abs(deltaY) < 0.5f) {
|
||||||
|
|
@ -1125,17 +1206,6 @@ class GameView @JvmOverloads constructor(
|
||||||
gameBoard.softDrop()
|
gameBoard.softDrop()
|
||||||
invalidate()
|
invalidate()
|
||||||
}
|
}
|
||||||
// Check for rotation (quick tap with minimal movement)
|
|
||||||
else if (moveTime < minTapTime * 1.5 && // Increased from 1.0 to 1.5 for more lenient timing
|
|
||||||
abs(deltaY) < maxTapMovement * 1.5 && // Increased from 1.0 to 1.5 for more lenient movement
|
|
||||||
abs(deltaX) < maxTapMovement * 1.5) { // Increased from 1.0 to 1.5 for more lenient movement
|
|
||||||
if (currentTime - lastRotationTime >= rotationCooldown) {
|
|
||||||
Log.d(TAG, "Rotation detected - moveTime: $moveTime, deltaX: $deltaX, deltaY: $deltaY")
|
|
||||||
gameBoard.rotate()
|
|
||||||
lastRotationTime = currentTime
|
|
||||||
invalidate()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Reset direction lock
|
// Reset direction lock
|
||||||
lockedDirection = null
|
lockedDirection = null
|
||||||
|
|
|
||||||
606
app/src/main/res/layout-land/activity_main.xml
Normal file
606
app/src/main/res/layout-land/activity_main.xml
Normal file
|
|
@ -0,0 +1,606 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:background="@color/black"
|
||||||
|
android:fitsSystemWindows="true"
|
||||||
|
tools:context=".MainActivity">
|
||||||
|
|
||||||
|
<!-- Game Container with Glow - Centered -->
|
||||||
|
<FrameLayout
|
||||||
|
android:id="@+id/gameContainer"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
android:layout_margin="12dp"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintDimensionRatio="1:2"
|
||||||
|
app:layout_constraintEnd_toStartOf="@+id/rightControlsPanel"
|
||||||
|
app:layout_constraintStart_toEndOf="@+id/leftControlsPanel"
|
||||||
|
app:layout_constraintTop_toTopOf="parent">
|
||||||
|
|
||||||
|
<com.mintris.game.GameView
|
||||||
|
android:id="@+id/gameView"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent" />
|
||||||
|
|
||||||
|
<!-- Glowing Border -->
|
||||||
|
<View
|
||||||
|
android:id="@+id/glowBorder"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:background="@drawable/glow_border" />
|
||||||
|
</FrameLayout>
|
||||||
|
|
||||||
|
<!-- Left Side Controls Panel -->
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
|
android:id="@+id/leftControlsPanel"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
android:layout_margin="8dp"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
app:layout_constraintWidth_percent="0.25">
|
||||||
|
|
||||||
|
<!-- Hold Piece View -->
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/holdLabel"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="HOLD"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="16sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:fontFamily="sans-serif"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
android:layout_marginTop="24dp"/>
|
||||||
|
|
||||||
|
<com.mintris.game.HoldPieceView
|
||||||
|
android:id="@+id/holdPieceView"
|
||||||
|
android:layout_width="80dp"
|
||||||
|
android:layout_height="80dp"
|
||||||
|
android:layout_marginTop="8dp"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/holdLabel" />
|
||||||
|
|
||||||
|
<!-- Pause Button -->
|
||||||
|
<ImageButton
|
||||||
|
android:id="@+id/pauseButton"
|
||||||
|
android:layout_width="48dp"
|
||||||
|
android:layout_height="48dp"
|
||||||
|
android:background="?attr/selectableItemBackgroundBorderless"
|
||||||
|
android:contentDescription="@string/settings"
|
||||||
|
android:padding="12dp"
|
||||||
|
android:src="@drawable/ic_pause"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
android:layout_marginBottom="24dp" />
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
|
||||||
|
<!-- Right Side Controls Panel -->
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
|
android:id="@+id/rightControlsPanel"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
android:layout_margin="8dp"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
app:layout_constraintWidth_percent="0.25">
|
||||||
|
|
||||||
|
<!-- Next Piece Preview -->
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/nextLabel"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="NEXT"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="16sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:fontFamily="sans-serif"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
android:layout_marginTop="24dp"/>
|
||||||
|
|
||||||
|
<com.mintris.game.NextPieceView
|
||||||
|
android:id="@+id/nextPieceView"
|
||||||
|
android:layout_width="80dp"
|
||||||
|
android:layout_height="80dp"
|
||||||
|
android:layout_marginTop="8dp"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/nextLabel" />
|
||||||
|
|
||||||
|
<!-- HUD Container - Score, Level, Lines -->
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/hudContainer"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="24dp"
|
||||||
|
android:orientation="vertical"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/nextPieceView">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/scoreText"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="24sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:fontFamily="sans-serif"
|
||||||
|
tools:text="score: 0" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/currentLevelText"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="24sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:fontFamily="sans-serif"
|
||||||
|
tools:text="level: 1" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/linesText"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="24sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:fontFamily="sans-serif"
|
||||||
|
tools:text="lines: 0" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/comboText"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="24sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:fontFamily="sans-serif"
|
||||||
|
tools:text="combo: 0" />
|
||||||
|
</LinearLayout>
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
|
||||||
|
<!-- Title Screen -->
|
||||||
|
<com.mintris.game.TitleScreen
|
||||||
|
android:id="@+id/titleScreen"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
<!-- Progression Screen -->
|
||||||
|
<com.mintris.ui.ProgressionScreen
|
||||||
|
android:id="@+id/progressionScreen"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
android:visibility="gone"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
<!-- Theme Selector -->
|
||||||
|
<com.mintris.ui.ThemeSelector
|
||||||
|
android:id="@+id/themeSelector"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
android:visibility="gone"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
<!-- Block Skin Selector -->
|
||||||
|
<com.mintris.ui.BlockSkinSelector
|
||||||
|
android:id="@+id/blockSkinSelector"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
android:visibility="gone"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
<!-- Pause Container -->
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/pauseContainer"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:background="@color/black"
|
||||||
|
android:gravity="center"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:visibility="gone">
|
||||||
|
|
||||||
|
<!-- Scrollable content for pause menu -->
|
||||||
|
<ScrollView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:gravity="center"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:padding="16dp">
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/pauseStartButton"
|
||||||
|
android:layout_width="200dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:background="@color/transparent"
|
||||||
|
android:text="@string/start"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="24sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:fontFamily="sans-serif"
|
||||||
|
android:textAllCaps="false" />
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/resumeButton"
|
||||||
|
android:layout_width="200dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="16dp"
|
||||||
|
android:background="@color/transparent"
|
||||||
|
android:text="@string/resume"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="24sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:fontFamily="sans-serif"
|
||||||
|
android:textAllCaps="false" />
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/pauseRestartButton"
|
||||||
|
android:layout_width="200dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="16dp"
|
||||||
|
android:background="@color/transparent"
|
||||||
|
android:text="@string/restart"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="24sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:fontFamily="sans-serif"
|
||||||
|
android:textAllCaps="false" />
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/highScoresButton"
|
||||||
|
android:layout_width="200dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="16dp"
|
||||||
|
android:background="@color/transparent"
|
||||||
|
android:text="@string/high_scores"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="24sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:fontFamily="sans-serif"
|
||||||
|
android:textAllCaps="false" />
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/statsButton"
|
||||||
|
android:layout_width="200dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="16dp"
|
||||||
|
android:background="@color/transparent"
|
||||||
|
android:text="@string/stats"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="24sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:fontFamily="sans-serif"
|
||||||
|
android:textAllCaps="false" />
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/levelSelectorContainer"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="32dp"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:gravity="center">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/selectLevelText"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/select_level"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="24sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:fontFamily="sans-serif"
|
||||||
|
android:textAllCaps="false" />
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="horizontal"
|
||||||
|
android:layout_marginTop="8dp">
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/pauseLevelDownButton"
|
||||||
|
android:layout_width="48dp"
|
||||||
|
android:layout_height="48dp"
|
||||||
|
android:background="@color/transparent"
|
||||||
|
android:text="−"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="24sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:fontFamily="sans-serif" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/pauseLevelText"
|
||||||
|
android:layout_width="48dp"
|
||||||
|
android:layout_height="48dp"
|
||||||
|
android:gravity="center"
|
||||||
|
android:text="1"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="24sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:fontFamily="sans-serif" />
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/pauseLevelUpButton"
|
||||||
|
android:layout_width="48dp"
|
||||||
|
android:layout_height="48dp"
|
||||||
|
android:background="@color/transparent"
|
||||||
|
android:text="+"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="24sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:fontFamily="sans-serif" />
|
||||||
|
</LinearLayout>
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<!-- Theme Selector -->
|
||||||
|
<com.mintris.ui.ThemeSelector
|
||||||
|
android:id="@+id/inPauseThemeSelector"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="24dp"
|
||||||
|
android:layout_marginBottom="16dp" />
|
||||||
|
|
||||||
|
<!-- Block Skin Selector -->
|
||||||
|
<com.mintris.ui.BlockSkinSelector
|
||||||
|
android:id="@+id/inPauseBlockSkinSelector"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="24dp"
|
||||||
|
android:layout_marginBottom="16dp" />
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/settingsButton"
|
||||||
|
android:layout_width="200dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="16dp"
|
||||||
|
android:background="@color/transparent"
|
||||||
|
android:text="@string/sound_on"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="24sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:fontFamily="sans-serif"
|
||||||
|
android:textAllCaps="false" />
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="horizontal"
|
||||||
|
android:gravity="center_vertical"
|
||||||
|
android:layout_marginTop="16dp">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/musicText"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/music"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="24sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:fontFamily="sans-serif"
|
||||||
|
android:textAllCaps="false"
|
||||||
|
android:layout_marginEnd="16dp" />
|
||||||
|
|
||||||
|
<ImageButton
|
||||||
|
android:id="@+id/musicToggle"
|
||||||
|
android:layout_width="48dp"
|
||||||
|
android:layout_height="48dp"
|
||||||
|
android:background="?attr/selectableItemBackgroundBorderless"
|
||||||
|
android:contentDescription="@string/toggle_music"
|
||||||
|
android:padding="12dp"
|
||||||
|
android:src="@drawable/ic_volume_up" />
|
||||||
|
</LinearLayout>
|
||||||
|
</LinearLayout>
|
||||||
|
</ScrollView>
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<!-- Game Over overlay -->
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/gameOverContainer"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:background="@color/black"
|
||||||
|
android:gravity="center"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:visibility="gone">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/gameOverText"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/game_over"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="36sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:fontFamily="sans-serif" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/session_stats"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="28sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:fontFamily="sans-serif"
|
||||||
|
android:layout_marginTop="24dp" />
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="horizontal"
|
||||||
|
android:layout_marginTop="8dp">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:layout_marginEnd="24dp">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/sessionScoreText"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="20sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:fontFamily="sans-serif" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/sessionLinesText"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="20sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:fontFamily="sans-serif" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/sessionPiecesText"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="20sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:fontFamily="sans-serif" />
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/sessionTimeText"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="20sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:fontFamily="sans-serif" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/sessionLevelText"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="20sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:fontFamily="sans-serif" />
|
||||||
|
</LinearLayout>
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/line_clears"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="28sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:fontFamily="sans-serif"
|
||||||
|
android:layout_marginTop="16dp" />
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="horizontal">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:layout_marginEnd="24dp">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/sessionSinglesText"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="20sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:fontFamily="sans-serif" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/sessionDoublesText"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="20sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:fontFamily="sans-serif" />
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/sessionTriplesText"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="20sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:fontFamily="sans-serif" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/sessionTetrisesText"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="20sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:fontFamily="sans-serif" />
|
||||||
|
</LinearLayout>
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/playAgainButton"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="24dp"
|
||||||
|
android:text="@string/play"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="18sp" />
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<!-- This linear layout is hidden in landscape mode as we're using the panels instead -->
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/gameControlsContainer"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:visibility="gone"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent">
|
||||||
|
</LinearLayout>
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
194
app/src/main/res/layout-land/activity_stats.xml
Normal file
194
app/src/main/res/layout-land/activity_stats.xml
Normal file
|
|
@ -0,0 +1,194 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:background="@color/black"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/lifetime_stats"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="28sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:layout_gravity="center"
|
||||||
|
android:layout_marginTop="16dp"/>
|
||||||
|
|
||||||
|
<ScrollView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
android:layout_weight="1">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="horizontal"
|
||||||
|
android:padding="16dp">
|
||||||
|
|
||||||
|
<!-- Left Column -->
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:padding="8dp">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/general_stats"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="20sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:layout_marginBottom="16dp"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/totalGamesText"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="18sp"
|
||||||
|
android:layout_marginBottom="8dp"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/totalScoreText"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="18sp"
|
||||||
|
android:layout_marginBottom="8dp"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/totalLinesText"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="18sp"
|
||||||
|
android:layout_marginBottom="8dp"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/totalPiecesText"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="18sp"
|
||||||
|
android:layout_marginBottom="8dp"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/totalTimeText"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="18sp"
|
||||||
|
android:layout_marginBottom="24dp"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/line_clears"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="20sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:layout_marginBottom="16dp"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/totalSinglesText"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="18sp"
|
||||||
|
android:layout_marginBottom="4dp"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/totalDoublesText"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="18sp"
|
||||||
|
android:layout_marginBottom="4dp"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/totalTriplesText"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="18sp"
|
||||||
|
android:layout_marginBottom="4dp"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/totalTetrisesText"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="18sp"/>
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<!-- Right Column -->
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:padding="8dp">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/best_performance"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="20sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:layout_marginBottom="16dp"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/maxLevelText"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="18sp"
|
||||||
|
android:layout_marginBottom="8dp"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/maxScoreText"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="18sp"
|
||||||
|
android:layout_marginBottom="8dp"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/maxLinesText"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="18sp"/>
|
||||||
|
</LinearLayout>
|
||||||
|
</LinearLayout>
|
||||||
|
</ScrollView>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="horizontal"
|
||||||
|
android:gravity="center"
|
||||||
|
android:padding="8dp">
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/backButton"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/back"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:background="@color/transparent"
|
||||||
|
android:layout_marginEnd="16dp"/>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/resetStatsButton"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/reset_stats"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:background="@color/transparent"/>
|
||||||
|
</LinearLayout>
|
||||||
|
</LinearLayout>
|
||||||
51
app/src/main/res/layout-land/high_score_entry.xml
Normal file
51
app/src/main/res/layout-land/high_score_entry.xml
Normal file
|
|
@ -0,0 +1,51 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:background="@color/black"
|
||||||
|
android:gravity="center"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:padding="24dp">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/new_high_score"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="28sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:fontFamily="monospace"
|
||||||
|
android:layout_marginBottom="24dp"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/scoreText"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="24sp"
|
||||||
|
android:fontFamily="monospace"
|
||||||
|
android:layout_marginBottom="24dp"/>
|
||||||
|
|
||||||
|
<EditText
|
||||||
|
android:id="@+id/nameInput"
|
||||||
|
android:layout_width="280dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:background="@drawable/edit_text_background"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="22sp"
|
||||||
|
android:fontFamily="monospace"
|
||||||
|
android:gravity="center"
|
||||||
|
android:inputType="text"
|
||||||
|
android:maxLength="10"
|
||||||
|
android:layout_marginBottom="24dp"/>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/saveButton"
|
||||||
|
android:layout_width="200dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:background="@color/transparent"
|
||||||
|
android:text="@string/save"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="20sp"
|
||||||
|
android:fontFamily="monospace"/>
|
||||||
|
</LinearLayout>
|
||||||
38
app/src/main/res/layout-land/high_scores.xml
Normal file
38
app/src/main/res/layout-land/high_scores.xml
Normal file
|
|
@ -0,0 +1,38 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:background="@color/black"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:padding="16dp">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/high_scores"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="28sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:fontFamily="monospace"
|
||||||
|
android:layout_gravity="center"
|
||||||
|
android:layout_marginBottom="16dp"/>
|
||||||
|
|
||||||
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
|
android:id="@+id/highScoresList"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:layout_marginHorizontal="64dp"
|
||||||
|
android:layout_marginBottom="16dp"/>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/backButton"
|
||||||
|
android:layout_width="200dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_gravity="center"
|
||||||
|
android:background="@color/transparent"
|
||||||
|
android:text="@string/back"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="18sp"
|
||||||
|
android:fontFamily="monospace"/>
|
||||||
|
</LinearLayout>
|
||||||
|
|
@ -23,6 +23,7 @@
|
||||||
|
|
||||||
<!-- Stats Screen -->
|
<!-- Stats Screen -->
|
||||||
<string name="lifetime_stats">lifetime stats</string>
|
<string name="lifetime_stats">lifetime stats</string>
|
||||||
|
<string name="general_stats">general stats</string>
|
||||||
<string name="best_performance">best performance</string>
|
<string name="best_performance">best performance</string>
|
||||||
<string name="total_games">total games: %d</string>
|
<string name="total_games">total games: %d</string>
|
||||||
<string name="total_score">total score: %d</string>
|
<string name="total_score">total score: %d</string>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue