Skip to content

feat/bottomNavbar: updated bottom navbar, remove inbox and replaced i… #294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mildrette wants to merge 1 commit into
base: audit-builds
Choose a base branch
from
Open

feat/bottomNavbar: updated bottom navbar, remove inbox and replaced i… #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
180 changes: 113 additions & 67 deletions app/src/main/java/com/example/sw0b_001/ui/appbars/BottomNavBar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,112 +1,158 @@
package com.example.sw0b_001.ui.appbars

import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Home
import androidx.compose.material.icons.filled.Inbox
import androidx.compose.material.icons.filled.PhoneAndroid
import androidx.compose.material.icons.filled.ChatBubbleOutline
import androidx.compose.material.icons.filled.GridView
import androidx.compose.material.icons.filled.Public
import androidx.compose.material.icons.filled.Settings
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.NavigationBar
import androidx.compose.material3.NavigationBarItem
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalInspectionMode
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.navigation.NavController
import com.afkanerd.smswithoutborders_libsmsmms.extensions.context.isDefault
import com.example.sw0b_001.R
import com.example.sw0b_001.ui.navigation.SettingsScreen
import com.example.sw0b_001.ui.theme.AppTheme
import com.example.sw0b_001.ui.views.tabs.BottomTabsItems

@Composable
fun BottomNavBar(
navController: NavController,
selectedTab: BottomTabsItems,
onChangeTab: (BottomTabsItems) -> Unit = {},
) {
val context = LocalContext.current
val isDefaultSmsApp = if(LocalInspectionMode.current) true else context.isDefault()
val isDefaultSmsApp = if (LocalInspectionMode.current) true else context.isDefault()

NavigationBar {
NavigationBarItem(
icon = { Icon(
Icons.Filled.Home,
contentDescription = stringResource(R.string.recents),
modifier = Modifier.size(20.dp)
) },
label = {
Text(
text = stringResource(R.string.recents_text),
style = MaterialTheme.typography.labelSmall
Box(
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 20.dp, vertical = 16.dp)
) {
Surface(
shape = RoundedCornerShape(30.dp),
tonalElevation = 6.dp,
shadowElevation = 8.dp,
color = MaterialTheme.colorScheme.surface
) {
NavigationBar(
containerColor = Color.Transparent,
tonalElevation = 0.dp
) {

NavigationBarItem(
icon = {
Icon(
Icons.Filled.ChatBubbleOutline,
contentDescription = stringResource(R.string.Messages),
modifier = Modifier.size(20.dp)
)
},
label = {
Text(
text = stringResource(R.string.Messages),
style = MaterialTheme.typography.labelSmall
)
},
selected = selectedTab == BottomTabsItems.BottomBarRecentTab,
onClick = {
onChangeTab(BottomTabsItems.BottomBarRecentTab)
},
)
},
selected = selectedTab == BottomTabsItems.BottomBarRecentTab,
onClick = {
onChangeTab(BottomTabsItems.BottomBarRecentTab)
},
)

NavigationBarItem(
icon = { Icon(
Icons.Filled.PhoneAndroid,
contentDescription = stringResource(R.string.platforms),
modifier = Modifier.size(20.dp)
) },
label = { Text(
text = stringResource(R.string.platforms),
style = MaterialTheme.typography.labelSmall
) },
selected = selectedTab == BottomTabsItems.BottomBarPlatformsTab,
onClick = {
onChangeTab(BottomTabsItems.BottomBarPlatformsTab,)
},
)
NavigationBarItem(
icon = {
Icon(
Icons.Filled.GridView,
contentDescription = stringResource(R.string.platforms),
modifier = Modifier.size(20.dp)
)
},
label = {
Text(
text = stringResource(R.string.platforms),
style = MaterialTheme.typography.labelSmall
)
},
selected = selectedTab == BottomTabsItems.BottomBarPlatformsTab,
onClick = {
onChangeTab(BottomTabsItems.BottomBarPlatformsTab,)
},
)

NavigationBarItem(
icon = { Icon(
Icons.Filled.Inbox,
contentDescription = stringResource(R.string.inbox),
modifier = Modifier.size(20.dp)
) },
label = { Text(
text = stringResource(R.string.inbox),
style = MaterialTheme.typography.labelSmall
) },
selected = selectedTab == BottomTabsItems.BottomBarInboxTab,
onClick = {
onChangeTab(BottomTabsItems.BottomBarInboxTab,)
},
)

NavigationBarItem(
icon = { Icon(
Icons.Filled.Public,
contentDescription = stringResource(R.string.countries),
modifier = Modifier.size(20.dp)
) },
label = { Text(
text = stringResource(R.string.countries),
style = MaterialTheme.typography.labelSmall
) },
selected = selectedTab == BottomTabsItems.BottomBarCountriesTab,
onClick = {
onChangeTab(BottomTabsItems.BottomBarCountriesTab,)
},
)
NavigationBarItem(
icon = {
Icon(
Icons.Filled.Public,
contentDescription = stringResource(R.string.countries),
modifier = Modifier.size(20.dp)
)
},
label = {
Text(
text = stringResource(R.string.countries),
style = MaterialTheme.typography.labelSmall
)
},
selected = selectedTab == BottomTabsItems.BottomBarCountriesTab,
onClick = {
onChangeTab(BottomTabsItems.BottomBarCountriesTab,)
},
)


NavigationBarItem(
icon = {
Icon(
Icons.Filled.Settings,
contentDescription = stringResource(R.string.Settings),
modifier = Modifier.size(20.dp)
)
},
label = {
Text(
text = stringResource(R.string.Settings),
style = MaterialTheme.typography.labelSmall
)
},
selected = false,
onClick = {
navController.navigate(SettingsScreen)
},
)


}
}
}
}



@Preview
@Composable
fun BottomNavBar_Preview() {
AppTheme {
BottomNavBar(
navController = NavController(LocalContext.current),
selectedTab = BottomTabsItems.BottomBarRecentTab
)
}
}
}
2 changes: 1 addition & 1 deletion app/src/main/java/com/example/sw0b_001/ui/views/tabs/HomepageView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ fun HomepageView(
}
},
bottomBar = {
BottomNavBar( selectedTab = tokensViewModel.bottomTabsItem ) { selectedTab ->
BottomNavBar( navController = navController, selectedTab = tokensViewModel.bottomTabsItem ) { selectedTab ->
tokensViewModel.bottomTabsItem = selectedTab
}
},
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,5 +475,7 @@
<string name="select_the_file_on_your_device_where_your_backup_is_stored">Select the file on your device where your backup is stored</string>
<string name="open_backup_file">Open backup file</string>
<string name="incorrect_recovery_key">Incorrect recovery key</string>
<string name="Settings">Settings</string>
<string name="Messages">Messages</string>

</resources>