From 3621794a3ded88e234fb8880b8557fd590e43b0f Mon Sep 17 00:00:00 2001
From: Koen <koen@pop-os.localdomain>
Date: Wed, 28 Jun 2023 13:49:07 +0200
Subject: [PATCH] Fixed FCast Android full-screen and pause/resume behaviour
 when going to background.

---
 clients/terminal/Cargo.lock                    |  2 +-
 .../android/app/src/main/AndroidManifest.xml   |  4 ++--
 .../com/futo/fcast/receiver/PlayerActivity.kt  | 18 ++++++++++++++++++
 .../android/app/src/main/res/values/themes.xml |  1 +
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/clients/terminal/Cargo.lock b/clients/terminal/Cargo.lock
index 00e18b7..6fb36af 100644
--- a/clients/terminal/Cargo.lock
+++ b/clients/terminal/Cargo.lock
@@ -66,7 +66,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "fastcast"
+name = "fcast"
 version = "0.1.0"
 dependencies = [
  "clap",
diff --git a/receivers/android/app/src/main/AndroidManifest.xml b/receivers/android/app/src/main/AndroidManifest.xml
index a4c14f4..d10b823 100644
--- a/receivers/android/app/src/main/AndroidManifest.xml
+++ b/receivers/android/app/src/main/AndroidManifest.xml
@@ -21,7 +21,7 @@
         <activity
             android:name=".MainActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
-            android:theme="@style/Theme.AppCompat.NoActionBar"
+            android:theme="@style/Theme.Main"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -32,7 +32,7 @@
         <activity
             android:name=".PlayerActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
-            android:theme="@style/Theme.AppCompat.NoActionBar" />
+            android:theme="@style/Theme.Player" />
 
         <receiver
             android:name=".BootReceiver"
diff --git a/receivers/android/app/src/main/java/com/futo/fcast/receiver/PlayerActivity.kt b/receivers/android/app/src/main/java/com/futo/fcast/receiver/PlayerActivity.kt
index 86a41f9..e9c6f46 100644
--- a/receivers/android/app/src/main/java/com/futo/fcast/receiver/PlayerActivity.kt
+++ b/receivers/android/app/src/main/java/com/futo/fcast/receiver/PlayerActivity.kt
@@ -4,6 +4,8 @@ import android.content.Context
 import android.net.*
 import android.os.Bundle
 import android.util.Log
+import android.view.Window
+import android.view.WindowManager
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.exoplayer2.*
 import com.google.android.exoplayer2.source.DefaultMediaSourceFactory
@@ -23,6 +25,7 @@ class PlayerActivity : AppCompatActivity() {
     private var _shouldPlaybackRestartOnConnectivity: Boolean = false
     private lateinit var _connectivityManager: ConnectivityManager
     private lateinit var _scope: CoroutineScope
+    private  var _wasPlaying = false;
 
     val currentPosition get() = _exoPlayer.currentPosition
     val isPlaying get() = _exoPlayer.isPlaying
@@ -137,6 +140,20 @@ class PlayerActivity : AppCompatActivity() {
         TcpListenerService.activityCount++
     }
 
+    override fun onPause() {
+        super.onPause()
+
+        _wasPlaying = _exoPlayer.isPlaying
+        _exoPlayer.pause()
+    }
+
+    override fun onResume() {
+        super.onResume()
+        if (_wasPlaying) {
+            _exoPlayer.play()
+        }
+    }
+
     override fun onDestroy() {
         super.onDestroy()
         Log.i(TAG, "onDestroy")
@@ -186,6 +203,7 @@ class PlayerActivity : AppCompatActivity() {
             _exoPlayer.seekTo(playMessage.time * 1000)
         }
 
+        _wasPlaying = false
         _exoPlayer.playWhenReady = true
         _exoPlayer.prepare()
         _exoPlayer.play()
diff --git a/receivers/android/app/src/main/res/values/themes.xml b/receivers/android/app/src/main/res/values/themes.xml
index f95057c..5137821 100644
--- a/receivers/android/app/src/main/res/values/themes.xml
+++ b/receivers/android/app/src/main/res/values/themes.xml
@@ -1,5 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <style name="Theme.Player" parent="Theme.AppCompat.NoActionBar">
+        <item name="android:windowFullscreen">true</item>
     </style>
 
     <style name="Theme.Main" parent="Theme.AppCompat.NoActionBar">