From a974eac871422293b0865ed6db1b96efb725fa8e Mon Sep 17 00:00:00 2001 From: zxj <275873859@qq.com> Date: Fri, 22 Aug 2025 16:13:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/sw/inbound/ui/page/HomeScreen.kt | 10 +++++++++- .../main/java/com/sw/inbound/ui/page/LoginScreen.kt | 3 +++ .../java/com/sw/inbound/ui/weight/BottomActionBar.kt | 3 +++ .../main/java/com/sw/inbound/ui/weight/CustomButton.kt | 6 ++++++ .../java/com/sw/inbound/ui/weight/GlobalLoading.kt | 3 +++ 5 files changed, 24 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/sw/inbound/ui/page/HomeScreen.kt b/app/src/main/java/com/sw/inbound/ui/page/HomeScreen.kt index a9a0fd4..358efc3 100644 --- a/app/src/main/java/com/sw/inbound/ui/page/HomeScreen.kt +++ b/app/src/main/java/com/sw/inbound/ui/page/HomeScreen.kt @@ -23,6 +23,7 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.navigation.NavHostController +import androidx.navigation.NavOptions import androidx.navigation.compose.rememberNavController import com.sw.inbound.R import com.sw.inbound.ui.Screen @@ -90,7 +91,14 @@ fun HomeScreen( interactionSource = remember { MutableInteractionSource() }, indication = null ) { - navController.navigate(Screen.SelfProcurement.route) + navController.navigate( + Screen.SelfProcurement.route, navOptions = NavOptions.Builder() + .setEnterAnim(0) + .setExitAnim(0) + .setPopEnterAnim(0) + .setPopExitAnim(0) + .build() + ) }, painter = painterResource(R.mipmap.ic_order_self_procurement), contentDescription = "自采入库" diff --git a/app/src/main/java/com/sw/inbound/ui/page/LoginScreen.kt b/app/src/main/java/com/sw/inbound/ui/page/LoginScreen.kt index b9b7a72..b4d3691 100644 --- a/app/src/main/java/com/sw/inbound/ui/page/LoginScreen.kt +++ b/app/src/main/java/com/sw/inbound/ui/page/LoginScreen.kt @@ -47,6 +47,9 @@ import com.sw.inbound.utils.ToastUtils import com.sw.inbound.viewmodel.UserViewModel import timber.log.Timber +/** + * 登录界面 + */ @Composable fun LoginScreen( modifier: Modifier = Modifier, diff --git a/app/src/main/java/com/sw/inbound/ui/weight/BottomActionBar.kt b/app/src/main/java/com/sw/inbound/ui/weight/BottomActionBar.kt index f54c2a8..2d4ce98 100644 --- a/app/src/main/java/com/sw/inbound/ui/weight/BottomActionBar.kt +++ b/app/src/main/java/com/sw/inbound/ui/weight/BottomActionBar.kt @@ -22,6 +22,9 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.sw.inbound.R +/** + * 底部按钮 + */ @Composable fun BottomActionBar( leftText: String = "返回", diff --git a/app/src/main/java/com/sw/inbound/ui/weight/CustomButton.kt b/app/src/main/java/com/sw/inbound/ui/weight/CustomButton.kt index 5910b35..fb896d5 100644 --- a/app/src/main/java/com/sw/inbound/ui/weight/CustomButton.kt +++ b/app/src/main/java/com/sw/inbound/ui/weight/CustomButton.kt @@ -24,6 +24,9 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.sw.inbound.R +/** + * 空心按钮 + */ @Composable fun CustomOutlinedButton( text: String, @@ -57,6 +60,9 @@ fun CustomOutlinedButton( } } +/** + * 实心按钮 + */ @Composable fun CustomButton( text: String, diff --git a/app/src/main/java/com/sw/inbound/ui/weight/GlobalLoading.kt b/app/src/main/java/com/sw/inbound/ui/weight/GlobalLoading.kt index bf9763e..55cc1d4 100644 --- a/app/src/main/java/com/sw/inbound/ui/weight/GlobalLoading.kt +++ b/app/src/main/java/com/sw/inbound/ui/weight/GlobalLoading.kt @@ -17,6 +17,9 @@ import com.sw.inbound.ext.withColor import com.sw.inbound.network.LoadingState import com.sw.inbound.ui.theme.AppTypography +/** + * 全局加载进度 + */ @Composable fun GlobalLoading() { if (LoadingState.isLoading) {