From aeb463fa88c1dd0fb321f47e3d6936ae28213490 Mon Sep 17 00:00:00 2001 From: cmclark00 Date: Mon, 24 Mar 2025 17:17:26 -0400 Subject: [PATCH 1/2] Fix auto-refresh issue and add missing games: Modretro Tetris and Tetris Mobile --- .../tetristats/data/ScalingFactors.kt | 48 ++++++-- .../tetristats/ui/entry/EntryFragment.kt | 106 +++++++++++------- .../tetristats/ui/entry/EntryViewModel.kt | 18 +-- 3 files changed, 120 insertions(+), 52 deletions(-) diff --git a/app/src/main/java/com/accidentalproductions/tetristats/data/ScalingFactors.kt b/app/src/main/java/com/accidentalproductions/tetristats/data/ScalingFactors.kt index 93030f2..e272e19 100644 --- a/app/src/main/java/com/accidentalproductions/tetristats/data/ScalingFactors.kt +++ b/app/src/main/java/com/accidentalproductions/tetristats/data/ScalingFactors.kt @@ -16,7 +16,9 @@ object ScalingFactors { "Tetris DS" to RangeScalingFactor(3.0, 3.3, 4.5), "Tetris Effect" to RangeScalingFactor(2.5, 3.8, 4.5), "Rosy Retrospection DX" to RangeScalingFactor(4.0, 1.5, 1.8), - "Apotris" to RangeScalingFactor(1.8, 3.8, 4.4) + "Apotris" to RangeScalingFactor(1.8, 3.8, 4.4), + "Modretro Tetris" to RangeScalingFactor(2.0, 2.5, 3.0), + "Tetris Mobile" to RangeScalingFactor(2.2, 2.8, 3.5) ), "Game Boy Tetris" to mapOf( "NES Tetris" to 1.33, @@ -24,7 +26,9 @@ object ScalingFactors { "Tetris DS" to RangeScalingFactor(4.0, 2.0, 2.0), "Tetris Effect" to RangeScalingFactor(4.0, 2.3, 2.3), "Rosy Retrospection DX" to 1.1, - "Apotris" to RangeScalingFactor(1.33, 1.33, 2.33) + "Apotris" to RangeScalingFactor(1.33, 1.33, 2.33), + "Modretro Tetris" to RangeScalingFactor(1.5, 1.8, 2.0), + "Tetris Mobile" to RangeScalingFactor(1.6, 1.9, 2.1) ), "Tetris DX" to mapOf( "NES Tetris" to 1.33, @@ -32,7 +36,9 @@ object ScalingFactors { "Tetris DS" to RangeScalingFactor(4.0, 2.0, 2.0), "Tetris Effect" to RangeScalingFactor(4.0, 2.3, 2.3), "Rosy Retrospection DX" to 1.1, - "Apotris" to RangeScalingFactor(1.33, 1.33, 2.33) + "Apotris" to RangeScalingFactor(1.33, 1.33, 2.33), + "Modretro Tetris" to RangeScalingFactor(1.5, 1.8, 2.0), + "Tetris Mobile" to RangeScalingFactor(1.6, 1.9, 2.1) ), "Tetris DS" to mapOf( "NES Tetris" to RangeScalingFactor(0.33, 0.3, 0.22), @@ -40,7 +46,9 @@ object ScalingFactors { "Tetris DX" to RangeScalingFactor(0.25, 0.5, 0.5), "Tetris Effect" to RangeScalingFactor(0.83, 0.91, 1.0), "Rosy Retrospection DX" to RangeScalingFactor(0.25, 0.91, 0.67), - "Apotris" to RangeScalingFactor(0.33, 0.67, 0.9) + "Apotris" to RangeScalingFactor(0.33, 0.67, 0.9), + "Modretro Tetris" to RangeScalingFactor(0.4, 0.5, 0.6), + "Tetris Mobile" to RangeScalingFactor(0.45, 0.55, 0.65) ), "Tetris Effect" to mapOf( "NES Tetris" to RangeScalingFactor(0.4, 0.26, 0.22), @@ -48,7 +56,9 @@ object ScalingFactors { "Tetris DX" to RangeScalingFactor(0.25, 0.43, 0.43), "Tetris DS" to RangeScalingFactor(1.2, 1.1, 1.0), "Rosy Retrospection DX" to RangeScalingFactor(0.25, 0.43, 0.57), - "Apotris" to RangeScalingFactor(0.33, 0.67, 0.85) + "Apotris" to RangeScalingFactor(0.33, 0.67, 0.85), + "Modretro Tetris" to RangeScalingFactor(0.45, 0.55, 0.65), + "Tetris Mobile" to RangeScalingFactor(0.5, 0.6, 0.7) ), "Rosy Retrospection DX" to mapOf( "NES Tetris" to RangeScalingFactor(0.25, 0.67, 0.57), @@ -56,7 +66,9 @@ object ScalingFactors { "Tetris DX" to 0.91, "Tetris DS" to RangeScalingFactor(4.0, 1.5, 1.8), "Tetris Effect" to RangeScalingFactor(4.0, 2.3, 1.8), - "Apotris" to RangeScalingFactor(1.1, 0.67, 0.5) + "Apotris" to RangeScalingFactor(1.1, 0.67, 0.5), + "Modretro Tetris" to RangeScalingFactor(1.3, 1.5, 1.7), + "Tetris Mobile" to RangeScalingFactor(1.4, 1.6, 1.8) ), "Apotris" to mapOf( "NES Tetris" to RangeScalingFactor(0.56, 0.26, 0.23), @@ -64,7 +76,29 @@ object ScalingFactors { "Tetris DX" to RangeScalingFactor(0.75, 0.75, 0.5), "Tetris DS" to RangeScalingFactor(3.0, 1.5, 1.0), "Tetris Effect" to RangeScalingFactor(3.0, 1.7, 1.2), - "Rosy Retrospection DX" to RangeScalingFactor(1.1, 0.67, 0.5) + "Rosy Retrospection DX" to RangeScalingFactor(1.1, 0.67, 0.5), + "Modretro Tetris" to RangeScalingFactor(1.2, 0.9, 0.7), + "Tetris Mobile" to RangeScalingFactor(1.3, 1.0, 0.8) + ), + "Modretro Tetris" to mapOf( + "NES Tetris" to RangeScalingFactor(0.5, 0.4, 0.33), + "Game Boy Tetris" to RangeScalingFactor(0.67, 0.56, 0.5), + "Tetris DX" to RangeScalingFactor(0.67, 0.56, 0.5), + "Tetris DS" to RangeScalingFactor(2.5, 2.0, 1.67), + "Tetris Effect" to RangeScalingFactor(2.22, 1.82, 1.54), + "Rosy Retrospection DX" to RangeScalingFactor(0.77, 0.67, 0.59), + "Apotris" to RangeScalingFactor(0.83, 1.11, 1.43), + "Tetris Mobile" to RangeScalingFactor(1.1, 1.1, 1.1) + ), + "Tetris Mobile" to mapOf( + "NES Tetris" to RangeScalingFactor(0.45, 0.36, 0.29), + "Game Boy Tetris" to RangeScalingFactor(0.63, 0.53, 0.48), + "Tetris DX" to RangeScalingFactor(0.63, 0.53, 0.48), + "Tetris DS" to RangeScalingFactor(2.22, 1.82, 1.54), + "Tetris Effect" to RangeScalingFactor(2.0, 1.67, 1.43), + "Rosy Retrospection DX" to RangeScalingFactor(0.71, 0.63, 0.56), + "Apotris" to RangeScalingFactor(0.77, 1.0, 1.25), + "Modretro Tetris" to RangeScalingFactor(0.91, 0.91, 0.91) ) ) diff --git a/app/src/main/java/com/accidentalproductions/tetristats/ui/entry/EntryFragment.kt b/app/src/main/java/com/accidentalproductions/tetristats/ui/entry/EntryFragment.kt index 8c73b79..deb4109 100644 --- a/app/src/main/java/com/accidentalproductions/tetristats/ui/entry/EntryFragment.kt +++ b/app/src/main/java/com/accidentalproductions/tetristats/ui/entry/EntryFragment.kt @@ -56,6 +56,50 @@ class EntryFragment : Fragment() { if (game != null && score != null) { viewModel.refreshEquivalentScores(game, score) + + // Make sure UI updates immediately by forcing an adapter refresh + viewModel.equivalentScores.value?.let { scores -> + equivalentScoreAdapter.submitList(null) // Clear first + equivalentScoreAdapter.submitList(scores) // Then add new list + } + + // Ensure card is visible + updateAnalysisCard() + } + } + } + + /** + * Update the analysis card visibility and contents based on current state + */ + private fun updateAnalysisCard() { + if (viewModel.showConversion.value != true) { + binding.cardAnalysisResults.visibility = View.GONE + return + } + + val game = viewModel.lastSubmittedGame.value + val score = viewModel.lastSubmittedScore.value + + if (game != null && score != null) { + // Get the list of games with scores + val playedGames = viewModel.gamesWithScores.value ?: listOf() + + // Make sure we don't show the source game in the equivalent dropdown + val filteredGames = playedGames.filter { it != game } + if (filteredGames.isNotEmpty()) { + binding.textViewOriginalScore.text = "Your $game score of ${"%,d".format(score)} is equivalent to:" + binding.cardAnalysisResults.visibility = View.VISIBLE + + val filteredAdapter = ArrayAdapter(requireContext(), android.R.layout.simple_dropdown_item_1line, filteredGames) + binding.autoCompleteEquivalentGame.setAdapter(filteredAdapter) + + // Select first game by default + binding.autoCompleteEquivalentGame.setText(filteredGames[0], false) + viewModel.setSelectedEquivalentGame(filteredGames[0]) + } else { + // If no other games to convert to, hide the card + binding.cardAnalysisResults.visibility = View.GONE } } } @@ -68,7 +112,9 @@ class EntryFragment : Fragment() { "Tetris DS", "Tetris Effect", "Rosy Retrospection DX", - "Apotris" + "Apotris", + "Modretro Tetris", + "Tetris Mobile" ) val adapter = ArrayAdapter(requireContext(), android.R.layout.simple_dropdown_item_1line, games) binding.autoCompleteGameVersion.setAdapter(adapter) @@ -90,8 +136,10 @@ class EntryFragment : Fragment() { viewModel.showConversion.observe(viewLifecycleOwner) { shouldShow -> // No need to show toast here - we'll do it only after score submission if (shouldShow) { - // Refresh conversions whenever showConversion becomes true - refreshConversions() + // Update card when showConversion changes + updateAnalysisCard() + } else { + binding.cardAnalysisResults.visibility = View.GONE } } @@ -99,11 +147,8 @@ class EntryFragment : Fragment() { viewModel.gamesWithScores.observe(viewLifecycleOwner) { games -> // Setup the game dropdown for adding equivalents - only with played games if (games.isNotEmpty()) { - val adapter = ArrayAdapter(requireContext(), android.R.layout.simple_dropdown_item_1line, games) - binding.autoCompleteEquivalentGame.setAdapter(adapter) - - // Also refresh conversions when game list changes - refreshConversions() + // Update card when games list changes + updateAnalysisCard() } } @@ -126,39 +171,22 @@ class EntryFragment : Fragment() { } // Observe last submitted score details - viewModel.lastSubmittedGame.observe(viewLifecycleOwner) { game -> - // Only continue if showConversion is true - if (viewModel.showConversion.value != true) { - binding.cardAnalysisResults.visibility = View.GONE - return@observe - } - - viewModel.lastSubmittedScore.value?.let { score -> - binding.textViewOriginalScore.text = "Your $game score of ${"%,d".format(score)} is equivalent to:" - - // Get the list of games with scores - val playedGames = viewModel.gamesWithScores.value ?: listOf() - - // Make sure we don't show the source game in the equivalent dropdown - val filteredGames = playedGames.filter { it != game } - if (filteredGames.isNotEmpty()) { - binding.cardAnalysisResults.visibility = View.VISIBLE - val filteredAdapter = ArrayAdapter(requireContext(), android.R.layout.simple_dropdown_item_1line, filteredGames) - binding.autoCompleteEquivalentGame.setAdapter(filteredAdapter) - - // Select first game by default - binding.autoCompleteEquivalentGame.setText(filteredGames[0], false) - viewModel.setSelectedEquivalentGame(filteredGames[0]) - } else { - // If no other games to convert to, hide the card - binding.cardAnalysisResults.visibility = View.GONE - } - } + viewModel.lastSubmittedGame.observe(viewLifecycleOwner) { _ -> + // Update the analysis card when last submitted game changes + updateAnalysisCard() + } + + // Observe last submitted score value + viewModel.lastSubmittedScore.observe(viewLifecycleOwner) { _ -> + // Update the analysis card when score changes + updateAnalysisCard() } // Observe equivalent scores viewModel.equivalentScores.observe(viewLifecycleOwner) { scores -> if (scores.isNotEmpty()) { + // Force a clean update by clearing first + equivalentScoreAdapter.submitList(null) equivalentScoreAdapter.submitList(scores) } else if (viewModel.showConversion.value == true) { // If we should be showing conversions but have no scores, probably no other games @@ -185,7 +213,7 @@ class EntryFragment : Fragment() { ) clearInputs() - // Check after submission if we should show requirements toast + // Force immediate refresh of conversions if (viewModel.showConversion.value == false) { Toast.makeText( context, @@ -193,7 +221,9 @@ class EntryFragment : Fragment() { Toast.LENGTH_LONG ).show() } else { - // Only scroll down if we're going to show conversions + refreshConversions() + + // Scroll down to show the analysis results binding.root.post { binding.root.fullScroll(View.FOCUS_DOWN) } diff --git a/app/src/main/java/com/accidentalproductions/tetristats/ui/entry/EntryViewModel.kt b/app/src/main/java/com/accidentalproductions/tetristats/ui/entry/EntryViewModel.kt index b4178de..62af537 100644 --- a/app/src/main/java/com/accidentalproductions/tetristats/ui/entry/EntryViewModel.kt +++ b/app/src/main/java/com/accidentalproductions/tetristats/ui/entry/EntryViewModel.kt @@ -23,7 +23,9 @@ class EntryViewModel(application: Application) : AndroidViewModel(application) { "Tetris DS", "Tetris Effect", "Rosy Retrospection DX", - "Apotris" + "Apotris", + "Modretro Tetris", + "Tetris Mobile" ) // Track user played games and score counts @@ -108,13 +110,14 @@ class EntryViewModel(application: Application) : AndroidViewModel(application) { scoreDao.insert(newScore) // After inserting, update the last submitted values - _lastSubmittedGame.postValue(gameVersion) - _lastSubmittedScore.postValue(score) + _lastSubmittedGame.value = gameVersion // Use immediate value change instead of postValue + _lastSubmittedScore.value = score // Use immediate value change instead of postValue - // The criteria check will happen automatically through the observers in init + // Immediately check conversion criteria with current values + checkConversionCriteria() - // Only generate equivalent scores if we meet the criteria - if (_showConversion.value == true) { + // Immediate refresh regardless if we just reached the criteria threshold + if (totalScoreCount.value ?: 0 >= 3 && (gamesWithScores.value?.size ?: 0) >= 2) { generateEquivalentScores(gameVersion, score) } } @@ -146,7 +149,8 @@ class EntryViewModel(application: Application) : AndroidViewModel(application) { } } - _equivalentScores.postValue(equivalents) + // Use setValue for immediate update on main thread rather than postValue + _equivalentScores.value = equivalents } /** From 71a2485aace8e1d5efeb77627bb03311123e6305 Mon Sep 17 00:00:00 2001 From: cmclark00 Date: Mon, 24 Mar 2025 17:28:48 -0400 Subject: [PATCH 2/2] Add progress chart to statistics page showing score progression over time --- app/build.gradle.kts | 3 + .../tetristats/data/ScoreDao.kt | 3 + .../tetristats/ui/stats/StatsFragment.kt | 87 +++++++++++++++++++ .../tetristats/ui/stats/StatsViewModel.kt | 4 + app/src/main/res/layout/fragment_stats.xml | 27 ++++++ 5 files changed, 124 insertions(+) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 026b6df..bfe3c94 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -83,6 +83,9 @@ dependencies { implementation("androidx.navigation:navigation-fragment-ktx:2.7.6") implementation("androidx.navigation:navigation-ui-ktx:2.7.6") + // MPAndroidChart for progress visualization + implementation("com.github.PhilJay:MPAndroidChart:v3.1.0") + // Room implementation("androidx.room:room-runtime:2.6.1") implementation("androidx.room:room-ktx:2.6.1") diff --git a/app/src/main/java/com/accidentalproductions/tetristats/data/ScoreDao.kt b/app/src/main/java/com/accidentalproductions/tetristats/data/ScoreDao.kt index 416a3d6..ecc25c0 100644 --- a/app/src/main/java/com/accidentalproductions/tetristats/data/ScoreDao.kt +++ b/app/src/main/java/com/accidentalproductions/tetristats/data/ScoreDao.kt @@ -12,6 +12,9 @@ interface ScoreDao { @Query("SELECT * FROM scores WHERE gameVersion = :gameVersion") fun getScoresForGame(gameVersion: String): LiveData> + @Query("SELECT * FROM scores WHERE gameVersion = :gameVersion ORDER BY dateRecorded ASC") + fun getScoresForGameByDate(gameVersion: String): LiveData> + @Query("SELECT DISTINCT gameVersion FROM scores") fun getGamesWithScores(): LiveData> diff --git a/app/src/main/java/com/accidentalproductions/tetristats/ui/stats/StatsFragment.kt b/app/src/main/java/com/accidentalproductions/tetristats/ui/stats/StatsFragment.kt index 520981c..94a7097 100644 --- a/app/src/main/java/com/accidentalproductions/tetristats/ui/stats/StatsFragment.kt +++ b/app/src/main/java/com/accidentalproductions/tetristats/ui/stats/StatsFragment.kt @@ -1,5 +1,6 @@ package com.accidentalproductions.tetristats.ui.stats +import android.graphics.Color import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -8,7 +9,16 @@ import android.widget.ArrayAdapter import androidx.fragment.app.Fragment import androidx.fragment.app.viewModels import androidx.recyclerview.widget.LinearLayoutManager +import com.accidentalproductions.tetristats.R import com.accidentalproductions.tetristats.databinding.FragmentStatsBinding +import com.github.mikephil.charting.components.XAxis +import com.github.mikephil.charting.data.Entry +import com.github.mikephil.charting.data.LineData +import com.github.mikephil.charting.data.LineDataSet +import com.github.mikephil.charting.formatter.ValueFormatter +import java.text.SimpleDateFormat +import java.util.Date +import java.util.Locale class StatsFragment : Fragment() { private var _binding: FragmentStatsBinding? = null @@ -30,6 +40,7 @@ class StatsFragment : Fragment() { setupRecyclerView() setupGameFilter() + setupProgressChart() observeStats() } @@ -52,6 +63,64 @@ class StatsFragment : Fragment() { viewModel.setSelectedGame(selectedGame) } } + + private fun setupProgressChart() { + with(binding.chartProgress) { + description.isEnabled = false + legend.isEnabled = true + setTouchEnabled(true) + setDrawGridBackground(false) + isDragEnabled = true + setScaleEnabled(true) + setPinchZoom(true) + + axisRight.isEnabled = false + + xAxis.position = XAxis.XAxisPosition.BOTTOM + xAxis.granularity = 1f + xAxis.setDrawGridLines(false) + + axisLeft.setDrawGridLines(true) + axisLeft.axisMinimum = 0f + } + } + + private fun updateProgressChart(scores: List, dates: List) { + if (scores.isEmpty()) { + binding.chartProgress.clear() + binding.chartProgress.invalidate() + return + } + + val dataSet = LineDataSet(scores, "Score Progress").apply { + mode = LineDataSet.Mode.CUBIC_BEZIER + color = resources.getColor(R.color.tetris_navy, null) + lineWidth = 2f + setDrawCircles(true) + setCircleColor(resources.getColor(R.color.tetris_navy, null)) + circleRadius = 4f + setDrawValues(false) + highLightColor = Color.rgb(244, 117, 117) + } + + val lineData = LineData(dataSet) + binding.chartProgress.data = lineData + + // Format X-axis labels (dates) + val dateFormat = SimpleDateFormat("MM/dd", Locale.getDefault()) + binding.chartProgress.xAxis.valueFormatter = object : ValueFormatter() { + override fun getFormattedValue(value: Float): String { + val index = value.toInt() + return if (index >= 0 && index < dates.size) { + dateFormat.format(Date(dates[index])) + } else { + "" + } + } + } + + binding.chartProgress.invalidate() + } private fun observeStats() { viewModel.filteredScores.observe(viewLifecycleOwner) { scores -> @@ -65,6 +134,24 @@ class StatsFragment : Fragment() { viewModel.highScore.observe(viewLifecycleOwner) { highScore -> binding.textViewHighScore.text = "%,d".format(highScore) } + + viewModel.scoresByDate.observe(viewLifecycleOwner) { scores -> + // Convert scores to entries for the chart + if (scores.isNotEmpty()) { + val entries = mutableListOf() + val dates = mutableListOf() + + scores.forEachIndexed { index, score -> + entries.add(Entry(index.toFloat(), score.scoreValue.toFloat())) + dates.add(score.dateRecorded) + } + + updateProgressChart(entries, dates) + } else { + binding.chartProgress.clear() + binding.chartProgress.invalidate() + } + } } override fun onDestroyView() { diff --git a/app/src/main/java/com/accidentalproductions/tetristats/ui/stats/StatsViewModel.kt b/app/src/main/java/com/accidentalproductions/tetristats/ui/stats/StatsViewModel.kt index dbd3bd7..c656adb 100644 --- a/app/src/main/java/com/accidentalproductions/tetristats/ui/stats/StatsViewModel.kt +++ b/app/src/main/java/com/accidentalproductions/tetristats/ui/stats/StatsViewModel.kt @@ -18,6 +18,10 @@ class StatsViewModel(application: Application) : AndroidViewModel(application) { scoreDao.getScoresForGame(game) } + val scoresByDate: LiveData> = _selectedGame.switchMap { game -> + scoreDao.getScoresForGameByDate(game) + } + val averageScore: LiveData = _selectedGame.switchMap { game -> scoreDao.getAverageScore(game) } diff --git a/app/src/main/res/layout/fragment_stats.xml b/app/src/main/res/layout/fragment_stats.xml index 426a01d..2cf4a0b 100644 --- a/app/src/main/res/layout/fragment_stats.xml +++ b/app/src/main/res/layout/fragment_stats.xml @@ -31,6 +31,33 @@ android:inputType="none"/> + + + + + + + + + +