-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #14 from mende273/create_ui_shared_package
Create ui shared package and move BottomNavigationBar and TopAppBar
- Loading branch information
Showing
3 changed files
with
109 additions
and
85 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
54 changes: 54 additions & 0 deletions
54
app/src/main/java/com/jumrukovski/quotescompose/ui/shared/BottomNavigationBar.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| package com.jumrukovski.quotescompose.ui.shared | ||
|
|
||
| import androidx.compose.material3.* | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.mutableStateOf | ||
| import androidx.compose.runtime.remember | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.res.painterResource | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.unit.dp | ||
| import com.jumrukovski.quotescompose.BottomMenuItem | ||
| import com.jumrukovski.quotescompose.ui.theme.MediumDarkGreyColor | ||
| import com.jumrukovski.quotescompose.ui.theme.NavigationBarBackgroundColor | ||
| import com.jumrukovski.quotescompose.ui.theme.NavigationBarItemRippleColor | ||
| import com.jumrukovski.quotescompose.ui.theme.NavigationBarSelectedItemColor | ||
|
|
||
| @Composable | ||
| fun BottomNavigationBar(onItemClick: (BottomMenuItem) -> Unit = {}) { | ||
| val selectedIndex = remember { mutableStateOf(0) } | ||
|
|
||
| NavigationBar( | ||
| modifier = Modifier, | ||
| contentColor = MaterialTheme.colorScheme.NavigationBarItemRippleColor, | ||
| tonalElevation = 0.dp, | ||
| containerColor = MaterialTheme.colorScheme.NavigationBarBackgroundColor, | ||
| content = { | ||
| BottomMenuItem.values().forEachIndexed { index, menuItem -> | ||
| NavigationBarItem( | ||
| selected = selectedIndex.value == index, | ||
| onClick = { | ||
| selectedIndex.value = index | ||
| onItemClick(BottomMenuItem.values()[index]) | ||
| }, | ||
| label = { Text(text = stringResource(id = menuItem.titleTextId)) }, | ||
| enabled = true, | ||
| icon = { | ||
| Icon( | ||
| painter = painterResource(id = menuItem.icon), | ||
| contentDescription = stringResource(id = menuItem.titleTextId) | ||
| ) | ||
| }, | ||
| alwaysShowLabel = true, | ||
| colors = NavigationBarItemDefaults.colors( | ||
| selectedIconColor = MaterialTheme.colorScheme.NavigationBarSelectedItemColor, | ||
| unselectedIconColor = MediumDarkGreyColor, | ||
| selectedTextColor = MaterialTheme.colorScheme.NavigationBarSelectedItemColor, | ||
| unselectedTextColor = MediumDarkGreyColor, | ||
| indicatorColor = MaterialTheme.colorScheme.NavigationBarBackgroundColor | ||
| ) | ||
| ) | ||
| } | ||
| } | ||
| ) | ||
| } |
48 changes: 48 additions & 0 deletions
48
app/src/main/java/com/jumrukovski/quotescompose/ui/shared/TopAppBar.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| package com.jumrukovski.quotescompose.ui.shared | ||
|
|
||
| import androidx.compose.foundation.background | ||
| import androidx.compose.material3.* | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.res.painterResource | ||
| import com.jumrukovski.quotescompose.MainActivity | ||
| import com.jumrukovski.quotescompose.ui.theme.PrimaryBackgroundColor | ||
| import com.jumrukovski.quotescompose.ui.theme.PrimaryTextColor | ||
|
|
||
| @OptIn(ExperimentalMaterial3Api::class) | ||
| @Composable | ||
| fun Toolbar(title:String, | ||
| topMenuItems: List<MainActivity.MainActivityMenuItem>, | ||
| onActionClick: (MainActivity.MainActivityMenuItem) -> Unit = {} | ||
| ) { | ||
| TopAppBar( | ||
| modifier = Modifier.background(MaterialTheme.colorScheme.PrimaryBackgroundColor), | ||
| title = { Text(title) }, | ||
| colors = TopAppBarDefaults.topAppBarColors( | ||
| containerColor = MaterialTheme.colorScheme.PrimaryBackgroundColor, | ||
| scrolledContainerColor = MaterialTheme.colorScheme.PrimaryBackgroundColor, | ||
| navigationIconContentColor = MaterialTheme.colorScheme.PrimaryTextColor, | ||
| titleContentColor = MaterialTheme.colorScheme.PrimaryTextColor, | ||
| actionIconContentColor = MaterialTheme.colorScheme.PrimaryTextColor | ||
| ), | ||
| actions = { | ||
| topMenuItems.forEach { topMenuItem -> | ||
| TopMenuItem(topMenuItem = topMenuItem, onActionClick = { onActionClick(it) }) | ||
| } | ||
| } | ||
| ) | ||
| } | ||
|
|
||
| @Composable | ||
| private fun TopMenuItem( | ||
| topMenuItem: MainActivity.MainActivityMenuItem, | ||
| onActionClick: (MainActivity.MainActivityMenuItem) -> Unit = {} | ||
| ) { | ||
| IconButton(onClick = { onActionClick(topMenuItem) }) { | ||
| Icon( | ||
| painter = painterResource(id = topMenuItem.drawable), | ||
| contentDescription = topMenuItem.title, | ||
| tint = MaterialTheme.colorScheme.onSurface | ||
| ) | ||
| } | ||
| } |