diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/TodoDefaults.kt b/app/src/main/kotlin/cn/super12138/todo/ui/TodoDefaults.kt new file mode 100644 index 0000000..3386031 --- /dev/null +++ b/app/src/main/kotlin/cn/super12138/todo/ui/TodoDefaults.kt @@ -0,0 +1,10 @@ +package cn.super12138.todo.ui + +import androidx.compose.ui.unit.dp + +object TodoDefaults { + /** + * 屏幕左右两边预留边距(防止内容全部贴边显示过丑) + */ + val screenPadding = 16.dp +} \ No newline at end of file diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/components/FloatingActionButton.kt b/app/src/main/kotlin/cn/super12138/todo/ui/components/FloatingActionButton.kt index c3b7b27..cea5297 100644 --- a/app/src/main/kotlin/cn/super12138/todo/ui/components/FloatingActionButton.kt +++ b/app/src/main/kotlin/cn/super12138/todo/ui/components/FloatingActionButton.kt @@ -10,6 +10,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp +import cn.super12138.todo.ui.TodoDefaults /** * 带动画且比 Material 3 内置组件动画好看的的可扩展 FAB @@ -35,7 +36,7 @@ fun AnimatedExtendedFloatingActionButton( modifier = modifier ) { Row( - modifier = Modifier.padding(horizontal = 16.dp), + modifier = Modifier.padding(horizontal = TodoDefaults.screenPadding), verticalAlignment = Alignment.CenterVertically ) { icon() diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/crash/CrashHandler.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/crash/CrashHandler.kt index 028d28f..7ecaecf 100644 --- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/crash/CrashHandler.kt +++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/crash/CrashHandler.kt @@ -1,4 +1,5 @@ package cn.super12138.todo.ui.pages.crash + import android.content.Context import android.content.Intent import android.os.Process diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/crash/CrashPage.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/crash/CrashPage.kt index b204d0a..212d63f 100644 --- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/crash/CrashPage.kt +++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/crash/CrashPage.kt @@ -30,6 +30,7 @@ import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import cn.super12138.todo.R +import cn.super12138.todo.ui.TodoDefaults import cn.super12138.todo.ui.components.AnimatedExtendedFloatingActionButton @OptIn(ExperimentalMaterial3Api::class) @@ -85,7 +86,7 @@ fun CrashPage( Column( modifier = Modifier .padding(innerPadding) - .padding(horizontal = 16.dp) + .padding(horizontal = TodoDefaults.screenPadding) .fillMaxSize() .verticalScroll(scrollState) ) { diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/ManagerFragment.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/ManagerFragment.kt index 070756d..1a3b0ab 100644 --- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/ManagerFragment.kt +++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/ManagerFragment.kt @@ -19,6 +19,7 @@ import androidx.compose.ui.unit.dp import cn.super12138.todo.R import cn.super12138.todo.logic.database.TodoEntity import cn.super12138.todo.logic.model.Subjects +import cn.super12138.todo.ui.TodoDefaults import cn.super12138.todo.ui.pages.main.components.TodoCard import my.nanihadesuka.compose.LazyColumnScrollbar import my.nanihadesuka.compose.ScrollbarSettings @@ -42,10 +43,7 @@ fun ManagerFragment( ) { LazyColumn( state = state, - contentPadding = PaddingValues( - start = 10.dp, - end = 10.dp, - ) + contentPadding = PaddingValues(horizontal = TodoDefaults.screenPadding) ) { if (list.isEmpty()) { item { diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/TodoBottomSheet.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/TodoBottomSheet.kt index 36f018d..a928148 100644 --- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/TodoBottomSheet.kt +++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/TodoBottomSheet.kt @@ -33,6 +33,7 @@ import androidx.compose.ui.unit.dp import cn.super12138.todo.R import cn.super12138.todo.logic.database.TodoEntity import cn.super12138.todo.logic.model.Subjects +import cn.super12138.todo.ui.TodoDefaults import cn.super12138.todo.ui.components.FilterChipGroup @OptIn(ExperimentalMaterial3Api::class) @@ -55,7 +56,7 @@ fun TodoBottomSheet( Column( horizontalAlignment = Alignment.CenterHorizontally, modifier = Modifier - .padding(horizontal = 16.dp) + .padding(horizontal = TodoDefaults.screenPadding) .verticalScroll(rememberScrollState()) ) { Text(