Skip to content

Commit

Permalink
move back button
Browse files Browse the repository at this point in the history
  • Loading branch information
@lings03
lings03 committed Jan 23, 2025
1 parent ad4d1da commit 7a8cdbf
Show file tree
Hide file tree
Showing 4 changed files with 132 additions and 66 deletions.
8 changes: 5 additions & 3 deletions app/src/main/kotlin/top/laoxin/modmanager/ui/state/ModUiState.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ data class ModUiState(
val currentMods: List<ModBean> = emptyList(),
// 当前路径
val currentPath: String = "",
) {

}
// 是否显示返回按钮
val isBackPathExist: Boolean = false,
// 执行返回操作
val doBackFunction: Boolean = false,
)
89 changes: 31 additions & 58 deletions app/src/main/kotlin/top/laoxin/modmanager/ui/view/modView/ModBrowser.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ import top.laoxin.modmanager.tools.ModTools
import top.laoxin.modmanager.ui.state.ModUiState
import top.laoxin.modmanager.ui.viewmodel.ModViewModel
import java.io.File
import kotlin.collections.set

const val TAG = "ModsBrowser"

Expand All @@ -56,11 +57,30 @@ fun ModsBrowser(viewModel: ModViewModel, uiState: ModUiState) {
val listState = rememberLazyListState()
val scrollPositions = remember { mutableMapOf<String, Int>() }
val scrollOffsets = remember { mutableMapOf<String, Int>() }
val doBackFunction by rememberUpdatedState(uiState.doBackFunction)
if (currentPath == ModTools.MOD_PATH) {
return NoMod()
}

// 返回上级目录是否显示
fun doBack() {
if (currentPath != uiState.currentGameModPath && currentPath != Environment.getExternalStorageDirectory().path) {
// 记录当前路径的滚动位置
scrollPositions[currentPath] = listState.firstVisibleItemIndex
scrollOffsets[currentPath] = listState.firstVisibleItemScrollOffset
previousPath = currentPath
currentPath = File(currentPath).parent ?: currentPath
}
}

LaunchedEffect(doBackFunction) {
if (doBackFunction) {
doBack()
viewModel.setDoBackFunction(false)
viewModel.setBackIconVisiable(false)
}
}

// 监听当前路径变化并更新文件列表
LaunchedEffect(currentPath) {
viewModel.updateFiles(currentPath)
}
Expand All @@ -82,13 +102,7 @@ fun ModsBrowser(viewModel: ModViewModel, uiState: ModUiState) {
// 监听返回按键事件
if (currentPath != uiState.currentGameModPath) {
BackHandler {
if (currentPath != Environment.getExternalStorageDirectory().path) {
// 记录当前路径的滚动位置
scrollPositions[currentPath] = listState.firstVisibleItemIndex
scrollOffsets[currentPath] = listState.firstVisibleItemScrollOffset
previousPath = currentPath
currentPath = File(currentPath).parent ?: currentPath
}
viewModel.setDoBackFunction(true)
}
}

Expand Down Expand Up @@ -119,59 +133,19 @@ fun ModsBrowser(viewModel: ModViewModel, uiState: ModUiState) {
)
}
viewModel.setCurrentMods(mods)
// 返回上级目录按钮

// 空目录的返回上级目录按钮
if (currentPath != uiState.currentGameModPath && files.isEmpty()) {
FileListItem(
modifier = Modifier.padding(horizontal = 8.dp, vertical = 8.dp),
name = stringResource(R.string.mod_browser_file_list_back),
isSelected = false,
onLongClick = {
// 长按事件
},
onClick = {
if (currentPath != uiState.currentGameModPath) {
// 记录当前路径的滚动位置
scrollPositions[currentPath] = listState.firstVisibleItemIndex
scrollOffsets[currentPath] = listState.firstVisibleItemScrollOffset
previousPath = currentPath
currentPath = File(currentPath).parent ?: currentPath
}
},
onMultiSelectClick = {
// 多选状态下的点击事件
},
isMultiSelect = uiState.isMultiSelect,
description = currentPath.replace(uiState.currentGameModPath, ""),
iconId = R.drawable.back_icon
)
viewModel.setBackIconVisiable(true)
}

LazyColumn(state = listState) {

items(files) { file: File ->
if (currentPath != uiState.currentGameModPath && files.indexOf(file) == 0) {
FileListItem(
modifier = Modifier.padding(horizontal = 8.dp, vertical = 8.dp),
name = stringResource(R.string.mod_browser_file_list_back),
isSelected = false,
onLongClick = {
// 长按事件
},
onClick = {
if (currentPath != uiState.currentGameModPath) {
// 记录当前路径的滚动位置
scrollPositions[currentPath] = listState.firstVisibleItemIndex
scrollOffsets[currentPath] =
listState.firstVisibleItemScrollOffset
previousPath = currentPath
currentPath = File(currentPath).parent ?: currentPath
}
},
onMultiSelectClick = {
// 多选状态下的点击事件
},
isMultiSelect = uiState.isMultiSelect,
description = currentPath.replace(uiState.currentGameModPath, ""),
iconId = R.drawable.back_icon
)

// 非空目录的返回上级目录按钮
if (!uiState.isBackPathExist && currentPath != uiState.currentGameModPath) {
viewModel.setBackIconVisiable(true)
}

// 通过filepath获取mods
Expand All @@ -180,7 +154,6 @@ fun ModsBrowser(viewModel: ModViewModel, uiState: ModUiState) {
val modsByVirtualPaths = viewModel.getModsByVirtualPathsStrict(file.path)

// 设置当前页面的mods

val modCount = if (viewModel.getModsByPath(file.path)
.isNotEmpty()
) viewModel.getModsByPath(file.path).size else viewModel.getModsByVirtualPaths(
Expand Down
87 changes: 83 additions & 4 deletions app/src/main/kotlin/top/laoxin/modmanager/ui/view/modView/ModTopBar.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.text.KeyboardActions
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowBackIosNew
import androidx.compose.material.icons.filled.Close
import androidx.compose.material.icons.filled.Delete
import androidx.compose.material.icons.filled.Deselect
Expand All @@ -21,6 +23,7 @@ import androidx.compose.material.icons.filled.Menu
import androidx.compose.material.icons.filled.Refresh
import androidx.compose.material.icons.filled.Search
import androidx.compose.material.icons.filled.SelectAll
import androidx.compose.material3.Button
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.ExperimentalMaterial3Api
Expand Down Expand Up @@ -94,7 +97,44 @@ fun MultiSelectTopBar(
modifier = modifier,
colors = TopAppBarDefaults.topAppBarColors(
containerColor = if (configuration == Configuration.ORIENTATION_LANDSCAPE) MaterialTheme.colorScheme.surface else MaterialTheme.colorScheme.surfaceContainer,
), title = {
),
navigationIcon = {
if (uiState.modsView == NavigationIndex.MODS_BROWSER && uiState.isBackPathExist) {
Button(
onClick = {
viewModel.setDoBackFunction(true)
},
) {
Box(
contentAlignment = Alignment.CenterStart
) {
Row(
verticalAlignment = Alignment.CenterVertically,
) {
Icon(
imageVector = Icons.Filled.ArrowBackIosNew,
contentDescription = null,
Modifier.size(16.dp)
)
Text(
text = uiState.currentPath.replace(
uiState.currentGameModPath,
""
)
.substringAfterLast('/')
.substringBeforeLast('.')
.takeLast(5),
style = MaterialTheme.typography.titleLarge,
modifier = Modifier.padding(start = 8.dp)
)
}
}
}
} else {
null
}
},
title = {
Box(contentAlignment = Alignment.CenterStart) {
Text(
stringResource(id = uiState.modsView.title),
Expand Down Expand Up @@ -128,7 +168,8 @@ fun MultiSelectTopBar(
}
}

}, actions = {
},
actions = {
// 全选
IconButton(onClick = {
// 在这里处理图标按钮的点击事件
Expand Down Expand Up @@ -232,7 +273,44 @@ fun GeneralTopBar(
modifier = modifier,
colors = TopAppBarDefaults.topAppBarColors(
containerColor = if (configuration == Configuration.ORIENTATION_LANDSCAPE) MaterialTheme.colorScheme.surface else MaterialTheme.colorScheme.surfaceContainer,
), title = {
),
navigationIcon = {
if (uiState.modsView == NavigationIndex.MODS_BROWSER && uiState.isBackPathExist) {
Button(
onClick = {
viewModel.setDoBackFunction(true)
},
) {
Box(
contentAlignment = Alignment.CenterStart
) {
Row(
verticalAlignment = Alignment.CenterVertically,
) {
Icon(
imageVector = Icons.Filled.ArrowBackIosNew,
contentDescription = null,
Modifier.size(16.dp)
)
Text(
text = uiState.currentPath.replace(
uiState.currentGameModPath,
""
)
.substringAfterLast('/')
.substringBeforeLast('.')
.takeLast(5),
style = MaterialTheme.typography.titleLarge,
modifier = Modifier.padding(start = 8.dp)
)
}
}
}
} else {
null
}
},
title = {
Box(contentAlignment = Alignment.CenterStart) {
Text(
stringResource(id = uiState.modsView.title),
Expand All @@ -257,7 +335,8 @@ fun GeneralTopBar(
}
}

}, actions = {
},
actions = {
// IconButton(onClick = {
// // 在这里处理图标按钮的点击事件
// viewModel.setUserTipsDialog(true)
Expand Down
14 changes: 13 additions & 1 deletion app/src/main/kotlin/top/laoxin/modmanager/ui/viewmodel/ModViewModel.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ class ModViewModel(
scanDirectoryMods,
delUnzipDictionaryFlow,
showCategoryView
) { values ->
) { values: Array<Any> ->
UserPreferencesState(
scanQQDirectory = values[0] as Boolean,
selectedDirectory = values[1] as String,
Expand Down Expand Up @@ -897,6 +897,18 @@ class ModViewModel(
}
}

fun setBackIconVisiable(b: Boolean) {
_uiState.update {
it.copy(isBackPathExist = b)
}
}

fun setDoBackFunction(b: Boolean) {
_uiState.update {
it.copy(doBackFunction = b)
}
}

fun modLongClick(modBean: ModBean) {
Log.d("ModViewModel", "长按事件: $modBean")
if (!_uiState.value.isMultiSelect) {
Expand Down

0 comments on commit 7a8cdbf

Please sign in to comment.