curiosite/DnDApplication
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove search from character sheet.

Browse source
This commit is contained in:
Andres Gomez, Thomas (ITDV RL) 2024-04-29 15:05:15 +02:00
parent 33f0d0d344
commit 7656fbf3eb
1 changed files with 3 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

62
app/src/main/java/com/pixelized/rplexicon/ui/screens/character/CharacterSheetScreen.kt
View file

@ -22,15 +22,11 @@ import androidx.compose.material.ModalBottomSheetLayout
import androidx.compose.material.ModalBottomSheetState
import androidx.compose.material.ModalBottomSheetValue
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.MoreVert
import androidx.compose.material.icons.filled.Refresh
import androidx.compose.material.icons.filled.Search
import androidx.compose.material.pullrefresh.PullRefreshState
import androidx.compose.material.pullrefresh.pullRefresh
import androidx.compose.material.pullrefresh.rememberPullRefreshState
import androidx.compose.material.rememberModalBottomSheetState
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
@ -68,7 +64,6 @@ import com.pixelized.rplexicon.ui.composable.edit.HandleHitPointEditDialog
import com.pixelized.rplexicon.ui.composable.edit.HandleSkillEditDialog
import com.pixelized.rplexicon.ui.composable.error.HandleFetchError
import com.pixelized.rplexicon.ui.navigation.LocalScreenNavHost
import com.pixelized.rplexicon.ui.navigation.screens.navigateToSearch
import com.pixelized.rplexicon.ui.screens.character.CharacterTabUio.Action
import com.pixelized.rplexicon.ui.screens.character.CharacterTabUio.Alteration
import com.pixelized.rplexicon.ui.screens.character.CharacterTabUio.Inventory
@ -146,7 +141,6 @@ fun CharacterSheetScreen(
pagerState = pagerState,
sheetState = sheetState,
refreshState = refresh,
isMenuExpended = isMenuExpended,
name = viewModel.character,
tabs = tabs,
header = headerViewModel.header,
@ -170,15 +164,6 @@ fun CharacterSheetScreen(
},
onDeathSuccess = headerViewModel::onDeathSuccess,
onDeathFailure = headerViewModel::onDeathFailure,
onMenuRequest = { isMenuExpended.value = it },
onSearch = {
screen.navigateToSearch(
enableLexicon = true,
enableQuests = true,
enableLocations = true,
enableSpells = true,
)
},
onFullRefresh = {
scope.launch { viewModel.update(force = true, full = true) }
},
@ -265,9 +250,6 @@ private fun CharacterSheetContent(
pagerState: PagerState,
sheetState: ModalBottomSheetState,
refreshState: PullRefreshState,
isMenuExpended: State<Boolean>,
onMenuRequest: (Boolean) -> Unit,
onSearch: () -> Unit,
onFullRefresh: () -> Unit,
name: String,
tabs: State<List<CharacterTabUio>>,
@ -302,45 +284,10 @@ private fun CharacterSheetContent(
}
},
actions = {
IconButton(onClick = { onMenuRequest(!isMenuExpended.value) }) {
IconButton(onClick = onFullRefresh) {
Icon(
imageVector = Icons.Filled.MoreVert,
contentDescription = "More",
)
}
DropdownMenu(
expanded = isMenuExpended.value,
onDismissRequest = { onMenuRequest(false) },
) {
DropdownMenuItem(
leadingIcon = {
Icon(
imageVector = Icons.Default.Search,
contentDescription = null,
)
},
text = {
Text(text = stringResource(id = R.string.search_field_title))
},
onClick = {
onMenuRequest(false)
onSearch()
},
)
DropdownMenuItem(
leadingIcon = {
Icon(
imageVector = Icons.Default.Refresh,
contentDescription = null,
)
},
text = {
Text(text = stringResource(id = R.string.character_sheet_refresh_label))
},
onClick = {
onMenuRequest(false)
onFullRefresh()
},
imageVector = Icons.Default.Refresh,
contentDescription = stringResource(id = R.string.character_sheet_refresh_label),
)
}
},
@ -510,11 +457,8 @@ private fun CharacterScreenPreview(
name = "Brulkhai",
header = rememberCharacterHeaderStatePreview(),
tabs = rememberHeaderPreview(),
isMenuExpended = remember { mutableStateOf(false) },
onMenuRequest = { },
onBack = { },
onTab = { },
onSearch = { },
onFullRefresh = { },
loader = { },
onInitiative = { },