](https://f-droid.org/packages/cn.super12138.todo)
-
# 📸 Screenshots
-|  |  |
-| --- | --- |
-| Main page (Light) | Main page (Dark) |
-|  |  |
-| Add task page | The effect of completing a task |
-# 📃 License
-[GPL-3.0-only](https://github.com/Super12138/ToDo/blob/main/LICENSE)
\ No newline at end of file
+|  |  |
+| ---------------------------------------------------------------------------- | --------------------------------------------------------------------------- |
+| Overview page (Light) | Overview page (Dark) |
+|  |  |
+| Task list | Add new task |
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 961dc41..a10005d 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -38,8 +38,8 @@ android {
applicationId = "cn.super12138.todo"
minSdk = 24
targetSdk = 36
- versionCode = 997
- versionName = "2.3.3"
+ versionCode = 998
+ versionName = "3.0.0"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/TodoDefaults.kt b/app/src/main/kotlin/cn/super12138/todo/ui/VerveDoDefaults.kt
similarity index 98%
rename from app/src/main/kotlin/cn/super12138/todo/ui/TodoDefaults.kt
rename to app/src/main/kotlin/cn/super12138/todo/ui/VerveDoDefaults.kt
index ef51827..4ea6cfc 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/TodoDefaults.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/VerveDoDefaults.kt
@@ -10,7 +10,7 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.Shape
import androidx.compose.ui.unit.dp
-object TodoDefaults {
+object VerveDoDefaults {
/**
* 屏幕左右两边预留边距(防止内容全部贴边显示过丑)
*/
diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/activities/MainActivity.kt b/app/src/main/kotlin/cn/super12138/todo/ui/activities/MainActivity.kt
index 343d523..6b60c67 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/activities/MainActivity.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/activities/MainActivity.kt
@@ -27,7 +27,7 @@ import cn.super12138.todo.constants.Constants
import cn.super12138.todo.logic.datastore.DataStoreManager
import cn.super12138.todo.logic.model.DarkMode
import cn.super12138.todo.logic.model.PaletteStyle
-import cn.super12138.todo.ui.TodoDefaults
+import cn.super12138.todo.ui.VerveDoDefaults
import cn.super12138.todo.ui.components.Konfetti
import cn.super12138.todo.ui.navigation.VerveDoDestinations
import cn.super12138.todo.ui.navigation.TopNavigation
@@ -106,7 +106,7 @@ class MainActivity : ComponentActivity() {
dynamicColor = dynamicColor
) {
Surface(
- color = TodoDefaults.Colors.Background,
+ color = VerveDoDefaults.Colors.Background,
modifier = Modifier.fillMaxSize()
) {
val view = LocalView.current
@@ -140,7 +140,7 @@ class MainActivity : ComponentActivity() {
)
}
},
- containerColor = TodoDefaults.Colors.Background,
+ containerColor = VerveDoDefaults.Colors.Background,
modifier = Modifier.fillMaxSize()
) {
TopNavigation(
diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/components/EmptyTip.kt b/app/src/main/kotlin/cn/super12138/todo/ui/components/EmptyTip.kt
index e76ffe9..3339bbf 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/components/EmptyTip.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/components/EmptyTip.kt
@@ -17,7 +17,7 @@ import androidx.compose.ui.res.painterResource
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import cn.super12138.todo.R
-import cn.super12138.todo.ui.TodoDefaults
+import cn.super12138.todo.ui.VerveDoDefaults
enum class EmptyTipType {
Search,
@@ -36,7 +36,7 @@ fun EmptyTip(
Box(
contentAlignment = Alignment.Center,
modifier = modifier
- .padding(TodoDefaults.screenHorizontalPadding)
+ .padding(VerveDoDefaults.screenHorizontalPadding)
.size(size)
.clip(CircleShape)
.background(containerColor)
diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/components/Scaffolds.kt b/app/src/main/kotlin/cn/super12138/todo/ui/components/Scaffolds.kt
index 7498154..0dd8ff6 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/components/Scaffolds.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/components/Scaffolds.kt
@@ -25,7 +25,7 @@ import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextOverflow
import cn.super12138.todo.R
-import cn.super12138.todo.ui.TodoDefaults
+import cn.super12138.todo.ui.VerveDoDefaults
import cn.super12138.todo.utils.VibrationUtils
/**
@@ -130,7 +130,7 @@ fun TopAppBarScaffold(
navigationIcon = navigationIcon,
actions = actions,
colors = TopAppBarDefaults.topAppBarColors(
- containerColor = TodoDefaults.Colors.Background,
+ containerColor = VerveDoDefaults.Colors.Background,
)
)
},
@@ -151,8 +151,8 @@ fun TopAppBarScaffold(
floatingActionButton: @Composable () -> Unit = {},
floatingActionButtonPosition: FabPosition = FabPosition.End,
contentWindowInsets: WindowInsets = ScaffoldDefaults.contentWindowInsets,
- containerColor: Color = TodoDefaults.Colors.Background,
- screenShape: Shape = TodoDefaults.ScreenContainerShape,
+ containerColor: Color = VerveDoDefaults.Colors.Background,
+ screenShape: Shape = VerveDoDefaults.ScreenContainerShape,
content: @Composable () -> Unit
) = Scaffold(
modifier = modifier,
@@ -166,7 +166,7 @@ fun TopAppBarScaffold(
Surface(
modifier = Modifier
.padding(paddingValues = innerPadding)
- .padding(horizontal = TodoDefaults.screenHorizontalPadding),
+ .padding(horizontal = VerveDoDefaults.screenHorizontalPadding),
color = containerColor,
shape = screenShape,
content = content
diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/components/ScreenContainer.kt b/app/src/main/kotlin/cn/super12138/todo/ui/components/ScreenContainer.kt
index 77b5539..cb0d935 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/components/ScreenContainer.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/components/ScreenContainer.kt
@@ -5,7 +5,7 @@ import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
import androidx.compose.material3.Surface
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
-import cn.super12138.todo.ui.TodoDefaults
+import cn.super12138.todo.ui.VerveDoDefaults
@OptIn(ExperimentalMaterial3ExpressiveApi::class)
@Composable
@@ -14,9 +14,9 @@ fun RoundedScreenContainer(
content: @Composable () -> Unit,
) {
Surface(
- modifier = modifier.padding(horizontal = TodoDefaults.screenHorizontalPadding),
- color = TodoDefaults.Colors.Background,
- shape = TodoDefaults.ScreenContainerShape,
+ modifier = modifier.padding(horizontal = VerveDoDefaults.screenHorizontalPadding),
+ color = VerveDoDefaults.Colors.Background,
+ shape = VerveDoDefaults.ScreenContainerShape,
content = content
)
}
\ No newline at end of file
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 2a8da2f..4170d04 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
@@ -36,7 +36,7 @@ import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.text.withStyle
import androidx.compose.ui.unit.dp
import cn.super12138.todo.R
-import cn.super12138.todo.ui.TodoDefaults
+import cn.super12138.todo.ui.VerveDoDefaults
import cn.super12138.todo.ui.activities.CrashActivity.Companion.BEGINNING_CRASH
import cn.super12138.todo.ui.activities.CrashActivity.Companion.BRAND_PREFIX
import cn.super12138.todo.ui.activities.CrashActivity.Companion.CRASH_TIME_PREFIX
@@ -113,7 +113,7 @@ fun CrashPage(
Column(
modifier = Modifier
.padding(innerPadding)
- .padding(horizontal = TodoDefaults.screenHorizontalPadding)
+ .padding(horizontal = VerveDoDefaults.screenHorizontalPadding)
.fillMaxSize()
.verticalScroll(scrollState)
) {
diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/editor/TaskEditorPage.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/editor/TaskEditorPage.kt
index 39eeabe..a19c757 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/editor/TaskEditorPage.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/editor/TaskEditorPage.kt
@@ -34,7 +34,7 @@ import cn.super12138.todo.R
import cn.super12138.todo.constants.Constants
import cn.super12138.todo.logic.database.TodoEntity
import cn.super12138.todo.logic.datastore.DataStoreManager
-import cn.super12138.todo.ui.TodoDefaults
+import cn.super12138.todo.ui.VerveDoDefaults
import cn.super12138.todo.ui.components.ChipItem
import cn.super12138.todo.ui.components.ConfirmDialog
import cn.super12138.todo.ui.components.TodoFloatingActionButton
@@ -184,7 +184,7 @@ fun SharedTransitionScope.TaskEditorPage(
modifier = Modifier.fillMaxSize()
) {
item(key = 0) {
- Spacer(modifier = Modifier.size(TodoDefaults.screenVerticalPadding))
+ Spacer(modifier = Modifier.size(VerveDoDefaults.screenVerticalPadding))
}
item(key = 1) {
@@ -262,7 +262,7 @@ fun SharedTransitionScope.TaskEditorPage(
}
item(key = 5) {
- Spacer(modifier = Modifier.size(TodoDefaults.screenVerticalPadding))
+ Spacer(modifier = Modifier.size(VerveDoDefaults.screenVerticalPadding))
}
}
}
diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/editor/state/EditorState.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/editor/state/EditorState.kt
index 6219903..56ccd56 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/editor/state/EditorState.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/editor/state/EditorState.kt
@@ -77,7 +77,17 @@ class EditorState(val initialTodo: TodoEntity? = null) {
object Saver : androidx.compose.runtime.saveable.Saver>N1QbCuuGax+U+-JztLg&~@ jjp>A*F;)8IXc|yX9WV-t@;K3(zWNRJ`y5isiYObY0
z?;jRtBgbyYSF6@=trry)jdiF+r~#88=%ji1{e{?Wj_pXIKMyuC!R;IyX`B{!vRGKg
z#b$|Ts}t#Cf#sht0C^PEcgn#(D7Gm7L7M)|hG84*!GQt;DPV+&FnMs+sq4Yl$CtWW
z^Pf%)A%Tr0k>2#J98;sK6Bh+H^N?7k!vZ8>gZ#WsYs)RGzEUG5!+C6E*e*xA4PBzT
z9k2JZip{1y_54pa?
ez=CZQbT8Xd#IN6IynUK~kt7rL_}-CT&4vOWS>D+=s;NkT5+C
zYvvGrQz?9L_?V84jw4N{I~nzbLpmbS5es8-ypUY+|Cecvd?#*>ORU8
zaJt>MDxpkPy*~v;)0vUXYi&PW4{~Q&0_n+N#~lxSsoOCX?d!6iQ;gN9vEpy49S#~A
zhF;8M>uHGQ<-G6ZO}#|+Jy{Az#VSIyKfebF-OW4bm^~9%o2OX$6Z#GJ{6Wm(K3GW6
z-?!S6*