diff --git a/android/app/src/main/java/pt/naps/maestro/MainActivity.kt b/android/app/src/main/java/pt/naps/maestro/MainActivity.kt index ed1188a..aad2d3a 100644 --- a/android/app/src/main/java/pt/naps/maestro/MainActivity.kt +++ b/android/app/src/main/java/pt/naps/maestro/MainActivity.kt @@ -8,25 +8,37 @@ import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.material3.DrawerValue +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.ModalDrawerSheet +import androidx.compose.material3.ModalNavigationDrawer import androidx.compose.material3.Scaffold import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.material3.rememberDrawerState import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue +import androidx.compose.runtime.rememberCoroutineScope 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 kotlinx.coroutines.launch import pt.naps.maestro.connection.DaemonLink import pt.naps.maestro.connection.DaemonPrefs import pt.naps.maestro.connection.LinkState +import pt.naps.maestro.ui.sidebar.SidebarContent import pt.naps.maestro.ui.theme.MaestroTheme class MainActivity : ComponentActivity() { private lateinit var daemonLink: DaemonLink + @OptIn(ExperimentalMaterial3Api::class) override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) enableEdgeToEdge() @@ -38,8 +50,35 @@ class MainActivity : ComponentActivity() { setContent { MaestroTheme { val linkState by daemonLink.state.collectAsState() - Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding -> - PlaceholderScreen(modifier = Modifier.padding(innerPadding), linkState = linkState) + val drawerState = rememberDrawerState(DrawerValue.Closed) + val scope = rememberCoroutineScope() + + ModalNavigationDrawer( + drawerState = drawerState, + drawerContent = { + ModalDrawerSheet(modifier = Modifier.width(320.dp)) { + SidebarContent( + catalogStore = daemonLink.catalog, + onOpenSession = { scope.launch { drawerState.close() } }, + ) + } + }, + ) { + Scaffold( + modifier = Modifier.fillMaxSize(), + topBar = { + TopAppBar( + title = { Text("Maestro") }, + navigationIcon = { + IconButton(onClick = { scope.launch { drawerState.open() } }) { + Text("☰") + } + }, + ) + }, + ) { innerPadding -> + PlaceholderScreen(modifier = Modifier.padding(innerPadding), linkState = linkState) + } } } }