ui调整、bug修复

-修复星座以及mbti类型选择后不需要保存就能更改成功
-mbti类型选择界面缺省图调整
-修复我的-侧边栏在滑动时会出现黑色遮罩

app/src/main/java/com/aiosman/ravenow/ui/account/MbtiBottomSheetHost.kt

@@ -0,0 +1,15 @@
+package com.aiosman.ravenow.ui.account
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+
+@Composable
+fun MbtiBottomSheetHost() {
+    val show = MbtiSheetManager.visible.collectAsState(false).value
+    if (show) {
+        MbtiSelectBottomSheet(
+            onClose = { MbtiSheetManager.close() }
+        )
+    }
+}
+

app/src/main/java/com/aiosman/ravenow/ui/account/MbtiSelectScreen.kt

@@ -1,42 +1,60 @@
 package com.aiosman.ravenow.ui.account
 
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
+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.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.asPaddingValues
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.systemBars
-import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.grid.GridCells
-import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
-import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.lazy.grid.itemsIndexed
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.Icon
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.Text
+import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.shadow
+import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
+import androidx.compose.ui.input.nestedscroll.NestedScrollSource
+import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.unit.Velocity
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Check
 import com.aiosman.ravenow.AppState
 import com.aiosman.ravenow.LocalAppTheme
 import com.aiosman.ravenow.LocalNavController
 import com.aiosman.ravenow.R
-import com.aiosman.ravenow.ui.comment.NoticeScreenHeader
+import com.aiosman.ravenow.ui.modifiers.noRippleClickable
 
 // MBTI类型列表
 val MBTI_TYPES = listOf(
@@ -46,96 +64,285 @@ val MBTI_TYPES = listOf(
     "ISTP", "ISFP", "ESTP", "ESFP"
 )
 
+fun getMbtiImageResId(mbti: String, isDarkMode: Boolean): Int {
+    return when {
+        isDarkMode && mbti == "ENTP" -> R.mipmap.anmbti_entp
+        isDarkMode && mbti == "ESTP" -> R.mipmap.anmbti_estp
+        isDarkMode && mbti == "ENTJ" -> R.mipmap.anmbti_entj
+        else -> when (mbti) {
+            "INTJ" -> R.mipmap.mbti_intj
+            "INTP" -> R.mipmap.mbti_intp
+            "ENTJ" -> R.mipmap.mbti_entj
+            "ENTP" -> R.mipmap.mbti_entp
+            "INFJ" -> R.mipmap.mbti_infj
+            "INFP" -> R.mipmap.mbti_infp
+            "ENFJ" -> R.mipmap.mbti_enfj
+            "ENFP" -> R.mipmap.mbti_enfp
+            "ISTJ" -> R.mipmap.mbti_istj
+            "ISFJ" -> R.mipmap.mbti_isfj
+            "ESTJ" -> R.mipmap.mbti_estj
+            "ESFJ" -> R.mipmap.mbti_esfj
+            "ISTP" -> R.mipmap.mbti_istp
+            "ISFP" -> R.mipmap.mbti_isfp
+            "ESTP" -> R.mipmap.mbti_estp
+            "ESFP" -> R.mipmap.mbti_esfp
+            else -> R.mipmap.xingzuo
+        }
+    }
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun MbtiSelectScreen() {
+fun MbtiSelectBottomSheet(
-    val navController = LocalNavController.current
+    onClose: () -> Unit
+) {
     val appColors = LocalAppTheme.current
+    val isDarkMode = AppState.darkMode
     val model = AccountEditViewModel
     val currentMbti = model.mbti
+    val sheetBackgroundColor = if (isDarkMode) {
+        appColors.secondaryBackground
+    } else {
+        Color(0xFFFFFFFF)
+    }
     
-    Column(
+    val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
-        modifier = Modifier
+    
-            .fillMaxSize()
+    // 确保弹窗展开
-            .background(appColors.profileBackground)
+    LaunchedEffect(Unit) {
+        sheetState.expand()
+    }
+    
+    // 监听状态变化，确保弹窗始终展开（防止拖拽关闭和滑动）
+    LaunchedEffect(sheetState.currentValue, sheetState.targetValue, sheetState.isVisible) {
+        // 如果弹窗被拖拽关闭或位置发生变化，立即重新展开
+        if (!sheetState.isVisible || sheetState.targetValue != androidx.compose.material3.SheetValue.Expanded) {
+            kotlinx.coroutines.delay(10) // 短暂延迟确保状态更新
+            sheetState.expand()
+        }
+    }
+
+    val statusBarPadding = WindowInsets.systemBars.asPaddingValues()
+    val configuration = LocalConfiguration.current
+    val screenHeight = configuration.screenHeightDp.dp
+    val offsetY = screenHeight * 0.07f - statusBarPadding.calculateTopPadding()
+    
+    ModalBottomSheet(
+        onDismissRequest = onClose,
+        sheetState = sheetState,
+        containerColor = sheetBackgroundColor,
+        dragHandle = null
     ) {
-        // 头部
         Box(
             modifier = Modifier
                 .fillMaxWidth()
-                .padding(vertical = 16.dp)
+                .fillMaxHeight(0.95f)
+                .offset(y = offsetY)
+                .padding(
+                    start = 16.dp,
+                    end = 16.dp,
+                    bottom = 8.dp
+                )
         ) {
-            NoticeScreenHeader(
+            Column(
-                title = stringResource(R.string.choose_mbti),
+                modifier = Modifier
-                moreIcon = false
+                    .fillMaxWidth()
+                    .fillMaxHeight()
+            ) {
+                // 头部 - 使用 Box 实现绝对居中布局
+                Box(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .height(48.dp),
+                    contentAlignment = Alignment.Center
+                ) {
+                    val cancelButtonGradientColors = if (isDarkMode) {
+                        listOf(
+                            Color(0xFF3A3A3C),
+                            Color(0xFF2C2C2E)
+                        )
+                    } else {
+                        listOf(
+                            Color(0xFFFFFFFF),
+                            Color(0xFFF8F8F8)
+                        )
+                    }
+                    val cancelButtonContentColor = if (isDarkMode) Color(0xFFFFFFFF) else Color(0xFF404040)
+
+                    // 左上角返回按钮
+                    Row(
+                        modifier = Modifier
+                            .align(Alignment.CenterStart)
+                            .height(36.dp)
+                            .clip(RoundedCornerShape(18.dp))
+                            .background(
+                                brush = Brush.linearGradient(
+                                    colors = cancelButtonGradientColors
+                                )
+                            )
+                            .noRippleClickable { onClose() }
+                            .padding(horizontal = 8.dp),
+                        horizontalArrangement = Arrangement.Center,
+                        verticalAlignment = Alignment.CenterVertically
+                    ) {
+                        // 左箭头图标
+                        Image(
+                            painter = painterResource(id = R.drawable.rider_pro_back_icon),
+                            contentDescription = null,
+                            modifier = Modifier.size(17.dp),
+                            colorFilter = ColorFilter.tint(cancelButtonContentColor)
+                        )
+                        
+                        // "取消" 文字
+                        Text(
+                            text = "取消",
+                            fontSize = 17.sp,
+                            fontWeight = FontWeight.Medium,
+                            color = cancelButtonContentColor,
+                            textAlign = androidx.compose.ui.text.style.TextAlign.Center
                         )
                     }
                     
-        // 列表
+                    // 中间标题 - 绝对居中
-        LazyColumn(
+                    Text(
-            modifier = Modifier.fillMaxSize(),
+                        text = stringResource(R.string.choose_mbti),
-            contentPadding = androidx.compose.foundation.layout.PaddingValues(horizontal = 16.dp, vertical = 8.dp)
+                        color = appColors.text,
+                        fontSize = 20.sp,
+                        fontWeight = FontWeight.Bold,
+                        textAlign = androidx.compose.ui.text.style.TextAlign.Center
+                    )
+                }
+
+                Spacer(Modifier.height(12.dp))
+
+                // 创建 NestedScrollConnection 来阻止滚动事件向上传播到 ModalBottomSheet
+                val nestedScrollConnection = remember {
+                    object : NestedScrollConnection {
+                        override fun onPreScroll(available: Offset, source: NestedScrollSource): Offset {
+                            // 不消费任何事件，让 LazyVerticalGrid 先处理
+                            return Offset.Zero
+                        }
+
+                        override fun onPostScroll(consumed: Offset, available: Offset, source: NestedScrollSource): Offset {
+                            // 消费 LazyVerticalGrid 处理后的剩余滚动事件，防止传递到 ModalBottomSheet
+                            return available
+                        }
+
+                        override suspend fun onPreFling(available: Velocity): Velocity {
+                            // 不消费惯性滚动，让 LazyVerticalGrid 先处理
+                            return Velocity.Zero
+                        }
+
+                        override suspend fun onPostFling(consumed: Velocity, available: Velocity): Velocity {
+                            // 消费 LazyVerticalGrid 处理后的剩余惯性滚动，防止传递到 ModalBottomSheet
+                            return available
+                        }
+                    }
+                }
+
+                // 网格列表 - 2列
+                LazyVerticalGrid(
+                    columns = GridCells.Fixed(2),
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .weight(1f)
+                        .nestedScroll(nestedScrollConnection),
+                    contentPadding = PaddingValues(
+                        start = 8.dp,
+                        top = 8.dp,
+                        end = 8.dp,
+                        bottom = 8.dp
+                    ),
+                    horizontalArrangement = Arrangement.spacedBy(10.dp),
+                    verticalArrangement = Arrangement.spacedBy(10.dp)
                 ) {
-            items(MBTI_TYPES) { mbti ->
+                    itemsIndexed(MBTI_TYPES) { index, mbti ->
-                MBTIItem(
+                        MbtiItem(
                             mbti = mbti,
                             isSelected = mbti == currentMbti,
                             onClick = {
+                                // 保存MBTI类型
                                 model.mbti = mbti
-                        // 立即保存到本地存储，确保选择后立即生效
+                                onClose()
-                        AppState.UserId?.let { uid ->
-                            com.aiosman.ravenow.AppStore.setUserMbti(uid, mbti)
-                        }
-                        navController.navigateUp()
                             }
                         )
-                Spacer(modifier = Modifier.height(8.dp))
+                    }
+                }
             }
         }
     }
 }
 
+// 保留原有的 MbtiSelectScreen 用于导航路由（如果需要）
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun MBTIItem(
+fun MbtiSelectScreen() {
+    val navController = LocalNavController.current
+    MbtiSelectBottomSheet(
+        onClose = {
+            navController.navigateUp()
+        }
+    )
+}
+
+@Composable
+fun MbtiItem(
     mbti: String,
     isSelected: Boolean,
     onClick: () -> Unit
 ) {
     val appColors = LocalAppTheme.current
+    val isDarkMode = AppState.darkMode
     
-    Box(
+    // 卡片背景色
+    val cardBackgroundColor = if (isDarkMode) {
+        Color(0xFF2A2A2A) // 比 secondaryBackground (0xFF1C1C1C) 更亮的灰色
+    } else {
+        Color(0xFFFAF9FB)
+    }
+    
+    Column(
         modifier = Modifier
             .fillMaxWidth()
-            .clip(RoundedCornerShape(16.dp))
+            .aspectRatio(1.1f)
-            .background(if (isSelected) appColors.main.copy(alpha = 0.1f) else Color.White)
+            .shadow(
+                elevation = if (isDarkMode) 8.dp else 2.dp,
+                shape = RoundedCornerShape(21.dp),
+                spotColor = if (isDarkMode) Color.Black.copy(alpha = 0.5f) else Color.Black.copy(alpha = 0.1f)
+            )
+            .clip(RoundedCornerShape(21.dp))
+            .background(cardBackgroundColor)
             .clickable(
                 indication = null,
                 interactionSource = remember { MutableInteractionSource() }
             ) {
                 onClick()
             }
-            .padding(16.dp)
+            .padding(horizontal = 24.dp, vertical = 12.dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.Center
     ) {
-        Row(
+        // MBTI图标 - 使用占位图片
-            modifier = Modifier.fillMaxWidth(),
+        Box(
-            verticalAlignment = Alignment.CenterVertically
+            modifier = Modifier.size(100.dp),
+            contentAlignment = Alignment.Center
         ) {
+            Image(
+                painter = painterResource(id = getMbtiImageResId(mbti, isDarkMode)),
+                contentDescription = mbti,
+                modifier = Modifier.size(100.dp)
+            )
+        }
+        
+        // MBTI名称 - 使用负间距让文本向上移动，与图标更靠近
         Text(
             text = mbti,
-                fontSize = 17.sp,
+            fontSize = 14.sp,
-                fontWeight = FontWeight.Normal,
+            fontWeight = FontWeight.Medium,
-                color = if (isSelected) appColors.main else appColors.text,
+            color = appColors.text,
-                modifier = Modifier.weight(1f)
+            textAlign = TextAlign.Center,
+            modifier = Modifier.offset(y = (-20).dp)
         )
-            
-            if (isSelected) {
-                Icon(
-                    imageVector = Icons.Default.Check,
-                    contentDescription = "Selected",
-                    modifier = Modifier.size(20.dp),
-                    tint = appColors.main
-                )
-            }
-        }
     }
 }
 

app/src/main/java/com/aiosman/ravenow/ui/account/MbtiSheetManager.kt

@@ -0,0 +1,19 @@
+package com.aiosman.ravenow.ui.account
+
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+
+object MbtiSheetManager {
+    private val _visible = MutableStateFlow(false)
+    val visible: StateFlow<Boolean> = _visible.asStateFlow()
+
+    fun open() {
+        _visible.value = true
+    }
+
+    fun close() {
+        _visible.value = false
+    }
+}
+

app/src/main/java/com/aiosman/ravenow/ui/account/ZodiacSelectScreen.kt

@@ -293,10 +293,6 @@ fun ZodiacSelectBottomSheet(
                             onClick = {
                                 // 保存当前语言的星座文本
                                 model.zodiac = zodiacText
-                                // 立即保存到本地存储，确保选择后立即生效
-                                AppState.UserId?.let { uid ->
-                                    com.aiosman.ravenow.AppStore.setUserZodiac(uid, zodiacText)
-                                }
                                 onClose()
                             }
                         )

app/src/main/java/com/aiosman/ravenow/ui/account/edit2.kt

@@ -77,6 +77,8 @@ import java.io.File
 import androidx.activity.compose.BackHandler
 import com.aiosman.ravenow.ui.account.ZodiacBottomSheetHost
 import com.aiosman.ravenow.ui.account.ZodiacSheetManager
+import com.aiosman.ravenow.ui.account.MbtiBottomSheetHost
+import com.aiosman.ravenow.ui.account.MbtiSheetManager
 
 /**
  * 编辑用户资料界面
@@ -194,6 +196,8 @@ fun AccountEditScreen2(onUpdateBanner: ((Uri, File, Context) -> Unit)? = null,)
     ) {
     // 挂载星座选择弹窗
     ZodiacBottomSheetHost()
+    // 挂载MBTI选择弹窗
+    MbtiBottomSheetHost()
     
     Box(
         modifier = Modifier
@@ -425,9 +429,7 @@ fun AccountEditScreen2(onUpdateBanner: ((Uri, File, Context) -> Unit)? = null,)
                                 iconResDark = null, // TODO: 添加MBTI暗色模式图标
                                 iconResLight = null, // TODO: 添加MBTI亮色模式图标
                                 onClick = {
-                                    debouncedNavigation {
+                                    MbtiSheetManager.open()
-                                        navController.navigate(NavigationRoute.MbtiSelect.route)
-                                    }
                                 }
                             )
                             

app/src/main/java/com/aiosman/ravenow/ui/index/Index.kt

@@ -2,10 +2,6 @@ package com.aiosman.ravenow.ui.index
 
 import androidx.compose.animation.animateColorAsState
 import androidx.compose.animation.core.animateFloatAsState
-import androidx.compose.animation.core.FastOutLinearInEasing
-import androidx.compose.animation.core.LinearOutSlowInEasing
-import androidx.compose.animation.core.updateTransition
-import androidx.compose.animation.core.animateFloat
 import androidx.compose.animation.core.FastOutSlowInEasing
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.ExperimentalFoundationApi
@@ -140,6 +136,7 @@ fun IndexScreen() {
         ModalNavigationDrawer(
             drawerState = drawerState,
             gesturesEnabled = drawerState.isOpen,
+            scrimColor = Color.Black.copy(alpha = 0.6f),
             drawerContent = {
                 CompositionLocalProvider(LocalLayoutDirection provides LayoutDirection.Ltr) {
                     SideMenuContent(
@@ -525,8 +522,6 @@ fun SideMenuContent(
     } else {
         Color(0xFFFAF9FB) // 亮色模式：浅灰色
     }
-    // 遮罩颜色 黑色透明度0.6
-    val overlayColor = Color.Black.copy(alpha = 0.6f)
     // 卡片背景色 - 根据暗色模式适配
     val cardBackgroundColor = if (darkModeEnabled) {
         appColors.background // 暗色模式：深色背景
@@ -546,24 +541,6 @@ fun SideMenuContent(
         modifier = Modifier
             .fillMaxSize()
     ) {
-        // 左侧半透明遮罩（平滑淡入淡出）
-        val overlayTransition = updateTransition(targetState = isDrawerOpen, label = "overlay")
-        val overlayAlpha by overlayTransition.animateFloat(
-            transitionSpec = {
-                if (targetState) {
-                    tween(durationMillis = 400, easing = LinearOutSlowInEasing)
-                } else {
-                    tween(durationMillis = 300, easing = FastOutLinearInEasing)
-                }
-            },
-            label = "overlayAlpha"
-        ) { open -> if (open) 0.6f else 0f }
-        Box(
-            modifier = Modifier
-                .fillMaxSize()
-                .background(Color.Black.copy(alpha = overlayAlpha))
-        )
-        
         // 右侧菜单面板
         Box(
             modifier = Modifier