Remove search from character sheet.
This commit is contained in:
parent
33f0d0d344
commit
7656fbf3eb
1 changed files with 3 additions and 59 deletions
|
|
@ -22,15 +22,11 @@ import androidx.compose.material.ModalBottomSheetLayout
|
||||||
import androidx.compose.material.ModalBottomSheetState
|
import androidx.compose.material.ModalBottomSheetState
|
||||||
import androidx.compose.material.ModalBottomSheetValue
|
import androidx.compose.material.ModalBottomSheetValue
|
||||||
import androidx.compose.material.icons.Icons
|
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.Refresh
|
||||||
import androidx.compose.material.icons.filled.Search
|
|
||||||
import androidx.compose.material.pullrefresh.PullRefreshState
|
import androidx.compose.material.pullrefresh.PullRefreshState
|
||||||
import androidx.compose.material.pullrefresh.pullRefresh
|
import androidx.compose.material.pullrefresh.pullRefresh
|
||||||
import androidx.compose.material.pullrefresh.rememberPullRefreshState
|
import androidx.compose.material.pullrefresh.rememberPullRefreshState
|
||||||
import androidx.compose.material.rememberModalBottomSheetState
|
import androidx.compose.material.rememberModalBottomSheetState
|
||||||
import androidx.compose.material3.DropdownMenu
|
|
||||||
import androidx.compose.material3.DropdownMenuItem
|
|
||||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||||
import androidx.compose.material3.Icon
|
import androidx.compose.material3.Icon
|
||||||
import androidx.compose.material3.IconButton
|
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.edit.HandleSkillEditDialog
|
||||||
import com.pixelized.rplexicon.ui.composable.error.HandleFetchError
|
import com.pixelized.rplexicon.ui.composable.error.HandleFetchError
|
||||||
import com.pixelized.rplexicon.ui.navigation.LocalScreenNavHost
|
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.Action
|
||||||
import com.pixelized.rplexicon.ui.screens.character.CharacterTabUio.Alteration
|
import com.pixelized.rplexicon.ui.screens.character.CharacterTabUio.Alteration
|
||||||
import com.pixelized.rplexicon.ui.screens.character.CharacterTabUio.Inventory
|
import com.pixelized.rplexicon.ui.screens.character.CharacterTabUio.Inventory
|
||||||
|
|
@ -146,7 +141,6 @@ fun CharacterSheetScreen(
|
||||||
pagerState = pagerState,
|
pagerState = pagerState,
|
||||||
sheetState = sheetState,
|
sheetState = sheetState,
|
||||||
refreshState = refresh,
|
refreshState = refresh,
|
||||||
isMenuExpended = isMenuExpended,
|
|
||||||
name = viewModel.character,
|
name = viewModel.character,
|
||||||
tabs = tabs,
|
tabs = tabs,
|
||||||
header = headerViewModel.header,
|
header = headerViewModel.header,
|
||||||
|
|
@ -170,15 +164,6 @@ fun CharacterSheetScreen(
|
||||||
},
|
},
|
||||||
onDeathSuccess = headerViewModel::onDeathSuccess,
|
onDeathSuccess = headerViewModel::onDeathSuccess,
|
||||||
onDeathFailure = headerViewModel::onDeathFailure,
|
onDeathFailure = headerViewModel::onDeathFailure,
|
||||||
onMenuRequest = { isMenuExpended.value = it },
|
|
||||||
onSearch = {
|
|
||||||
screen.navigateToSearch(
|
|
||||||
enableLexicon = true,
|
|
||||||
enableQuests = true,
|
|
||||||
enableLocations = true,
|
|
||||||
enableSpells = true,
|
|
||||||
)
|
|
||||||
},
|
|
||||||
onFullRefresh = {
|
onFullRefresh = {
|
||||||
scope.launch { viewModel.update(force = true, full = true) }
|
scope.launch { viewModel.update(force = true, full = true) }
|
||||||
},
|
},
|
||||||
|
|
@ -265,9 +250,6 @@ private fun CharacterSheetContent(
|
||||||
pagerState: PagerState,
|
pagerState: PagerState,
|
||||||
sheetState: ModalBottomSheetState,
|
sheetState: ModalBottomSheetState,
|
||||||
refreshState: PullRefreshState,
|
refreshState: PullRefreshState,
|
||||||
isMenuExpended: State<Boolean>,
|
|
||||||
onMenuRequest: (Boolean) -> Unit,
|
|
||||||
onSearch: () -> Unit,
|
|
||||||
onFullRefresh: () -> Unit,
|
onFullRefresh: () -> Unit,
|
||||||
name: String,
|
name: String,
|
||||||
tabs: State<List<CharacterTabUio>>,
|
tabs: State<List<CharacterTabUio>>,
|
||||||
|
|
@ -302,45 +284,10 @@ private fun CharacterSheetContent(
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
actions = {
|
actions = {
|
||||||
IconButton(onClick = { onMenuRequest(!isMenuExpended.value) }) {
|
IconButton(onClick = onFullRefresh) {
|
||||||
Icon(
|
Icon(
|
||||||
imageVector = Icons.Filled.MoreVert,
|
imageVector = Icons.Default.Refresh,
|
||||||
contentDescription = "More",
|
contentDescription = stringResource(id = R.string.character_sheet_refresh_label),
|
||||||
)
|
|
||||||
}
|
|
||||||
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()
|
|
||||||
},
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
@ -510,11 +457,8 @@ private fun CharacterScreenPreview(
|
||||||
name = "Brulkhai",
|
name = "Brulkhai",
|
||||||
header = rememberCharacterHeaderStatePreview(),
|
header = rememberCharacterHeaderStatePreview(),
|
||||||
tabs = rememberHeaderPreview(),
|
tabs = rememberHeaderPreview(),
|
||||||
isMenuExpended = remember { mutableStateOf(false) },
|
|
||||||
onMenuRequest = { },
|
|
||||||
onBack = { },
|
onBack = { },
|
||||||
onTab = { },
|
onTab = { },
|
||||||
onSearch = { },
|
|
||||||
onFullRefresh = { },
|
onFullRefresh = { },
|
||||||
loader = { },
|
loader = { },
|
||||||
onInitiative = { },
|
onInitiative = { },
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue