Compare commits

...

2 commits

Author SHA1 Message Date
40dec8832d
Small changes and fixes
All checks were successful
continuous-integration/drone/push Build is passing
2021-10-07 16:51:22 +02:00
d2d668a93f
Added basic logo 2021-10-07 16:43:01 +02:00
14 changed files with 17 additions and 10 deletions

View file

@ -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>
@ -18,7 +20,7 @@
<option name="HEAP_SIZE" value="256" />
<option name="LOCALE" value="en" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="JDK" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

View file

@ -7,9 +7,9 @@
<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:icon="@drawable/ic_caster_logo"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:roundIcon="@drawable/ic_caster_logo"
android:supportsRtl="true"
android:theme="@style/Theme.Caster">
<activity

View file

@ -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(

View file

@ -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 = { }) {

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB