From 582a17974da460083682e343d825e0cd0dd146e5 Mon Sep 17 00:00:00 2001
From: xiaoluo <348237080@qq.com>
Date: Wed, 31 Dec 2025 13:09:41 +0800
Subject: [PATCH 01/14] =?UTF-8?q?feat:=20=E5=AE=9E=E7=8E=B0=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E6=B5=81=E7=A8=8B=E5=92=8C=E5=A4=9A=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E9=9A=94=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加登录页面, 要求输入用户名进行访问
- 实现基于 Jetpack Navigation Compose 的页面路由, 连接登录页和文件浏览页
- 将文件浏览功能重构为独立的 `ExplorerScreen` 和 `ExplorerViewModel`
- `ExplorerViewModel` 根据登录的 userId 初始化不同的文件根目录, 实现用户空间隔离
- 引入 `navigation-compose` 依赖库
---
 .idea/deploymentTargetSelector.xml            | 10 ++-
 .idea/gradle.xml                              |  1 +
 .idea/misc.xml                                |  1 -
 app/build.gradle.kts                          |  4 ++
 .../com/eggetteluo/folder/MainActivity.kt     | 22 ++-----
 .../ui/features/explorer/ExplorerScreen.kt    | 35 ++++++++++
 .../ui/features/explorer/ExplorerViewModel.kt | 45 +++++++++++++
 .../folder/ui/features/explorer/components.kt | 44 +++++++++++++
 .../folder/ui/features/login/LoginScreen.kt   | 64 +++++++++++++++++++
 .../ui/features/login/LoginViewModel.kt       | 38 +++++++++++
 .../folder/ui/navigation/NavGraph.kt          | 34 ++++++++++
 .../eggetteluo/folder/ui/navigation/Screen.kt |  8 +++
 gradle/libs.versions.toml                     |  4 ++
 13 files changed, 293 insertions(+), 17 deletions(-)
 create mode 100644 app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt
 create mode 100644 app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerViewModel.kt
 create mode 100644 app/src/main/java/com/eggetteluo/folder/ui/features/explorer/components.kt
 create mode 100644 app/src/main/java/com/eggetteluo/folder/ui/features/login/LoginScreen.kt
 create mode 100644 app/src/main/java/com/eggetteluo/folder/ui/features/login/LoginViewModel.kt
 create mode 100644 app/src/main/java/com/eggetteluo/folder/ui/navigation/NavGraph.kt
 create mode 100644 app/src/main/java/com/eggetteluo/folder/ui/navigation/Screen.kt

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 039ab27..36c7b7d 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,8 +4,16 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
+        <DropdownSelection timestamp="2025-12-30T13:56:43.673074Z">
+          <Target type="DEFAULT_BOOT">
+            <handle>
+              <DeviceId pluginId="LocalEmulator" identifier="path=/Users/xiaoluo/.android/avd/Medium_Phone.avd" />
+            </handle>
+          </Target>
+        </DropdownSelection>
+        <DialogSelection />
       </SelectionState>
-      <SelectionState runConfigName="GreetingPreview">
+      <SelectionState runConfigName="DefaultPreview">
         <option name="selectionMode" value="DROPDOWN" />
       </SelectionState>
     </selectionStates>
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 97f0a8e..639c779 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 74dd639..b2c751a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 51f101e..38dd2f5 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -67,4 +67,8 @@ dependencies {
 
     implementation(libs.androidx.lifecycle.viewmodel.compose)
     implementation(libs.androidx.lifecycle.viewmodel.ktx)
+
+    // navigation
+    implementation(libs.androidx.navigation.compose)
+    implementation(libs.androidx.lifecycle.viewmodel.compose.v270)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/eggetteluo/folder/MainActivity.kt b/app/src/main/java/com/eggetteluo/folder/MainActivity.kt
index ed362a5..b4765f6 100644
--- a/app/src/main/java/com/eggetteluo/folder/MainActivity.kt
+++ b/app/src/main/java/com/eggetteluo/folder/MainActivity.kt
@@ -21,33 +21,25 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import androidx.fragment.app.FragmentActivity
+import androidx.navigation.compose.rememberNavController
 import com.eggetteluo.folder.model.FileItem
+import com.eggetteluo.folder.ui.navigation.AppNavGraph
 import com.eggetteluo.folder.ui.theme.FolderTheme
 import com.eggetteluo.folder.viewModel.FileViewModel
 import com.permissionx.guolindev.PermissionX
 import java.io.File
 
 class MainActivity : FragmentActivity() {
-
-    private val fileViewModel: FileViewModel by viewModels()
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
         setContent {
             FolderTheme {
-                val hasPermission by fileViewModel.hasPermission.collectAsState()
-
-                Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
-                    Box(modifier = Modifier.padding(innerPadding).fillMaxSize()) {
-                        if (hasPermission) {
-                            FileExplorerScreen(fileViewModel)
-                        } else {
-                            PermissionGuideScreen {
-                                requestStoragePermission(this@MainActivity) {
-                                    fileViewModel.onPermissionGranted()
-                                }
-                            }
+                FolderTheme {
+                    val navController = rememberNavController()
+                    Scaffold { innerPadding ->
+                        Box(modifier = Modifier.padding(innerPadding)) {
+                            AppNavGraph(navController = navController)
                         }
                     }
                 }
diff --git a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt
new file mode 100644
index 0000000..2cbb069
--- /dev/null
+++ b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt
@@ -0,0 +1,35 @@
+package com.eggetteluo.folder.ui.features.explorer
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.runtime.*
+import androidx.lifecycle.viewmodel.compose.viewModel
+import java.io.File
+
+@Composable
+fun ExplorerScreen(userId: String) {
+    val viewModel: ExplorerViewModel = viewModel()
+    val fileList by viewModel.fileList.collectAsState()
+    val currentPath by viewModel.currentPath.collectAsState()
+
+    // 关键：当 userId 改变时，初始化空间
+    LaunchedEffect(userId) {
+        viewModel.initUserSpace(userId)
+    }
+
+    Column {
+        // 使用来自 components.kt 的组件
+        currentPath?.let { PathHeader(it.absolutePath) }
+
+        LazyColumn {
+            items(fileList) { file ->
+                FileRow(file = file) {
+                    if (file.isDirectory) {
+                        viewModel.loadFiles(File(file.path))
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerViewModel.kt b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerViewModel.kt
new file mode 100644
index 0000000..5c157a0
--- /dev/null
+++ b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerViewModel.kt
@@ -0,0 +1,45 @@
+package com.eggetteluo.folder.ui.features.explorer
+
+import android.os.Environment
+import androidx.lifecycle.ViewModel
+import com.eggetteluo.folder.model.FileItem
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import java.io.File
+
+class ExplorerViewModel : ViewModel() {
+    private val _fileList = MutableStateFlow<List<FileItem>>(emptyList())
+    val fileList: StateFlow<List<FileItem>> = _fileList
+
+    private val _currentPath = MutableStateFlow<File?>(null)
+    val currentPath: StateFlow<File?> = _currentPath
+
+    private var userRoot: File? = null
+
+    fun initUserSpace(userId: String) {
+        // 这里的路径逻辑可以封装到 data 层
+        val root = File("/storage/emulated/0/MyFileManager/$userId")
+        if (!root.exists()) root.mkdirs()
+
+        userRoot = root
+        loadFiles(root)
+    }
+
+    fun loadFiles(directory: File) {
+        val files = directory.listFiles()?.map {
+            FileItem(it.name, it.absolutePath, it.isDirectory, it.length(), it.lastModified())
+        } ?: emptyList()
+        _fileList.value = files
+        _currentPath.value = directory
+    }
+
+    fun navigateBack(): Boolean {
+        val parent = _currentPath.value?.parentFile
+        // 限制不能回退到根目录之外
+        if (parent != null && parent.absolutePath.startsWith(Environment.getExternalStorageDirectory().absolutePath)) {
+            loadFiles(parent)
+            return true
+        }
+        return false
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/components.kt b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/components.kt
new file mode 100644
index 0000000..5a34dc4
--- /dev/null
+++ b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/components.kt
@@ -0,0 +1,44 @@
+package com.eggetteluo.folder.ui.features.explorer
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Description
+import androidx.compose.material.icons.filled.Folder
+import androidx.compose.material3.*
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+import com.eggetteluo.folder.model.FileItem
+
+// 组件 1：单个文件行
+@Composable
+fun FileRow(file: FileItem, onClick: () -> Unit) {
+    ListItem(
+        modifier = Modifier.clickable { onClick() },
+        headlineContent = { Text(file.name) },
+        leadingContent = {
+            Icon(
+                imageVector = if (file.isDirectory) Icons.Default.Folder else Icons.Default.Description,
+                contentDescription = null,
+                tint = if (file.isDirectory) Color(0xFFFFCA28) else Color.Gray
+            )
+        }
+    )
+}
+
+// 组件 2：顶部路径面包屑（可选）
+@Composable
+fun PathHeader(path: String) {
+    Surface(tonalElevation = 4.dp) {
+        Text(
+            text = path,
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(16.dp),
+            style = MaterialTheme.typography.labelSmall
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/eggetteluo/folder/ui/features/login/LoginScreen.kt b/app/src/main/java/com/eggetteluo/folder/ui/features/login/LoginScreen.kt
new file mode 100644
index 0000000..0887c13
--- /dev/null
+++ b/app/src/main/java/com/eggetteluo/folder/ui/features/login/LoginScreen.kt
@@ -0,0 +1,64 @@
+package com.eggetteluo.folder.ui.features.login
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.viewmodel.compose.viewModel
+
+@Composable
+fun LoginScreen(
+    onLoginSuccess: (String) -> Unit // 登录成功后的跳转回’调
+) {
+    val viewModel: LoginViewModel = viewModel()
+    val username by viewModel.usernameInput.collectAsState()
+    val errorMsg by viewModel.errorMessage.collectAsState()
+
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(24.dp),
+        verticalArrangement = Arrangement.Center,
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        Text(
+            text = "私有文件管理",
+            style = MaterialTheme.typography.headlineLarge,
+            color = MaterialTheme.colorScheme.primary
+        )
+
+        Spacer(modifier = Modifier.height(48.dp))
+
+        // 用户名输入框
+        OutlinedTextField(
+            value = username,
+            onValueChange = { viewModel.onUsernameChange(it) },
+            label = { Text("用户名") },
+            isError = errorMsg != null,
+            modifier = Modifier.fillMaxWidth(),
+            singleLine = true
+        )
+
+        // 错误信息提示
+        if (errorMsg != null) {
+            Text(
+                text = errorMsg!!,
+                color = MaterialTheme.colorScheme.error,
+                style = MaterialTheme.typography.bodySmall,
+                modifier = Modifier.align(Alignment.Start).padding(top = 4.dp)
+            )
+        }
+
+        Spacer(modifier = Modifier.height(24.dp))
+
+        Button(
+            onClick = { viewModel.performLogin(onLoginSuccess) },
+            modifier = Modifier.fillMaxWidth().height(50.dp)
+        ) {
+            Text("登录 / 进入空间")
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/eggetteluo/folder/ui/features/login/LoginViewModel.kt b/app/src/main/java/com/eggetteluo/folder/ui/features/login/LoginViewModel.kt
new file mode 100644
index 0000000..f5bf324
--- /dev/null
+++ b/app/src/main/java/com/eggetteluo/folder/ui/features/login/LoginViewModel.kt
@@ -0,0 +1,38 @@
+package com.eggetteluo.folder.ui.features.login
+
+import androidx.lifecycle.ViewModel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+
+class LoginViewModel : ViewModel() {
+    // UI 状态：记录用户名输入
+    var usernameInput = MutableStateFlow("")
+
+    // 错误信息状态：如果用户名为空或格式不对，显示给用户
+    private val _errorMessage = MutableStateFlow<String?>(null)
+    val errorMessage: StateFlow<String?> = _errorMessage
+
+    fun onUsernameChange(newName: String) {
+        usernameInput.value = newName
+        _errorMessage.value = null // 输入时清除错误
+    }
+
+    // 执行登录逻辑
+    fun performLogin(onSuccess: (String) -> Unit) {
+        val user = usernameInput.value.trim()
+
+        if (user.isBlank()) {
+            _errorMessage.value = "用户名不能为空"
+            return
+        }
+
+        // 模拟验证：实际开发中这里会去查数据库
+        if (user.length < 3) {
+            _errorMessage.value = "用户名至少需要3个字符"
+            return
+        }
+
+        // 验证通过，触发回调通知导航跳转
+        onSuccess(user)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/eggetteluo/folder/ui/navigation/NavGraph.kt b/app/src/main/java/com/eggetteluo/folder/ui/navigation/NavGraph.kt
new file mode 100644
index 0000000..365b584
--- /dev/null
+++ b/app/src/main/java/com/eggetteluo/folder/ui/navigation/NavGraph.kt
@@ -0,0 +1,34 @@
+package com.eggetteluo.folder.ui.navigation
+
+import androidx.compose.runtime.Composable
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import com.eggetteluo.folder.ui.features.explorer.ExplorerScreen
+import com.eggetteluo.folder.ui.features.login.LoginScreen
+
+@Composable
+fun AppNavGraph(navController: NavHostController) {
+    NavHost(
+        navController = navController,
+        startDestination = Screen.Login.route
+    ) {
+        // 登录页面路由
+        composable(Screen.Login.route) {
+            LoginScreen(
+                onLoginSuccess = { userId ->
+                    navController.navigate(Screen.Explorer.createRoute(userId)) {
+                        popUpTo(Screen.Login.route) { inclusive = true }
+                    }
+                }
+            )
+        }
+
+        // 文件管理页面路由
+        composable(Screen.Explorer.route) { backStackEntry ->
+            val userId = backStackEntry.arguments?.getString("userId") ?: ""
+            // 这里建议在 features/explorer 下创建专门的页面入口
+            ExplorerScreen(userId = userId)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/eggetteluo/folder/ui/navigation/Screen.kt b/app/src/main/java/com/eggetteluo/folder/ui/navigation/Screen.kt
new file mode 100644
index 0000000..26ce2c2
--- /dev/null
+++ b/app/src/main/java/com/eggetteluo/folder/ui/navigation/Screen.kt
@@ -0,0 +1,8 @@
+package com.eggetteluo.folder.ui.navigation
+
+sealed class Screen(val route: String) {
+    object Login : Screen("login")
+    object Explorer : Screen("explorer/{userId}") {
+        fun createRoute(userId: String) = "explorer/$userId"
+    }
+}
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e515132..b86b6ac 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -9,7 +9,9 @@ lifecycleRuntimeKtx = "2.6.1"
 activityCompose = "1.8.0"
 composeBom = "2024.09.00"
 lifecycleViewmodelCompose = "2.10.0"
+lifecycleViewmodelComposeVersion = "2.7.0"
 lifecycleViewmodelKtx = "2.10.0"
+navigationCompose = "2.9.6"
 permissionx = "1.8.1"
 fragmentKtx = "1.8.9"
 
@@ -17,7 +19,9 @@ fragmentKtx = "1.8.9"
 androidx-compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended" }
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
 androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycleViewmodelCompose" }
+androidx-lifecycle-viewmodel-compose-v270 = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycleViewmodelComposeVersion" }
 androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycleViewmodelKtx" }
+androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navigationCompose" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
 androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }

From 3180b86b37da23965d936705ab27c57fd930a8bb Mon Sep 17 00:00:00 2001
From: xiaoluo <3428237080@qq.com>
Date: Wed, 31 Dec 2025 14:39:55 +0800
Subject: [PATCH 02/14] =?UTF-8?q?feat:=20init=20-=20=E5=AE=9E=E7=8E=B0?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E5=99=A8=E5=9F=BA=E6=9C=AC?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=20-=20=E6=B7=BB=E5=8A=A0=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=92=8C=E6=96=87=E4=BB=B6=E5=A4=B9=E5=88=97=E8=A1=A8=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=20-=20=E5=AE=9E=E7=8E=B0=E7=9B=AE=E5=BD=95=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA=E5=92=8C=E8=BF=94=E5=9B=9E=E4=B8=8A=E4=B8=80=E7=BA=A7?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=20-=20=E5=A2=9E=E5=8A=A0=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E8=AE=BF=E9=97=AE=E6=9D=83=E9=99=90=E8=AF=B7=E6=B1=82=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=20-=20=E5=BC=95=E5=85=A5=E7=9B=B8=E5=85=B3=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96=E5=BA=93=20(ViewModel,=20PermissionX,=20Material=20Ic?=
 =?UTF-8?q?ons)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetSelector.xml            |   3 -
 app/src/main/AndroidManifest.xml              |  10 ++
 .../ui/features/explorer/ExplorerScreen.kt    | 103 ++++++++++++++++--
 .../ui/features/explorer/ExplorerViewModel.kt |  88 ++++++++++++++-
 .../folder/ui/features/explorer/components.kt |  41 ++++++-
 app/src/main/res/xml/file_paths.xml           |   4 +
 6 files changed, 231 insertions(+), 18 deletions(-)
 create mode 100644 app/src/main/res/xml/file_paths.xml

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 36c7b7d..adcc8ce 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -13,9 +13,6 @@
         </DropdownSelection>
         <DialogSelection />
       </SelectionState>
-      <SelectionState runConfigName="DefaultPreview">
-        <option name="selectionMode" value="DROPDOWN" />
-      </SelectionState>
     </selectionStates>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 02ba7ef..39c8ffc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -26,6 +26,16 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt
index 2cbb069..b3ed01b 100644
--- a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt
+++ b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt
@@ -1,9 +1,26 @@
 package com.eggetteluo.folder.ui.features.explorer
 
+import android.app.Activity
+import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Add
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.FloatingActionButton
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
 import androidx.compose.runtime.*
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
 import androidx.lifecycle.viewmodel.compose.viewModel
 import java.io.File
 
@@ -13,23 +30,93 @@ fun ExplorerScreen(userId: String) {
     val fileList by viewModel.fileList.collectAsState()
     val currentPath by viewModel.currentPath.collectAsState()
 
+    val showDialog = remember { mutableStateOf(false) }
+    val newFolderName = remember { mutableStateOf("") }
+
+    val context = LocalContext.current
+    val activity = context as? Activity
+
     // 关键：当 userId 改变时，初始化空间
     LaunchedEffect(userId) {
         viewModel.initUserSpace(userId)
     }
 
-    Column {
-        // 使用来自 components.kt 的组件
-        currentPath?.let { PathHeader(it.absolutePath) }
+    BackHandler(enabled = true) {
+        // 尝试回退目录
+        val handled = viewModel.navigateBack()
+        if (!handled) {
+            // 如果已经在根目录无法回退了，则退出 Activity (应用)
+            activity?.finish()
+        }
+    }
+
+    Scaffold(
+        floatingActionButton = {
+            FloatingActionButton(
+                onClick = {
+                    showDialog.value = true
+                    newFolderName.value = ""
+                },
+                containerColor = MaterialTheme.colorScheme.primary,
+                contentColor = Color.White
+            ) {
+                Icon(Icons.Default.Add, contentDescription = "新建文件")
+            }
+        }
+    ) { paddingValues ->
+        Column(
+            modifier = Modifier.padding(paddingValues)
+        ) {
+            // 使用来自 components.kt 的组件
+            currentPath?.let { PathHeader(it.absolutePath) }
 
-        LazyColumn {
-            items(fileList) { file ->
-                FileRow(file = file) {
-                    if (file.isDirectory) {
-                        viewModel.loadFiles(File(file.path))
+            LazyColumn {
+                items(fileList) { file ->
+                    FileRow(file = file) {
+                        if (file.isDirectory) {
+                            // 如果是文件夹，加载内容
+                            viewModel.loadFiles(File(file.path))
+                        } else {
+                            // 如果是文件，尝试打开
+                            viewModel.openFile(context, file)
+                        }
                     }
                 }
             }
         }
+
+        if (showDialog.value) {
+            AlertDialog(
+                onDismissRequest = { showDialog.value = false },
+                title = { Text("新建文件") },
+                text = {
+                    OutlinedTextField(
+                        value = newFolderName.value,
+                        onValueChange = { newFolderName.value = it },
+                        label = { Text("文件名称") },
+                        singleLine = true,
+                        modifier = Modifier.fillMaxWidth()
+                    )
+                },
+                confirmButton = {
+                    TextButton(
+                        onClick = {
+                            if (newFolderName.value.isNotBlank()) {
+                                // 调用 ViewModel 执行真正的文件系统操作
+                                viewModel.createItem(newFolderName.value)
+                                showDialog.value = false
+                            }
+                        }
+                    ) {
+                        Text("确定")
+                    }
+                },
+                dismissButton = {
+                    TextButton(onClick = { showDialog.value = false }) {
+                        Text("取消")
+                    }
+                }
+            )
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerViewModel.kt b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerViewModel.kt
index 5c157a0..4a3e482 100644
--- a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerViewModel.kt
+++ b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerViewModel.kt
@@ -1,6 +1,10 @@
 package com.eggetteluo.folder.ui.features.explorer
 
+import android.content.Context
+import android.content.Intent
 import android.os.Environment
+import android.webkit.MimeTypeMap
+import androidx.core.content.FileProvider
 import androidx.lifecycle.ViewModel
 import com.eggetteluo.folder.model.FileItem
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -28,18 +32,94 @@ class ExplorerViewModel : ViewModel() {
     fun loadFiles(directory: File) {
         val files = directory.listFiles()?.map {
             FileItem(it.name, it.absolutePath, it.isDirectory, it.length(), it.lastModified())
-        } ?: emptyList()
+        }?.sortedWith(
+            compareByDescending<FileItem> { it.isDirectory } // 文件夹(true)排在文件(false)前面
+                .thenBy { it.name.lowercase() }              // 然后按名称不区分大小写排序
+        ) ?: emptyList()
+
         _fileList.value = files
         _currentPath.value = directory
     }
 
     fun navigateBack(): Boolean {
-        val parent = _currentPath.value?.parentFile
-        // 限制不能回退到根目录之外
-        if (parent != null && parent.absolutePath.startsWith(Environment.getExternalStorageDirectory().absolutePath)) {
+        val current = _currentPath.value ?: return false
+        val root = userRoot ?: return false
+
+        // 1. 如果当前路径的绝对路径已经等于根目录的绝对路径，则拦截，不进行回退
+        if (current.absolutePath == root.absolutePath) {
+            return false
+        }
+
+        // 2. 否则获取父级目录并跳转
+        val parent = current.parentFile
+        if (parent != null) {
             loadFiles(parent)
             return true
         }
+
         return false
     }
+
+    /**
+     * 创建项目：根据是否有后缀名自动判断是文件还是文件夹
+     */
+    fun createItem(name: String) {
+        val currentDir = _currentPath.value ?: return
+        val targetFile = File(currentDir, name)
+
+        if (targetFile.exists()) {
+            // 这里可以根据需要添加“文件已存在”的提示逻辑
+            return
+        }
+
+        try {
+            val success = if (name.contains(".")) {
+                // 有扩展名 -> 创建文件
+                targetFile.createNewFile()
+            } else {
+                // 无扩展名 -> 创建文件夹
+                targetFile.mkdir()
+            }
+
+            if (success) {
+                // 关键：创建成功后，重新加载当前目录以刷新 UI
+                loadFiles(currentDir)
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+            // 实际开发中建议通过另一个 StateFlow 发送错误消息给 UI
+        }
+    }
+
+    fun openFile(context: Context, fileItem: FileItem) {
+        val file = File(fileItem.path)
+        if (!file.exists()) return
+
+        // 1. 获取文件的扩展名
+        val extension = MimeTypeMap.getFileExtensionFromUrl(file.absolutePath)
+        // 2. 根据扩展名获取 MIME 类型（例如 .txt -> text/plain）
+        val type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension.lowercase())
+
+        // 3. 使用 FileProvider 生成安全的 URI
+        // 注意：这里的 "${context.packageName}.fileprovider" 必须与 Manifest 中一致
+        val uri = FileProvider.getUriForFile(
+            context,
+            "${context.packageName}.fileprovider",
+            file
+        )
+
+        // 4. 创建并启动 Intent
+        val intent = Intent(Intent.ACTION_VIEW).apply {
+            setDataAndType(uri, type)
+            addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) // 授予临时读取权限
+            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        }
+
+        try {
+            context.startActivity(intent)
+        } catch (e: Exception) {
+            // 如果系统没有能打开该类型文件的应用，可以在这里处理报错
+            e.printStackTrace()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/components.kt b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/components.kt
index 5a34dc4..d9f3b89 100644
--- a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/components.kt
+++ b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/components.kt
@@ -1,30 +1,65 @@
 package com.eggetteluo.folder.ui.features.explorer
 
+import android.text.format.Formatter.formatFileSize
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.AudioFile
+import androidx.compose.material.icons.filled.ChevronRight
 import androidx.compose.material.icons.filled.Description
 import androidx.compose.material.icons.filled.Folder
+import androidx.compose.material.icons.filled.Image
+import androidx.compose.material.icons.filled.PictureAsPdf
+import androidx.compose.material.icons.filled.VideoFile
 import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import com.eggetteluo.folder.model.FileItem
 
 // 组件 1：单个文件行
 @Composable
 fun FileRow(file: FileItem, onClick: () -> Unit) {
+    val (icon, tint) = when {
+        file.isDirectory -> Icons.Default.Folder to Color(0xFFFFCA28) // 橙黄色文件夹
+        file.name.endsWith(".jpg", true) || file.name.endsWith(".png", true) ->
+            Icons.Default.Image to Color(0xFF4CAF50) // 绿色图片
+        file.name.endsWith(".mp4", true) || file.name.endsWith(".mkv", true) ->
+            Icons.Default.VideoFile to Color(0xFF2196F3) // 蓝色视频
+        file.name.endsWith(".mp3", true) || file.name.endsWith(".wav", true) ->
+            Icons.Default.AudioFile to Color(0xFFE91E63) // 粉色音频
+        file.name.endsWith(".pdf", true) ->
+            Icons.Default.PictureAsPdf to Color(0xFFF44336) // 红色 PDF
+        else -> Icons.Default.Description to Color.Gray // 默认灰色文件
+    }
+
     ListItem(
         modifier = Modifier.clickable { onClick() },
-        headlineContent = { Text(file.name) },
+        headlineContent = {
+            Text(
+                text = file.name,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis
+            )
+        },
         leadingContent = {
             Icon(
-                imageVector = if (file.isDirectory) Icons.Default.Folder else Icons.Default.Description,
+                imageVector = icon,
                 contentDescription = null,
-                tint = if (file.isDirectory) Color(0xFFFFCA28) else Color.Gray
+                tint = tint
             )
+        },
+        trailingContent = {
+            if (file.isDirectory) {
+                Icon(
+                    imageVector = Icons.Default.ChevronRight,
+                    contentDescription = "进入",
+                    tint = Color.LightGray
+                )
+            }
         }
     )
 }
diff --git a/app/src/main/res/xml/file_paths.xml b/app/src/main/res/xml/file_paths.xml
new file mode 100644
index 0000000..8248868
--- /dev/null
+++ b/app/src/main/res/xml/file_paths.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths>
+    <external-path name="external_files" path="." />
+</paths>
\ No newline at end of file

From 2285a74f2d6a87f2f9dc40d3e69696612b83a1b4 Mon Sep 17 00:00:00 2001
From: xiaoluo <3428237080@qq.com>
Date: Wed, 31 Dec 2025 15:19:00 +0800
Subject: [PATCH 03/14] =?UTF-8?q?feat:=20=E5=AE=9E=E7=8E=B0=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E8=AF=B7=E6=B1=82=E6=B5=81=E7=A8=8B=E5=92=8C=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=B5=8F=E8=A7=88=E9=A1=B5=20UI=20=E5=A2=9E=E5=BC=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增应用启动时的权限检查和请求逻辑，未授权则显示权限引导页
- 创建 `PermissionScreen` 作为专门的权限请求引导 UI 界面
- 将 `requestStoragePermission` 逻辑抽离到独立的 `util/Permission.kt` 文件中
- 在 `NavGraph` 中根据授权状态决定起始页面是权限页还是登录页
- 为 `ExplorerScreen` 添加 `TopAppBar`，显示当前路径和用户 ID
- 在 `TopAppBar` 上实现返回上一级的功能（非根目录时显示返回按钮）
- 添加刷新、排序等操作的下拉菜单入口
---
 .idea/deploymentTargetSelector.xml            |  4 +-
 .../com/eggetteluo/folder/MainActivity.kt     | 41 ----------
 .../ui/features/explorer/ExplorerScreen.kt    | 78 ++++++++++++++++++-
 .../ui/features/explorer/ExplorerViewModel.kt |  7 +-
 .../folder/ui/features/login/LoginScreen.kt   |  2 +-
 .../features/permission/PermissionScreen.kt   | 68 ++++++++++++++++
 .../folder/ui/navigation/NavGraph.kt          | 20 ++++-
 .../eggetteluo/folder/ui/navigation/Screen.kt |  1 +
 .../com/eggetteluo/folder/util/Permission.kt  | 31 ++++++++
 9 files changed, 203 insertions(+), 49 deletions(-)
 create mode 100644 app/src/main/java/com/eggetteluo/folder/ui/features/permission/PermissionScreen.kt
 create mode 100644 app/src/main/java/com/eggetteluo/folder/util/Permission.kt

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index adcc8ce..5cedc6f 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-12-30T13:56:43.673074Z">
+        <DropdownSelection timestamp="2025-12-31T07:18:05.130510Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=/Users/xiaoluo/.android/avd/Medium_Phone.avd" />
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=97e679eb" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/app/src/main/java/com/eggetteluo/folder/MainActivity.kt b/app/src/main/java/com/eggetteluo/folder/MainActivity.kt
index b4765f6..184baef 100644
--- a/app/src/main/java/com/eggetteluo/folder/MainActivity.kt
+++ b/app/src/main/java/com/eggetteluo/folder/MainActivity.kt
@@ -103,45 +103,4 @@ fun FileRow(file: FileItem, onClick: () -> Unit) {
             )
         }
     )
-}
-
-@Composable
-fun PermissionGuideScreen(onButtonClick: () -> Unit) {
-    Column(
-        modifier = Modifier.fillMaxSize(),
-        verticalArrangement = Arrangement.Center,
-        horizontalAlignment = Alignment.CenterHorizontally
-    ) {
-        Text("需要“所有文件访问权限”才能管理文件")
-        Spacer(modifier = Modifier.height(16.dp))
-        Button(onClick = onButtonClick) {
-            Text("去授权")
-        }
-    }
-}
-
-fun requestStoragePermission(activity: FragmentActivity, onPermissionGranted: () -> Unit) {
-    PermissionX.init(activity)
-        .permissions(Manifest.permission.MANAGE_EXTERNAL_STORAGE) // 请求所有文件访问权限
-        .onExplainRequestReason { scope, deniedList ->
-            scope.showRequestReasonDialog(
-                deniedList,
-                "文件管理器需要访问所有文件以进行管理，请在设置中允许权限",
-                "确定", "取消"
-            )
-        }
-        .onForwardToSettings { scope, deniedList ->
-            scope.showForwardToSettingsDialog(
-                deniedList,
-                "您需要去设置界面手动开启文件访问权限",
-                "去设置", "取消"
-            )
-        }
-        .request { allGranted, _, _ ->
-            if (allGranted) {
-                onPermissionGranted() // 权限获取成功，去刷新文件列表
-            } else {
-                // 处理权限被拒绝的情况，比如弹一个 Toast
-            }
-        }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt
index b3ed01b..ea3915a 100644
--- a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt
+++ b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt
@@ -2,36 +2,54 @@ package com.eggetteluo.folder.ui.features.explorer
 
 import android.app.Activity
 import androidx.activity.compose.BackHandler
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.Add
+import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.lifecycle.viewmodel.compose.viewModel
 import java.io.File
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun ExplorerScreen(userId: String) {
     val viewModel: ExplorerViewModel = viewModel()
     val fileList by viewModel.fileList.collectAsState()
     val currentPath by viewModel.currentPath.collectAsState()
+    val isRoot by remember(currentPath) {
+        derivedStateOf { viewModel.isRoot() }
+    }
 
     val showDialog = remember { mutableStateOf(false) }
     val newFolderName = remember { mutableStateOf("") }
+    var showMenu = remember { mutableStateOf(false) }
 
     val context = LocalContext.current
     val activity = context as? Activity
@@ -51,6 +69,63 @@ fun ExplorerScreen(userId: String) {
     }
 
     Scaffold(
+        modifier = Modifier.fillMaxSize(),
+        topBar = {
+            TopAppBar(
+                title = {
+                    Text(
+                        text = if (isRoot) "我的空间 ($userId)" else currentPath?.name ?: "",
+                        style = MaterialTheme.typography.titleLarge
+                    )
+                },
+                navigationIcon = {
+                    if (!isRoot) {
+                        IconButton(onClick = { viewModel.navigateBack() }) {
+                            Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "返回")
+                        }
+                    }
+                },
+                actions = {
+                    Box(modifier = Modifier.wrapContentSize(Alignment.TopEnd)) {
+                        IconButton(onClick = { showMenu.value = true }) {
+                            Icon(Icons.Default.MoreVert, contentDescription = "更多选项")
+                        }
+
+                        // 下拉菜单组件
+                        DropdownMenu(
+                            expanded = showMenu.value,
+                            onDismissRequest = { showMenu.value = false }
+                        ) {
+                            DropdownMenuItem(
+                                text = { Text("刷新列表") },
+                                onClick = {
+                                    showMenu.value = false
+                                    viewModel.currentPath.value?.let { viewModel.loadFiles(it) }
+                                }
+                            )
+                            DropdownMenuItem(
+                                text = { Text("按名称排序") },
+                                onClick = {
+                                    showMenu.value = false
+                                    // 这里可以调用 viewModel 的排序逻辑
+                                }
+                            )
+                            DropdownMenuItem(
+                                text = { Text("设置") },
+                                onClick = {
+                                    showMenu.value = false
+                                    // 处理设置点击
+                                }
+                            )
+                        }
+                    }
+                },
+                colors = TopAppBarDefaults.topAppBarColors(
+                    containerColor = MaterialTheme.colorScheme.primaryContainer,
+                    titleContentColor = MaterialTheme.colorScheme.onPrimaryContainer
+                )
+            )
+        },
         floatingActionButton = {
             FloatingActionButton(
                 onClick = {
@@ -67,9 +142,6 @@ fun ExplorerScreen(userId: String) {
         Column(
             modifier = Modifier.padding(paddingValues)
         ) {
-            // 使用来自 components.kt 的组件
-            currentPath?.let { PathHeader(it.absolutePath) }
-
             LazyColumn {
                 items(fileList) { file ->
                     FileRow(file = file) {
diff --git a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerViewModel.kt b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerViewModel.kt
index 4a3e482..baf3d9f 100644
--- a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerViewModel.kt
+++ b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerViewModel.kt
@@ -3,6 +3,7 @@ package com.eggetteluo.folder.ui.features.explorer
 import android.content.Context
 import android.content.Intent
 import android.os.Environment
+import android.util.Log
 import android.webkit.MimeTypeMap
 import androidx.core.content.FileProvider
 import androidx.lifecycle.ViewModel
@@ -21,7 +22,6 @@ class ExplorerViewModel : ViewModel() {
     private var userRoot: File? = null
 
     fun initUserSpace(userId: String) {
-        // 这里的路径逻辑可以封装到 data 层
         val root = File("/storage/emulated/0/MyFileManager/$userId")
         if (!root.exists()) root.mkdirs()
 
@@ -29,6 +29,10 @@ class ExplorerViewModel : ViewModel() {
         loadFiles(root)
     }
 
+    fun isRoot(): Boolean {
+        return _currentPath.value?.absolutePath == userRoot?.absolutePath
+    }
+
     fun loadFiles(directory: File) {
         val files = directory.listFiles()?.map {
             FileItem(it.name, it.absolutePath, it.isDirectory, it.length(), it.lastModified())
@@ -87,6 +91,7 @@ class ExplorerViewModel : ViewModel() {
             }
         } catch (e: Exception) {
             e.printStackTrace()
+            Log.d("xiaoluo", "文件创建失败: ${e.message}")
             // 实际开发中建议通过另一个 StateFlow 发送错误消息给 UI
         }
     }
diff --git a/app/src/main/java/com/eggetteluo/folder/ui/features/login/LoginScreen.kt b/app/src/main/java/com/eggetteluo/folder/ui/features/login/LoginScreen.kt
index 0887c13..c548d7e 100644
--- a/app/src/main/java/com/eggetteluo/folder/ui/features/login/LoginScreen.kt
+++ b/app/src/main/java/com/eggetteluo/folder/ui/features/login/LoginScreen.kt
@@ -11,7 +11,7 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 
 @Composable
 fun LoginScreen(
-    onLoginSuccess: (String) -> Unit // 登录成功后的跳转回’调
+    onLoginSuccess: (String) -> Unit
 ) {
     val viewModel: LoginViewModel = viewModel()
     val username by viewModel.usernameInput.collectAsState()
diff --git a/app/src/main/java/com/eggetteluo/folder/ui/features/permission/PermissionScreen.kt b/app/src/main/java/com/eggetteluo/folder/ui/features/permission/PermissionScreen.kt
new file mode 100644
index 0000000..d100eda
--- /dev/null
+++ b/app/src/main/java/com/eggetteluo/folder/ui/features/permission/PermissionScreen.kt
@@ -0,0 +1,68 @@
+package com.eggetteluo.folder.ui.features.permission
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Security
+import androidx.compose.material3.*
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.fragment.app.FragmentActivity
+import com.eggetteluo.folder.util.requestStoragePermission // 导入你的工具函数
+
+@Composable
+fun PermissionScreen(onPermissionGranted: () -> Unit) {
+    // 获取当前的 Activity
+    val context = LocalContext.current
+    val activity = context as? FragmentActivity
+
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(24.dp),
+        verticalArrangement = Arrangement.Center,
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        Icon(
+            imageVector = Icons.Default.Security,
+            contentDescription = null,
+            modifier = Modifier.size(80.dp),
+            tint = MaterialTheme.colorScheme.primary
+        )
+
+        Spacer(modifier = Modifier.height(24.dp))
+
+        Text(
+            text = "需要文件访问权限",
+            style = MaterialTheme.typography.headlineSmall
+        )
+
+        Spacer(modifier = Modifier.height(8.dp))
+
+        Text(
+            text = "为了实现多用户文件隔离管理，我们需要“所有文件访问权限”。请在设置中勾选允许访问。",
+            style = MaterialTheme.typography.bodyMedium,
+            textAlign = TextAlign.Center,
+            color = MaterialTheme.colorScheme.onSurfaceVariant
+        )
+
+        Spacer(modifier = Modifier.height(32.dp))
+
+        Button(
+            onClick = {
+                // 调用你 util 包里的函数
+                activity?.let {
+                    requestStoragePermission(it) {
+                        onPermissionGranted() // 授权成功后的回调
+                    }
+                }
+            },
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            Text("立即去授权")
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/eggetteluo/folder/ui/navigation/NavGraph.kt b/app/src/main/java/com/eggetteluo/folder/ui/navigation/NavGraph.kt
index 365b584..83bbb77 100644
--- a/app/src/main/java/com/eggetteluo/folder/ui/navigation/NavGraph.kt
+++ b/app/src/main/java/com/eggetteluo/folder/ui/navigation/NavGraph.kt
@@ -1,18 +1,36 @@
 package com.eggetteluo.folder.ui.navigation
 
+import android.os.Environment
 import androidx.compose.runtime.Composable
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import com.eggetteluo.folder.ui.features.explorer.ExplorerScreen
 import com.eggetteluo.folder.ui.features.login.LoginScreen
+import com.eggetteluo.folder.ui.features.permission.PermissionScreen
+import com.eggetteluo.folder.util.requestStoragePermission
 
 @Composable
 fun AppNavGraph(navController: NavHostController) {
+    val startDest = if (Environment.isExternalStorageManager()) {
+        Screen.Login.route
+    } else {
+        Screen.Permission.route
+    }
+
     NavHost(
         navController = navController,
-        startDestination = Screen.Login.route
+        startDestination = startDest
     ) {
+        // 权限页
+        composable(Screen.Permission.route) {
+            PermissionScreen(onPermissionGranted = {
+                navController.navigate(Screen.Login.route) {
+                    popUpTo(Screen.Permission.route) { inclusive = true }
+                }
+            })
+        }
+
         // 登录页面路由
         composable(Screen.Login.route) {
             LoginScreen(
diff --git a/app/src/main/java/com/eggetteluo/folder/ui/navigation/Screen.kt b/app/src/main/java/com/eggetteluo/folder/ui/navigation/Screen.kt
index 26ce2c2..971edde 100644
--- a/app/src/main/java/com/eggetteluo/folder/ui/navigation/Screen.kt
+++ b/app/src/main/java/com/eggetteluo/folder/ui/navigation/Screen.kt
@@ -1,6 +1,7 @@
 package com.eggetteluo.folder.ui.navigation
 
 sealed class Screen(val route: String) {
+    object Permission : Screen("permission")
     object Login : Screen("login")
     object Explorer : Screen("explorer/{userId}") {
         fun createRoute(userId: String) = "explorer/$userId"
diff --git a/app/src/main/java/com/eggetteluo/folder/util/Permission.kt b/app/src/main/java/com/eggetteluo/folder/util/Permission.kt
new file mode 100644
index 0000000..450b882
--- /dev/null
+++ b/app/src/main/java/com/eggetteluo/folder/util/Permission.kt
@@ -0,0 +1,31 @@
+package com.eggetteluo.folder.util
+
+import android.Manifest
+import androidx.fragment.app.FragmentActivity
+import com.permissionx.guolindev.PermissionX
+
+fun requestStoragePermission(activity: FragmentActivity, onPermissionGranted: () -> Unit) {
+    PermissionX.init(activity)
+        .permissions(Manifest.permission.MANAGE_EXTERNAL_STORAGE) // 请求所有文件访问权限
+        .onExplainRequestReason { scope, deniedList ->
+            scope.showRequestReasonDialog(
+                deniedList,
+                "文件管理器需要访问所有文件以进行管理，请在设置中允许权限",
+                "确定", "取消"
+            )
+        }
+        .onForwardToSettings { scope, deniedList ->
+            scope.showForwardToSettingsDialog(
+                deniedList,
+                "您需要去设置界面手动开启文件访问权限",
+                "去设置", "取消"
+            )
+        }
+        .request { allGranted, _, _ ->
+            if (allGranted) {
+                onPermissionGranted() // 权限获取成功，去刷新文件列表
+            } else {
+                // 处理权限被拒绝的情况，比如弹一个 Toast
+            }
+        }
+}
\ No newline at end of file

From 59ad5e04cf3ced979ebfb61fe91ca95eb0d54543 Mon Sep 17 00:00:00 2001
From: xiaoluo <3428237080@qq.com>
Date: Wed, 31 Dec 2025 15:33:07 +0800
Subject: [PATCH 04/14] =?UTF-8?q?refactor:=20=E6=8F=90=E5=8F=96=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=B5=8F=E8=A7=88=E9=A1=B5=E4=B8=BA=E7=8B=AC=E7=AB=8B?=
 =?UTF-8?q?=20`Screen`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将 `FileExplorerScreen` 和 `FileRow` 相关的 Composable 函数从 `MainActivity` 中移除
- 在 `MainActivity` 中设置 `Scaffold` 作为应用根布局，并集成 `AppNavGraph` 来处理页面导航
---
 .../com/eggetteluo/folder/MainActivity.kt     | 80 +------------------
 1 file changed, 3 insertions(+), 77 deletions(-)

diff --git a/app/src/main/java/com/eggetteluo/folder/MainActivity.kt b/app/src/main/java/com/eggetteluo/folder/MainActivity.kt
index 184baef..20b592d 100644
--- a/app/src/main/java/com/eggetteluo/folder/MainActivity.kt
+++ b/app/src/main/java/com/eggetteluo/folder/MainActivity.kt
@@ -1,33 +1,16 @@
 package com.eggetteluo.folder
 
-import android.Manifest
 import android.os.Bundle
-import android.os.Environment
-import androidx.activity.compose.BackHandler
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-import androidx.activity.viewModels
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Description
-import androidx.compose.material.icons.filled.Folder
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Scaffold
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.unit.dp
 import androidx.fragment.app.FragmentActivity
 import androidx.navigation.compose.rememberNavController
-import com.eggetteluo.folder.model.FileItem
 import com.eggetteluo.folder.ui.navigation.AppNavGraph
 import com.eggetteluo.folder.ui.theme.FolderTheme
-import com.eggetteluo.folder.viewModel.FileViewModel
-import com.permissionx.guolindev.PermissionX
-import java.io.File
 
 class MainActivity : FragmentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -46,61 +29,4 @@ class MainActivity : FragmentActivity() {
             }
         }
     }
-}
-
-@Composable
-fun FileExplorerScreen(viewModel: FileViewModel) {
-    val fileList by viewModel.fileList.collectAsState()
-    val currentPath by viewModel.currentPath.collectAsState()
-
-    // 处理安卓物理返回键：如果不在根目录，点击返回键则跳回上一级
-    BackHandler(enabled = currentPath.absolutePath != Environment.getExternalStorageDirectory().absolutePath) {
-        viewModel.navigateBack()
-    }
-
-    Column {
-        Surface(tonalElevation = 4.dp, modifier = Modifier.fillMaxWidth()) {
-            Text(
-                text = "当前路径: ${currentPath.absolutePath}",
-                modifier = Modifier.padding(16.dp),
-                style = MaterialTheme.typography.labelSmall
-            )
-        }
-
-        if (fileList.isEmpty()) {
-            Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
-                Text("文件夹为空", color = Color.Gray)
-            }
-        } else {
-            LazyColumn {
-                items(fileList) { file ->
-                    FileRow(file) {
-                        if (file.isDirectory) {
-                            viewModel.loadFiles(File(file.path))
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-@Composable
-fun FileRow(file: FileItem, onClick: () -> Unit) {
-    ListItem(
-        modifier = Modifier.clickable { onClick() },
-        headlineContent = { Text(file.name) },
-        supportingContent = {
-            if (!file.isDirectory) {
-                Text("${file.size / 1024} KB")
-            }
-        },
-        leadingContent = {
-            Icon(
-                imageVector = if (file.isDirectory) Icons.Default.Folder else Icons.Default.Description,
-                contentDescription = null,
-                tint = if (file.isDirectory) Color(0xFFFFCA28) else Color.Gray
-            )
-        }
-    )
 }
\ No newline at end of file

From 5c0cfe7b313c0e6975837a85c44a9940b107362a Mon Sep 17 00:00:00 2001
From: xiaoluo <3428237080@qq.com>
Date: Wed, 31 Dec 2025 15:51:33 +0800
Subject: [PATCH 05/14] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=B5=8F=E8=A7=88=E5=99=A8=20UI=20=E4=BB=A5=E9=80=82?=
 =?UTF-8?q?=E5=BA=94=20Scaffold=20=E8=BE=B9=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将 `Scaffold` 的 `PaddingValues` 从 `MainActivity` 传递到 `ExplorerScreen`。
- 在 `ExplorerScreen` 中，将 `TopAppBar` 的 `windowInsets` 设置为默认值，避免与系统 UI 重叠。
- 为 `LazyColumn` 设置底部 `padding`，以确保列表底部内容不会被系统导航栏遮挡。
---
 .../main/java/com/eggetteluo/folder/MainActivity.kt |  4 +---
 .../folder/ui/features/explorer/ExplorerScreen.kt   | 10 ++++++++--
 .../com/eggetteluo/folder/ui/navigation/NavGraph.kt | 13 +++++++++----
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/eggetteluo/folder/MainActivity.kt b/app/src/main/java/com/eggetteluo/folder/MainActivity.kt
index 20b592d..6485e74 100644
--- a/app/src/main/java/com/eggetteluo/folder/MainActivity.kt
+++ b/app/src/main/java/com/eggetteluo/folder/MainActivity.kt
@@ -21,9 +21,7 @@ class MainActivity : FragmentActivity() {
                 FolderTheme {
                     val navController = rememberNavController()
                     Scaffold { innerPadding ->
-                        Box(modifier = Modifier.padding(innerPadding)) {
-                            AppNavGraph(navController = navController)
-                        }
+                        AppNavGraph(navController = navController, contentPadding = innerPadding)
                     }
                 }
             }
diff --git a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt
index ea3915a..1e976b0 100644
--- a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt
+++ b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt
@@ -4,6 +4,7 @@ import android.app.Activity
 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -39,7 +40,7 @@ import java.io.File
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun ExplorerScreen(userId: String) {
+fun ExplorerScreen(userId: String, contentPadding: PaddingValues) {
     val viewModel: ExplorerViewModel = viewModel()
     val fileList by viewModel.fileList.collectAsState()
     val currentPath by viewModel.currentPath.collectAsState()
@@ -78,6 +79,7 @@ fun ExplorerScreen(userId: String) {
                         style = MaterialTheme.typography.titleLarge
                     )
                 },
+                windowInsets = TopAppBarDefaults.windowInsets,
                 navigationIcon = {
                     if (!isRoot) {
                         IconButton(onClick = { viewModel.navigateBack() }) {
@@ -142,7 +144,11 @@ fun ExplorerScreen(userId: String) {
         Column(
             modifier = Modifier.padding(paddingValues)
         ) {
-            LazyColumn {
+            LazyColumn(
+                contentPadding = PaddingValues(
+                    bottom = paddingValues.calculateBottomPadding()
+                )
+            ) {
                 items(fileList) { file ->
                     FileRow(file = file) {
                         if (file.isDirectory) {
diff --git a/app/src/main/java/com/eggetteluo/folder/ui/navigation/NavGraph.kt b/app/src/main/java/com/eggetteluo/folder/ui/navigation/NavGraph.kt
index 83bbb77..72313e2 100644
--- a/app/src/main/java/com/eggetteluo/folder/ui/navigation/NavGraph.kt
+++ b/app/src/main/java/com/eggetteluo/folder/ui/navigation/NavGraph.kt
@@ -1,6 +1,7 @@
 package com.eggetteluo.folder.ui.navigation
 
 import android.os.Environment
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.runtime.Composable
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
@@ -8,10 +9,12 @@ import androidx.navigation.compose.composable
 import com.eggetteluo.folder.ui.features.explorer.ExplorerScreen
 import com.eggetteluo.folder.ui.features.login.LoginScreen
 import com.eggetteluo.folder.ui.features.permission.PermissionScreen
-import com.eggetteluo.folder.util.requestStoragePermission
 
 @Composable
-fun AppNavGraph(navController: NavHostController) {
+fun AppNavGraph(
+    navController: NavHostController,
+    contentPadding: PaddingValues
+) {
     val startDest = if (Environment.isExternalStorageManager()) {
         Screen.Login.route
     } else {
@@ -45,8 +48,10 @@ fun AppNavGraph(navController: NavHostController) {
         // 文件管理页面路由
         composable(Screen.Explorer.route) { backStackEntry ->
             val userId = backStackEntry.arguments?.getString("userId") ?: ""
-            // 这里建议在 features/explorer 下创建专门的页面入口
-            ExplorerScreen(userId = userId)
+            ExplorerScreen(
+                userId = userId,
+                contentPadding = contentPadding
+            )
         }
     }
 }
\ No newline at end of file

From 360f1206771cc184cad9a81bd380b47412e3c21b Mon Sep 17 00:00:00 2001
From: xiaoluo <3428237080@qq.com>
Date: Wed, 31 Dec 2025 15:52:27 +0800
Subject: [PATCH 06/14] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20ExplorerScree?=
 =?UTF-8?q?n=20=E4=B8=AD=20LazyColumn=20=E7=9A=84=20contentPadding?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将 `LazyColumn` 的 `contentPadding` 从使用错误的 `paddingValues` 修正为 `contentPadding`
---
 .../eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt
index 1e976b0..bae9675 100644
--- a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt
+++ b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt
@@ -146,7 +146,7 @@ fun ExplorerScreen(userId: String, contentPadding: PaddingValues) {
         ) {
             LazyColumn(
                 contentPadding = PaddingValues(
-                    bottom = paddingValues.calculateBottomPadding()
+                    bottom = contentPadding.calculateBottomPadding()
                 )
             ) {
                 items(fileList) { file ->

From c2a944141b9f44c4d501dec473a3f3a189b43be3 Mon Sep 17 00:00:00 2001
From: xiaoluo <3428237080@qq.com>
Date: Wed, 31 Dec 2025 16:32:01 +0800
Subject: [PATCH 07/14] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=8A=A0=E8=BD=BD=E4=B8=8EUI=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除旧的 `FileViewModel`，统一使用 `ExplorerViewModel`
- `ExplorerViewModel` 文件加载移至 IO 线程，避免阻塞主线程
- 增强 `FileItem` 模型，增加创建时间、权限、后缀名等属性
- 在 Android O 以上版本中，尝试读取文件的真实创建时间
- 简化并清理 `MainActivity` 和 `NavGraph`，移除不再需要的 `PaddingValues` 传递

feat: 增强文件列表 UI 表现力

- 重新设计 `FileRow`，展示更丰富的文件信息（图标、名称、日期、大小或项数）
- 新增 `util/Format.kt`，提供文件日期、大小和文件夹项数格式化的工具函数
- 实现 `getFileTheme` 函数，根据文件后缀名为不同类型文件匹配专属的彩色图标
- 扩大了文件类型的图标覆盖范围（如：代码、压缩包、APK、电子书等）
---
 .../com/eggetteluo/folder/MainActivity.kt     |   9 +-
 .../com/eggetteluo/folder/model/FileItem.kt   |  17 ++-
 .../ui/features/explorer/ExplorerScreen.kt    |  20 +--
 .../ui/features/explorer/ExplorerViewModel.kt |  62 ++++++---
 .../folder/ui/features/explorer/components.kt | 124 +++++++++++++-----
 .../folder/ui/navigation/NavGraph.kt          |  11 +-
 .../java/com/eggetteluo/folder/util/Format.kt |  28 ++++
 .../folder/viewModel/FileViewModel.kt         |  61 ---------
 8 files changed, 190 insertions(+), 142 deletions(-)
 create mode 100644 app/src/main/java/com/eggetteluo/folder/util/Format.kt
 delete mode 100644 app/src/main/java/com/eggetteluo/folder/viewModel/FileViewModel.kt

diff --git a/app/src/main/java/com/eggetteluo/folder/MainActivity.kt b/app/src/main/java/com/eggetteluo/folder/MainActivity.kt
index 6485e74..f83dfec 100644
--- a/app/src/main/java/com/eggetteluo/folder/MainActivity.kt
+++ b/app/src/main/java/com/eggetteluo/folder/MainActivity.kt
@@ -4,8 +4,7 @@ import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Scaffold
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.ui.Modifier
 import androidx.fragment.app.FragmentActivity
 import androidx.navigation.compose.rememberNavController
@@ -20,8 +19,10 @@ class MainActivity : FragmentActivity() {
             FolderTheme {
                 FolderTheme {
                     val navController = rememberNavController()
-                    Scaffold { innerPadding ->
-                        AppNavGraph(navController = navController, contentPadding = innerPadding)
+                    Box(
+                        modifier = Modifier.fillMaxSize()
+                    ) {
+                        AppNavGraph(navController = navController)
                     }
                 }
             }
diff --git a/app/src/main/java/com/eggetteluo/folder/model/FileItem.kt b/app/src/main/java/com/eggetteluo/folder/model/FileItem.kt
index 3a59e09..0df10e2 100644
--- a/app/src/main/java/com/eggetteluo/folder/model/FileItem.kt
+++ b/app/src/main/java/com/eggetteluo/folder/model/FileItem.kt
@@ -1,9 +1,14 @@
 package com.eggetteluo.folder.model
 
 data class FileItem(
-    val name: String,
-    val path: String,
-    val isDirectory: Boolean,
-    val size: Long,
-    val lastModified: Long
-)
+    val name: String,           // 文件名
+    val path: String,           // 文件的真实物理绝对路径
+    val isDirectory: Boolean,    // 是否为文件夹
+    val size: Long,              // 文件大小 (字节)
+    val lastModified: Long,      // 最后修改时间戳
+    val createdAt: Long = 0L,    // 创建时间
+    val canRead: Boolean,        // 是否可读
+    val canWrite: Boolean,       // 是否可写
+    val isHidden: Boolean,       // 是否是隐藏文件
+    val extension: String = ""   // 后缀名 (如 "jpg", "pdf")
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt
index bae9675..d91dfbc 100644
--- a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt
+++ b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt
@@ -4,7 +4,6 @@ import android.app.Activity
 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -14,7 +13,6 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.DropdownMenu
@@ -30,7 +28,13 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -40,7 +44,7 @@ import java.io.File
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun ExplorerScreen(userId: String, contentPadding: PaddingValues) {
+fun ExplorerScreen(userId: String) {
     val viewModel: ExplorerViewModel = viewModel()
     val fileList by viewModel.fileList.collectAsState()
     val currentPath by viewModel.currentPath.collectAsState()
@@ -50,7 +54,7 @@ fun ExplorerScreen(userId: String, contentPadding: PaddingValues) {
 
     val showDialog = remember { mutableStateOf(false) }
     val newFolderName = remember { mutableStateOf("") }
-    var showMenu = remember { mutableStateOf(false) }
+    val showMenu = remember { mutableStateOf(false) }
 
     val context = LocalContext.current
     val activity = context as? Activity
@@ -144,11 +148,7 @@ fun ExplorerScreen(userId: String, contentPadding: PaddingValues) {
         Column(
             modifier = Modifier.padding(paddingValues)
         ) {
-            LazyColumn(
-                contentPadding = PaddingValues(
-                    bottom = contentPadding.calculateBottomPadding()
-                )
-            ) {
+            LazyColumn {
                 items(fileList) { file ->
                     FileRow(file = file) {
                         if (file.isDirectory) {
diff --git a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerViewModel.kt b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerViewModel.kt
index baf3d9f..b119e36 100644
--- a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerViewModel.kt
+++ b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerViewModel.kt
@@ -2,15 +2,22 @@ package com.eggetteluo.folder.ui.features.explorer
 
 import android.content.Context
 import android.content.Intent
-import android.os.Environment
+import android.os.Build
 import android.util.Log
 import android.webkit.MimeTypeMap
 import androidx.core.content.FileProvider
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import com.eggetteluo.folder.model.FileItem
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import java.io.File
+import java.nio.file.Files
+import java.nio.file.Paths
+import java.nio.file.attribute.BasicFileAttributes
 
 class ExplorerViewModel : ViewModel() {
     private val _fileList = MutableStateFlow<List<FileItem>>(emptyList())
@@ -33,16 +40,42 @@ class ExplorerViewModel : ViewModel() {
         return _currentPath.value?.absolutePath == userRoot?.absolutePath
     }
 
+    // 在 ExplorerViewModel.kt 中
     fun loadFiles(directory: File) {
-        val files = directory.listFiles()?.map {
-            FileItem(it.name, it.absolutePath, it.isDirectory, it.length(), it.lastModified())
-        }?.sortedWith(
-            compareByDescending<FileItem> { it.isDirectory } // 文件夹(true)排在文件(false)前面
-                .thenBy { it.name.lowercase() }              // 然后按名称不区分大小写排序
-        ) ?: emptyList()
-
-        _fileList.value = files
-        _currentPath.value = directory
+        viewModelScope.launch(Dispatchers.IO) {
+            val files = directory.listFiles()?.map { file ->
+                // 获取创建时间
+                val creationTime = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    try {
+                        val path = Paths.get(file.absolutePath)
+                        val attributes = Files.readAttributes(path, BasicFileAttributes::class.java)
+                        attributes.creationTime().toMillis()
+                    } catch (e: Exception) {
+                        file.lastModified() // 如果读取失败，回退到最后修改时间
+                    }
+                } else {
+                    file.lastModified() // 低版本 Android 不支持，默认用最后修改时间
+                }
+
+                FileItem(
+                    name = file.name,
+                    path = file.absolutePath,
+                    isDirectory = file.isDirectory,
+                    size = if (file.isDirectory) 0L else file.length(),
+                    lastModified = file.lastModified(),
+                    createdAt = creationTime,
+                    canRead = file.canRead(),
+                    canWrite = file.canWrite(),
+                    isHidden = file.isHidden,
+                    extension = file.extension
+                )
+            }?.sortedWith(compareBy({ !it.isDirectory }, { it.name.lowercase() })) ?: emptyList()
+
+            withContext(Dispatchers.Main) {
+                _fileList.value = files
+                _currentPath.value = directory
+            }
+        }
     }
 
     fun navigateBack(): Boolean {
@@ -100,20 +133,13 @@ class ExplorerViewModel : ViewModel() {
         val file = File(fileItem.path)
         if (!file.exists()) return
 
-        // 1. 获取文件的扩展名
-        val extension = MimeTypeMap.getFileExtensionFromUrl(file.absolutePath)
-        // 2. 根据扩展名获取 MIME 类型（例如 .txt -> text/plain）
-        val type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension.lowercase())
-
-        // 3. 使用 FileProvider 生成安全的 URI
-        // 注意：这里的 "${context.packageName}.fileprovider" 必须与 Manifest 中一致
+        val type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(file.extension)
         val uri = FileProvider.getUriForFile(
             context,
             "${context.packageName}.fileprovider",
             file
         )
 
-        // 4. 创建并启动 Intent
         val intent = Intent(Intent.ACTION_VIEW).apply {
             setDataAndType(uri, type)
             addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) // 授予临时读取权限
diff --git a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/components.kt b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/components.kt
index d9f3b89..1b8586c 100644
--- a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/components.kt
+++ b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/components.kt
@@ -1,79 +1,135 @@
 package com.eggetteluo.folder.ui.features.explorer
 
-import android.text.format.Formatter.formatFileSize
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Android
+import androidx.compose.material.icons.filled.Article
 import androidx.compose.material.icons.filled.AudioFile
+import androidx.compose.material.icons.filled.AutoStories
 import androidx.compose.material.icons.filled.ChevronRight
+import androidx.compose.material.icons.filled.Code
 import androidx.compose.material.icons.filled.Description
 import androidx.compose.material.icons.filled.Folder
 import androidx.compose.material.icons.filled.Image
+import androidx.compose.material.icons.filled.Inventory2
 import androidx.compose.material.icons.filled.PictureAsPdf
+import androidx.compose.material.icons.filled.TableChart
 import androidx.compose.material.icons.filled.VideoFile
-import androidx.compose.material3.*
+import androidx.compose.material3.Icon
+import androidx.compose.material3.ListItem
+import androidx.compose.material3.MaterialTheme
+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.graphics.vector.ImageVector
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import com.eggetteluo.folder.model.FileItem
+import com.eggetteluo.folder.util.formatFileDate
+import com.eggetteluo.folder.util.formatFileSize
+import com.eggetteluo.folder.util.getFolderItemCount
 
 // 组件 1：单个文件行
 @Composable
 fun FileRow(file: FileItem, onClick: () -> Unit) {
-    val (icon, tint) = when {
-        file.isDirectory -> Icons.Default.Folder to Color(0xFFFFCA28) // 橙黄色文件夹
-        file.name.endsWith(".jpg", true) || file.name.endsWith(".png", true) ->
-            Icons.Default.Image to Color(0xFF4CAF50) // 绿色图片
-        file.name.endsWith(".mp4", true) || file.name.endsWith(".mkv", true) ->
-            Icons.Default.VideoFile to Color(0xFF2196F3) // 蓝色视频
-        file.name.endsWith(".mp3", true) || file.name.endsWith(".wav", true) ->
-            Icons.Default.AudioFile to Color(0xFFE91E63) // 粉色音频
-        file.name.endsWith(".pdf", true) ->
-            Icons.Default.PictureAsPdf to Color(0xFFF44336) // 红色 PDF
-        else -> Icons.Default.Description to Color.Gray // 默认灰色文件
-    }
+    val theme = getFileTheme(file)
 
     ListItem(
         modifier = Modifier.clickable { onClick() },
+        leadingContent = {
+            Icon(
+                imageVector = theme.icon,
+                contentDescription = null,
+                tint = theme.color,
+                modifier = Modifier.size(40.dp)
+            )
+        },
         headlineContent = {
             Text(
                 text = file.name,
+                style = MaterialTheme.typography.titleMedium,
                 maxLines = 1,
                 overflow = TextOverflow.Ellipsis
             )
         },
-        leadingContent = {
-            Icon(
-                imageVector = icon,
-                contentDescription = null,
-                tint = tint
+        supportingContent = {
+            // 拼接辅助信息：日期 | (项数 或 大小)
+            val dateStr = formatFileDate(file.createdAt)
+            val extraInfo = if (file.isDirectory) {
+                "${getFolderItemCount(file.path)}项"
+            } else {
+                formatFileSize(file.size)
+            }
+
+            Text(
+                text = "$dateStr  |  $extraInfo",
+                style = MaterialTheme.typography.bodySmall,
+                color = Color.Gray
             )
         },
         trailingContent = {
             if (file.isDirectory) {
                 Icon(
                     imageVector = Icons.Default.ChevronRight,
-                    contentDescription = "进入",
-                    tint = Color.LightGray
+                    contentDescription = null,
+                    tint = Color(0xFFD1D1D1),
+                    modifier = Modifier.size(20.dp)
                 )
             }
         }
     )
 }
 
-// 组件 2：顶部路径面包屑（可选）
-@Composable
-fun PathHeader(path: String) {
-    Surface(tonalElevation = 4.dp) {
-        Text(
-            text = path,
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(16.dp),
-            style = MaterialTheme.typography.labelSmall
-        )
+// 定义一个数据类来存放结果
+data class FileIconTheme(val icon: ImageVector, val color: Color)
+
+fun getFileTheme(file: FileItem): FileIconTheme {
+    val ext = file.extension.lowercase()
+    return when {
+        file.isDirectory -> FileIconTheme(Icons.Default.Folder, Color(0xFFFFCA28))
+
+        // 图片
+        ext in listOf("jpg", "jpeg", "png", "webp", "gif") ->
+            FileIconTheme(Icons.Default.Image, Color(0xFF4CAF50))
+
+        // 视频
+        ext in listOf("mp4", "mkv", "avi", "mov") ->
+            FileIconTheme(Icons.Default.VideoFile, Color(0xFF2196F3))
+
+        // 音频
+        ext in listOf("mp3", "wav", "flac", "m4a", "ogg") ->
+            FileIconTheme(Icons.Default.AudioFile, Color(0xFFE91E63))
+
+        // PDF
+        ext == "pdf" ->
+            FileIconTheme(Icons.Default.PictureAsPdf, Color(0xFFF44336))
+
+        // Android 安装包
+        ext == "apk" ->
+            FileIconTheme(Icons.Default.Android, Color(0xFF3DDC84))
+
+        // 压缩包
+        ext in listOf("zip", "rar", "7z", "tar", "gz") ->
+            FileIconTheme(Icons.Default.Inventory2, Color(0xFFFB8C00))
+
+        // 代码/网页文件
+        ext in listOf("html", "xml", "js", "json", "php", "py", "cpp", "kt") ->
+            FileIconTheme(Icons.Default.Code, Color(0xFF00BCD4))
+
+        // 电子书/表格 (区分纯文本)
+        ext in listOf("epub", "mobi") ->
+            FileIconTheme(Icons.Default.AutoStories, Color(0xFF795548))
+
+        // 表格
+        ext in listOf("xls", "xlsx", "csv") ->
+            FileIconTheme(Icons.Default.TableChart, Color(0xFF2E7D32))
+
+        // 文档
+        ext in listOf("txt", "doc", "docx", "md") ->
+            FileIconTheme(Icons.Default.Article, Color(0xFF9C27B0))
+
+        else -> FileIconTheme(Icons.Default.Description, Color.Gray)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/eggetteluo/folder/ui/navigation/NavGraph.kt b/app/src/main/java/com/eggetteluo/folder/ui/navigation/NavGraph.kt
index 72313e2..851f645 100644
--- a/app/src/main/java/com/eggetteluo/folder/ui/navigation/NavGraph.kt
+++ b/app/src/main/java/com/eggetteluo/folder/ui/navigation/NavGraph.kt
@@ -1,7 +1,6 @@
 package com.eggetteluo.folder.ui.navigation
 
 import android.os.Environment
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.runtime.Composable
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
@@ -11,10 +10,7 @@ import com.eggetteluo.folder.ui.features.login.LoginScreen
 import com.eggetteluo.folder.ui.features.permission.PermissionScreen
 
 @Composable
-fun AppNavGraph(
-    navController: NavHostController,
-    contentPadding: PaddingValues
-) {
+fun AppNavGraph(navController: NavHostController) {
     val startDest = if (Environment.isExternalStorageManager()) {
         Screen.Login.route
     } else {
@@ -48,10 +44,7 @@ fun AppNavGraph(
         // 文件管理页面路由
         composable(Screen.Explorer.route) { backStackEntry ->
             val userId = backStackEntry.arguments?.getString("userId") ?: ""
-            ExplorerScreen(
-                userId = userId,
-                contentPadding = contentPadding
-            )
+            ExplorerScreen(userId = userId)
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/eggetteluo/folder/util/Format.kt b/app/src/main/java/com/eggetteluo/folder/util/Format.kt
new file mode 100644
index 0000000..5c8285d
--- /dev/null
+++ b/app/src/main/java/com/eggetteluo/folder/util/Format.kt
@@ -0,0 +1,28 @@
+package com.eggetteluo.folder.util
+
+import java.io.File
+import java.text.DecimalFormat
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+import kotlin.math.log10
+import kotlin.math.pow
+
+// 格式化时间戳为 2025/05/03 格式
+fun formatFileDate(timestamp: Long): String {
+    val sdf = SimpleDateFormat("yyyy/MM/dd", Locale.getDefault())
+    return sdf.format(Date(timestamp))
+}
+
+// 格式化大小 (B, KB, MB...)
+fun formatFileSize(size: Long): String {
+    if (size <= 0) return "0 B"
+    val units = arrayOf("B", "KB", "MB", "GB", "TB")
+    val digitGroups = (log10(size.toDouble()) / log10(1024.0)).toInt()
+    return DecimalFormat("#,##0.#").format(size / 1024.0.pow(digitGroups.toDouble())) + " " + units[digitGroups]
+}
+
+// 获取文件夹下的项数（仅对文件夹有效）
+fun getFolderItemCount(path: String): Int {
+    return File(path).listFiles()?.size ?: 0
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/eggetteluo/folder/viewModel/FileViewModel.kt b/app/src/main/java/com/eggetteluo/folder/viewModel/FileViewModel.kt
deleted file mode 100644
index 0b66cb5..0000000
--- a/app/src/main/java/com/eggetteluo/folder/viewModel/FileViewModel.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.eggetteluo.folder.viewModel
-
-import android.os.Environment
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.eggetteluo.folder.model.FileItem
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.launch
-import java.io.File
-
-class FileViewModel : ViewModel() {
-    private val _hasPermission = MutableStateFlow(Environment.isExternalStorageManager())
-    val hasPermission: StateFlow<Boolean> = _hasPermission
-
-    private val _fileList = MutableStateFlow<List<FileItem>>(emptyList())
-    val fileList: StateFlow<List<FileItem>> = _fileList
-
-    private val _currentPath = MutableStateFlow(Environment.getExternalStorageDirectory())
-    val currentPath: StateFlow<File> = _currentPath
-
-    init {
-        if (_hasPermission.value) {
-            loadFiles(_currentPath.value)
-        }
-    }
-
-    fun onPermissionGranted() {
-        _hasPermission.value = true
-        loadFiles(_currentPath.value)
-    }
-
-    fun loadFiles(directory: File) {
-        viewModelScope.launch {
-            if (directory.isDirectory && directory.canRead()) {
-                val files = directory.listFiles()?.map {
-                    FileItem(
-                        name = it.name,
-                        path = it.absolutePath,
-                        isDirectory = it.isDirectory,
-                        size = it.length(),
-                        lastModified = it.lastModified()
-                    )
-                }?.sortedWith(compareBy({ !it.isDirectory }, { it.name.lowercase() })) ?: emptyList()
-
-                _fileList.value = files
-                _currentPath.value = directory
-            }
-        }
-    }
-
-    fun navigateBack(): Boolean {
-        val parent = _currentPath.value.parentFile
-        // 限制不能回退到根目录之外
-        if (parent != null && parent.absolutePath.startsWith(Environment.getExternalStorageDirectory().absolutePath)) {
-            loadFiles(parent)
-            return true
-        }
-        return false
-    }
-}
\ No newline at end of file

From 884a23671ab5b463fbb6acf575333f6f48a6579d Mon Sep 17 00:00:00 2001
From: xiaoluo <3428237080@qq.com>
Date: Wed, 31 Dec 2025 16:35:19 +0800
Subject: [PATCH 08/14] =?UTF-8?q?feat:=20=E7=A9=BA=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=A4=B9=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在文件浏览页增加空状态 UI
- 当文件夹内容为空时，居中显示 "文件夹为空" 的提示文本
---
 .../ui/features/explorer/ExplorerScreen.kt    | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt
index d91dfbc..3562373 100644
--- a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt
+++ b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt
@@ -148,15 +148,21 @@ fun ExplorerScreen(userId: String) {
         Column(
             modifier = Modifier.padding(paddingValues)
         ) {
-            LazyColumn {
-                items(fileList) { file ->
-                    FileRow(file = file) {
-                        if (file.isDirectory) {
-                            // 如果是文件夹，加载内容
-                            viewModel.loadFiles(File(file.path))
-                        } else {
-                            // 如果是文件，尝试打开
-                            viewModel.openFile(context, file)
+            if (fileList.isEmpty()) {
+                Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+                    Text("文件夹为空", color = Color.Gray)
+                }
+            } else {
+                LazyColumn {
+                    items(fileList) { file ->
+                        FileRow(file = file) {
+                            if (file.isDirectory) {
+                                // 如果是文件夹，加载内容
+                                viewModel.loadFiles(File(file.path))
+                            } else {
+                                // 如果是文件，尝试打开
+                                viewModel.openFile(context, file)
+                            }
                         }
                     }
                 }

From ab174954374e6813d554f4c8692dbbce6f2ebbc1 Mon Sep 17 00:00:00 2001
From: xiaoluo <3428237080@qq.com>
Date: Wed, 31 Dec 2025 18:01:10 +0800
Subject: [PATCH 09/14] =?UTF-8?q?feat:=20=E6=96=87=E4=BB=B6=E9=95=BF?=
 =?UTF-8?q?=E6=8C=89=E6=93=8D=E4=BD=9C=E4=B8=8E=E5=BA=95=E9=83=A8=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 为文件列表项 `FileRow` 添加长按事件, 用于选中文件
- 文件被长按选中后, 底部会弹出 `BottomAppBar` 操作栏, 同时隐藏新建文件夹的 `FloatingActionButton`
- 在底部工具栏中添加删除、详情、移动、复制、重命名和取消等操作的占位图标按钮
- 将 `FileRow` 的 `clickable` 修改为 `combinedClickable`, 以同时支持单击和长按
- 新增 `ActionIconButton` 可复用组件, 用于构建底部工具栏中的带标签的图标按钮
---
 .../ui/features/explorer/ExplorerScreen.kt    | 83 +++++++++++++++----
 .../folder/ui/features/explorer/components.kt | 34 +++++++-
 2 files changed, 97 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt
index 3562373..3ea6c47 100644
--- a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt
+++ b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt
@@ -12,9 +12,17 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.DriveFileMove
 import androidx.compose.material.icons.filled.Add
+import androidx.compose.material.icons.filled.Cancel
+import androidx.compose.material.icons.filled.ContentCopy
+import androidx.compose.material.icons.filled.Delete
+import androidx.compose.material.icons.filled.DriveFileMove
+import androidx.compose.material.icons.filled.Edit
+import androidx.compose.material.icons.filled.Info
 import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.BottomAppBar
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -40,6 +48,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.lifecycle.viewmodel.compose.viewModel
+import com.eggetteluo.folder.model.FileItem
 import java.io.File
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -55,6 +64,7 @@ fun ExplorerScreen(userId: String) {
     val showDialog = remember { mutableStateOf(false) }
     val newFolderName = remember { mutableStateOf("") }
     val showMenu = remember { mutableStateOf(false) }
+    val selectedFile = remember { mutableStateOf<FileItem?>(null) }
 
     val context = LocalContext.current
     val activity = context as? Activity
@@ -133,15 +143,46 @@ fun ExplorerScreen(userId: String) {
             )
         },
         floatingActionButton = {
-            FloatingActionButton(
-                onClick = {
-                    showDialog.value = true
-                    newFolderName.value = ""
-                },
-                containerColor = MaterialTheme.colorScheme.primary,
-                contentColor = Color.White
-            ) {
-                Icon(Icons.Default.Add, contentDescription = "新建文件")
+            if (selectedFile.value == null) {
+                FloatingActionButton(
+                    onClick = {
+                        showDialog.value = true
+                        newFolderName.value = ""
+                    },
+                    containerColor = MaterialTheme.colorScheme.primary,
+                    contentColor = Color.White
+                ) {
+                    Icon(Icons.Default.Add, contentDescription = "新建文件")
+                }
+            }
+        },
+        bottomBar = {
+            if (selectedFile.value != null) {
+                BottomAppBar(
+                    containerColor = MaterialTheme.colorScheme.surfaceVariant,
+                    contentColor = MaterialTheme.colorScheme.primary,
+                    actions = {
+                        // 封装一个简单的工具按钮组件
+                        ActionIconButton(Icons.Default.Delete, "删除") {
+                            // 调用 viewModel.delete(selectedFile!!)
+                        }
+                        ActionIconButton(Icons.Default.Info, "详情") {
+                            // 显示详情对话框
+                        }
+                        ActionIconButton(Icons.Default.DriveFileMove, "移动") {
+                            // 移动逻辑
+                        }
+                        ActionIconButton(Icons.Default.ContentCopy, "复制") {
+                            // 复制逻辑
+                        }
+                        ActionIconButton(Icons.Default.Edit, "重命名") {
+                            // 重命名逻辑
+                        }
+                        ActionIconButton(Icons.Default.Cancel, "取消") {
+                            selectedFile.value = null
+                        }
+                    }
+                )
             }
         }
     ) { paddingValues ->
@@ -155,15 +196,23 @@ fun ExplorerScreen(userId: String) {
             } else {
                 LazyColumn {
                     items(fileList) { file ->
-                        FileRow(file = file) {
-                            if (file.isDirectory) {
-                                // 如果是文件夹，加载内容
-                                viewModel.loadFiles(File(file.path))
-                            } else {
-                                // 如果是文件，尝试打开
-                                viewModel.openFile(context, file)
+                        FileRow(
+                            file = file,
+                            onClick = {
+                                if (selectedFile.value != null) {
+                                    // 如果当前处于选中模式，点击任何项可能意味着取消选中
+                                    selectedFile.value = null
+                                } else {
+                                    // 正常的目录跳转或打开文件逻辑
+                                    if (file.isDirectory) viewModel.loadFiles(File(file.path))
+                                    else viewModel.openFile(context, file)
+                                }
+                            },
+                            onLongClick = {
+                                // 长按时，记录选中的文件，这会触发 Scaffold 底部工具栏的弹出
+                                selectedFile.value = file
                             }
-                        }
+                        )
                     }
                 }
             }
diff --git a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/components.kt b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/components.kt
index 1b8586c..53a8dbf 100644
--- a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/components.kt
+++ b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/components.kt
@@ -1,6 +1,10 @@
 package com.eggetteluo.folder.ui.features.explorer
 
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Android
@@ -17,10 +21,12 @@ import androidx.compose.material.icons.filled.PictureAsPdf
 import androidx.compose.material.icons.filled.TableChart
 import androidx.compose.material.icons.filled.VideoFile
 import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
 import androidx.compose.material3.ListItem
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
@@ -31,13 +37,20 @@ import com.eggetteluo.folder.util.formatFileDate
 import com.eggetteluo.folder.util.formatFileSize
 import com.eggetteluo.folder.util.getFolderItemCount
 
-// 组件 1：单个文件行
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
-fun FileRow(file: FileItem, onClick: () -> Unit) {
+fun FileRow(
+    file: FileItem,
+    onClick: () -> Unit,
+    onLongClick: () -> Unit
+) {
     val theme = getFileTheme(file)
 
     ListItem(
-        modifier = Modifier.clickable { onClick() },
+        modifier = Modifier.combinedClickable(
+            onClick = onClick,
+            onLongClick = onLongClick // 绑定长按事件
+        ),
         leadingContent = {
             Icon(
                 imageVector = theme.icon,
@@ -132,4 +145,19 @@ fun getFileTheme(file: FileItem): FileIconTheme {
 
         else -> FileIconTheme(Icons.Default.Description, Color.Gray)
     }
+}
+
+@Composable
+fun ActionIconButton(icon: ImageVector, label: String, onClick: () -> Unit) {
+    Column(
+        horizontalAlignment = Alignment.CenterHorizontally,
+        modifier = Modifier
+            .padding(horizontal = 8.dp)
+            .clickable { onClick() }
+    ) {
+        IconButton(onClick = onClick) {
+            Icon(icon, contentDescription = label)
+        }
+        Text(label, style = MaterialTheme.typography.labelSmall)
+    }
 }
\ No newline at end of file

From 8979132790e9a2a75baf3c11d3d74768ce8d85f0 Mon Sep 17 00:00:00 2001
From: xiaoluo <3428237080@qq.com>
Date: Sat, 3 Jan 2026 12:28:11 +0800
Subject: [PATCH 10/14] =?UTF-8?q?feat:=20=E5=AE=9E=E7=8E=B0=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=93=8D=E4=BD=9C=E5=92=8C=E6=8E=92=E5=BA=8F=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- **文件排序**:
    - 新增按名称、创建时间 (正序/倒序) 对文件列表进行排序的功能。
    - 在 `ExplorerViewModel` 中添加 `SortOrder` 枚举和 `updateSortOrder` 方法来管理和切换排序逻辑。
    - 在 `ExplorerScreen` 的顶部菜单中添加入口，允许用户选择不同的排序方式。

- **文件操作**:
    - 实现文件的删除、重命名、复制和剪切功能。
    - 在 `ExplorerViewModel` 中添加 `deleteItem`, `renameItem`, `setClipboard`, `paste` 等方法来处理核心逻辑。
    - `ExplorerScreen` 中，当用户长按文件时，底部会弹出操作栏，包含删除、剪切、复制、重命名等按钮。
    - 为“重命名”操作添加了专用的 `AlertDialog` 对话框。

- **文件详情**:
    - 新增“文件详情”功能，通过 `ModalBottomSheet` 展示选中文件的详细信息，如路径、大小、创建/修改时间等。
    - 创建了独立的 `FileDetailsSheet` Composable 组件来承载详情 UI。

- **UI 和依赖**:
    - 在底部操作栏中，使用 `ContentCut` 图标替换了旧的移动图标。
    - 在顶部菜单中添加了“粘贴”选项，该选项在剪贴板有内容时才可用。
    - 引入 `androidx.compose.material3:material3` 依赖以支持 `ModalBottomSheet` 组件。
---
 app/build.gradle.kts                          |   1 +
 .../ui/features/explorer/ExplorerScreen.kt    | 132 +++++++++++++++---
 .../ui/features/explorer/ExplorerViewModel.kt | 130 ++++++++++++++++-
 .../folder/ui/features/explorer/components.kt |  64 +++++++++
 gradle/libs.versions.toml                     |   2 +
 5 files changed, 304 insertions(+), 25 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 38dd2f5..575aec6 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -51,6 +51,7 @@ dependencies {
     implementation(libs.androidx.compose.ui.tooling.preview)
     implementation(libs.androidx.compose.material3)
     implementation(libs.androidx.fragment.ktx)
+    implementation(libs.androidx.material3)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
diff --git a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt
index 3ea6c47..759ba13 100644
--- a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt
+++ b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt
@@ -2,8 +2,10 @@ package com.eggetteluo.folder.ui.features.explorer
 
 import android.app.Activity
 import androidx.activity.compose.BackHandler
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -16,8 +18,8 @@ import androidx.compose.material.icons.automirrored.filled.DriveFileMove
 import androidx.compose.material.icons.filled.Add
 import androidx.compose.material.icons.filled.Cancel
 import androidx.compose.material.icons.filled.ContentCopy
+import androidx.compose.material.icons.filled.ContentCut
 import androidx.compose.material.icons.filled.Delete
-import androidx.compose.material.icons.filled.DriveFileMove
 import androidx.compose.material.icons.filled.Edit
 import androidx.compose.material.icons.filled.Info
 import androidx.compose.material.icons.filled.MoreVert
@@ -60,12 +62,19 @@ fun ExplorerScreen(userId: String) {
     val isRoot by remember(currentPath) {
         derivedStateOf { viewModel.isRoot() }
     }
+    val isClipboardEmpty by viewModel.clipboardFile.collectAsState()
 
     val showDialog = remember { mutableStateOf(false) }
     val newFolderName = remember { mutableStateOf("") }
+
     val showMenu = remember { mutableStateOf(false) }
     val selectedFile = remember { mutableStateOf<FileItem?>(null) }
 
+    val showRenameDialog = remember { mutableStateOf(false) }
+    val renameTextFieldValue = remember { mutableStateOf("") }
+
+    val showDetailsSheet = remember { mutableStateOf(false) }
+
     val context = LocalContext.current
     val activity = context as? Activity
 
@@ -123,14 +132,32 @@ fun ExplorerScreen(userId: String) {
                                 text = { Text("按名称排序") },
                                 onClick = {
                                     showMenu.value = false
-                                    // 这里可以调用 viewModel 的排序逻辑
+                                    viewModel.updateSortOrder(ExplorerViewModel.SortOrder.NAME)
+                                }
+                            )
+                            DropdownMenuItem(
+                                text = { Text("按时间排序 (最新优先)") },
+                                onClick = {
+                                    showMenu.value = false
+                                    viewModel.updateSortOrder(ExplorerViewModel.SortOrder.TIME_DESC)
                                 }
                             )
                             DropdownMenuItem(
-                                text = { Text("设置") },
+                                text = { Text("按时间排序 (最旧优先)") },
                                 onClick = {
                                     showMenu.value = false
-                                    // 处理设置点击
+                                    viewModel.updateSortOrder(ExplorerViewModel.SortOrder.TIME_ASC)
+                                }
+                            )
+                            DropdownMenuItem(
+                                text = { Text("粘贴") },
+                                enabled = isClipboardEmpty != null,
+                                onClick = {
+                                    // 粘贴事件
+                                    showMenu.value = false
+                                    currentPath?.let {
+                                        viewModel.paste(it)
+                                    }
                                 }
                             )
                         }
@@ -162,24 +189,43 @@ fun ExplorerScreen(userId: String) {
                     containerColor = MaterialTheme.colorScheme.surfaceVariant,
                     contentColor = MaterialTheme.colorScheme.primary,
                     actions = {
-                        // 封装一个简单的工具按钮组件
-                        ActionIconButton(Icons.Default.Delete, "删除") {
-                            // 调用 viewModel.delete(selectedFile!!)
-                        }
-                        ActionIconButton(Icons.Default.Info, "详情") {
-                            // 显示详情对话框
-                        }
-                        ActionIconButton(Icons.Default.DriveFileMove, "移动") {
-                            // 移动逻辑
-                        }
-                        ActionIconButton(Icons.Default.ContentCopy, "复制") {
-                            // 复制逻辑
-                        }
-                        ActionIconButton(Icons.Default.Edit, "重命名") {
-                            // 重命名逻辑
-                        }
-                        ActionIconButton(Icons.Default.Cancel, "取消") {
-                            selectedFile.value = null
+                        Row(
+                            modifier = Modifier.fillMaxWidth(),
+                            horizontalArrangement = Arrangement.SpaceEvenly,
+                            verticalAlignment = Alignment.CenterVertically
+                        ) {
+                            ActionIconButton(Icons.Default.Delete, "删除") {
+                                selectedFile.value?.let {
+                                    viewModel.deleteItem(it)
+                                }
+                                selectedFile.value = null
+                            }
+                            ActionIconButton(Icons.Default.Info, "详情") {
+                                showDetailsSheet.value = true
+                            }
+                            ActionIconButton(Icons.Default.ContentCut, "剪切") {
+                                // 剪切逻辑
+                                selectedFile.value?.let {
+                                    viewModel.setClipboard(it, ExplorerViewModel.TransferMode.CUT)
+                                }
+                                selectedFile.value = null
+                            }
+                            ActionIconButton(Icons.Default.ContentCopy, "复制") {
+                                // 复制逻辑
+                                selectedFile.value?.let {
+                                    viewModel.setClipboard(it, ExplorerViewModel.TransferMode.COPY)
+                                }
+                                selectedFile.value = null
+                            }
+                            ActionIconButton(Icons.Default.Edit, "重命名") {
+                                selectedFile.value?.let {
+                                    renameTextFieldValue.value = it.name // 默认填充当前文件名
+                                    showRenameDialog.value = true
+                                }
+                            }
+                            ActionIconButton(Icons.Default.Cancel, "取消") {
+                                selectedFile.value = null
+                            }
                         }
                     }
                 )
@@ -251,5 +297,47 @@ fun ExplorerScreen(userId: String) {
                 }
             )
         }
+
+        if (showRenameDialog.value && selectedFile.value != null) {
+            AlertDialog(
+                onDismissRequest = { showRenameDialog.value = false },
+                title = { Text("重命名") },
+                text = {
+                    OutlinedTextField(
+                        value = renameTextFieldValue.value,
+                        onValueChange = { renameTextFieldValue.value = it },
+                        label = { Text("新名称") },
+                        singleLine = true,
+                        modifier = Modifier.fillMaxWidth()
+                    )
+                },
+                confirmButton = {
+                    TextButton(
+                        onClick = {
+                            if (renameTextFieldValue.value.isNotBlank() &&
+                                renameTextFieldValue.value != selectedFile.value?.name) {
+                                viewModel.renameItem(selectedFile.value!!, renameTextFieldValue.value)
+                                selectedFile.value = null // 操作完取消选中状态
+                                showRenameDialog.value = false
+                            }
+                        }
+                    ) {
+                        Text("确定")
+                    }
+                },
+                dismissButton = {
+                    TextButton(onClick = { showRenameDialog.value = false }) {
+                        Text("取消")
+                    }
+                }
+            )
+        }
+
+        if (showDetailsSheet.value && selectedFile.value != null) {
+            FileDetailsSheet(
+                file = selectedFile.value!!,
+                onDismiss = { showDetailsSheet.value = false }
+            )
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerViewModel.kt b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerViewModel.kt
index b119e36..eb0c0b8 100644
--- a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerViewModel.kt
+++ b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerViewModel.kt
@@ -20,6 +20,13 @@ import java.nio.file.Paths
 import java.nio.file.attribute.BasicFileAttributes
 
 class ExplorerViewModel : ViewModel() {
+
+    enum class SortOrder {
+        NAME,       // 按名称排序
+        TIME_DESC,  // 按创建时间倒序（最新的在前）
+        TIME_ASC    // 按创建时间正序
+    }
+
     private val _fileList = MutableStateFlow<List<FileItem>>(emptyList())
     val fileList: StateFlow<List<FileItem>> = _fileList
 
@@ -28,6 +35,15 @@ class ExplorerViewModel : ViewModel() {
 
     private var userRoot: File? = null
 
+    // 定义操作类型
+    enum class TransferMode { COPY, CUT, NONE }
+
+    private val _clipboardFile = MutableStateFlow<FileItem?>(null)
+    private val _transferMode = MutableStateFlow(TransferMode.NONE)
+
+    val clipboardFile: StateFlow<FileItem?> = _clipboardFile
+    val transferMode: StateFlow<TransferMode> = _transferMode
+
     fun initUserSpace(userId: String) {
         val root = File("/storage/emulated/0/MyFileManager/$userId")
         if (!root.exists()) root.mkdirs()
@@ -40,7 +56,6 @@ class ExplorerViewModel : ViewModel() {
         return _currentPath.value?.absolutePath == userRoot?.absolutePath
     }
 
-    // 在 ExplorerViewModel.kt 中
     fun loadFiles(directory: File) {
         viewModelScope.launch(Dispatchers.IO) {
             val files = directory.listFiles()?.map { file ->
@@ -69,15 +84,40 @@ class ExplorerViewModel : ViewModel() {
                     isHidden = file.isHidden,
                     extension = file.extension
                 )
-            }?.sortedWith(compareBy({ !it.isDirectory }, { it.name.lowercase() })) ?: emptyList()
+            } ?: emptyList()
+
+            val sortedFiles = when (_sortOrder.value) {
+                SortOrder.NAME -> {
+                    files.sortedWith(compareBy({ !it.isDirectory }, { it.name.lowercase() }))
+                }
+
+                SortOrder.TIME_DESC -> {
+                    // 文件夹依然排在前面，然后按创建时间从新到旧
+                    files.sortedWith(compareBy({ !it.isDirectory }, { -it.createdAt }))
+                }
+
+                SortOrder.TIME_ASC -> {
+                    files.sortedWith(compareBy({ !it.isDirectory }, { it.createdAt }))
+                }
+            }
 
             withContext(Dispatchers.Main) {
-                _fileList.value = files
+                _fileList.value = sortedFiles
                 _currentPath.value = directory
             }
         }
     }
 
+    private val _sortOrder = MutableStateFlow(SortOrder.NAME)
+    val sortOrder: StateFlow<SortOrder> = _sortOrder
+
+    // 提供一个方法供 UI 切换排序
+    fun updateSortOrder(order: SortOrder) {
+        _sortOrder.value = order
+        // 切换后重新加载当前目录以应用新排序
+        _currentPath.value?.let { loadFiles(it) }
+    }
+
     fun navigateBack(): Boolean {
         val current = _currentPath.value ?: return false
         val root = userRoot ?: return false
@@ -153,4 +193,88 @@ class ExplorerViewModel : ViewModel() {
             e.printStackTrace()
         }
     }
+
+    /**
+     * 删除文件或文件夹
+     */
+    fun deleteItem(fileItem: FileItem) {
+        val file = File(fileItem.path)
+        val currentDir = _currentPath.value ?: return
+
+        viewModelScope.launch(Dispatchers.IO) {
+            try {
+                val success = if (file.isDirectory) {
+                    // 如果是文件夹，建议使用 deleteRecursively() 确保删除内部所有内容
+                    file.deleteRecursively()
+                } else {
+                    file.delete()
+                }
+
+                if (success) {
+                    // 删除成功后，回到主线程刷新列表
+                    loadFiles(currentDir)
+                } else {
+                    Log.e("ExplorerViewModel", "删除失败: ${file.absolutePath}")
+                }
+            } catch (e: Exception) {
+                e.printStackTrace()
+                Log.e("ExplorerViewModel", "删除异常: ${e.message}")
+            }
+        }
+    }
+
+    /**
+     * 重命名文件或文件夹
+     */
+    fun renameItem(fileItem: FileItem, newName: String) {
+        val currentFile = File(fileItem.path)
+        val parentDir = currentFile.parentFile ?: return
+        val targetFile = File(parentDir, newName)
+
+        if (targetFile.exists()) {
+            // 这里可以发送一个错误状态给 UI，提示“文件名已存在”
+            return
+        }
+
+        viewModelScope.launch(Dispatchers.IO) {
+            try {
+                val success = currentFile.renameTo(targetFile)
+                if (success) {
+                    // 刷新列表
+                    loadFiles(parentDir)
+                }
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+        }
+    }
+
+    fun setClipboard(file: FileItem, mode: TransferMode) {
+        _clipboardFile.value = file
+        _transferMode.value = mode
+    }
+
+    fun paste(targetFolder: File) {
+        val source = _clipboardFile.value ?: return
+        val mode = _transferMode.value
+        val sourceFile = File(source.path)
+        val destFile = File(targetFolder, sourceFile.name)
+
+        viewModelScope.launch(Dispatchers.IO) {
+            try {
+                if (mode == TransferMode.COPY) {
+                    sourceFile.copyRecursively(destFile, overwrite = true)
+                } else if (mode == TransferMode.CUT) {
+                    sourceFile.renameTo(destFile) // 移动操作
+                }
+
+                // 操作完成后清除剪贴板并刷新
+                _clipboardFile.value = null
+                _transferMode.value = TransferMode.NONE
+                loadFiles(targetFolder)
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/components.kt b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/components.kt
index 53a8dbf..1efb92f 100644
--- a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/components.kt
+++ b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/components.kt
@@ -3,7 +3,9 @@ package com.eggetteluo.folder.ui.features.explorer
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
@@ -20,10 +22,12 @@ import androidx.compose.material.icons.filled.Inventory2
 import androidx.compose.material.icons.filled.PictureAsPdf
 import androidx.compose.material.icons.filled.TableChart
 import androidx.compose.material.icons.filled.VideoFile
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.ListItem
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -160,4 +164,64 @@ fun ActionIconButton(icon: ImageVector, label: String, onClick: () -> Unit) {
         }
         Text(label, style = MaterialTheme.typography.labelSmall)
     }
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun FileDetailsSheet(file: FileItem, onDismiss: () -> Unit) {
+    ModalBottomSheet(
+        onDismissRequest = onDismiss,
+        containerColor = MaterialTheme.colorScheme.surface,
+    ) {
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 20.dp)
+                .padding(bottom = 32.dp), // 留出底部安全距离
+            verticalArrangement = Arrangement.spacedBy(16.dp)
+        ) {
+            Text(
+                text = "文件详情",
+                style = MaterialTheme.typography.headlineSmall,
+                color = MaterialTheme.colorScheme.primary
+            )
+
+            // 详情列表项
+            DetailRow(label = "名称", value = file.name)
+            DetailRow(label = "类型", value = if (file.isDirectory) "文件夹" else "${file.extension.uppercase()} 文件")
+            DetailRow(label = "路径", value = file.path)
+
+            if (!file.isDirectory) {
+                DetailRow(label = "大小", value = formatFileSize(file.size))
+            }
+
+            DetailRow(label = "创建时间", value = formatFileDate(file.createdAt))
+            DetailRow(label = "修改时间", value = formatFileDate(file.lastModified))
+
+            // 权限展示
+            val permissions = buildString {
+                if (file.canRead) append("可读 ")
+                if (file.canWrite) append("可写 ")
+                if (file.isHidden) append("(隐藏)")
+            }
+            DetailRow(label = "属性", value = permissions)
+        }
+    }
+}
+
+@Composable
+fun DetailRow(label: String, value: String) {
+    Column(modifier = Modifier.fillMaxWidth()) {
+        Text(
+            text = label,
+            style = MaterialTheme.typography.labelMedium,
+            color = MaterialTheme.colorScheme.secondary
+        )
+        Text(
+            text = value,
+            style = MaterialTheme.typography.bodyLarge,
+            color = MaterialTheme.colorScheme.onSurface,
+            modifier = Modifier.padding(top = 4.dp)
+        )
+    }
 }
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b86b6ac..83df2e9 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -14,6 +14,7 @@ lifecycleViewmodelKtx = "2.10.0"
 navigationCompose = "2.9.6"
 permissionx = "1.8.1"
 fragmentKtx = "1.8.9"
+material3 = "1.4.0"
 
 [libraries]
 androidx-compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended" }
@@ -37,6 +38,7 @@ androidx-compose-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-te
 androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }
 permissionx = { module = "com.guolindev.permissionx:permissionx", version.ref = "permissionx" }
 androidx-fragment-ktx = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "fragmentKtx" }
+androidx-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "material3" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }

From 91ce9992e955ab1e4f4b4b4c518b7a452c73ce7b Mon Sep 17 00:00:00 2001
From: xiaoluo <3428237080@qq.com>
Date: Sat, 3 Jan 2026 12:36:08 +0800
Subject: [PATCH 11/14] =?UTF-8?q?feat:=20=E5=AE=9E=E7=8E=B0=E4=BB=8E?=
 =?UTF-8?q?=E7=9B=B8=E5=86=8C=E5=AF=BC=E5=85=A5=E5=9B=BE=E7=89=87=E5=92=8C?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E6=8B=89=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增从系统相册选择图片并保存到当前目录的功能
- 在 `ExplorerViewModel` 中添加 `saveImageToCurrentDir` 方法, 用于处理图片保存逻辑
- 在 `ExplorerScreen` 的 `TopAppBar` 下拉菜单中添加入口，并使用 `rememberLauncherForActivityResult` 调用图片选择器
- 优化 `TopAppBar` 下拉菜单，为刷新、排序、粘贴等操作添加了带颜色区分的 `leadingIcon`
- 调整了下拉菜单中部分选项的文案，使其更直观 (如: “按时间排序” -> “时间排序 (新→旧)”)
---
 .../ui/features/explorer/ExplorerScreen.kt    | 80 ++++++++++++++++++-
 .../ui/features/explorer/ExplorerViewModel.kt | 27 +++++++
 2 files changed, 103 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt
index 759ba13..7dbebad 100644
--- a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt
+++ b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt
@@ -2,6 +2,8 @@ package com.eggetteluo.folder.ui.features.explorer
 
 import android.app.Activity
 import androidx.activity.compose.BackHandler
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -16,13 +18,20 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.automirrored.filled.DriveFileMove
 import androidx.compose.material.icons.filled.Add
+import androidx.compose.material.icons.filled.AddPhotoAlternate
 import androidx.compose.material.icons.filled.Cancel
 import androidx.compose.material.icons.filled.ContentCopy
 import androidx.compose.material.icons.filled.ContentCut
+import androidx.compose.material.icons.filled.ContentPaste
 import androidx.compose.material.icons.filled.Delete
 import androidx.compose.material.icons.filled.Edit
+import androidx.compose.material.icons.filled.History
+import androidx.compose.material.icons.filled.Image
 import androidx.compose.material.icons.filled.Info
 import androidx.compose.material.icons.filled.MoreVert
+import androidx.compose.material.icons.filled.Refresh
+import androidx.compose.material.icons.filled.SortByAlpha
+import androidx.compose.material.icons.filled.Update
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.BottomAppBar
 import androidx.compose.material3.DropdownMenu
@@ -92,6 +101,15 @@ fun ExplorerScreen(userId: String) {
         }
     }
 
+    val imagePickerLauncher = rememberLauncherForActivityResult(
+        contract = ActivityResultContracts.GetContent()
+    ) { uri: android.net.Uri? ->
+        // 当用户选完图片后回调
+        uri?.let {
+            viewModel.saveImageToCurrentDir(context, it)
+        }
+    }
+
     Scaffold(
         modifier = Modifier.fillMaxSize(),
         topBar = {
@@ -123,37 +141,91 @@ fun ExplorerScreen(userId: String) {
                         ) {
                             DropdownMenuItem(
                                 text = { Text("刷新列表") },
+                                leadingIcon = {
+                                    Icon(
+                                        imageVector = Icons.Default.Refresh,
+                                        contentDescription = null,
+                                        tint = Color(0xFF2196F3) // 蓝色：代表同步与刷新
+                                    )
+                                },
                                 onClick = {
                                     showMenu.value = false
                                     viewModel.currentPath.value?.let { viewModel.loadFiles(it) }
                                 }
                             )
+
                             DropdownMenuItem(
                                 text = { Text("按名称排序") },
+                                leadingIcon = {
+                                    Icon(
+                                        imageVector = Icons.Default.SortByAlpha,
+                                        contentDescription = null,
+                                        tint = Color(0xFF9C27B0) // 紫色：代表逻辑与组织
+                                    )
+                                },
                                 onClick = {
                                     showMenu.value = false
                                     viewModel.updateSortOrder(ExplorerViewModel.SortOrder.NAME)
                                 }
                             )
+
                             DropdownMenuItem(
-                                text = { Text("按时间排序 (最新优先)") },
+                                text = { Text("时间排序 (新→旧)") },
+                                leadingIcon = {
+                                    Icon(
+                                        imageVector = Icons.Default.History,
+                                        contentDescription = null,
+                                        tint = Color(0xFF00BCD4) // 青色：代表历史回顾
+                                    )
+                                },
                                 onClick = {
                                     showMenu.value = false
                                     viewModel.updateSortOrder(ExplorerViewModel.SortOrder.TIME_DESC)
                                 }
                             )
+
                             DropdownMenuItem(
-                                text = { Text("按时间排序 (最旧优先)") },
+                                text = { Text("时间排序 (旧→新)") },
+                                leadingIcon = {
+                                    Icon(
+                                        imageVector = Icons.Default.Update,
+                                        contentDescription = null,
+                                        tint = Color(0xFF009688) // 深青色：代表更新顺序
+                                    )
+                                },
                                 onClick = {
                                     showMenu.value = false
                                     viewModel.updateSortOrder(ExplorerViewModel.SortOrder.TIME_ASC)
                                 }
                             )
+
+                            DropdownMenuItem(
+                                text = { Text("从相册导入图片") },
+                                leadingIcon = {
+                                    Icon(
+                                        imageVector = Icons.Default.AddPhotoAlternate,
+                                        contentDescription = null,
+                                        tint = Color(0xFF4CAF50) // 绿色：代表新增与成功
+                                    )
+                                },
+                                onClick = {
+                                    showMenu.value = false
+                                    imagePickerLauncher.launch("image/*")
+                                }
+                            )
+
                             DropdownMenuItem(
-                                text = { Text("粘贴") },
+                                text = { Text("粘贴文件") },
+                                // 只有剪贴板有内容时才高亮显示图标
+                                leadingIcon = {
+                                    Icon(
+                                        imageVector = Icons.Default.ContentPaste,
+                                        contentDescription = null,
+                                        tint = if (isClipboardEmpty != null) MaterialTheme.colorScheme.primary else Color.Gray
+                                    )
+                                },
                                 enabled = isClipboardEmpty != null,
                                 onClick = {
-                                    // 粘贴事件
                                     showMenu.value = false
                                     currentPath?.let {
                                         viewModel.paste(it)
diff --git a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerViewModel.kt b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerViewModel.kt
index eb0c0b8..6c76851 100644
--- a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerViewModel.kt
+++ b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerViewModel.kt
@@ -277,4 +277,31 @@ class ExplorerViewModel : ViewModel() {
             }
         }
     }
+
+    /**
+     * 将选取的图片保存到当前目录
+     */
+    fun saveImageToCurrentDir(context: Context, uri: android.net.Uri) {
+        val currentDir = _currentPath.value ?: return
+
+        viewModelScope.launch(Dispatchers.IO) {
+            try {
+                val fileName = "IMG_${System.currentTimeMillis()}.jpg"
+                val targetFile = File(currentDir, fileName)
+
+                context.contentResolver.openInputStream(uri)?.use { inputStream ->
+                    targetFile.outputStream().use { outputStream ->
+                        inputStream.copyTo(outputStream)
+                    }
+                }
+
+                withContext(Dispatchers.Main) {
+                    loadFiles(currentDir)
+                }
+            } catch (e: Exception) {
+                e.printStackTrace()
+                Log.e("ExplorerViewModel", "图片保存失败: ${e.message}")
+            }
+        }
+    }
 }
\ No newline at end of file

From f30bc74f818ef72362d8fd0b95451f559e443830 Mon Sep 17 00:00:00 2001
From: xiaoluo <3428237080@qq.com>
Date: Sat, 3 Jan 2026 12:52:12 +0800
Subject: [PATCH 12/14] =?UTF-8?q?feat:=20=E5=AE=9E=E7=8E=B0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=AF=86=E7=A0=81=E8=AE=A4=E8=AF=81=E5=92=8C=E9=80=80?=
 =?UTF-8?q?=E5=87=BA=E7=99=BB=E5=BD=95=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在登录页增加密码输入框和可见性切换功能
- `LoginViewModel` 引入 `SharedPreferences` 实现用户密码的保存与验证
- 实现首次输入即注册、后续输入则验证密码的登录逻辑
- 在文件浏览页 `TopAppBar` 的菜单中添加“退出登录”选项
- 实现退出登录后导航回登录页面的功能
---
 .../ui/features/explorer/ExplorerScreen.kt    | 20 +++++-
 .../folder/ui/features/login/LoginScreen.kt   | 69 ++++++++++++++-----
 .../ui/features/login/LoginViewModel.kt       | 51 ++++++++------
 .../folder/ui/navigation/NavGraph.kt          |  6 +-
 4 files changed, 106 insertions(+), 40 deletions(-)

diff --git a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt
index 7dbebad..21e1fa4 100644
--- a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt
+++ b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt
@@ -16,7 +16,7 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.icons.automirrored.filled.DriveFileMove
+import androidx.compose.material.icons.automirrored.filled.ExitToApp
 import androidx.compose.material.icons.filled.Add
 import androidx.compose.material.icons.filled.AddPhotoAlternate
 import androidx.compose.material.icons.filled.Cancel
@@ -26,7 +26,6 @@ import androidx.compose.material.icons.filled.ContentPaste
 import androidx.compose.material.icons.filled.Delete
 import androidx.compose.material.icons.filled.Edit
 import androidx.compose.material.icons.filled.History
-import androidx.compose.material.icons.filled.Image
 import androidx.compose.material.icons.filled.Info
 import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material.icons.filled.Refresh
@@ -64,7 +63,7 @@ import java.io.File
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun ExplorerScreen(userId: String) {
+fun ExplorerScreen(userId: String, onLogout: () -> Unit) {
     val viewModel: ExplorerViewModel = viewModel()
     val fileList by viewModel.fileList.collectAsState()
     val currentPath by viewModel.currentPath.collectAsState()
@@ -232,6 +231,21 @@ fun ExplorerScreen(userId: String) {
                                     }
                                 }
                             )
+
+                            DropdownMenuItem(
+                                text = { Text("退出登录") },
+                                leadingIcon = {
+                                    Icon(
+                                        imageVector = Icons.AutoMirrored.Filled.ExitToApp,
+                                        contentDescription = null,
+                                        tint = Color(0xFFF44336) // 红色：代表警告或断开连接
+                                    )
+                                },
+                                onClick = {
+                                    showMenu.value = false
+                                    onLogout()
+                                }
+                            )
                         }
                     }
                 },
diff --git a/app/src/main/java/com/eggetteluo/folder/ui/features/login/LoginScreen.kt b/app/src/main/java/com/eggetteluo/folder/ui/features/login/LoginScreen.kt
index c548d7e..5b58994 100644
--- a/app/src/main/java/com/eggetteluo/folder/ui/features/login/LoginScreen.kt
+++ b/app/src/main/java/com/eggetteluo/folder/ui/features/login/LoginScreen.kt
@@ -1,11 +1,33 @@
 package com.eggetteluo.folder.ui.features.login
 
-import androidx.compose.foundation.layout.*
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Visibility
+import androidx.compose.material.icons.filled.VisibilityOff
+import androidx.compose.material3.Button
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.input.PasswordVisualTransformation
+import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 
@@ -15,34 +37,49 @@ fun LoginScreen(
 ) {
     val viewModel: LoginViewModel = viewModel()
     val username by viewModel.usernameInput.collectAsState()
+    val password by viewModel.passwordInput.collectAsState() // 新增
     val errorMsg by viewModel.errorMessage.collectAsState()
 
+    // 控制密码可见性的状态
+    var passwordVisible by remember { mutableStateOf(false) }
+
     Column(
-        modifier = Modifier
-            .fillMaxSize()
-            .padding(24.dp),
+        modifier = Modifier.fillMaxSize().padding(24.dp),
         verticalArrangement = Arrangement.Center,
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
-        Text(
-            text = "私有文件管理",
-            style = MaterialTheme.typography.headlineLarge,
-            color = MaterialTheme.colorScheme.primary
-        )
+        Text(text = "私有文件管理", style = MaterialTheme.typography.headlineLarge, color = MaterialTheme.colorScheme.primary)
 
         Spacer(modifier = Modifier.height(48.dp))
 
-        // 用户名输入框
+        // 用户名输入
         OutlinedTextField(
             value = username,
             onValueChange = { viewModel.onUsernameChange(it) },
             label = { Text("用户名") },
-            isError = errorMsg != null,
             modifier = Modifier.fillMaxWidth(),
             singleLine = true
         )
 
-        // 错误信息提示
+        Spacer(modifier = Modifier.height(16.dp))
+
+        // 密码输入框
+        OutlinedTextField(
+            value = password,
+            onValueChange = { viewModel.onPasswordChange(it) },
+            label = { Text("访问密码") },
+            modifier = Modifier.fillMaxWidth(),
+            singleLine = true,
+            visualTransformation = if (passwordVisible) VisualTransformation.None else PasswordVisualTransformation(),
+            trailingIcon = {
+                val image = if (passwordVisible) Icons.Filled.Visibility else Icons.Filled.VisibilityOff
+                IconButton(onClick = { passwordVisible = !passwordVisible }) {
+                    Icon(imageVector = image, contentDescription = null)
+                }
+            },
+            keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password)
+        )
+
         if (errorMsg != null) {
             Text(
                 text = errorMsg!!,
@@ -58,7 +95,7 @@ fun LoginScreen(
             onClick = { viewModel.performLogin(onLoginSuccess) },
             modifier = Modifier.fillMaxWidth().height(50.dp)
         ) {
-            Text("登录 / 进入空间")
+            Text("安全进入空间")
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/eggetteluo/folder/ui/features/login/LoginViewModel.kt b/app/src/main/java/com/eggetteluo/folder/ui/features/login/LoginViewModel.kt
index f5bf324..a0cb048 100644
--- a/app/src/main/java/com/eggetteluo/folder/ui/features/login/LoginViewModel.kt
+++ b/app/src/main/java/com/eggetteluo/folder/ui/features/login/LoginViewModel.kt
@@ -1,38 +1,49 @@
 package com.eggetteluo.folder.ui.features.login
 
-import androidx.lifecycle.ViewModel
+import android.app.Application
+import android.content.Context
+import androidx.lifecycle.AndroidViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 
-class LoginViewModel : ViewModel() {
-    // UI 状态：记录用户名输入
-    var usernameInput = MutableStateFlow("")
+class LoginViewModel(application: Application) : AndroidViewModel(application) {
+    private val prefs = application.getSharedPreferences("user_creds", Context.MODE_PRIVATE)
+
+    private val _usernameInput = MutableStateFlow("")
+    val usernameInput: StateFlow<String> = _usernameInput
+
+    private val _passwordInput = MutableStateFlow("")
+    val passwordInput: StateFlow<String> = _passwordInput
 
-    // 错误信息状态：如果用户名为空或格式不对，显示给用户
     private val _errorMessage = MutableStateFlow<String?>(null)
     val errorMessage: StateFlow<String?> = _errorMessage
 
-    fun onUsernameChange(newName: String) {
-        usernameInput.value = newName
-        _errorMessage.value = null // 输入时清除错误
-    }
+    fun onUsernameChange(input: String) { _usernameInput.value = input }
+    fun onPasswordChange(input: String) { _passwordInput.value = input }
 
-    // 执行登录逻辑
     fun performLogin(onSuccess: (String) -> Unit) {
-        val user = usernameInput.value.trim()
+        val user = _usernameInput.value
+        val pass = _passwordInput.value
 
-        if (user.isBlank()) {
-            _errorMessage.value = "用户名不能为空"
+        if (user.isBlank() || pass.isBlank()) {
+            _errorMessage.value = "用户名和密码不能为空"
             return
         }
 
-        // 模拟验证：实际开发中这里会去查数据库
-        if (user.length < 3) {
-            _errorMessage.value = "用户名至少需要3个字符"
-            return
+        val savedPass = prefs.getString("pwd_$user", null)
+
+        if (savedPass == null) {
+            // 初次登录，自动注册密码
+            prefs.edit().putString("pwd_$user", pass).apply()
+            onSuccess(user)
+        } else {
+            // 验证密码
+            if (savedPass == pass) {
+                _errorMessage.value = null
+                onSuccess(user)
+            } else {
+                _errorMessage.value = "密码错误，请重新输入"
+            }
         }
-
-        // 验证通过，触发回调通知导航跳转
-        onSuccess(user)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/eggetteluo/folder/ui/navigation/NavGraph.kt b/app/src/main/java/com/eggetteluo/folder/ui/navigation/NavGraph.kt
index 851f645..dd34df6 100644
--- a/app/src/main/java/com/eggetteluo/folder/ui/navigation/NavGraph.kt
+++ b/app/src/main/java/com/eggetteluo/folder/ui/navigation/NavGraph.kt
@@ -44,7 +44,11 @@ fun AppNavGraph(navController: NavHostController) {
         // 文件管理页面路由
         composable(Screen.Explorer.route) { backStackEntry ->
             val userId = backStackEntry.arguments?.getString("userId") ?: ""
-            ExplorerScreen(userId = userId)
+            ExplorerScreen(userId = userId) {
+                navController.navigate(Screen.Login.route) {
+                    popUpTo(Screen.Explorer.route) { inclusive = true }
+                }
+            }
         }
     }
 }
\ No newline at end of file

From 032e3055b7bd64e1254eb979193ff8b1ba5ceb27 Mon Sep 17 00:00:00 2001
From: xiaoluo <348237080@qq.com>
Date: Sat, 3 Jan 2026 17:30:35 +0800
Subject: [PATCH 13/14] =?UTF-8?q?refactor:=20=E6=A0=B8=E5=BF=83=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E9=87=8D=E6=9E=84=E4=B8=8E=20UI/UX=20=E5=85=A8?=
 =?UTF-8?q?=E9=9D=A2=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- **代码重构**:
    - 抽离 `FileHelper` 单例工具类，将所有物理文件操作（如读写、删除、复制、移动）与 ViewModel 解耦.
    - 在 `ExplorerViewModel` 中引入 `FileHelper`，简化 ViewModel 职责，使其更专注于状态管理和业务流转.
    - 重构 `ExplorerViewModel` 内部逻辑，增加错误处理机制，通过 `SharedFlow` 向 UI 层发送 Snackbar 错误提示.

- **UI/UX 增强**:
    - **文件列表**:
        - 长按文件进入“选中模式”，底部滑入带动画效果的操作栏，并为选中项提供高亮背景和勾选图标.
        - 为不同文件类型（如图片、视频、音频、文档、代码等）配置了多样化的彩色图标，增强辨识度.
        - 优化列表为空时的显示效果，添加了“文件夹为空”的占位视图.
        - 列表滚动时，顶部 `TopAppBar` 增加滚动颜色和阴影变化的交互效果.
    - **顶部栏**:
        - 优化标题显示，在根目录时副标题显示当前用户名.
        - 当剪贴板有内容时，在顶部栏右侧显示“粘贴”快捷图标.
    - **对话框**:
        - 将新建和重命名对话框重构为独立的 `@Composable` 组件，提升代码复用性.
    - **动画与依赖**:
        - 为底部操作栏的出现/消失添加了平滑的动画效果 (`AnimatedVisibility`).
        - 为 `LazyColumn` 添加了 `key` 和 `animateItem` 增强列表渲染性能与动画表现.
        - 添加了 `androidx.compose.foundation` 依赖.
---
 app/build.gradle.kts                          |   1 +
 .../eggetteluo/folder/model/FileIconTheme.kt  |  16 +
 .../ui/features/explorer/ExplorerScreen.kt    | 498 +++++++++---------
 .../ui/features/explorer/ExplorerViewModel.kt | 371 +++++++------
 .../folder/ui/features/explorer/components.kt | 270 ++++++++--
 .../ui/features/login/LoginViewModel.kt       |   3 +-
 .../com/eggetteluo/folder/util/FileHelper.kt  | 160 ++++++
 gradle/libs.versions.toml                     |   2 +
 8 files changed, 826 insertions(+), 495 deletions(-)
 create mode 100644 app/src/main/java/com/eggetteluo/folder/model/FileIconTheme.kt
 create mode 100644 app/src/main/java/com/eggetteluo/folder/util/FileHelper.kt

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 575aec6..8aae2e5 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -52,6 +52,7 @@ dependencies {
     implementation(libs.androidx.compose.material3)
     implementation(libs.androidx.fragment.ktx)
     implementation(libs.androidx.material3)
+    implementation(libs.androidx.compose.foundation)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
diff --git a/app/src/main/java/com/eggetteluo/folder/model/FileIconTheme.kt b/app/src/main/java/com/eggetteluo/folder/model/FileIconTheme.kt
new file mode 100644
index 0000000..77c3f9c
--- /dev/null
+++ b/app/src/main/java/com/eggetteluo/folder/model/FileIconTheme.kt
@@ -0,0 +1,16 @@
+package com.eggetteluo.folder.model
+
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+
+/**
+ * 文件图标主题模型
+ * 用于封装文件在列表项中展示的图标向量和颜色方案
+ *
+ * @property icon 图标的 ImageVector（如 Icons.Default.Folder）
+ * @property color 图标的着色（如 Color.Yellow）
+ */
+data class FileIconTheme(
+    val icon: ImageVector,
+    val color: Color
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt
index 21e1fa4..8eb3b07 100644
--- a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt
+++ b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerScreen.kt
@@ -4,9 +4,13 @@ import android.app.Activity
 import androidx.activity.compose.BackHandler
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.expandVertically
+import androidx.compose.animation.shrinkVertically
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -42,10 +46,14 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarDuration
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.material3.surfaceColorAtElevation
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -56,71 +64,106 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.eggetteluo.folder.model.FileItem
 import java.io.File
 
+/**
+ * 文件管理器主界面
+ * 使用 Material3 规范实现的响应式文件列表页面
+ * * @param userId 用户ID，用于区分不同用户的存储空间
+ * @param onLogout 退出登录的回调
+ */
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun ExplorerScreen(userId: String, onLogout: () -> Unit) {
+    // --- 状态与业务逻辑订阅 ---
     val viewModel: ExplorerViewModel = viewModel()
+
+    // collectAsState 将 Flow 转化为 Compose 可感知的 State，实现数据驱动 UI
     val fileList by viewModel.fileList.collectAsState()
     val currentPath by viewModel.currentPath.collectAsState()
-    val isRoot by remember(currentPath) {
-        derivedStateOf { viewModel.isRoot() }
-    }
-    val isClipboardEmpty by viewModel.clipboardFile.collectAsState()
-
-    val showDialog = remember { mutableStateOf(false) }
-    val newFolderName = remember { mutableStateOf("") }
-
-    val showMenu = remember { mutableStateOf(false) }
-    val selectedFile = remember { mutableStateOf<FileItem?>(null) }
+    val clipboardFile by viewModel.clipboardFile.collectAsState()
 
-    val showRenameDialog = remember { mutableStateOf(false) }
-    val renameTextFieldValue = remember { mutableStateOf("") }
+    // 使用 derivedStateOf 优化性能：只有当 currentPath 变化时才重新计算是否为根目录
+    val isRoot by remember(currentPath) { derivedStateOf { viewModel.isRoot() } }
 
-    val showDetailsSheet = remember { mutableStateOf(false) }
+    // --- UI 交互状态管理 ---
+    val showDialog = remember { mutableStateOf(false) }         // 控制新建文件对话框
+    val showMenu = remember { mutableStateOf(false) }           // 控制顶部下拉菜单
+    val selectedFile = remember { mutableStateOf<FileItem?>(null) } // 当前被选中的文件（长按触发）
+    val showRenameDialog = remember { mutableStateOf(false) }   // 控制重命名对话框
+    val showDetailsSheet = remember { mutableStateOf(false) }   // 控制详情底部抽屉
+    val snackbarHostState = remember { SnackbarHostState() }    // 管理 Snackbar 的显示队列
 
     val context = LocalContext.current
     val activity = context as? Activity
 
-    // 关键：当 userId 改变时，初始化空间
+    // 滚动行为配置：当列表滚动时，TopAppBar 的颜色和阴影会产生自然变化
+    val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
+
+    // --- 生命周期与异步事件监听 ---
+
+    // 初始化用户空间，当 userId 变化时重新加载
     LaunchedEffect(userId) {
         viewModel.initUserSpace(userId)
     }
 
-    BackHandler(enabled = true) {
-        // 尝试回退目录
-        val handled = viewModel.navigateBack()
-        if (!handled) {
-            // 如果已经在根目录无法回退了，则退出 Activity (应用)
-            activity?.finish()
+    // 监听 ViewModel 发出的单次错误事件，并以 Snackbar 形式展示
+    LaunchedEffect(Unit) {
+        viewModel.errorMessage.collect { message ->
+            snackbarHostState.showSnackbar(
+                message = message,
+                withDismissAction = true,
+                duration = SnackbarDuration.Short
+            )
         }
     }
 
+    // 处理系统返回键：如果有选中文件先取消选中；否则尝试回退目录；最后关闭应用
+    BackHandler(enabled = true) {
+        if (selectedFile.value != null) selectedFile.value = null
+        else if (!viewModel.navigateBack()) activity?.finish()
+    }
+
+    // 注册系统相册选择器的回调
     val imagePickerLauncher = rememberLauncherForActivityResult(
         contract = ActivityResultContracts.GetContent()
     ) { uri: android.net.Uri? ->
-        // 当用户选完图片后回调
-        uri?.let {
-            viewModel.saveImageToCurrentDir(context, it)
-        }
+        uri?.let { viewModel.saveImageToCurrentDir(context, it) }
     }
 
+    // --- 界面布局主体 ---
     Scaffold(
-        modifier = Modifier.fillMaxSize(),
+        modifier = Modifier
+            .fillMaxSize()
+            .nestedScroll(scrollBehavior.nestedScrollConnection), // 绑定嵌套滚动
+        snackbarHost = { SnackbarHost(hostState = snackbarHostState) },
         topBar = {
             TopAppBar(
                 title = {
-                    Text(
-                        text = if (isRoot) "我的空间 ($userId)" else currentPath?.name ?: "",
-                        style = MaterialTheme.typography.titleLarge
-                    )
+                    Column {
+                        Text(
+                            text = if (isRoot) "我的空间" else currentPath?.name ?: "",
+                            style = MaterialTheme.typography.titleLarge,
+                            maxLines = 1,
+                            overflow = TextOverflow.Ellipsis
+                        )
+                        if (isRoot) {
+                            Text(
+                                userId,
+                                style = MaterialTheme.typography.labelSmall,
+                                color = MaterialTheme.colorScheme.secondary
+                            )
+                        }
+                    }
                 },
-                windowInsets = TopAppBarDefaults.windowInsets,
                 navigationIcon = {
+                    // 非根目录下显示返回箭头
                     if (!isRoot) {
                         IconButton(onClick = { viewModel.navigateBack() }) {
                             Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "返回")
@@ -128,127 +171,118 @@ fun ExplorerScreen(userId: String, onLogout: () -> Unit) {
                     }
                 },
                 actions = {
-                    Box(modifier = Modifier.wrapContentSize(Alignment.TopEnd)) {
-                        IconButton(onClick = { showMenu.value = true }) {
-                            Icon(Icons.Default.MoreVert, contentDescription = "更多选项")
+                    // 如果剪贴板有内容，在顶部显示“快捷粘贴”图标
+                    if (clipboardFile != null) {
+                        IconButton(onClick = { currentPath?.let { viewModel.paste(it) } }) {
+                            Icon(
+                                imageVector = Icons.Default.ContentPaste,
+                                contentDescription = "粘贴",
+                                tint = Color(0xFFFF9800)
+                            )
                         }
+                    }
 
-                        // 下拉菜单组件
-                        DropdownMenu(
-                            expanded = showMenu.value,
-                            onDismissRequest = { showMenu.value = false }
-                        ) {
-                            DropdownMenuItem(
-                                text = { Text("刷新列表") },
-                                leadingIcon = {
-                                    Icon(
-                                        imageVector = Icons.Default.Refresh,
-                                        contentDescription = null,
-                                        tint = Color(0xFF2196F3) // 蓝色：代表同步与刷新
-                                    )
-                                },
-                                onClick = {
-                                    showMenu.value = false
-                                    viewModel.currentPath.value?.let { viewModel.loadFiles(it) }
-                                }
-                            )
+                    IconButton(onClick = { showMenu.value = true }) {
+                        Icon(Icons.Default.MoreVert, contentDescription = "更多选项")
+                    }
 
-                            DropdownMenuItem(
-                                text = { Text("按名称排序") },
-                                leadingIcon = {
-                                    Icon(
-                                        imageVector = Icons.Default.SortByAlpha,
-                                        contentDescription = null,
-                                        tint = Color(0xFF9C27B0) // 紫色：代表逻辑与组织
-                                    )
-                                },
-                                onClick = {
-                                    showMenu.value = false
-                                    viewModel.updateSortOrder(ExplorerViewModel.SortOrder.NAME)
-                                }
-                            )
+                    // 更多选项下拉菜单
+                    DropdownMenu(
+                        expanded = showMenu.value,
+                        onDismissRequest = { showMenu.value = false }
+                    ) {
+                        DropdownMenuItem(
+                            text = { Text("刷新列表") },
+                            leadingIcon = {
+                                Icon(
+                                    Icons.Default.Refresh,
+                                    null,
+                                    tint = Color(0xFF2196F3)
+                                )
+                            },
+                            onClick = {
+                                showMenu.value = false
+                                viewModel.currentPath.value?.let { viewModel.loadFiles(it) }
+                            }
+                        )
 
-                            DropdownMenuItem(
-                                text = { Text("时间排序 (新→旧)") },
-                                leadingIcon = {
-                                    Icon(
-                                        imageVector = Icons.Default.History,
-                                        contentDescription = null,
-                                        tint = Color(0xFF00BCD4) // 青色：代表历史回顾
-                                    )
-                                },
-                                onClick = {
-                                    showMenu.value = false
-                                    viewModel.updateSortOrder(ExplorerViewModel.SortOrder.TIME_DESC)
-                                }
-                            )
+                        DropdownMenuItem(
+                            text = { Text("按名称排序") },
+                            leadingIcon = {
+                                Icon(
+                                    imageVector = Icons.Default.SortByAlpha,
+                                    contentDescription = null,
+                                    tint = Color(0xFF9C27B0) // 紫色：代表逻辑与组织
+                                )
+                            },
+                            onClick = {
+                                showMenu.value = false
+                                viewModel.updateSortOrder(ExplorerViewModel.SortOrder.NAME)
+                            }
+                        )
 
-                            DropdownMenuItem(
-                                text = { Text("时间排序 (旧→新)") },
-                                leadingIcon = {
-                                    Icon(
-                                        imageVector = Icons.Default.Update,
-                                        contentDescription = null,
-                                        tint = Color(0xFF009688) // 深青色：代表更新顺序
-                                    )
-                                },
-                                onClick = {
-                                    showMenu.value = false
-                                    viewModel.updateSortOrder(ExplorerViewModel.SortOrder.TIME_ASC)
-                                }
-                            )
+                        DropdownMenuItem(
+                            text = { Text("时间排序 (新→旧)") },
+                            leadingIcon = {
+                                Icon(
+                                    imageVector = Icons.Default.History,
+                                    contentDescription = null,
+                                    tint = Color(0xFF00BCD4) // 青色：代表历史回顾
+                                )
+                            },
+                            onClick = {
+                                showMenu.value = false
+                                viewModel.updateSortOrder(ExplorerViewModel.SortOrder.TIME_DESC)
+                            }
+                        )
 
-                            DropdownMenuItem(
-                                text = { Text("从相册导入图片") },
-                                leadingIcon = {
-                                    Icon(
-                                        imageVector = Icons.Default.AddPhotoAlternate,
-                                        contentDescription = null,
-                                        tint = Color(0xFF4CAF50) // 绿色：代表新增与成功
-                                    )
-                                },
-                                onClick = {
-                                    showMenu.value = false
-                                    imagePickerLauncher.launch("image/*")
-                                }
-                            )
+                        DropdownMenuItem(
+                            text = { Text("时间排序 (旧→新)") },
+                            leadingIcon = {
+                                Icon(
+                                    imageVector = Icons.Default.Update,
+                                    contentDescription = null,
+                                    tint = Color(0xFF009688) // 深青色：代表更新顺序
+                                )
+                            },
+                            onClick = {
+                                showMenu.value = false
+                                viewModel.updateSortOrder(ExplorerViewModel.SortOrder.TIME_ASC)
+                            }
+                        )
 
-                            DropdownMenuItem(
-                                text = { Text("粘贴文件") },
-                                // 只有剪贴板有内容时才高亮显示图标
-                                leadingIcon = {
-                                    Icon(
-                                        imageVector = Icons.Default.ContentPaste,
-                                        contentDescription = null,
-                                        tint = if (isClipboardEmpty != null) MaterialTheme.colorScheme.primary else Color.Gray
-                                    )
-                                },
-                                enabled = isClipboardEmpty != null,
-                                onClick = {
-                                    showMenu.value = false
-                                    currentPath?.let {
-                                        viewModel.paste(it)
-                                    }
-                                }
-                            )
+                        DropdownMenuItem(
+                            text = { Text("从相册导入图片") },
+                            leadingIcon = {
+                                Icon(
+                                    imageVector = Icons.Default.AddPhotoAlternate,
+                                    contentDescription = null,
+                                    tint = Color(0xFF4CAF50) // 绿色：代表新增与成功
+                                )
+                            },
+                            onClick = {
+                                showMenu.value = false
+                                imagePickerLauncher.launch("image/*")
+                            }
+                        )
 
-                            DropdownMenuItem(
-                                text = { Text("退出登录") },
-                                leadingIcon = {
-                                    Icon(
-                                        imageVector = Icons.AutoMirrored.Filled.ExitToApp,
-                                        contentDescription = null,
-                                        tint = Color(0xFFF44336) // 红色：代表警告或断开连接
-                                    )
-                                },
-                                onClick = {
-                                    showMenu.value = false
-                                    onLogout()
-                                }
-                            )
-                        }
+                        DropdownMenuItem(
+                            text = { Text("退出登录") },
+                            leadingIcon = {
+                                Icon(
+                                    Icons.AutoMirrored.Filled.ExitToApp,
+                                    null,
+                                    tint = Color(0xFFF44336)
+                                )
+                            },
+                            onClick = {
+                                showMenu.value = false
+                                onLogout()
+                            }
+                        )
                     }
                 },
+                scrollBehavior = scrollBehavior,
                 colors = TopAppBarDefaults.topAppBarColors(
                     containerColor = MaterialTheme.colorScheme.primaryContainer,
                     titleContentColor = MaterialTheme.colorScheme.onPrimaryContainer
@@ -256,169 +290,129 @@ fun ExplorerScreen(userId: String, onLogout: () -> Unit) {
             )
         },
         floatingActionButton = {
+            // 仅在非选中模式下显示悬浮球
             if (selectedFile.value == null) {
                 FloatingActionButton(
-                    onClick = {
-                        showDialog.value = true
-                        newFolderName.value = ""
-                    },
-                    containerColor = MaterialTheme.colorScheme.primary,
-                    contentColor = Color.White
+                    onClick = { showDialog.value = true },
+                    containerColor = MaterialTheme.colorScheme.primaryContainer,
+                    contentColor = MaterialTheme.colorScheme.onPrimaryContainer
                 ) {
-                    Icon(Icons.Default.Add, contentDescription = "新建文件")
+                    Icon(Icons.Default.Add, "新建")
                 }
             }
         },
         bottomBar = {
+            // 选中文件时，滑入底部操作栏
             if (selectedFile.value != null) {
-                BottomAppBar(
-                    containerColor = MaterialTheme.colorScheme.surfaceVariant,
-                    contentColor = MaterialTheme.colorScheme.primary,
-                    actions = {
+                AnimatedVisibility(
+                    visible = selectedFile.value != null,
+                    enter = expandVertically(expandFrom = Alignment.Bottom),
+                    exit = shrinkVertically(shrinkTowards = Alignment.Bottom)
+                ) {
+                    BottomAppBar(
+                        containerColor = MaterialTheme.colorScheme.surfaceColorAtElevation(3.dp),
+                        contentPadding = PaddingValues(horizontal = 8.dp)
+                    ) {
                         Row(
                             modifier = Modifier.fillMaxWidth(),
-                            horizontalArrangement = Arrangement.SpaceEvenly,
-                            verticalAlignment = Alignment.CenterVertically
+                            horizontalArrangement = Arrangement.SpaceEvenly
                         ) {
                             ActionIconButton(Icons.Default.Delete, "删除") {
-                                selectedFile.value?.let {
-                                    viewModel.deleteItem(it)
-                                }
+                                selectedFile.value?.let { viewModel.deleteItem(it) }
                                 selectedFile.value = null
                             }
                             ActionIconButton(Icons.Default.Info, "详情") {
                                 showDetailsSheet.value = true
                             }
                             ActionIconButton(Icons.Default.ContentCut, "剪切") {
-                                // 剪切逻辑
                                 selectedFile.value?.let {
-                                    viewModel.setClipboard(it, ExplorerViewModel.TransferMode.CUT)
+                                    viewModel.setClipboard(
+                                        it,
+                                        ExplorerViewModel.TransferMode.CUT
+                                    )
                                 }
                                 selectedFile.value = null
                             }
                             ActionIconButton(Icons.Default.ContentCopy, "复制") {
-                                // 复制逻辑
                                 selectedFile.value?.let {
-                                    viewModel.setClipboard(it, ExplorerViewModel.TransferMode.COPY)
+                                    viewModel.setClipboard(
+                                        it,
+                                        ExplorerViewModel.TransferMode.COPY
+                                    )
                                 }
                                 selectedFile.value = null
                             }
-                            ActionIconButton(Icons.Default.Edit, "重命名") {
-                                selectedFile.value?.let {
-                                    renameTextFieldValue.value = it.name // 默认填充当前文件名
-                                    showRenameDialog.value = true
-                                }
-                            }
+                            ActionIconButton(
+                                Icons.Default.Edit,
+                                "重命名"
+                            ) { showRenameDialog.value = true }
                             ActionIconButton(Icons.Default.Cancel, "取消") {
                                 selectedFile.value = null
                             }
                         }
                     }
-                )
+                }
             }
         }
     ) { paddingValues ->
-        Column(
-            modifier = Modifier.padding(paddingValues)
-        ) {
+        // --- 核心内容列表区 ---
+        Column(modifier = Modifier.padding(paddingValues)) {
             if (fileList.isEmpty()) {
-                Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
-                    Text("文件夹为空", color = Color.Gray)
-                }
+                // 列表为空时的空状态视图
+                EmptyStateView()
             } else {
-                LazyColumn {
-                    items(fileList) { file ->
-                        FileRow(
-                            file = file,
-                            onClick = {
-                                if (selectedFile.value != null) {
-                                    // 如果当前处于选中模式，点击任何项可能意味着取消选中
-                                    selectedFile.value = null
-                                } else {
-                                    // 正常的目录跳转或打开文件逻辑
-                                    if (file.isDirectory) viewModel.loadFiles(File(file.path))
-                                    else viewModel.openFile(context, file)
-                                }
-                            },
-                            onLongClick = {
-                                // 长按时，记录选中的文件，这会触发 Scaffold 底部工具栏的弹出
-                                selectedFile.value = file
-                            }
-                        )
+                LazyColumn(modifier = Modifier.fillMaxSize()) {
+                    // key={it.path} 提高列表重组性能
+                    items(fileList, key = { it.path }) { file ->
+                        val isSelected = selectedFile.value?.path == file.path
+                        // animateItem 实现平滑的项目移动和增删动画
+                        Box(modifier = Modifier.animateItem()) {
+                            FileRow(
+                                file = file,
+                                isSelected = isSelected,
+                                onClick = {
+                                    if (selectedFile.value != null) {
+                                        selectedFile.value = null // 选中模式下点击取消
+                                    } else {
+                                        if (file.isDirectory) viewModel.loadFiles(File(file.path)) // 文件夹跳转
+                                        else viewModel.openFile(context, file) // 文件打开
+                                    }
+                                },
+                                onLongClick = { selectedFile.value = file } // 长按进入选中模式
+                            )
+                        }
                     }
                 }
             }
         }
 
+        // --- 对话框组件挂载 ---
+
+        // 新建文件对话框
         if (showDialog.value) {
-            AlertDialog(
-                onDismissRequest = { showDialog.value = false },
-                title = { Text("新建文件") },
-                text = {
-                    OutlinedTextField(
-                        value = newFolderName.value,
-                        onValueChange = { newFolderName.value = it },
-                        label = { Text("文件名称") },
-                        singleLine = true,
-                        modifier = Modifier.fillMaxWidth()
-                    )
-                },
-                confirmButton = {
-                    TextButton(
-                        onClick = {
-                            if (newFolderName.value.isNotBlank()) {
-                                // 调用 ViewModel 执行真正的文件系统操作
-                                viewModel.createItem(newFolderName.value)
-                                showDialog.value = false
-                            }
-                        }
-                    ) {
-                        Text("确定")
-                    }
+            AddFileItemDialog(
+                onConfirm = { fileName ->
+                    showDialog.value = false
+                    viewModel.createItem(fileName)
                 },
-                dismissButton = {
-                    TextButton(onClick = { showDialog.value = false }) {
-                        Text("取消")
-                    }
-                }
+                onDismiss = { showDialog.value = false }
             )
         }
 
+        // 重命名对话框
         if (showRenameDialog.value && selectedFile.value != null) {
-            AlertDialog(
-                onDismissRequest = { showRenameDialog.value = false },
-                title = { Text("重命名") },
-                text = {
-                    OutlinedTextField(
-                        value = renameTextFieldValue.value,
-                        onValueChange = { renameTextFieldValue.value = it },
-                        label = { Text("新名称") },
-                        singleLine = true,
-                        modifier = Modifier.fillMaxWidth()
-                    )
+            RenameFileName(
+                fileName = selectedFile.value?.name ?: "",
+                onConfirm = { fileName ->
+                    selectedFile.value?.let { viewModel.renameItem(it, fileName) }
+                    showRenameDialog.value = false
+                    selectedFile.value = null // 重命名成功后释放选中
                 },
-                confirmButton = {
-                    TextButton(
-                        onClick = {
-                            if (renameTextFieldValue.value.isNotBlank() &&
-                                renameTextFieldValue.value != selectedFile.value?.name) {
-                                viewModel.renameItem(selectedFile.value!!, renameTextFieldValue.value)
-                                selectedFile.value = null // 操作完取消选中状态
-                                showRenameDialog.value = false
-                            }
-                        }
-                    ) {
-                        Text("确定")
-                    }
-                },
-                dismissButton = {
-                    TextButton(onClick = { showRenameDialog.value = false }) {
-                        Text("取消")
-                    }
-                }
+                onDismiss = { showRenameDialog.value = false }
             )
         }
 
+        // 详情面板
         if (showDetailsSheet.value && selectedFile.value != null) {
             FileDetailsSheet(
                 file = selectedFile.value!!,
diff --git a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerViewModel.kt b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerViewModel.kt
index 6c76851..1f5f86a 100644
--- a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerViewModel.kt
+++ b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/ExplorerViewModel.kt
@@ -2,306 +2,297 @@ package com.eggetteluo.folder.ui.features.explorer
 
 import android.content.Context
 import android.content.Intent
-import android.os.Build
-import android.util.Log
+import android.net.Uri
 import android.webkit.MimeTypeMap
 import androidx.core.content.FileProvider
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.eggetteluo.folder.model.FileItem
+import com.eggetteluo.folder.util.FileHelper
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import java.io.File
-import java.nio.file.Files
-import java.nio.file.Paths
-import java.nio.file.attribute.BasicFileAttributes
 
+/**
+ * 文件资源管理器的核心 ViewModel
+ * 负责维护文件列表状态、路径导航、剪贴板逻辑以及与物理文件系统的交互
+ */
 class ExplorerViewModel : ViewModel() {
 
-    enum class SortOrder {
-        NAME,       // 按名称排序
-        TIME_DESC,  // 按创建时间倒序（最新的在前）
-        TIME_ASC    // 按创建时间正序
-    }
+    // --- 枚举定义 ---
+
+    /** 排序方式：按名称、按时间倒序、按时间正序 */
+    enum class SortOrder { NAME, TIME_DESC, TIME_ASC }
+
+    /** 文件传输模式：复制、剪切、无 */
+    enum class TransferMode { COPY, CUT, NONE }
 
+    // --- 状态流 (StateFlow) ---
+
+    // 当前目录下的文件列表数据
     private val _fileList = MutableStateFlow<List<FileItem>>(emptyList())
     val fileList: StateFlow<List<FileItem>> = _fileList
 
+    // 当前所处的物理目录路径
     private val _currentPath = MutableStateFlow<File?>(null)
     val currentPath: StateFlow<File?> = _currentPath
 
-    private var userRoot: File? = null
-
-    // 定义操作类型
-    enum class TransferMode { COPY, CUT, NONE }
-
+    // 剪贴板中持有的文件对象
     private val _clipboardFile = MutableStateFlow<FileItem?>(null)
-    private val _transferMode = MutableStateFlow(TransferMode.NONE)
-
     val clipboardFile: StateFlow<FileItem?> = _clipboardFile
+
+    // 当前剪贴板的操作模式（复制或剪切）
+    private val _transferMode = MutableStateFlow(TransferMode.NONE)
     val transferMode: StateFlow<TransferMode> = _transferMode
 
+    // --- 事件流 (SharedFlow) ---
+
+    // 一次性错误消息通知流，用于 UI 弹出 Snackbar 或 Toast
+    private val _errorMessage = MutableSharedFlow<String>()
+    val errorMessage = _errorMessage.asSharedFlow()
+
+    // 内部持有的当前排序规则
+    private val _sortOrder = MutableStateFlow(SortOrder.NAME)
+
+    // 用户的根目录（在该应用空间内的最高级目录）
+    private var userRoot: File? = null
+
+    // --- 核心业务方法 ---
+
+    /**
+     * 初始化用户的私人文件空间
+     * @param userId 用户唯一标识，用于隔离不同用户的文件
+     */
     fun initUserSpace(userId: String) {
+        if (userRoot != null) return // 避免重复初始化
         val root = File("/storage/emulated/0/MyFileManager/$userId")
-        if (!root.exists()) root.mkdirs()
-
+        if (!root.exists()) root.mkdirs() // 如果文件夹不存在则递归创建
         userRoot = root
         loadFiles(root)
     }
 
+    /**
+     * 判断当前是否处于用户空间的根目录
+     * @return true 表示已无法再向后退
+     */
     fun isRoot(): Boolean {
         return _currentPath.value?.absolutePath == userRoot?.absolutePath
     }
 
-    fun loadFiles(directory: File) {
-        viewModelScope.launch(Dispatchers.IO) {
-            val files = directory.listFiles()?.map { file ->
-                // 获取创建时间
-                val creationTime = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                    try {
-                        val path = Paths.get(file.absolutePath)
-                        val attributes = Files.readAttributes(path, BasicFileAttributes::class.java)
-                        attributes.creationTime().toMillis()
-                    } catch (e: Exception) {
-                        file.lastModified() // 如果读取失败，回退到最后修改时间
-                    }
-                } else {
-                    file.lastModified() // 低版本 Android 不支持，默认用最后修改时间
-                }
-
-                FileItem(
-                    name = file.name,
-                    path = file.absolutePath,
-                    isDirectory = file.isDirectory,
-                    size = if (file.isDirectory) 0L else file.length(),
-                    lastModified = file.lastModified(),
-                    createdAt = creationTime,
-                    canRead = file.canRead(),
-                    canWrite = file.canWrite(),
-                    isHidden = file.isHidden,
-                    extension = file.extension
-                )
-            } ?: emptyList()
-
-            val sortedFiles = when (_sortOrder.value) {
-                SortOrder.NAME -> {
-                    files.sortedWith(compareBy({ !it.isDirectory }, { it.name.lowercase() }))
-                }
-
-                SortOrder.TIME_DESC -> {
-                    // 文件夹依然排在前面，然后按创建时间从新到旧
-                    files.sortedWith(compareBy({ !it.isDirectory }, { -it.createdAt }))
-                }
-
-                SortOrder.TIME_ASC -> {
-                    files.sortedWith(compareBy({ !it.isDirectory }, { it.createdAt }))
-                }
-            }
-
-            withContext(Dispatchers.Main) {
-                _fileList.value = sortedFiles
-                _currentPath.value = directory
-            }
-        }
-    }
-
-    private val _sortOrder = MutableStateFlow(SortOrder.NAME)
-    val sortOrder: StateFlow<SortOrder> = _sortOrder
-
-    // 提供一个方法供 UI 切换排序
-    fun updateSortOrder(order: SortOrder) {
-        _sortOrder.value = order
-        // 切换后重新加载当前目录以应用新排序
-        _currentPath.value?.let { loadFiles(it) }
-    }
-
+    /**
+     * 向上一级目录导航
+     * @return true 表示成功返回上一级，false 表示已在根目录
+     */
     fun navigateBack(): Boolean {
         val current = _currentPath.value ?: return false
         val root = userRoot ?: return false
 
-        // 1. 如果当前路径的绝对路径已经等于根目录的绝对路径，则拦截，不进行回退
+        // 如果当前已经是根目录，拒绝回退请求
         if (current.absolutePath == root.absolutePath) {
             return false
         }
 
-        // 2. 否则获取父级目录并跳转
         val parent = current.parentFile
         if (parent != null) {
             loadFiles(parent)
             return true
         }
-
         return false
     }
 
     /**
-     * 创建项目：根据是否有后缀名自动判断是文件还是文件夹
+     * 从物理磁盘加载指定目录的文件列表
+     * @param directory 目标目录，默认为当前目录
      */
-    fun createItem(name: String) {
-        val currentDir = _currentPath.value ?: return
-        val targetFile = File(currentDir, name)
-
-        if (targetFile.exists()) {
-            // 这里可以根据需要添加“文件已存在”的提示逻辑
-            return
+    fun loadFiles(directory: File? = _currentPath.value) {
+        if (directory == null) return
+        viewModelScope.launch(Dispatchers.IO) {
+            runCatching {
+                // 调用工具类扫描磁盘
+                FileHelper.listFiles(directory)
+            }.onSuccess { files ->
+                // 应用当前的排序算法
+                val sorted = sortFiles(files, _sortOrder.value)
+                _fileList.value = sorted
+                _currentPath.value = directory
+            }.onFailure {
+                _errorMessage.emit("无法读取目录：${it.message}")
+            }
         }
+    }
 
-        try {
-            val success = if (name.contains(".")) {
-                // 有扩展名 -> 创建文件
-                targetFile.createNewFile()
-            } else {
-                // 无扩展名 -> 创建文件夹
-                targetFile.mkdir()
-            }
+    /**
+     * 在当前目录下创建新项目
+     * @param name 新建的文件或文件夹名称（FileHelper 根据名称后缀自动判断类型）
+     */
+    fun createItem(name: String) {
+        val currentDir = _currentPath.value ?: return
 
+        viewModelScope.launch(Dispatchers.IO) {
+            val success = FileHelper.createItem(currentDir, name)
             if (success) {
-                // 关键：创建成功后，重新加载当前目录以刷新 UI
-                loadFiles(currentDir)
+                loadFiles(currentDir) // 创建成功后自动刷新列表
+            } else {
+                _errorMessage.emit("创建失败：项目已存在或名称非法")
             }
-        } catch (e: Exception) {
-            e.printStackTrace()
-            Log.d("xiaoluo", "文件创建失败: ${e.message}")
-            // 实际开发中建议通过另一个 StateFlow 发送错误消息给 UI
         }
     }
 
+    /**
+     * 调用 Android 系统能力尝试打开文件
+     * @param context 上下文用于启动 Activity
+     * @param fileItem 要打开的目标文件模型
+     */
     fun openFile(context: Context, fileItem: FileItem) {
         val file = File(fileItem.path)
-        if (!file.exists()) return
-
-        val type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(file.extension)
-        val uri = FileProvider.getUriForFile(
-            context,
-            "${context.packageName}.fileprovider",
-            file
-        )
-
-        val intent = Intent(Intent.ACTION_VIEW).apply {
-            setDataAndType(uri, type)
-            addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) // 授予临时读取权限
-            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+
+        if (!file.exists()) {
+            viewModelScope.launch { _errorMessage.emit("文件不存在") }
+            return
         }
 
         try {
+            // 获取文件的后缀并解析 MimeType（媒体类型）
+            val extension = file.extension.lowercase()
+            var type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension)
+
+            // 如果无法识别类型，使用通用的二进制流类型
+            if (type == null) { type = "*/*" }
+
+            // 使用 FileProvider 生成安全 Uri，避免 7.0+ 后的 FileUriExposedException
+            val uri = FileProvider.getUriForFile(
+                context,
+                "${context.packageName}.fileprovider",
+                file
+            )
+
+            // 构建隐式 Intent 启动第三方应用（如相册、视频播放器）
+            val intent = Intent(Intent.ACTION_VIEW).apply {
+                setDataAndType(uri, type)
+                addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) // 授予临时读取权限
+                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            }
+
             context.startActivity(intent)
         } catch (e: Exception) {
-            // 如果系统没有能打开该类型文件的应用，可以在这里处理报错
             e.printStackTrace()
+            viewModelScope.launch {
+                _errorMessage.emit("没有找到可以打开此文件的应用")
+            }
         }
     }
 
     /**
-     * 删除文件或文件夹
+     * 更新当前界面的排序方式
+     * @param order 选中的排序枚举
      */
-    fun deleteItem(fileItem: FileItem) {
-        val file = File(fileItem.path)
-        val currentDir = _currentPath.value ?: return
+    fun updateSortOrder(order: SortOrder) {
+        _sortOrder.value = order
+        // 仅对当前内存中的列表进行重新排序，无需重新扫描磁盘（性能优化）
+        _fileList.value = sortFiles(_fileList.value, order)
+    }
 
+    /**
+     * 删除选中的项目
+     * @param fileItem 要删除的文件或文件夹模型
+     */
+    fun deleteItem(fileItem: FileItem) {
         viewModelScope.launch(Dispatchers.IO) {
-            try {
-                val success = if (file.isDirectory) {
-                    // 如果是文件夹，建议使用 deleteRecursively() 确保删除内部所有内容
-                    file.deleteRecursively()
-                } else {
-                    file.delete()
-                }
-
-                if (success) {
-                    // 删除成功后，回到主线程刷新列表
-                    loadFiles(currentDir)
-                } else {
-                    Log.e("ExplorerViewModel", "删除失败: ${file.absolutePath}")
-                }
-            } catch (e: Exception) {
-                e.printStackTrace()
-                Log.e("ExplorerViewModel", "删除异常: ${e.message}")
+            if (FileHelper.delete(File(fileItem.path))) {
+                loadFiles() // 删除成功后刷新界面
+            } else {
+                _errorMessage.emit("删除失败：权限不足或文件被占用")
             }
         }
     }
 
     /**
-     * 重命名文件或文件夹
+     * 重命名选中的项目
+     * @param fileItem 目标文件
+     * @param newName 新的名字
      */
     fun renameItem(fileItem: FileItem, newName: String) {
         val currentFile = File(fileItem.path)
-        val parentDir = currentFile.parentFile ?: return
-        val targetFile = File(parentDir, newName)
-
-        if (targetFile.exists()) {
-            // 这里可以发送一个错误状态给 UI，提示“文件名已存在”
-            return
-        }
 
         viewModelScope.launch(Dispatchers.IO) {
-            try {
-                val success = currentFile.renameTo(targetFile)
-                if (success) {
-                    // 刷新列表
-                    loadFiles(parentDir)
-                }
-            } catch (e: Exception) {
-                e.printStackTrace()
+            val success = FileHelper.rename(currentFile, newName)
+            if (success) {
+                loadFiles()
+            } else {
+                _errorMessage.emit("重命名失败：名称冲突或无权限")
             }
         }
     }
 
+    /**
+     * 将文件标记为等待传输状态
+     * @param file 要操作的文件
+     * @param mode 操作模式（复制或剪切）
+     */
     fun setClipboard(file: FileItem, mode: TransferMode) {
         _clipboardFile.value = file
         _transferMode.value = mode
     }
 
+    /**
+     * 在目标目录下执行粘贴操作
+     * @param targetFolder 目标目录
+     */
     fun paste(targetFolder: File) {
         val source = _clipboardFile.value ?: return
-        val mode = _transferMode.value
-        val sourceFile = File(source.path)
-        val destFile = File(targetFolder, sourceFile.name)
+        val isMove = _transferMode.value == TransferMode.CUT
 
         viewModelScope.launch(Dispatchers.IO) {
-            try {
-                if (mode == TransferMode.COPY) {
-                    sourceFile.copyRecursively(destFile, overwrite = true)
-                } else if (mode == TransferMode.CUT) {
-                    sourceFile.renameTo(destFile) // 移动操作
-                }
-
-                // 操作完成后清除剪贴板并刷新
+            // 调用 FileHelper 执行真正的 IO 操作（Copy 或 Move）
+            val success = FileHelper.paste(source.path, targetFolder, isMove)
+            if (success) {
+                // 操作成功后清空剪贴板并刷新
                 _clipboardFile.value = null
                 _transferMode.value = TransferMode.NONE
                 loadFiles(targetFolder)
-            } catch (e: Exception) {
-                e.printStackTrace()
+            } else {
+                _errorMessage.emit("粘贴失败：目标位置已存在同名项目")
             }
         }
     }
 
     /**
-     * 将选取的图片保存到当前目录
+     * 将从外部（如系统相册）选中的图片保存到当前目录
+     * @param context 环境上下文
+     * @param uri 图片的 Uri
      */
-    fun saveImageToCurrentDir(context: Context, uri: android.net.Uri) {
+    fun saveImageToCurrentDir(context: Context, uri: Uri) {
         val currentDir = _currentPath.value ?: return
-
         viewModelScope.launch(Dispatchers.IO) {
-            try {
-                val fileName = "IMG_${System.currentTimeMillis()}.jpg"
-                val targetFile = File(currentDir, fileName)
-
-                context.contentResolver.openInputStream(uri)?.use { inputStream ->
-                    targetFile.outputStream().use { outputStream ->
-                        inputStream.copyTo(outputStream)
-                    }
-                }
-
-                withContext(Dispatchers.Main) {
-                    loadFiles(currentDir)
-                }
-            } catch (e: Exception) {
-                e.printStackTrace()
-                Log.e("ExplorerViewModel", "图片保存失败: ${e.message}")
+            // 生成带时间戳的文件名，避免冲突
+            val fileName = "IMG_${System.currentTimeMillis()}.jpg"
+            val target = File(currentDir, fileName)
+
+            // 将 Uri 输入流拷贝到本地目标文件
+            if (FileHelper.saveUriStream(context, uri, target)) {
+                loadFiles()
+            } else {
+                _errorMessage.emit("保存图片失败")
             }
         }
     }
+
+    /**
+     * 内部私有排序逻辑
+     * 文件夹始终排在最前面，然后根据指定规则排序
+     */
+    private fun sortFiles(files: List<FileItem>, order: SortOrder): List<FileItem> {
+        return when (order) {
+            // 按名称：文件夹优先 -> 名称 A-Z
+            SortOrder.NAME -> files.sortedWith(compareBy({ !it.isDirectory }, { it.name.lowercase() }))
+            // 按时间倒序：文件夹优先 -> 最新创建在前
+            SortOrder.TIME_DESC -> files.sortedWith(compareBy({ !it.isDirectory }, { -it.createdAt }))
+            // 按时间正序：文件夹优先 -> 最老创建在前
+            SortOrder.TIME_ASC -> files.sortedWith(compareBy({ !it.isDirectory }, { it.createdAt }))
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/components.kt b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/components.kt
index 1efb92f..9af4487 100644
--- a/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/components.kt
+++ b/app/src/main/java/com/eggetteluo/folder/ui/features/explorer/components.kt
@@ -1,18 +1,22 @@
 package com.eggetteluo.folder.ui.features.explorer
 
 import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.Article
 import androidx.compose.material.icons.filled.Android
-import androidx.compose.material.icons.filled.Article
 import androidx.compose.material.icons.filled.AudioFile
-import androidx.compose.material.icons.filled.AutoStories
+import androidx.compose.material.icons.filled.CheckCircle
 import androidx.compose.material.icons.filled.ChevronRight
 import androidx.compose.material.icons.filled.Code
 import androidx.compose.material.icons.filled.Description
@@ -22,40 +26,69 @@ import androidx.compose.material.icons.filled.Inventory2
 import androidx.compose.material.icons.filled.PictureAsPdf
 import androidx.compose.material.icons.filled.TableChart
 import androidx.compose.material.icons.filled.VideoFile
+import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.ListItem
+import androidx.compose.material3.ListItemDefaults
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
+import com.eggetteluo.folder.model.FileIconTheme
 import com.eggetteluo.folder.model.FileItem
 import com.eggetteluo.folder.util.formatFileDate
 import com.eggetteluo.folder.util.formatFileSize
 import com.eggetteluo.folder.util.getFolderItemCount
 
+/**
+ * 文件列表中的单行项目组件
+ * 负责展示文件的图标、名称、详细信息以及选中状态的视觉反馈。
+ *
+ * @param file 对应的文件数据模型
+ * @param isSelected 当前行是否处于被选中状态
+ * @param onClick 普通点击事件（用于打开文件或进入目录）
+ * @param onLongClick 长按点击事件（用于进入选中模式）
+ */
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun FileRow(
     file: FileItem,
+    isSelected: Boolean,
     onClick: () -> Unit,
     onLongClick: () -> Unit
 ) {
+    // 根据文件后缀获取图标主题
     val theme = getFileTheme(file)
 
+    // 计算背景色：选中时显示半透明的主题容器色
+    val backgroundColor = if (isSelected) {
+        MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.5f)
+    } else {
+        Color.Transparent
+    }
+
     ListItem(
-        modifier = Modifier.combinedClickable(
-            onClick = onClick,
-            onLongClick = onLongClick // 绑定长按事件
-        ),
+        modifier = Modifier
+            .fillMaxWidth()
+            .background(backgroundColor)
+            .combinedClickable(
+                onClick = onClick,
+                onLongClick = onLongClick
+            ),
         leadingContent = {
+            // 左侧显示文件类型图标
             Icon(
                 imageVector = theme.icon,
                 contentDescription = null,
@@ -64,15 +97,17 @@ fun FileRow(
             )
         },
         headlineContent = {
+            // 中间显示文件名，超出部分省略
             Text(
                 text = file.name,
                 style = MaterialTheme.typography.titleMedium,
                 maxLines = 1,
-                overflow = TextOverflow.Ellipsis
+                overflow = TextOverflow.Ellipsis,
+                color = if (isSelected) MaterialTheme.colorScheme.primary else Color.Unspecified
             )
         },
         supportingContent = {
-            // 拼接辅助信息：日期 | (项数 或 大小)
+            // 显示辅助信息：日期 | 文件大小/项目数
             val dateStr = formatFileDate(file.createdAt)
             val extraInfo = if (file.isDirectory) {
                 "${getFolderItemCount(file.path)}项"
@@ -83,74 +118,96 @@ fun FileRow(
             Text(
                 text = "$dateStr  |  $extraInfo",
                 style = MaterialTheme.typography.bodySmall,
-                color = Color.Gray
+                color = if (isSelected) MaterialTheme.colorScheme.primary.copy(alpha = 0.7f) else Color.Gray
             )
         },
         trailingContent = {
-            if (file.isDirectory) {
+            // 右侧状态展示：选中时显示勾选框，未选中时文件夹显示前进箭头
+            if (file.isDirectory && !isSelected) {
                 Icon(
                     imageVector = Icons.Default.ChevronRight,
                     contentDescription = null,
                     tint = Color(0xFFD1D1D1),
                     modifier = Modifier.size(20.dp)
                 )
+            } else if (isSelected) {
+                Icon(
+                    imageVector = Icons.Default.CheckCircle,
+                    contentDescription = "已选中",
+                    tint = MaterialTheme.colorScheme.primary,
+                    modifier = Modifier.size(24.dp)
+                )
             }
-        }
+        },
+        // 使 ListItem 容器背景透明，以展示 Modifier.background 设置的颜色
+        colors = ListItemDefaults.colors(containerColor = Color.Transparent)
     )
 }
 
-// 定义一个数据类来存放结果
-data class FileIconTheme(val icon: ImageVector, val color: Color)
-
+/**
+ * 根据文件扩展名返回对应的图标和颜色方案
+ * 实现了不同类型文件（图片、视频、文档、代码等）的视觉区分。
+ */
 fun getFileTheme(file: FileItem): FileIconTheme {
     val ext = file.extension.lowercase()
     return when {
-        file.isDirectory -> FileIconTheme(Icons.Default.Folder, Color(0xFFFFCA28))
-
-        // 图片
-        ext in listOf("jpg", "jpeg", "png", "webp", "gif") ->
-            FileIconTheme(Icons.Default.Image, Color(0xFF4CAF50))
+        file.isDirectory -> FileIconTheme(Icons.Default.Folder, Color(0xFFFFCA28)) // 经典文件夹黄
 
-        // 视频
-        ext in listOf("mp4", "mkv", "avi", "mov") ->
-            FileIconTheme(Icons.Default.VideoFile, Color(0xFF2196F3))
-
-        // 音频
-        ext in listOf("mp3", "wav", "flac", "m4a", "ogg") ->
-            FileIconTheme(Icons.Default.AudioFile, Color(0xFFE91E63))
-
-        // PDF
-        ext == "pdf" ->
-            FileIconTheme(Icons.Default.PictureAsPdf, Color(0xFFF44336))
+        // 媒体文件
+        ext in listOf("jpg", "jpeg", "png", "webp", "gif") -> FileIconTheme(
+            Icons.Default.Image,
+            Color(0xFF4CAF50)
+        )
 
-        // Android 安装包
-        ext == "apk" ->
-            FileIconTheme(Icons.Default.Android, Color(0xFF3DDC84))
+        ext in listOf("mp4", "mkv", "avi", "mov") -> FileIconTheme(
+            Icons.Default.VideoFile,
+            Color(0xFF2196F3)
+        )
 
-        // 压缩包
-        ext in listOf("zip", "rar", "7z", "tar", "gz") ->
-            FileIconTheme(Icons.Default.Inventory2, Color(0xFFFB8C00))
+        ext in listOf("mp3", "wav", "flac", "m4a", "ogg") -> FileIconTheme(
+            Icons.Default.AudioFile,
+            Color(0xFFE91E63)
+        )
 
-        // 代码/网页文件
-        ext in listOf("html", "xml", "js", "json", "php", "py", "cpp", "kt") ->
-            FileIconTheme(Icons.Default.Code, Color(0xFF00BCD4))
+        // 文档与工具
+        ext == "pdf" -> FileIconTheme(Icons.Default.PictureAsPdf, Color(0xFFF44336))
+        ext == "apk" -> FileIconTheme(Icons.Default.Android, Color(0xFF3DDC84))
+        ext in listOf("zip", "rar", "7z", "tar", "gz") -> FileIconTheme(
+            Icons.Default.Inventory2,
+            Color(0xFFFB8C00)
+        )
 
-        // 电子书/表格 (区分纯文本)
-        ext in listOf("epub", "mobi") ->
-            FileIconTheme(Icons.Default.AutoStories, Color(0xFF795548))
+        // 开发相关
+        ext in listOf(
+            "html",
+            "xml",
+            "js",
+            "json",
+            "php",
+            "py",
+            "cpp",
+            "kt"
+        ) -> FileIconTheme(Icons.Default.Code, Color(0xFF00BCD4))
 
-        // 表格
-        ext in listOf("xls", "xlsx", "csv") ->
-            FileIconTheme(Icons.Default.TableChart, Color(0xFF2E7D32))
+        // 办公文档
+        ext in listOf("xls", "xlsx", "csv") -> FileIconTheme(
+            Icons.Default.TableChart,
+            Color(0xFF2E7D32)
+        )
 
-        // 文档
-        ext in listOf("txt", "doc", "docx", "md") ->
-            FileIconTheme(Icons.Default.Article, Color(0xFF9C27B0))
+        ext in listOf("txt", "doc", "docx", "md") -> FileIconTheme(
+            Icons.AutoMirrored.Filled.Article,
+            Color(0xFF9C27B0)
+        )
 
         else -> FileIconTheme(Icons.Default.Description, Color.Gray)
     }
 }
 
+/**
+ * 底部操作栏中的功能按钮（如：删除、详情、重命名）
+ * 包含一个图标和下方的文字标签。
+ */
 @Composable
 fun ActionIconButton(icon: ImageVector, label: String, onClick: () -> Unit) {
     Column(
@@ -166,6 +223,10 @@ fun ActionIconButton(icon: ImageVector, label: String, onClick: () -> Unit) {
     }
 }
 
+/**
+ * 文件详情模态底部抽屉
+ * 点击“详情”后弹出，展示文件完整的路径、读写权限、大小及时间戳信息。
+ */
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun FileDetailsSheet(file: FileItem, onDismiss: () -> Unit) {
@@ -177,7 +238,7 @@ fun FileDetailsSheet(file: FileItem, onDismiss: () -> Unit) {
             modifier = Modifier
                 .fillMaxWidth()
                 .padding(horizontal = 20.dp)
-                .padding(bottom = 32.dp), // 留出底部安全距离
+                .padding(bottom = 32.dp),
             verticalArrangement = Arrangement.spacedBy(16.dp)
         ) {
             Text(
@@ -186,9 +247,11 @@ fun FileDetailsSheet(file: FileItem, onDismiss: () -> Unit) {
                 color = MaterialTheme.colorScheme.primary
             )
 
-            // 详情列表项
             DetailRow(label = "名称", value = file.name)
-            DetailRow(label = "类型", value = if (file.isDirectory) "文件夹" else "${file.extension.uppercase()} 文件")
+            DetailRow(
+                label = "类型",
+                value = if (file.isDirectory) "文件夹" else "${file.extension.uppercase()} 文件"
+            )
             DetailRow(label = "路径", value = file.path)
 
             if (!file.isDirectory) {
@@ -198,7 +261,7 @@ fun FileDetailsSheet(file: FileItem, onDismiss: () -> Unit) {
             DetailRow(label = "创建时间", value = formatFileDate(file.createdAt))
             DetailRow(label = "修改时间", value = formatFileDate(file.lastModified))
 
-            // 权限展示
+            // 拼接权限字符串
             val permissions = buildString {
                 if (file.canRead) append("可读 ")
                 if (file.canWrite) append("可写 ")
@@ -209,6 +272,9 @@ fun FileDetailsSheet(file: FileItem, onDismiss: () -> Unit) {
     }
 }
 
+/**
+ * 详情页中的单行数据组件（标签：值）
+ */
 @Composable
 fun DetailRow(label: String, value: String) {
     Column(modifier = Modifier.fillMaxWidth()) {
@@ -224,4 +290,104 @@ fun DetailRow(label: String, value: String) {
             modifier = Modifier.padding(top = 4.dp)
         )
     }
+}
+
+/**
+ * 列表为空时的占位视图
+ */
+@Composable
+fun EmptyStateView() {
+    Column(
+        modifier = Modifier.fillMaxSize(),
+        verticalArrangement = Arrangement.Center,
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        Icon(
+            Icons.Default.Folder,
+            contentDescription = null,
+            modifier = Modifier.size(64.dp),
+            tint = Color.LightGray
+        )
+        Spacer(Modifier.height(16.dp))
+        Text("文件夹为空", style = MaterialTheme.typography.bodyLarge, color = Color.Gray)
+    }
+}
+
+/**
+ * 创建新项目的输入对话框
+ * @param onConfirm 点击确定后的逻辑回调，传递输入的文件名
+ * @param onDismiss 点击取消或关闭对话框的回调
+ */
+@Composable
+fun AddFileItemDialog(onConfirm: (String) -> Unit, onDismiss: () -> Unit) {
+    val newFolderName = remember { mutableStateOf("") }
+    AlertDialog(
+        onDismissRequest = { onDismiss() },
+        title = { Text("新建文件") },
+        text = {
+            OutlinedTextField(
+                value = newFolderName.value,
+                onValueChange = { newFolderName.value = it },
+                label = { Text("文件名称") },
+                singleLine = true,
+                modifier = Modifier.fillMaxWidth()
+            )
+        },
+        confirmButton = {
+            TextButton(
+                onClick = {
+                    onConfirm(newFolderName.value)
+                    newFolderName.value = ""
+                }
+            ) {
+                Text("确定")
+            }
+        },
+        dismissButton = {
+            TextButton(onClick = { onDismiss() }) {
+                Text("取消")
+            }
+        }
+    )
+}
+
+/**
+ * 文件重命名的输入对话框
+ * @param fileName 初始文件名（默认填入输入框中）
+ * @param onConfirm 点击确定后的逻辑回调，传递新文件名
+ */
+@Composable
+fun RenameFileName(fileName: String, onConfirm: (String) -> Unit, onDismiss: () -> Unit) {
+    val renameTextFieldValue = remember { mutableStateOf(fileName) }
+    AlertDialog(
+        onDismissRequest = { onDismiss() },
+        title = { Text("重命名") },
+        text = {
+            OutlinedTextField(
+                value = renameTextFieldValue.value,
+                onValueChange = { renameTextFieldValue.value = it },
+                label = { Text("新名称") },
+                singleLine = true,
+                modifier = Modifier.fillMaxWidth()
+            )
+        },
+        confirmButton = {
+            TextButton(
+                onClick = {
+                    if (renameTextFieldValue.value.isNotBlank()) {
+                        onConfirm(renameTextFieldValue.value)
+                    } else {
+                        onDismiss()
+                    }
+                }
+            ) {
+                Text("确定")
+            }
+        },
+        dismissButton = {
+            TextButton(onClick = { onDismiss() }) {
+                Text("取消")
+            }
+        }
+    )
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/eggetteluo/folder/ui/features/login/LoginViewModel.kt b/app/src/main/java/com/eggetteluo/folder/ui/features/login/LoginViewModel.kt
index a0cb048..6a1ad7a 100644
--- a/app/src/main/java/com/eggetteluo/folder/ui/features/login/LoginViewModel.kt
+++ b/app/src/main/java/com/eggetteluo/folder/ui/features/login/LoginViewModel.kt
@@ -5,6 +5,7 @@ import android.content.Context
 import androidx.lifecycle.AndroidViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
+import androidx.core.content.edit
 
 class LoginViewModel(application: Application) : AndroidViewModel(application) {
     private val prefs = application.getSharedPreferences("user_creds", Context.MODE_PRIVATE)
@@ -34,7 +35,7 @@ class LoginViewModel(application: Application) : AndroidViewModel(application) {
 
         if (savedPass == null) {
             // 初次登录，自动注册密码
-            prefs.edit().putString("pwd_$user", pass).apply()
+            prefs.edit { putString("pwd_$user", pass) }
             onSuccess(user)
         } else {
             // 验证密码
diff --git a/app/src/main/java/com/eggetteluo/folder/util/FileHelper.kt b/app/src/main/java/com/eggetteluo/folder/util/FileHelper.kt
new file mode 100644
index 0000000..95c17ec
--- /dev/null
+++ b/app/src/main/java/com/eggetteluo/folder/util/FileHelper.kt
@@ -0,0 +1,160 @@
+package com.eggetteluo.folder.util
+
+import android.content.Context
+import android.os.Build
+import android.util.Log
+import com.eggetteluo.folder.model.FileItem
+import java.io.File
+import java.nio.file.Files
+import java.nio.file.Paths
+import java.nio.file.attribute.BasicFileAttributes
+
+/**
+ * 文件操作工具单例对象
+ * 封装了对底层文件系统的物理操作，包括读取、创建、删除、移动和复制等。
+ */
+object FileHelper {
+    private const val TAG = "FileHelper"
+
+    /**
+     * 扫描指定目录下的所有文件和子目录
+     * * @param directory 目标父目录对象
+     * @return 返回封装好的 [FileItem] 列表，若目录不可读或为空则返回空列表
+     */
+    fun listFiles(directory: File): List<FileItem> {
+        return directory.listFiles()?.map { file ->
+            val creationTime = getCreationTime(file)
+            FileItem(
+                name = file.name,
+                path = file.absolutePath,
+                isDirectory = file.isDirectory,
+                // 文件夹大小通常在文件系统中不直接体现，设为 0L；文件则获取其实际长度
+                size = if (file.isDirectory) 0L else file.length(),
+                lastModified = file.lastModified(),
+                createdAt = creationTime,
+                canRead = file.canRead(),
+                canWrite = file.canWrite(),
+                isHidden = file.isHidden,
+                extension = file.extension
+            )
+        } ?: emptyList()
+    }
+
+    /**
+     * 获取物理文件的创建时间
+     * * 兼容性处理：
+     * - Android 8.0 (API 26) 及以上：尝试通过 NIO 访问 [BasicFileAttributes] 获取精确创建时间。
+     * - 低版本或获取失败：退而求其次使用最后修改时间 (lastModified)。
+     * * @param file 目标文件
+     * @return 毫秒级时间戳
+     */
+    private fun getCreationTime(file: File): Long {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            try {
+                val path = Paths.get(file.absolutePath)
+                val attributes = Files.readAttributes(path, BasicFileAttributes::class.java)
+                attributes.creationTime().toMillis()
+            } catch (_: Exception) {
+                file.lastModified()
+            }
+        } else {
+            file.lastModified()
+        }
+    }
+
+    /**
+     * 执行物理删除操作
+     * * @param file 要删除的对象。如果是目录，将执行递归删除（包含其下所有子项）。
+     * @return 删除成功返回 true，否则返回 false。
+     */
+    fun delete(file: File): Boolean {
+        return if (file.isDirectory) file.deleteRecursively() else file.delete()
+    }
+
+    /**
+     * 执行粘贴逻辑（支持跨目录复制或移动）
+     * * @param sourcePath 源文件的绝对路径
+     * @param targetFolder 粘贴的目标父目录
+     * @param isMove true 表示移动（剪切粘贴），false 表示复制粘贴
+     * @return 操作成功返回 true，发生 I/O 异常返回 false
+     */
+    fun paste(sourcePath: String, targetFolder: File, isMove: Boolean): Boolean {
+        val sourceFile = File(sourcePath)
+        val destFile = File(targetFolder, sourceFile.name)
+        return try {
+            if (isMove) {
+                // 物理移动：尝试直接重命名（最快），若失败则需要手动流拷贝（跨分区）
+                sourceFile.renameTo(destFile)
+            } else {
+                // 物理复制：递归拷贝所有子文件及文件夹，覆盖已存在的同名文件
+                sourceFile.copyRecursively(destFile, overwrite = true)
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "Paste failed", e)
+            false
+        }
+    }
+
+    /**
+     * 创建新的文件或文件夹
+     * * @param parentDir 目标位置的父目录
+     * @param name 新项的名称
+     * @param isDirectory 可选明确指定类型。若为 null，则根据名称中是否包含 "." 自动判断。
+     * @return 创建成功且无重名项返回 true
+     */
+    fun createItem(parentDir: File, name: String, isDirectory: Boolean? = null): Boolean {
+        if (name.isBlank()) return false
+
+        val targetFile = File(parentDir, name)
+        // 健壮性检查：如果该路径已存在，则禁止创建以防误删
+        if (targetFile.exists()) return false
+
+        return try {
+            val shouldCreateDir = isDirectory ?: !name.contains(".")
+
+            if (shouldCreateDir) {
+                targetFile.mkdir()
+            } else {
+                targetFile.createNewFile()
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "Create item failed: ${e.message}")
+            false
+        }
+    }
+
+    /**
+     * 重命名文件或文件夹
+     * * @param file 原物理文件对象
+     * @param newName 新的文件名（不包含路径）
+     * @return 成功且目标路径无冲突返回 true
+     */
+    fun rename(file: File, newName: String): Boolean {
+        val dest = File(file.parentFile, newName)
+        // 确保新名字没有被占用
+        return if (!dest.exists()) file.renameTo(dest) else false
+    }
+
+    /**
+     * 将从 Android ContentResolver 获取的 Uri 输入流保存为物理文件
+     * 常用于从系统相册、外部文档选择器导入数据
+     * * @param context 上下文用于访问 ContentResolver
+     * @param uri 外部数据的 Uri (content://)
+     * @param targetFile 要保存到的本地 File 对象
+     * @return 拷贝完成返回 true
+     */
+    fun saveUriStream(context: Context, uri: android.net.Uri, targetFile: File): Boolean {
+        return try {
+            context.contentResolver.openInputStream(uri)?.use { input ->
+                targetFile.outputStream().use { output ->
+                    // 高效流拷贝
+                    input.copyTo(output)
+                    true
+                }
+            } ?: false
+        } catch (e: Exception) {
+            Log.e(TAG, "Save Uri failed", e)
+            false
+        }
+    }
+}
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 83df2e9..45cfc33 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,6 +15,7 @@ navigationCompose = "2.9.6"
 permissionx = "1.8.1"
 fragmentKtx = "1.8.9"
 material3 = "1.4.0"
+foundation = "1.10.0"
 
 [libraries]
 androidx-compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended" }
@@ -39,6 +40,7 @@ androidx-compose-material3 = { group = "androidx.compose.material3", name = "mat
 permissionx = { module = "com.guolindev.permissionx:permissionx", version.ref = "permissionx" }
 androidx-fragment-ktx = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "fragmentKtx" }
 androidx-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "material3" }
+androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation", version.ref = "foundation" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }

From 4213c7c5c3ec7175809bda633dc85e8f922719c9 Mon Sep 17 00:00:00 2001
From: xiaoluo <348237080@qq.com>
Date: Sat, 3 Jan 2026 20:15:37 +0800
Subject: [PATCH 14/14] =?UTF-8?q?chore:=20=E4=BB=A3=E7=A0=81=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E5=8C=96=E5=92=8C=E7=89=88=E6=9C=AC=E5=8F=B7=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将应用版本号从 `1.0` 更新为 `1.0.0`
- 对 `LoginViewModel` 和 `LoginScreen` 的代码进行了格式化和重构，以提高可读性
- 在 `LoginViewModel` 中为 `SharedPreferences` 的使用添加了注释说明
---
 app/build.gradle.kts                          |  2 +-
 .../folder/ui/features/login/LoginScreen.kt   | 26 ++++++++++++++-----
 .../ui/features/login/LoginViewModel.kt       | 10 +++++--
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 8aae2e5..a0beeea 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -15,7 +15,7 @@ android {
         minSdk = 30
         targetSdk = 36
         versionCode = 1
-        versionName = "1.0"
+        versionName = "1.0.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/java/com/eggetteluo/folder/ui/features/login/LoginScreen.kt b/app/src/main/java/com/eggetteluo/folder/ui/features/login/LoginScreen.kt
index 5b58994..67a96cd 100644
--- a/app/src/main/java/com/eggetteluo/folder/ui/features/login/LoginScreen.kt
+++ b/app/src/main/java/com/eggetteluo/folder/ui/features/login/LoginScreen.kt
@@ -44,11 +44,17 @@ fun LoginScreen(
     var passwordVisible by remember { mutableStateOf(false) }
 
     Column(
-        modifier = Modifier.fillMaxSize().padding(24.dp),
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(24.dp),
         verticalArrangement = Arrangement.Center,
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
-        Text(text = "私有文件管理", style = MaterialTheme.typography.headlineLarge, color = MaterialTheme.colorScheme.primary)
+        Text(
+            text = "私有文件管理",
+            style = MaterialTheme.typography.headlineLarge,
+            color = MaterialTheme.colorScheme.primary
+        )
 
         Spacer(modifier = Modifier.height(48.dp))
 
@@ -70,9 +76,13 @@ fun LoginScreen(
             label = { Text("访问密码") },
             modifier = Modifier.fillMaxWidth(),
             singleLine = true,
-            visualTransformation = if (passwordVisible) VisualTransformation.None else PasswordVisualTransformation(),
+            visualTransformation = if (passwordVisible)
+                VisualTransformation.None
+            else
+                PasswordVisualTransformation(),
             trailingIcon = {
-                val image = if (passwordVisible) Icons.Filled.Visibility else Icons.Filled.VisibilityOff
+                val image =
+                    if (passwordVisible) Icons.Filled.Visibility else Icons.Filled.VisibilityOff
                 IconButton(onClick = { passwordVisible = !passwordVisible }) {
                     Icon(imageVector = image, contentDescription = null)
                 }
@@ -85,7 +95,9 @@ fun LoginScreen(
                 text = errorMsg!!,
                 color = MaterialTheme.colorScheme.error,
                 style = MaterialTheme.typography.bodySmall,
-                modifier = Modifier.align(Alignment.Start).padding(top = 4.dp)
+                modifier = Modifier
+                    .align(Alignment.Start)
+                    .padding(top = 4.dp)
             )
         }
 
@@ -93,7 +105,9 @@ fun LoginScreen(
 
         Button(
             onClick = { viewModel.performLogin(onLoginSuccess) },
-            modifier = Modifier.fillMaxWidth().height(50.dp)
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(50.dp)
         ) {
             Text("安全进入空间")
         }
diff --git a/app/src/main/java/com/eggetteluo/folder/ui/features/login/LoginViewModel.kt b/app/src/main/java/com/eggetteluo/folder/ui/features/login/LoginViewModel.kt
index 6a1ad7a..e952afc 100644
--- a/app/src/main/java/com/eggetteluo/folder/ui/features/login/LoginViewModel.kt
+++ b/app/src/main/java/com/eggetteluo/folder/ui/features/login/LoginViewModel.kt
@@ -8,6 +8,8 @@ import kotlinx.coroutines.flow.StateFlow
 import androidx.core.content.edit
 
 class LoginViewModel(application: Application) : AndroidViewModel(application) {
+
+    // 调用安卓本地缓存
     private val prefs = application.getSharedPreferences("user_creds", Context.MODE_PRIVATE)
 
     private val _usernameInput = MutableStateFlow("")
@@ -19,8 +21,12 @@ class LoginViewModel(application: Application) : AndroidViewModel(application) {
     private val _errorMessage = MutableStateFlow<String?>(null)
     val errorMessage: StateFlow<String?> = _errorMessage
 
-    fun onUsernameChange(input: String) { _usernameInput.value = input }
-    fun onPasswordChange(input: String) { _passwordInput.value = input }
+    fun onUsernameChange(input: String) {
+        _usernameInput.value = input
+    }
+    fun onPasswordChange(input: String) {
+        _passwordInput.value = input
+    }
 
     fun performLogin(onSuccess: (String) -> Unit) {
         val user = _usernameInput.value