Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
package com.codandotv.streamplayerapp.navigation

import androidx.compose.animation.core.tween
import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.navigation.NavController
import androidx.navigation.NavGraphBuilder
Expand All @@ -14,15 +19,19 @@ import com.codandotv.streamplayerapp.core_navigation.routes.BottomNavRoutes
import com.codandotv.streamplayerapp.core_navigation.routes.Routes
import com.codandotv.streamplayerapp.feature_list_streams.list.presentation.navigation.listStreamsNavGraph
import com.codandotv.streamplayerapp.profile.presentation.navigation.profilePickerStreamNavGraph

import com.codandotv.streamplayerapp.presentation.navigation.splashNavGraph
import com.codandotv.streamplayerapp.feature_detail.presentation.navigation.detailStreamNavGraph
import com.codandotv.streamplayerapp.feature_news.presentation.navigation.newsStreamNavGraph
import com.codandotv.streamplayerapp.feature_search.presentation.navigation.searchStreamsNavGraph

@Composable
fun NavigationGraph(navController: NavHostController) {
NavHost(navController = navController, startDestination = Routes.Splash) {
NavHost(
navController = navController,
startDestination = Routes.Splash,
enterTransition = { fadeIn(animationSpec = tween(300)) },
exitTransition = { fadeOut(animationSpec = tween(300)) },
) {
splashNavGraph(navController = navController)
listStreamsNavGraph(navController = navController)
searchStreamsNavGraph(navController = navController)
Expand All @@ -46,7 +55,11 @@ fun example(navController: NavController, route: String) {
bottomBar = {
StreamPlayerBottomNavigation(navController = navController)
}
) { _ ->
Text(text = route, color = Color.White)
) { innerPadding ->
Text(
modifier = Modifier.padding(top = innerPadding.calculateTopPadding()),
text = route,
color = Color.White
)
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.codandotv.streamplayerapp.core_navigation.bottomnavigation

import androidx.compose.foundation.layout.height
import androidx.compose.material3.Icon
import androidx.compose.material3.LocalAbsoluteTonalElevation
import androidx.compose.material3.MaterialTheme
Expand All @@ -10,8 +9,6 @@ import androidx.compose.material3.NavigationBarItemDefaults
import androidx.compose.material3.Text
import androidx.compose.material3.surfaceColorAtElevation
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import androidx.navigation.NavController
import com.codandotv.streamplayerapp.core_navigation.helper.currentRoute
import org.jetbrains.compose.resources.painterResource
Expand All @@ -29,20 +26,20 @@ fun StreamPlayerBottomNavigation(navController: NavController) {
NavigationBar(
containerColor = MaterialTheme.colorScheme.surface,
contentColor = MaterialTheme.colorScheme.onBackground,
modifier = Modifier.height(72.dp)
) {
val currentRoute = currentRoute(navController = navController)

bottomMenuItems.forEach { item ->
NavigationBarItem(colors = NavigationBarItemDefaults.colors(
selectedIconColor = MaterialTheme.colorScheme.onBackground,
unselectedIconColor = MaterialTheme.colorScheme.surfaceVariant,
selectedTextColor = MaterialTheme.colorScheme.onBackground,
unselectedTextColor = MaterialTheme.colorScheme.surfaceVariant,
indicatorColor = MaterialTheme.colorScheme.surfaceColorAtElevation(
LocalAbsoluteTonalElevation.current
)
),
NavigationBarItem(
colors = NavigationBarItemDefaults.colors(
selectedIconColor = MaterialTheme.colorScheme.onBackground,
unselectedIconColor = MaterialTheme.colorScheme.surfaceVariant,
selectedTextColor = MaterialTheme.colorScheme.onBackground,
unselectedTextColor = MaterialTheme.colorScheme.surfaceVariant,
indicatorColor = MaterialTheme.colorScheme.surfaceColorAtElevation(
LocalAbsoluteTonalElevation.current
)
),
icon = { NavItemIcon(currentRoute, item) },
label = {
Text(
Expand All @@ -62,11 +59,13 @@ private fun NavItemIcon(
item: BottomNavItem
) {
Icon(
painterResource(if (currentRoute == item.screenRoute || currentRoute?.contains(item.screenRoute) == true){
item.iconSelected
} else {
item.iconUnselected
}),
painterResource(
if (currentRoute == item.screenRoute || currentRoute?.contains(item.screenRoute) == true) {
item.iconSelected
} else {
item.iconUnselected
}
),
contentDescription = stringResource(item.title),
)
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.codandotv.streamplayerapp.core_shared_ui.widget

import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.statusBarsPadding
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material3.ExperimentalMaterial3Api
Expand All @@ -21,7 +22,7 @@ fun BasicToolbar(
) {
TopAppBar(
title = { Text(text = title) },
modifier = Modifier.height(56.dp),
modifier = Modifier.height(56.dp).statusBarsPadding(),
navigationIcon = {
IconButton(onClick = navController::navigateUp) {
Icon(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.statusBarsPadding
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Search
Expand Down Expand Up @@ -46,7 +47,10 @@ fun StreamPlayerTopBar(
onNavigateSearchScreen: () -> Unit = {},
onSelectedProfilePicture: String
) {
Box(modifier = Modifier.background(color = Colors.Dark10)) {
Box(
modifier = Modifier.background(color = Colors.Dark10)
.statusBarsPadding()
) {
StreamPlayerTopBar(
onNavigateProfilePicker = { onNavigateProfilePicker() },
onNavigateSearchScreen = { onNavigateSearchScreen() },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ fun ListStreamsScreen(

Scaffold(
modifier = Modifier
.statusBarsPadding()
.nestedScroll(scrollBehavior.nestedScrollConnection),
topBar = {
StreamPlayerTopBar(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.statusBarsPadding
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Edit
import androidx.compose.material3.Icon
Expand All @@ -25,6 +26,7 @@ fun ProfilePickerStreamToolbar(modifier: Modifier = Modifier) {
Box(
modifier
.fillMaxWidth()
.statusBarsPadding()
.height(56.dp),
contentAlignment = Alignment.CenterEnd
) {
Expand Down
3 changes: 2 additions & 1 deletion iosApp/iosApp/ContentView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ struct ComposeView: UIViewControllerRepresentable {
struct ContentView: View {
var body: some View {
ComposeView()
.ignoresSafeArea(.keyboard) // Compose has own keyboard handler
.ignoresSafeArea(.container)
.ignoresSafeArea(.keyboard)
}
}

Expand Down
Loading