Skip to content
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

Jump to bottom

[conflict]Add ZeDrawerItemData to host the drawer items and pass the items as List to ZeDrawerContent #356

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

[conflict]Add ZeDrawerItemData to host the drawer items and pass the items as List to ZeDrawerContent #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
67351c7
Add ZeDrawerItemData to host the drawer items and pass the items as l…
mehdiyari Jul 5, 2024
79ef013
Merge branch 'main' of https://github.com/mehdiyari/ZeBadge into usin…
mehdiyari Jul 5, 2024
fa5c266
Merge branch 'main' into using_list_for_drawer_data
mehdiyari Jul 5, 2024
6415a8b
Fix ktlint issues
mehdiyari Jul 5, 2024
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
113 changes: 31 additions & 82 deletions zeapp/android/src/main/java/de/berlindroid/zeapp/zeui/zehome/ZeDrawerContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ import androidx.compose.foundation.border
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Info
import androidx.compose.material.icons.filled.ThumbUp
import androidx.compose.material3.DrawerDefaults
import androidx.compose.material3.DrawerState
import androidx.compose.material3.DrawerValue
Expand All @@ -21,27 +18,20 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.painter.Painter
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.graphics.vector.rememberVectorPainter
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import de.berlindroid.zeapp.R
import de.berlindroid.zeapp.zeui.zetheme.ZeBlack
import de.berlindroid.zeapp.zeui.zetheme.ZeWhite

@Composable
@Preview
internal fun ZeDrawerContent(
drawerState: DrawerState = DrawerState(DrawerValue.Open),
onSaveAllClick: () -> Unit = {},
onGetStoredPages: () -> Unit = {},
onGotoReleaseClick: () -> Unit = {},
onGotoContributors: () -> Unit = {},
onGotoOpenSourceClick: () -> Unit = {},
onUpdateConfig: () -> Unit = {},
onCloseDrawer: () -> Unit = {},
onTitleClick: () -> Unit = {},
zeDrawerItems: List<ZeDrawerItemData> = listOf(),
) {
@Composable
fun NavDrawerItem(
Expand Down Expand Up @@ -107,78 +97,37 @@ internal fun ZeDrawerContent(
}

LazyColumn {
item {
NavDrawerItem(
onClick = onSaveAllClick,
painter = painterResource(id = R.drawable.save_all),
text = stringResource(id = R.string.ze_navdrawer_save_all_pages),
)
}

item {
NavDrawerItem(
text = stringResource(id = R.string.ze_navdrawer_update_config),
vector = Icons.Default.ThumbUp,
onClick = onUpdateConfig,
)
}

item {
NavDrawerItem(
painter = painterResource(id = R.drawable.ic_random),
text = stringResource(id = R.string.ze_navdrawer_send_random_page),
onClick = onGetStoredPages,
)
}

item {
HorizontalDivider(
thickness = 0.dp,
color = MaterialTheme.colorScheme.background,
modifier = Modifier.padding(
start = 0.dp,
end = 0.dp,
top = 16.dp,
bottom = 16.dp,
),
)
}
items(zeDrawerItems.size) { index ->
when (val currentItem = zeDrawerItems[index]) {
is ZeDrawerItemData.ItemWithText -> {
if (currentItem.icon != null) {
NavDrawerItem(
onClick = currentItem.onClick,
painter = painterResource(id = currentItem.icon),
text = stringResource(id = currentItem.text),
)
} else if (currentItem.imageVector != null) {
NavDrawerItem(
onClick = currentItem.onClick,
vector = currentItem.imageVector,
text = stringResource(id = currentItem.text),
)
}
}

item {
NavDrawerItem(
text = stringResource(id = R.string.ze_navdrawer_contributors),
painter = rememberVectorPainter(Icons.Default.Info),
onClick = onGotoContributors,
)
}

item {
NavDrawerItem(
text = stringResource(id = R.string.ze_navdrawer_open_source),
painter = painterResource(id = R.drawable.ic_open_source_initiative),
onClick = onGotoOpenSourceClick,
)
}

item {
HorizontalDivider(
thickness = 0.dp,
color = MaterialTheme.colorScheme.background,
modifier = Modifier.padding(
start = 0.dp,
end = 0.dp,
top = 16.dp,
bottom = 16.dp,
),
)
}

item {
NavDrawerItem(
text = stringResource(id = R.string.ze_navdrawer_open_release_page),
painter = painterResource(id = R.drawable.ic_update),
onClick = onGotoReleaseClick,
)
is ZeDrawerItemData.HorizontalDivider -> {
HorizontalDivider(
thickness = 0.dp,
color = MaterialTheme.colorScheme.background,
modifier = Modifier.padding(
start = 0.dp,
end = 0.dp,
top = 16.dp,
bottom = 16.dp,
),
)
}
}
}
}
}
Expand Down
17 changes: 17 additions & 0 deletions zeapp/android/src/main/java/de/berlindroid/zeapp/zeui/zehome/ZeDrawerItemData.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package de.berlindroid.zeapp.zeui.zehome

import androidx.annotation.DrawableRes
import androidx.annotation.StringRes
import androidx.compose.ui.graphics.vector.ImageVector

sealed class ZeDrawerItemData {

data class ItemWithText(
val onClick: () -> Unit,
@DrawableRes val icon: Int? = null,
val imageVector: ImageVector? = null,
@StringRes val text: Int,
) : ZeDrawerItemData()

data object HorizontalDivider : ZeDrawerItemData()
}
89 changes: 67 additions & 22 deletions zeapp/android/src/main/java/de/berlindroid/zeapp/zeui/zehome/ZeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ import android.content.Intent
import android.net.Uri
import androidx.activity.compose.BackHandler
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Info
import androidx.compose.material.icons.filled.ThumbUp
import androidx.compose.material3.DrawerState
import androidx.compose.material3.DrawerValue
import androidx.compose.material3.ModalNavigationDrawer
Expand All @@ -15,10 +18,12 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.navigation.NavHostController
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import androidx.navigation.compose.currentBackStackEntryAsState
import androidx.navigation.compose.rememberNavController
import de.berlindroid.zeapp.R
import de.berlindroid.zeapp.ROUTE_ABOUT
import de.berlindroid.zeapp.ROUTE_HOME
import de.berlindroid.zeapp.ROUTE_OPENSOURCE
Expand Down Expand Up @@ -71,34 +76,18 @@ internal fun ZeScreen(vm: ZeBadgeViewModel, modifier: Modifier = Modifier) {
drawerContent = {
ZeDrawerContent(
drawerState,
onGetStoredPages = vm::getStoredPages,
onSaveAllClick = vm::saveAll,
onGotoReleaseClick = goToReleases,
onGotoContributors = {
if (currentRoute == ROUTE_ABOUT) {
navController.navigateUp()
} else {
navController.navigate(
ROUTE_ABOUT,
)
}
},
onGotoOpenSourceClick = {
if (currentRoute == ROUTE_OPENSOURCE) {
navController.navigateUp()
} else {
navController.navigate(
ROUTE_OPENSOURCE,
)
}
},
onUpdateConfig = vm::listConfiguration,
onCloseDrawer = {
scope.launch {
drawerState.close()
}
},
onTitleClick = goToGithubPage,
zeDrawerItems = getZeDrawerItems(
zeBadgeViewModel = vm,
currentRoute = currentRoute,
navController = navController,
goToReleases = goToReleases,
),
)
},
) {
Expand Down Expand Up @@ -154,6 +143,62 @@ internal fun ZeScreen(vm: ZeBadgeViewModel, modifier: Modifier = Modifier) {
)
}

private fun getZeDrawerItems(
zeBadgeViewModel: ZeBadgeViewModel,
currentRoute: String,
navController: NavHostController,
goToReleases: () -> Unit,
): List<ZeDrawerItemData> = listOf(
ZeDrawerItemData.ItemWithText(
onClick = zeBadgeViewModel::saveAll,
icon = R.drawable.save_all,
text = R.string.ze_navdrawer_save_all_pages,
),
ZeDrawerItemData.ItemWithText(
onClick = zeBadgeViewModel::listConfiguration,
imageVector = Icons.Default.ThumbUp,
text = R.string.ze_navdrawer_update_config,
),
ZeDrawerItemData.ItemWithText(
onClick = zeBadgeViewModel::listConfiguration,
icon = R.drawable.ic_random,
text = R.string.ze_navdrawer_send_random_page,
),
ZeDrawerItemData.HorizontalDivider,
ZeDrawerItemData.ItemWithText(
onClick = {
if (currentRoute == ROUTE_ABOUT) {
navController.navigateUp()
} else {
navController.navigate(
ROUTE_ABOUT,
)
}
},
imageVector = Icons.Default.Info,
text = R.string.ze_navdrawer_contributors,
),
ZeDrawerItemData.ItemWithText(
onClick = {
if (currentRoute == ROUTE_OPENSOURCE) {
navController.navigateUp()
} else {
navController.navigate(
ROUTE_OPENSOURCE,
)
}
},
icon = R.drawable.ic_open_source_initiative,
text = R.string.ze_navdrawer_open_source,
),
ZeDrawerItemData.ItemWithText(
onClick = goToReleases,
icon = R.drawable.ic_update,
text = R.string.ze_navdrawer_open_release_page,
),
ZeDrawerItemData.HorizontalDivider,
)

@Composable
fun DrawerBackHandler(drawerState: DrawerState, scope: CoroutineScope) {
BackHandler(drawerState.isOpen) {
Expand Down