fix buttons and android build

Author: stringhandler

meta/tasks/upnext/goal-details-best-worst-games.md

@@ -0,0 +1,32 @@
+# Goal Details: Best & Worst Games
+
+## Description
+
+On the goal details page, show two sections: **Best Games** and **Worst Games** ranked by performance according to that goal's metric.
+
+## Requirements
+
+### Game Lists
+- Show the top N best and worst matches scored by the goal's metric (e.g. lowest deaths for a deaths goal, highest win rate context, etc.)
+- Each match row should be clickable and open the **match details page** (same as used elsewhere in the app)
+
+### Filters
+
+#### Hero Filter
+- If the goal is **not** hero-specific (i.e. applies to "any hero"), show a **hero filter** so the user can narrow results to a specific hero
+
+#### Game Mode Filter
+- If the goal's hero filter is set to **"any"**, show a **ranked/turbo filter** (All / Ranked / Turbo) to let the user slice results by game mode
+
+### Sorting / Scoring
+- Best games = matches where the goal metric was most achieved (e.g. fewest deaths, highest KDA, etc.)
+- Worst games = matches where the goal metric was least achieved
+- Use the same metric logic already used to evaluate goal pass/fail
+
+## Acceptance Criteria
+- [ ] Best games section visible on goal details page
+- [ ] Worst games section visible on goal details page
+- [ ] Hero filter shown when goal applies to any hero
+- [ ] Game mode filter (All / Ranked / Turbo) shown when goal hero is "any"
+- [ ] Clicking a match opens the match details page
+- [ ] Filters update both best and worst lists reactively

meta/tasks/upnext/match-details-compare.md

@@ -0,0 +1,34 @@
+# Match Details: Compare to Another Match
+
+**Epic: Performance Journal**
+
+## Description
+
+On the match details page, allow the user to compare the current match side-by-side with another match. A "Compare to" button opens a selection popup with quick options and a manual entry field.
+
+## Requirements
+
+### "Compare to" Button (Match Details Page)
+- Add a **Compare to** button on the match details page
+- Opens a popup with the following options:
+  - **Last game** — compare to the most recent match in history
+  - **Last game with this hero** — compare to the most recent match played on the same hero
+  - **Specific match ID** — text input to enter an arbitrary match ID manually
+
+### Comparison View
+- Once a comparison target is selected, show both matches side-by-side (or stacked on smaller layouts)
+- Highlight differences in key stats (KDA, GPM, XPM, deaths, hero damage, etc.)
+- Make it clear which match is "this match" vs "comparison match"
+
+### Compare Buttons in Matches List (per Goal)
+- In the matches list popup/modal (used on goal details or elsewhere), add a **Compare to best** button for each match row
+- "Best" = the best match for that goal according to the goal's metric
+- Clicking it navigates to / opens the match details page in comparison mode with that goal's best match pre-selected
+
+## Acceptance Criteria
+- [ ] "Compare to" button visible on match details page
+- [ ] Popup shows: Last game, Last game with this hero, Specific match ID input
+- [ ] Selecting any option loads the comparison view
+- [ ] Comparison view clearly labels both matches and highlights stat differences
+- [ ] Matches list popup has a "Compare to best" button per match for each goal context
+- [ ] "Compare to best" opens match details in comparison mode with the goal's best match

scripts/reset-android-emulator.ps1

@@ -0,0 +1,33 @@
+# reset-android-emulator.ps1
+# Kills running emulator processes and deletes all AVDs so they can be recreated fresh.
+
+$avdmanager = "$env:LOCALAPPDATA\Android\Sdk\cmdline-tools\latest\bin\avdmanager.bat"
+$emulatorBin = "$env:LOCALAPPDATA\Android\Sdk\emulator\emulator.exe"
+$adb = "$env:LOCALAPPDATA\Android\Sdk\platform-tools\adb.exe"
+
+# 1. Kill running emulators
+Write-Host "Stopping running emulators..." -ForegroundColor Cyan
+& $adb kill-server 2>$null
+Get-Process -Name "emulator*", "qemu-system*" -ErrorAction SilentlyContinue | ForEach-Object {
+    Write-Host "  Killing $($_.Name) (pid $($_.Id))"
+    Stop-Process -Id $_.Id -Force
+}
+Start-Sleep -Seconds 2
+
+# 2. List AVDs
+Write-Host "`nExisting AVDs:" -ForegroundColor Cyan
+$avds = & $avdmanager list avd -c 2>$null
+if (-not $avds) {
+    Write-Host "  (none found)"
+} else {
+    $avds | ForEach-Object { Write-Host "  $_" }
+}
+
+# 3. Delete each AVD
+$avds | Where-Object { $_ -match '\S' } | ForEach-Object {
+    $name = $_.Trim()
+    Write-Host "`nDeleting AVD: $name" -ForegroundColor Yellow
+    & $avdmanager delete avd -n $name
+}
+
+Write-Host "`nDone. Run 'cargo tauri android dev' to create a fresh emulator." -ForegroundColor Green

src-tauri/gen/android/app/build.gradle.kts

@@ -18,20 +18,12 @@ android {
     namespace = "com.volthawk.dota_keeper"
     defaultConfig {
         manifestPlaceholders["usesCleartextTraffic"] = "false"
+        applicationId = "com.volthawk.dota_keeper"
         minSdk = 24
         targetSdk = 36
         versionCode = tauriProperties.getProperty("tauri.android.versionCode", "1").toInt()
         versionName = tauriProperties.getProperty("tauri.android.versionName", "1.0")
     }
-    flavorDimensions += "channel"
-    productFlavors {
-        create("production") {
-            applicationId = "com.dotakeeper.dotakeeper"
-        }
-        create("beta") {
-            applicationId = "com.dotakeeper.dotakeeper_beta"
-        }
-    }
     buildTypes {
         getByName("debug") {
             manifestPlaceholders["usesCleartextTraffic"] = "true"

src-tauri/gen/android/app/src/main/java/com/volthawk/dota_keeper/MainActivity.kt

@@ -36,9 +36,12 @@ class MainActivity : TauriActivity() {
 
   override fun onResume() {
     super.onResume()
-    // Re-inject after a short delay to ensure the page has finished loading
-    // (covers initial launch where onResume fires before the SvelteKit app loads).
+    // Re-inject at multiple delays to ensure at least one attempt lands after
+    // the SvelteKit app has fully loaded. 300 ms catches fast resumes;
+    // 1 s and 3 s cover cold-start where the Tauri/Wry bundle takes longer.
     handler.postDelayed({ injectInsets() }, 300)
+    handler.postDelayed({ injectInsets() }, 1000)
+    handler.postDelayed({ injectInsets() }, 3000)
   }
 
   private fun injectInsets() {
@@ -55,5 +58,10 @@ class MainActivity : TauriActivity() {
   override fun onWebViewCreate(webView: WebView) {
     webViewRef = webView
     webView.setBackgroundColor(Color.parseColor("#111827"))
+    // Inject insets once the WebView exists — retried at increasing delays so
+    // at least one attempt lands after the SvelteKit bundle has executed.
+    handler.postDelayed({ injectInsets() }, 300)
+    handler.postDelayed({ injectInsets() }, 1000)
+    handler.postDelayed({ injectInsets() }, 3000)
   }
 }

src-tauri/gen/android/buildSrc/src/main/java/com/volthawk/dota_keeper/kotlin/RustPlugin.kt

@@ -57,7 +57,11 @@ open class RustPlugin : Plugin<Project> {
                     description = "Build dynamic library in $profile mode for all targets"
                 }
 
-                tasks["mergeUniversal${profileCapitalized}JniLibFolders"].dependsOn(buildTask)
+                // Use matching() so extra flavor dimensions (e.g. "channel") in the
+                // variant name don't break the lookup (task is e.g.
+                // mergeUniversalBetaDebugJniLibFolders, not mergeUniversalDebugJniLibFolders).
+                tasks.matching { it.name.matches(Regex("mergeUniversal.*${profileCapitalized}JniLibFolders")) }
+                    .configureEach { dependsOn(buildTask) }
 
                 for (targetPair in targetsList.withIndex()) {
                     val targetName = targetPair.value
@@ -75,9 +79,8 @@ open class RustPlugin : Plugin<Project> {
                     }
 
                     buildTask.dependsOn(targetBuildTask)
-                    tasks["merge$targetArchCapitalized${profileCapitalized}JniLibFolders"].dependsOn(
-                        targetBuildTask
-                    )
+                    tasks.matching { it.name.matches(Regex("merge${targetArchCapitalized}.*${profileCapitalized}JniLibFolders")) }
+                        .configureEach { dependsOn(targetBuildTask) }
                 }
             }
         }