From 40dec8832d94c588c8b51bb9283b3c3093748134 Mon Sep 17 00:00:00 2001
From: Balazs Toldi <balazs@toldi.eu>
Date: Thu, 7 Oct 2021 16:51:22 +0200
Subject: [PATCH] Small changes and fixes

---
 .idea/misc.xml                                   |  2 ++
 .../balazs/caster/ChromecastManagerActivity.kt   | 16 ++++++++++------
 .../toldi/balazs/caster/ShareRecieverActivity.kt |  3 ++-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index acfbbfb..e23cf97 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,6 +8,8 @@
         <entry key="../../../../../layout/compose-model-1633594045878.xml" value="1.0" />
         <entry key="../../../../../layout/compose-model-1633596772266.xml" value="0.18285472972972974" />
         <entry key="../../../../../layout/compose-model-1633601146222.xml" value="0.18285472972972974" />
+        <entry key="../../../../../layout/compose-model-1633617799626.xml" value="0.3095439189189189" />
+        <entry key="../../../../../layout/compose-model-1633617944748.xml" value="0.4962962962962963" />
       </map>
     </option>
   </component>
diff --git a/app/src/main/java/eu/toldi/balazs/caster/ChromecastManagerActivity.kt b/app/src/main/java/eu/toldi/balazs/caster/ChromecastManagerActivity.kt
index 1154f5b..67d5b83 100644
--- a/app/src/main/java/eu/toldi/balazs/caster/ChromecastManagerActivity.kt
+++ b/app/src/main/java/eu/toldi/balazs/caster/ChromecastManagerActivity.kt
@@ -56,13 +56,13 @@ class ChromecastManagerActivity : ComponentActivity() {
 
                     val streamInfo = _streamInfo as VideoInfo
                     val status = chromeCast.status
-                    if (chromeCast.isAppAvailable("CC1AD845") && !status.isAppRunning(
-                            "CC1AD845"
+                    if (chromeCast.isAppAvailable(ChromeCastHelper.APP_MEDIA_RECEIVER) && !status.isAppRunning(
+                            ChromeCastHelper.APP_MEDIA_RECEIVER
                         )
                     ) {
-                        val app: Application = chromeCast.launchApp("CC1AD845")
+                        val app: Application = chromeCast.launchApp(ChromeCastHelper.APP_MEDIA_RECEIVER)
                     }
-                    while (!chromeCast.status.isAppRunning("CC1AD845")) {
+                    while (!chromeCast.status.isAppRunning(ChromeCastHelper.APP_MEDIA_RECEIVER)) {
                         delay(100)
                     }
 
@@ -129,6 +129,9 @@ class ChromecastManagerActivity : ComponentActivity() {
                             ) {
                                 Text(text = "Cast")
                             }
+                            if(castEnabled.not()){
+                                CircularProgressIndicator()
+                            }
                             playBackControl()
                         }
                     }
@@ -162,7 +165,7 @@ class ChromecastManagerActivity : ComponentActivity() {
 
     @Composable
     fun playBackControl(){
-        Row() {
+        Row {
 
             IconButton(onClick = {
                 GlobalScope.launch(IO) {
@@ -214,7 +217,8 @@ class ChromecastManagerActivity : ComponentActivity() {
             }
             IconButton(onClick = {
                 GlobalScope.launch(IO) {
-                    chromeCast.stopApp()
+                    if(chromeCast.runningApp != null)
+                        chromeCast.stopApp()
                 }
             }) {
                 Icon(
diff --git a/app/src/main/java/eu/toldi/balazs/caster/ShareRecieverActivity.kt b/app/src/main/java/eu/toldi/balazs/caster/ShareRecieverActivity.kt
index 8a35ed5..c9ba42d 100644
--- a/app/src/main/java/eu/toldi/balazs/caster/ShareRecieverActivity.kt
+++ b/app/src/main/java/eu/toldi/balazs/caster/ShareRecieverActivity.kt
@@ -19,6 +19,7 @@ import androidx.compose.material.icons.filled.Share
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.yausername.youtubedl_android.YoutubeDL
@@ -134,7 +135,7 @@ class ShareRecieverActivity : ComponentActivity() {
     fun MenuBar() {
         TopAppBar(
             title = {
-                Text("Caster")
+                Text(stringResource(id = R.string.title_activity_share_reciever))
             },
             navigationIcon = {
                 IconButton(onClick = { }) {