浏览代码

1. 优化节点的显示的对齐方式
2. 优化时间组件的默认显示方式

bjb 4 月之前
父节点
当前提交
98a81b9930

+ 2 - 2
.idea/deploymentTargetSelector.xml

@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2026-01-12T09:05:28.388700300Z">
+        <DropdownSelection timestamp="2026-01-19T07:37:04.874216600Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=D1CGAPE741200820" />
+              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\ISCS\.android\avd\Resizable.avd" />
             </handle>
           </Target>
         </DropdownSelection>

+ 4 - 4
app/src/main/java/com/iscs/bozzys/ui/pages/compose/FormCompose.kt

@@ -684,7 +684,7 @@ fun FormDateSelect(
                 .padding(10.dp),
             fontSize = 14.sp,
             lineHeight = 26.sp,
-            color = Text.copy(alpha = if (enable) 1f else 0.6f)
+            color = if (date <= 0) Color(0xFF9CA3AF) else Text.copy(alpha = if (enable) 1f else 0.6f)
         )
     }
 }
@@ -776,7 +776,7 @@ fun FormDateRangeSelect(
                     .padding(10.dp),
                 fontSize = 14.sp,
                 lineHeight = 26.sp,
-                color = Text.copy(alpha = if (enable) 1f else 0.6f)
+                color = if (start <= 0) Color(0xFF9CA3AF) else Text.copy(alpha = if (enable) 1f else 0.6f)
             )
             Text(
                 "-",
@@ -817,7 +817,7 @@ fun FormDateRangeSelect(
                     .padding(10.dp),
                 fontSize = 14.sp,
                 lineHeight = 26.sp,
-                color = Text.copy(alpha = if (enable) 1f else 0.6f)
+                color = if (end <= 0) Color(0xFF9CA3AF) else Text.copy(alpha = if (enable) 1f else 0.6f)
             )
         }
 
@@ -897,7 +897,7 @@ fun FormTimeSelect(
                 .padding(10.dp),
             fontSize = 14.sp,
             lineHeight = 26.sp,
-            color = Text.copy(alpha = if (enable) 1f else 0.6f)
+            color = if (date <= 0) Color(0xFF9CA3AF) else Text.copy(alpha = if (enable) 1f else 0.6f)
         )
     }
 }

+ 1 - 2
app/src/main/java/com/iscs/bozzys/ui/pages/compose/JobListItem.kt

@@ -125,12 +125,11 @@ fun JobListItem(job: Job) {
                     job.currentNodeName ?: "--",
                     modifier = Modifier
                         .fillMaxHeight()
-                        .height(18.dp)
                         .clip(RoundedCornerShape(4.dp))
                         .background(Color(0xFF1E90FF))
                         .padding(horizontal = 6.dp),
                     fontSize = 12.sp,
-                    lineHeight = 18.sp,
+                    lineHeight = 20.sp,
                     fontWeight = FontWeight.Bold,
                     color = Color.White,
                     textAlign = TextAlign.Center

+ 1 - 2
app/src/main/java/com/iscs/bozzys/ui/pages/compose/TaskListItem.kt

@@ -115,12 +115,11 @@ fun TaskListItem(task: Task) {
                     task.currentNodeName ?: "--",
                     modifier = Modifier
                         .fillMaxHeight()
-                        .height(18.dp)
                         .clip(RoundedCornerShape(4.dp))
                         .background(Color(0xFF1E90FF))
                         .padding(horizontal = 6.dp),
                     fontSize = 12.sp,
-                    lineHeight = 18.sp,
+                    lineHeight = 20.sp,
                     fontWeight = FontWeight.Bold,
                     color = Color.White,
                     textAlign = TextAlign.Center

+ 1 - 1
app/src/main/java/com/iscs/bozzys/ui/pages/home/SettingsCompose.kt

@@ -63,7 +63,7 @@ fun SettingsCompose(pv: PaddingValues, zIndex: Float, vm: VMHome) {
     val ctx = LocalContext.current
     val tokenIv = Storage.readToken()
     // 指纹登录是否可用
-    val fingerSupport = ctx.isBiometricCanUse() && tokenIv.isNotEmpty()
+    val fingerSupport = false //ctx.isBiometricCanUse() && tokenIv.isNotEmpty()
     Column(
         modifier = Modifier
             .fillMaxSize()

+ 3 - 4
app/src/main/java/com/iscs/bozzys/ui/pages/login/PageLogin.kt

@@ -57,7 +57,6 @@ import com.iscs.bozzys.utils.BiometricKeyStore
 import com.iscs.bozzys.utils.LogUtil
 import com.iscs.bozzys.utils.Storage
 import com.iscs.bozzys.utils.SystemUtil
-import com.iscs.bozzys.utils.SystemUtil.isBiometricCanUse
 
 /**
  * 打开登录页面
@@ -126,7 +125,7 @@ class PageLogin : PageBase() {
         val state = vm.state
         val tokenIv = Storage.readTokenIv()
         // 指纹登录是否可用
-        val fingerSupport = ctx.isBiometricCanUse() && tokenIv.isNotEmpty()
+        val fingerSupport = false //ctx.isBiometricCanUse() && tokenIv.isNotEmpty()
         LaunchedEffect(Unit) {
             // 处理基础Toast和Loading提示
             vm.toast.initToast()
@@ -313,7 +312,7 @@ class PageLogin : PageBase() {
                         .padding(13.dp),
                     tint = Color(0xFF6B7280)
                 )
-                Icon(
+                if (false) Icon(
                     painter = painterResource(R.drawable.qrcode),
                     contentDescription = null,
                     Modifier
@@ -324,7 +323,7 @@ class PageLogin : PageBase() {
                         .padding(13.dp),
                     tint = Color(0xFF6B7280)
                 )
-                Icon(
+                if (false) Icon(
                     painter = painterResource(R.drawable.bluetooth),
                     contentDescription = null,
                     Modifier

+ 2 - 1
app/src/main/java/com/iscs/bozzys/ui/theme/Theme.kt

@@ -73,7 +73,8 @@ fun BozzysTheme(
         typography = Typography,
         content = {
             // 全局去除滑动顶部和底部的阴影效果
-            CompositionLocalProvider(LocalOverscrollFactory provides null) { content() }
+            // LocalOverscrollFactory provides null 为了提高高版本的显示效果,这里暂时还是不添加
+            CompositionLocalProvider() { content() }
         }
     )
 }