feat: add proper navigation in landscape mode

This commit is contained in:
Fritz Heiden 2025-04-06 18:41:21 +02:00
parent c0a86c5635
commit 8e1e8dc4e6
3 changed files with 120 additions and 51 deletions

View File

@ -28,6 +28,7 @@
tools:targetApi="31"> tools:targetApi="31">
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
android:windowSoftInputMode="adjustResize"
android:exported="true" android:exported="true"
android:theme="@style/Theme.TVController"> android:theme="@style/Theme.TVController">
<intent-filter> <intent-filter>

View File

@ -1,10 +1,17 @@
package com.example.tvcontroller.ui.views package com.example.tvcontroller.ui.views
import android.content.res.Configuration
import android.util.Log
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.aspectRatio
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import com.example.tvcontroller.ui.components.CameraPreview import com.example.tvcontroller.ui.components.CameraPreview
import org.webrtc.EglBase import org.webrtc.EglBase
@ -12,11 +19,16 @@ import org.webrtc.VideoTrack
@Composable @Composable
fun CameraView(eglBaseContext: EglBase.Context, videoTrack: VideoTrack) { fun CameraView(eglBaseContext: EglBase.Context, videoTrack: VideoTrack) {
val configuration = LocalConfiguration.current
val isLandscape = configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
var ratio = if (isLandscape) 16/9f else 9/16f
Box( Box(
modifier = Modifier modifier = Modifier
.fillMaxSize() .fillMaxSize(),
.padding(all = 16.dp), contentAlignment = Alignment.Center
) { ) {
Box(modifier = if (isLandscape) Modifier.aspectRatio(ratio).fillMaxHeight() else Modifier.aspectRatio(ratio).fillMaxWidth()) {
CameraPreview(eglBaseContext = eglBaseContext, videoTrack = videoTrack, modifier = Modifier.fillMaxSize()) CameraPreview(eglBaseContext = eglBaseContext, videoTrack = videoTrack, modifier = Modifier.fillMaxSize())
} }
}
} }

View File

@ -1,16 +1,28 @@
package com.example.tvcontroller.ui.views package com.example.tvcontroller.ui.views
import android.content.res.Configuration
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.NavigationBar import androidx.compose.material3.NavigationBar
import androidx.compose.material3.NavigationBarItem import androidx.compose.material3.NavigationBarItem
import androidx.compose.material3.NavigationRail
import androidx.compose.material3.NavigationRailItem
import androidx.compose.material3.Scaffold import androidx.compose.material3.Scaffold
import androidx.compose.material3.Surface
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.unit.dp
import androidx.lifecycle.viewmodel.compose.viewModel import androidx.lifecycle.viewmodel.compose.viewModel
import androidx.navigation.compose.NavHost import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable import androidx.navigation.compose.composable
@ -26,6 +38,13 @@ import com.example.tvcontroller.ui.views.MainViewModel.Companion.CAMERA_VIEW
import com.example.tvcontroller.ui.views.MainViewModel.Companion.REMOTE_VIEW import com.example.tvcontroller.ui.views.MainViewModel.Companion.REMOTE_VIEW
import com.example.tvcontroller.ui.views.MainViewModel.Companion.SETTINGS_VIEW import com.example.tvcontroller.ui.views.MainViewModel.Companion.SETTINGS_VIEW
private data class NavigationItem(
var onClick: () -> Unit = {},
var icon: @Composable () -> Unit = {},
var label: @Composable () -> Unit = {},
var selected: Boolean = false
)
@Composable @Composable
fun MainView( fun MainView(
deviceService: DeviceService, deviceService: DeviceService,
@ -41,38 +60,73 @@ fun MainView(
val baselineCamera24 = painterResource(R.drawable.baseline_camera_24) val baselineCamera24 = painterResource(R.drawable.baseline_camera_24)
val baselineRemote24 = painterResource(R.drawable.baseline_settings_remote_24) val baselineRemote24 = painterResource(R.drawable.baseline_settings_remote_24)
val baselineSettings24 = painterResource(R.drawable.baseline_settings_24) val baselineSettings24 = painterResource(R.drawable.baseline_settings_24)
Scaffold(modifier = Modifier.fillMaxSize(), bottomBar = { val configuration = LocalConfiguration.current
NavigationBar { val isLandscape = configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
NavigationBarItem(
onClick = { navController.navigate(CAMERA_VIEW) }, icon = { val navigationItems = listOf(
Icon( NavigationItem(
baselineCamera24, contentDescription = "Camera" onClick = { navController.navigate(CAMERA_VIEW) },
) icon = { Icon(baselineCamera24, contentDescription = "Camera") },
}, label = { Text("Camera") }, selected = currentView == CAMERA_VIEW label = { Text("Camera") },
) selected = currentView == CAMERA_VIEW
NavigationBarItem( ), NavigationItem(
onClick = { navController.navigate(REMOTE_VIEW) }, icon = { onClick = { navController.navigate(REMOTE_VIEW) },
Icon( icon = { Icon(baselineRemote24, contentDescription = "Remote") },
baselineRemote24, contentDescription = "Remote" label = { Text("Remote") },
) selected = currentView == REMOTE_VIEW
}, label = { Text("Remote") }, selected = currentView == REMOTE_VIEW ), NavigationItem(
)
NavigationBarItem(
onClick = { navController.navigate(SETTINGS_VIEW) }, onClick = { navController.navigate(SETTINGS_VIEW) },
icon = { icon = { Icon(baselineSettings24, contentDescription = "Settings") },
Icon(
baselineSettings24, contentDescription = "Settings"
)
},
label = { Text("Settings") }, label = { Text("Settings") },
selected = currentView == SETTINGS_VIEW selected = currentView == SETTINGS_VIEW
) )
)
Surface(modifier = Modifier.fillMaxSize()) {
Scaffold(
modifier = Modifier
.fillMaxHeight(),
bottomBar = {
if (!isLandscape) {
NavigationBar {
navigationItems.forEach { item ->
NavigationBarItem(
onClick = item.onClick,
icon = item.icon,
label = item.label,
selected = item.selected,
)
}
}
} }
}) { innerPadding -> }) { innerPadding ->
Row(Modifier.padding(innerPadding)) {
if (isLandscape) {
NavigationRail(
modifier = Modifier
.fillMaxHeight()
.width(64.dp)
) {
Column(
modifier = Modifier
.fillMaxHeight(),
verticalArrangement = Arrangement.spacedBy(
12.dp, Alignment.CenterVertically
)
) {
navigationItems.forEach { item ->
NavigationRailItem(
onClick = item.onClick,
icon = item.icon,
label = item.label,
selected = item.selected,
)
}
}
}
}
NavHost( NavHost(
navController = navController, navController = navController,
startDestination = viewModel.currentView.value, startDestination = viewModel.currentView.value,
modifier = Modifier.padding(innerPadding)
) { ) {
composable(route = CAMERA_VIEW) { composable(route = CAMERA_VIEW) {
CameraView( CameraView(
@ -92,5 +146,7 @@ fun MainView(
} }
} }
} }
}
}
} }