Merge pull request #4 from Priveetee/dev

fix: restore player surface after screen wake

Author: Priveetee

.github/workflows/android.yml

@@ -18,7 +18,7 @@ on:
       tag_name:
         description: Release tag
         required: true
-        default: v1.1.0
+        default: v1.1.1
 
 permissions:
   contents: write
@@ -107,7 +107,7 @@ jobs:
           if [ -n "$INPUT_TAG_NAME" ]; then
             echo "RELEASE_TAG=$INPUT_TAG_NAME" >> "$GITHUB_ENV"
           else
-            echo "RELEASE_TAG=v1.1.0" >> "$GITHUB_ENV"
+            echo "RELEASE_TAG=v1.1.1" >> "$GITHUB_ENV"
           fi
 
       - name: Prepare signing
@@ -154,20 +154,15 @@ jobs:
           tag_name: ${{ env.RELEASE_TAG }}
           name: ${{ env.RELEASE_TAG }}
           body: |
-            TypeType for Android 1.1.0 focuses on player polish, stability and production readiness.
-
-            This version improves the video experience across embedded playback, fullscreen, mini player, picture-in-picture, notifications and lockscreen controls while keeping the account-backed TypeType experience stable.
-
-            Highlights:
-            - Cleaner player quick actions without heavy pill backgrounds.
-            - More complete picture-in-picture controls with rewind, play/pause, forward and audio-only actions.
-            - Media notification and lockscreen controls for rewind, play/pause and forward.
-            - Smoother player resize mode transitions for Original, Zoom and Stretch.
-            - Better embedded player scrubber alignment and sizing.
-            - Improved mini-player and fullscreen drag behavior.
-            - SponsorBlock segments displayed directly in the player timeline.
-            - Playlist video deduplication for library surfaces such as Favorites.
-            - Startup route stability to avoid blank launch screens.
-            - Signed production release APK built from main.
+            TypeType for Android 1.1.1 is a production hotfix focused on player wake stability.
+
+            This version fixes the gray screen that could appear after turning the phone screen off and back on while a video was still playing. Playback now keeps the media session alive and restores the video surface when Android resumes the app.
+
+            Changes:
+            - Recreate the player surface after screen wake and unlock events.
+            - Reattach the active Media3 player view when the activity resumes.
+            - Avoid pausing the player view lifecycle while playback continues in the background.
+            - Show the startup loader if the app is still resolving its first route.
+            - Build and publish a signed production APK from main.
           files: artifacts/*.apk
           fail_on_unmatched_files: true

app/build.gradle.kts

@@ -24,8 +24,8 @@ android {
         applicationId = "dev.typetype.android"
         minSdk = 33
         targetSdk = 36
-        versionCode = 10100
-        versionName = "1.1.0"
+        versionCode = 10101
+        versionName = "1.1.1"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         resValue("string", "app_name", "TypeType")
     }

app/src/main/java/dev/typetype/android/MainActivity.kt

@@ -19,6 +19,7 @@ import androidx.media3.session.MediaController
 import androidx.media3.session.SessionToken
 import com.google.common.util.concurrent.MoreExecutors
 import dagger.hilt.android.AndroidEntryPoint
+import dev.typetype.android.core.ui.components.FullScreenLoader
 import dev.typetype.android.core.ui.theme.TypeTypeTheme
 import dev.typetype.android.feature.player.components.PIP_ACTION_AUDIO_ONLY
 import dev.typetype.android.feature.player.components.PIP_ACTION_FORWARD
@@ -60,6 +61,8 @@ class MainActivity : ComponentActivity() {
                 val startRoute = state.startRoute
                 if (startRoute != null) {
                     AppNavHost(startRoute = startRoute, mainViewModel = viewModel)
+                } else {
+                    FullScreenLoader()
                 }
             }
         }

app/src/main/java/dev/typetype/android/feature/player/components/PlayerSurfaceLifecycle.kt

@@ -1,17 +1,24 @@
 package dev.typetype.android.feature.player.components
 
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.platform.LocalContext
+import androidx.core.content.ContextCompat
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.compose.LocalLifecycleOwner
 
 @Composable
 internal fun rememberPlayerSurfaceKey(streamId: String): String {
+    val context = LocalContext.current
     val lifecycleOwner = LocalLifecycleOwner.current
     var epoch by remember(streamId) { mutableIntStateOf(0) }
     DisposableEffect(lifecycleOwner, streamId) {
@@ -23,5 +30,23 @@ internal fun rememberPlayerSurfaceKey(streamId: String): String {
         lifecycleOwner.lifecycle.addObserver(observer)
         onDispose { lifecycleOwner.lifecycle.removeObserver(observer) }
     }
+    DisposableEffect(context, streamId) {
+        val receiver = object : BroadcastReceiver() {
+            override fun onReceive(context: Context, intent: Intent) {
+                epoch += 1
+            }
+        }
+        val filter = IntentFilter().apply {
+            addAction(Intent.ACTION_SCREEN_ON)
+            addAction(Intent.ACTION_USER_PRESENT)
+        }
+        ContextCompat.registerReceiver(
+            context.applicationContext,
+            receiver,
+            filter,
+            ContextCompat.RECEIVER_NOT_EXPORTED,
+        )
+        onDispose { context.applicationContext.unregisterReceiver(receiver) }
+    }
     return "$streamId:$epoch"
 }

app/src/main/java/dev/typetype/android/feature/player/components/ResilientPlayerSurface.kt

@@ -108,10 +108,17 @@ internal fun ResilientPlayerSurface(
                 when (event) {
                     Lifecycle.Event.ON_START,
                     Lifecycle.Event.ON_RESUME,
-                    -> playerView.onResume()
+                    -> {
+                        if (playerView.player !== player) {
+                            playerView.player = player
+                        }
+                        playerView.onResume()
+                    }
                     Lifecycle.Event.ON_PAUSE,
                     Lifecycle.Event.ON_STOP,
-                    -> playerView.onPause()
+                    -> if (!player.isPlaying) {
+                        playerView.onPause()
+                    }
                     else -> Unit
                 }
             }