fix: artifacts for nightlies not being uploaded

* better animations for panels entering and exiting * use normal font for seekbar timers (was monospaced) * screen can now sleep if the video is paused
abdallahmehiz · Aug 20, 2024 · a120ae8 · a120ae8
1 parent 4690cc1
commit a120ae8
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 10 deletions.
diff --git a/.github/workflows/nightlies.yml b/.github/workflows/nightlies.yml
@@ -49,29 +49,29 @@ jobs:
 
           printf "%s\n" "${apks[@]}" | xargs -n 1 -I {} sh -c '
           cp app/build/outputs/apk/preview/app-{}-preview-signed.apk mpvKt-{}-r${{ env.COMMIT_COUNT }}.apk
-          echo "{}=mpv-{}-r${{ env.COMMIT_COUNT}}.apk" >> $GITHUB_ENV'
+          echo "{}=mpv-{}-r$(echo ${{ env.COMMIT_COUNT }}).apk" >> $GITHUB_ENV'
 
-      - name: Upload the APK artifact
+      - name: Upload the ${{ env.universal }} APK artifact
         uses: actions/upload-artifact@v4
         with:
           path: ${{ env.universal }}
           name: ${{ env.universal }}
-      - name: Upload the APK artifact
+      - name: Upload the ${{ env.arm64-v8a }} artifact
         uses: actions/upload-artifact@v4
         with:
           path: ${{ env.arm64-v8a }}
           name: ${{ env.arm64-v8a }}
-      - name: Upload the APK artifact
+      - name: Upload the ${{ env.armeabi-v7a }} artifact
         uses: actions/upload-artifact@v4
         with:
           path: ${{ env.armeabi-v7a }}
           name: ${{ env.armeabi-v7a }}
-      - name: Upload the APK artifact
+      - name: Upload the ${{ env.x86 }] artifact
         uses: actions/upload-artifact@v4
         with:
           path: ${{ env.x86 }}
           name: ${{ env.x86 }}
-      - name: Upload the APK artifact
+      - name: Upload the ${{ env.x86_64 }} artifact
         uses: actions/upload-artifact@v4
         with:
           path: ${{ env.x86_64 }}

diff --git a/app/src/main/java/live/mehiz/mpvkt/ui/player/PlayerActivity.kt b/app/src/main/java/live/mehiz/mpvkt/ui/player/PlayerActivity.kt
@@ -418,7 +418,12 @@ class PlayerActivity : AppCompatActivity() {
   internal fun onObserverEvent(property: String, value: Boolean) {
     when (property) {
       "pause" -> {
-        if (value) viewModel.pause()
+        if (value) {
+          viewModel.pause()
+          window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+        } else {
+          window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+        }
       }
 
       "paused-for-cache" -> {

diff --git a/app/src/main/java/live/mehiz/mpvkt/ui/player/controls/PlayerControls.kt b/app/src/main/java/live/mehiz/mpvkt/ui/player/controls/PlayerControls.kt
@@ -2,6 +2,7 @@ package live.mehiz.mpvkt.ui.player.controls
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.graphics.ExperimentalAnimationGraphicsApi
@@ -94,7 +95,8 @@ fun PlayerControls(
     }
   }
   val transparentOverlay by animateColorAsState(
-    Color.Black.copy(if (controlsShown) 0.2f else 0f),
+    Color.Black.copy(if (controlsShown) 0.5f else 0f),
+    animationSpec = tween(500),
     label = "",
   )
   GestureHandler()

diff --git a/app/src/main/java/live/mehiz/mpvkt/ui/player/controls/PlayerPanels.kt b/app/src/main/java/live/mehiz/mpvkt/ui/player/controls/PlayerPanels.kt
@@ -1,6 +1,8 @@
 package live.mehiz.mpvkt.ui.player.controls
 
 import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
 import androidx.compose.animation.slideInHorizontally
 import androidx.compose.animation.slideOutHorizontally
 import androidx.compose.animation.togetherWith
@@ -34,7 +36,8 @@ fun PlayerPanels(modifier: Modifier = Modifier) {
     label = "panels",
     contentAlignment = Alignment.CenterEnd,
     contentKey = { it.name },
-    transitionSpec = { slideInHorizontally { it } togetherWith slideOutHorizontally { it } },
+    transitionSpec = {
+      fadeIn() + slideInHorizontally { it / 3 } togetherWith fadeOut() + slideOutHorizontally { it / 2 } },
     modifier = modifier
   ) { currentPanel ->
     when (currentPanel) {

diff --git a/app/src/main/java/live/mehiz/mpvkt/ui/player/controls/components/Seekbar.kt b/app/src/main/java/live/mehiz/mpvkt/ui/player/controls/components/Seekbar.kt
@@ -100,7 +100,6 @@ fun VideoTimer(
       .wrapContentHeight(Alignment.CenterVertically),
     text = Utils.prettyTime(value.toInt(), isInverted),
     color = Color.White,
-    fontFamily = FontFamily.Monospace,
     textAlign = TextAlign.Center,
   )
 }