diff --git a/android/app/src/main/java/eu/lixko/ts3j/client/android/ui/App.kt b/android/app/src/main/java/eu/lixko/ts3j/client/android/ui/App.kt index 696c5c0..e02c1ef 100644 --- a/android/app/src/main/java/eu/lixko/ts3j/client/android/ui/App.kt +++ b/android/app/src/main/java/eu/lixko/ts3j/client/android/ui/App.kt @@ -31,6 +31,7 @@ fun App(vm: SessionController) { val snackbar = remember { SnackbarHostState() } var settingsOpen by rememberSaveable { mutableStateOf(false) } var contactsOpen by rememberSaveable { mutableStateOf(false) } + var myTeamSpeakOpen by rememberSaveable { mutableStateOf(false) } var editingContact by rememberSaveable { mutableStateOf(null) } // Set when a contact's page was opened from a client, so leaving it goes back there. var contactDirect by rememberSaveable { mutableStateOf(false) } @@ -46,6 +47,7 @@ fun App(vm: SessionController) { connectOpen = false settingsOpen = false contactsOpen = false + myTeamSpeakOpen = false editingBookmark = null } } @@ -87,6 +89,7 @@ fun App(vm: SessionController) { contactDirect = false editingContact = uniqueId }, onBack = { contactsOpen = false }) + myTeamSpeakOpen -> MyTeamSpeakScreen(vm, onBack = { myTeamSpeakOpen = false }) settingsOpen -> SettingsScreen(vm, onContacts = { openContacts(null) }, onBack = { settingsOpen = false }) server != null && !connectOpen -> { serverStates.SaveableStateProvider(server.id) { @@ -98,7 +101,7 @@ fun App(vm: SessionController) { } } } - else -> ConnectScreen(vm, snackbar, { settingsOpen = true }, connectAsking, + else -> ConnectScreen(vm, snackbar, { settingsOpen = true }, { myTeamSpeakOpen = true }, connectAsking, onEditBookmark = { editingBookmark = it }, onBack = if (current != null) ({ connectOpen = false }) else null) } diff --git a/android/app/src/main/java/eu/lixko/ts3j/client/android/ui/ConnectScreen.kt b/android/app/src/main/java/eu/lixko/ts3j/client/android/ui/ConnectScreen.kt index b97d960..8922550 100644 --- a/android/app/src/main/java/eu/lixko/ts3j/client/android/ui/ConnectScreen.kt +++ b/android/app/src/main/java/eu/lixko/ts3j/client/android/ui/ConnectScreen.kt @@ -30,6 +30,7 @@ import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.IconButton import androidx.compose.material3.ListItem import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedButton import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Scaffold import androidx.compose.material3.SnackbarHost @@ -66,6 +67,7 @@ fun ConnectScreen( vm: SessionController, snackbar: SnackbarHostState, onSettings: () -> Unit, + onMyTeamSpeak: () -> Unit, onConnect: (() -> Unit) -> Unit, onEditBookmark: (BookmarkEdit) -> Unit, /** Back to the servers already connected; null when there are none. */ @@ -74,6 +76,7 @@ fun ConnectScreen( val lastEnd by vm.lastEnd.collectAsStateWithLifecycle() val bookmarks by vm.bookmarks.collectAsStateWithLifecycle() val identities by vm.identities.all.collectAsStateWithLifecycle() + val myTeamSpeakSignedIn by vm.myTeamSpeakSignedIn.collectAsStateWithLifecycle() var address by rememberSaveable { mutableStateOf(vm.lastAddress) } var identityId by rememberSaveable { mutableStateOf("") } var nickname by rememberSaveable { mutableStateOf(vm.nicknameFor("")) } @@ -133,6 +136,12 @@ fun ConnectScreen( Text("Bookmarks", Modifier.padding(top = 16.dp), style = MaterialTheme.typography.titleSmall, color = MaterialTheme.colorScheme.primary) } + } else { + item { + OutlinedButton(onClick = onMyTeamSpeak, Modifier.padding(top = 16.dp)) { + Text(if (myTeamSpeakSignedIn) "Import from myTeamSpeak" else "Sign in to myTeamSpeak") + } + } } itemsIndexed(bookmarks) { index, bookmark -> BookmarkRow(bookmark, identities, { onConnect { vm.connect(bookmark) } },