From 8059fd15a06f85d2277528c5d36c908728631d75 Mon Sep 17 00:00:00 2001 From: Super12138 <70494801+Super12138@users.noreply.github.com> Date: Mon, 9 Feb 2026 17:33:15 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E4=B8=BAVerveDo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 4 +- app/src/main/AndroidManifest.xml | 6 +-- .../todo/{TodoApp.kt => VerveDoApp.kt} | 2 +- .../cn/super12138/todo/constants/Constants.kt | 2 +- .../cn/super12138/todo/logic/Repository.kt | 4 +- .../todo/logic/datastore/DataStoreManager.kt | 4 +- .../todo/ui/activities/CrashActivity.kt | 4 +- .../todo/ui/activities/MainActivity.kt | 10 ++-- .../todo/ui/navigation/TodoDestinations.kt | 32 ----------- .../todo/ui/navigation/TopNavigation.kt | 54 +++++++++---------- .../todo/ui/navigation/VerveDoDestinations.kt | 33 ++++++++++++ .../{TodoScreen.kt => VerveDoScreen.kt} | 10 ++-- .../{TodoEditorPage.kt => TaskEditorPage.kt} | 10 ++-- .../cn/super12138/todo/ui/theme/Theme.kt | 2 +- .../todo/ui/viewmodels/MainViewModel.kt | 8 +-- .../cn/super12138/todo/utils/SPUtils.kt | 4 +- app/src/main/res/values-ar/strings.xml | 3 -- app/src/main/res/values-night-v27/themes.xml | 2 +- app/src/main/res/values-night-v29/themes.xml | 2 +- app/src/main/res/values-night/themes.xml | 2 +- app/src/main/res/values-v27/themes.xml | 2 +- app/src/main/res/values-v29/themes.xml | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 5 +- app/src/main/res/values/strings.xml | 6 +-- app/src/main/res/values/themes.xml | 6 +-- 25 files changed, 108 insertions(+), 111 deletions(-) rename app/src/main/kotlin/cn/super12138/todo/{TodoApp.kt => VerveDoApp.kt} (95%) delete mode 100644 app/src/main/kotlin/cn/super12138/todo/ui/navigation/TodoDestinations.kt create mode 100644 app/src/main/kotlin/cn/super12138/todo/ui/navigation/VerveDoDestinations.kt rename app/src/main/kotlin/cn/super12138/todo/ui/navigation/{TodoScreen.kt => VerveDoScreen.kt} (83%) rename app/src/main/kotlin/cn/super12138/todo/ui/pages/editor/{TodoEditorPage.kt => TaskEditorPage.kt} (98%) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 64cea5a..961dc41 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -38,12 +38,12 @@ android { applicationId = "cn.super12138.todo" minSdk = 24 targetSdk = 36 - versionCode = 996 + versionCode = 997 versionName = "2.3.3" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - base.archivesName.set("todo-${versionName}") + base.archivesName.set("vervedo-${versionName}") } buildTypes { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 962dd28..f9b42d9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools"> + android:theme="@style/Theme.VerveDo" /> \ No newline at end of file diff --git a/app/src/main/kotlin/cn/super12138/todo/TodoApp.kt b/app/src/main/kotlin/cn/super12138/todo/VerveDoApp.kt similarity index 95% rename from app/src/main/kotlin/cn/super12138/todo/TodoApp.kt rename to app/src/main/kotlin/cn/super12138/todo/VerveDoApp.kt index b2397d5..4c102bd 100644 --- a/app/src/main/kotlin/cn/super12138/todo/TodoApp.kt +++ b/app/src/main/kotlin/cn/super12138/todo/VerveDoApp.kt @@ -6,7 +6,7 @@ import android.content.Context import cn.super12138.todo.logic.database.TodoDatabase import cn.super12138.todo.ui.pages.crash.CrashHandler -class TodoApp : Application() { +class VerveDoApp : Application() { private val database by lazy { TodoDatabase.getDatabase(this) } companion object { diff --git a/app/src/main/kotlin/cn/super12138/todo/constants/Constants.kt b/app/src/main/kotlin/cn/super12138/todo/constants/Constants.kt index 4a7547e..9d6b0e6 100644 --- a/app/src/main/kotlin/cn/super12138/todo/constants/Constants.kt +++ b/app/src/main/kotlin/cn/super12138/todo/constants/Constants.kt @@ -2,7 +2,7 @@ package cn.super12138.todo.constants object Constants { const val DEVELOPER_GITHUB = "https://github.com/Super12138/" - const val GITHUB_REPO = "https://github.com/Super12138/ToDo/" + const val GITHUB_REPO = "https://github.com/Super12138/VerveDo/" const val KEY_TODO_FAB_TRANSITION = "todo_fab" const val KEY_TODO_ITEM_TRANSITION = "todo_item_id" diff --git a/app/src/main/kotlin/cn/super12138/todo/logic/Repository.kt b/app/src/main/kotlin/cn/super12138/todo/logic/Repository.kt index 2aa71cc..d984fd4 100644 --- a/app/src/main/kotlin/cn/super12138/todo/logic/Repository.kt +++ b/app/src/main/kotlin/cn/super12138/todo/logic/Repository.kt @@ -1,11 +1,11 @@ package cn.super12138.todo.logic -import cn.super12138.todo.TodoApp +import cn.super12138.todo.VerveDoApp import cn.super12138.todo.logic.database.TodoEntity import kotlinx.coroutines.flow.Flow object Repository : IRepository { - private val db get() = TodoApp.db + private val db get() = VerveDoApp.db private val toDoDao = db.toDoDao() override suspend fun insertTodo(toDo: TodoEntity) { diff --git a/app/src/main/kotlin/cn/super12138/todo/logic/datastore/DataStoreManager.kt b/app/src/main/kotlin/cn/super12138/todo/logic/datastore/DataStoreManager.kt index e8d8de1..571a61e 100644 --- a/app/src/main/kotlin/cn/super12138/todo/logic/datastore/DataStoreManager.kt +++ b/app/src/main/kotlin/cn/super12138/todo/logic/datastore/DataStoreManager.kt @@ -8,7 +8,7 @@ import androidx.datastore.preferences.core.floatPreferencesKey import androidx.datastore.preferences.core.intPreferencesKey import androidx.datastore.preferences.core.stringPreferencesKey import androidx.datastore.preferences.preferencesDataStore -import cn.super12138.todo.TodoApp +import cn.super12138.todo.VerveDoApp import cn.super12138.todo.constants.Constants import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map @@ -27,7 +27,7 @@ object DataStoreManager { } ) - val dataStore = TodoApp.context.dataStore + val dataStore = VerveDoApp.context.dataStore // Keys // 外观与个性化 diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/activities/CrashActivity.kt b/app/src/main/kotlin/cn/super12138/todo/ui/activities/CrashActivity.kt index 1c4f57f..b743ccb 100644 --- a/app/src/main/kotlin/cn/super12138/todo/ui/activities/CrashActivity.kt +++ b/app/src/main/kotlin/cn/super12138/todo/ui/activities/CrashActivity.kt @@ -17,7 +17,7 @@ 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.pages.crash.CrashPage -import cn.super12138.todo.ui.theme.ToDoTheme +import cn.super12138.todo.ui.theme.VerveDoTheme import cn.super12138.todo.utils.VibrationUtils import cn.super12138.todo.utils.configureEdgeToEdge @@ -61,7 +61,7 @@ class CrashActivity : ComponentActivity() { VibrationUtils.setEnabled(hapticFeedback) } - ToDoTheme( + VerveDoTheme( darkTheme = darkTheme, style = PaletteStyle.fromId(paletteStyle), contrastLevel = contrastLevel.toDouble(), 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 f1d1086..343d523 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 @@ -29,9 +29,9 @@ 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.components.Konfetti -import cn.super12138.todo.ui.navigation.TodoDestinations +import cn.super12138.todo.ui.navigation.VerveDoDestinations import cn.super12138.todo.ui.navigation.TopNavigation -import cn.super12138.todo.ui.theme.ToDoTheme +import cn.super12138.todo.ui.theme.VerveDoTheme import cn.super12138.todo.ui.viewmodels.MainViewModel import cn.super12138.todo.utils.VibrationUtils import cn.super12138.todo.utils.configureEdgeToEdge @@ -91,7 +91,7 @@ class MainActivity : ComponentActivity() { // 当BackStack出现非顶层路由时，隐藏底部导航栏 LaunchedEffect(mainBackStack.backStack.lastOrNull()) { val isTopLevel = - mainBackStack.backStack.lastOrNull() in TodoDestinations.entries.map { it.route } + mainBackStack.backStack.lastOrNull() in VerveDoDestinations.entries.map { it.route } if (isTopLevel) { if (navigationScaffoldState.currentValue != NavigationSuiteScaffoldValue.Visible) navigationScaffoldState.show() } else { @@ -99,7 +99,7 @@ class MainActivity : ComponentActivity() { } } - ToDoTheme( + VerveDoTheme( darkTheme = darkTheme, style = PaletteStyle.fromId(paletteStyle), contrastLevel = contrastLevel.toDouble(), @@ -113,7 +113,7 @@ class MainActivity : ComponentActivity() { NavigationSuiteScaffold( state = navigationScaffoldState, navigationSuiteItems = { - TodoDestinations.entries.forEach { destination -> + VerveDoDestinations.entries.forEach { destination -> val selected = destination.route == mainBackStack.topLevelKey item( icon = { diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/navigation/TodoDestinations.kt b/app/src/main/kotlin/cn/super12138/todo/ui/navigation/TodoDestinations.kt deleted file mode 100644 index bb65f7b..0000000 --- a/app/src/main/kotlin/cn/super12138/todo/ui/navigation/TodoDestinations.kt +++ /dev/null @@ -1,32 +0,0 @@ -package cn.super12138.todo.ui.navigation - -import androidx.annotation.DrawableRes -import androidx.annotation.StringRes -import androidx.navigation3.runtime.NavKey - -enum class TodoDestinations( - val route: NavKey, - @param:StringRes val label: Int, - @param:DrawableRes val icon: Int, - @param:DrawableRes val selectedIcon: Int -) { - Overview( - route = TodoScreen.Overview, - label = cn.super12138.todo.R.string.page_overview, - icon = cn.super12138.todo.R.drawable.ic_dashboard, - selectedIcon = cn.super12138.todo.R.drawable.ic_dashboard_filled - ), - Tasks( - route = TodoScreen.Tasks, - label = cn.super12138.todo.R.string.page_tasks, - icon = cn.super12138.todo.R.drawable.ic_ballot, - selectedIcon = cn.super12138.todo.R.drawable.ic_ballot_filled - ), - Settings( - route = TodoScreen.Settings.Main, - label = cn.super12138.todo.R.string.page_settings, - icon = cn.super12138.todo.R.drawable.ic_settings, - selectedIcon = cn.super12138.todo.R.drawable.ic_settings_filled - ) -} - diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/navigation/TopNavigation.kt b/app/src/main/kotlin/cn/super12138/todo/ui/navigation/TopNavigation.kt index ea354f6..194971f 100644 --- a/app/src/main/kotlin/cn/super12138/todo/ui/navigation/TopNavigation.kt +++ b/app/src/main/kotlin/cn/super12138/todo/ui/navigation/TopNavigation.kt @@ -9,8 +9,8 @@ import androidx.compose.ui.Modifier import androidx.navigation3.runtime.NavKey import androidx.navigation3.runtime.entryProvider import androidx.navigation3.ui.NavDisplay -import cn.super12138.todo.ui.pages.editor.TodoAddPage -import cn.super12138.todo.ui.pages.editor.TodoEditPage +import cn.super12138.todo.ui.pages.editor.TaskAddPage +import cn.super12138.todo.ui.pages.editor.TaskEditPage import cn.super12138.todo.ui.pages.overview.OverviewPage import cn.super12138.todo.ui.pages.settings.SettingsAbout import cn.super12138.todo.ui.pages.settings.SettingsAboutLicence @@ -78,20 +78,20 @@ fun TopNavigation( popTransitionSpec = { defaultTransition }, predictivePopTransitionSpec = { defaultTransition }, entryProvider = entryProvider { - entry { + entry { OverviewPage(viewModel = viewModel) } - entry { + entry { TasksPage( viewModel = viewModel, - toTodoAddPage = { backStack.add(TodoScreen.Editor.Add) }, - toTodoEditPage = { backStack.add(TodoScreen.Editor.Edit(it)) } + toTodoAddPage = { backStack.add(VerveDoScreen.Editor.Add) }, + toTodoEditPage = { backStack.add(VerveDoScreen.Editor.Edit(it)) } ) } - entry(metadata = editorTransition()) { - TodoAddPage( + entry(metadata = editorTransition()) { + TaskAddPage( onSave = { viewModel.addTodo(it) onBack() @@ -100,8 +100,8 @@ fun TopNavigation( ) } - entry(metadata = editorTransition()) { editorArgs -> - TodoEditPage( + entry(metadata = editorTransition()) { editorArgs -> + TaskEditPage( toDo = editorArgs.toDo, onSave = { viewModel.addTodo(it) @@ -119,40 +119,40 @@ fun TopNavigation( ) } - entry { + entry { SettingsMain( - toAppearancePage = { backStack.add(TodoScreen.Settings.Appearance) }, - toAboutPage = { backStack.add(TodoScreen.Settings.About) }, - toInterfacePage = { backStack.add(TodoScreen.Settings.Interface) }, - toDataPage = { backStack.add(TodoScreen.Settings.Data) }, + toAppearancePage = { backStack.add(VerveDoScreen.Settings.Appearance) }, + toAboutPage = { backStack.add(VerveDoScreen.Settings.About) }, + toInterfacePage = { backStack.add(VerveDoScreen.Settings.Interface) }, + toDataPage = { backStack.add(VerveDoScreen.Settings.Data) }, ) } - entry(metadata = settingsTransition()) { + entry(metadata = settingsTransition()) { SettingsAppearance(onNavigateUp = ::onBack) } - entry(metadata = settingsTransition()) { + entry(metadata = settingsTransition()) { SettingsInterface(onNavigateUp = ::onBack) } - entry(metadata = settingsTransition()) { + entry(metadata = settingsTransition()) { SettingsData( viewModel = viewModel, - toCategoryManager = { backStack.add(TodoScreen.Settings.DataCategory) }, + toCategoryManager = { backStack.add(VerveDoScreen.Settings.DataCategory) }, onNavigateUp = ::onBack ) } - entry(metadata = settingsTransition()) { + entry(metadata = settingsTransition()) { SettingsDataCategory(onNavigateUp = ::onBack) } - entry(metadata = settingsTransition()) { + entry(metadata = settingsTransition()) { SettingsAbout( //toSpecialPage = { backStack.add(TodoScreen.Settings.AboutSpecial) }, - toLicencePage = { backStack.add(TodoScreen.Settings.AboutLicence) }, - toDevPage = { backStack.add(TodoScreen.Settings.DeveloperOptions) }, + toLicencePage = { backStack.add(VerveDoScreen.Settings.AboutLicence) }, + toDevPage = { backStack.add(VerveDoScreen.Settings.DeveloperOptions) }, onNavigateUp = ::onBack, ) } @@ -161,17 +161,17 @@ fun TopNavigation( SettingsAboutSpecial(viewModel = viewModel) }*/ - entry(metadata = settingsTransition()) { + entry(metadata = settingsTransition()) { SettingsAboutLicence(onNavigateUp = ::onBack) } - entry(metadata = settingsTransition()) { + entry(metadata = settingsTransition()) { SettingsDeveloperOptions( - toPaddingPage = { backStack.add(TodoScreen.Settings.DeveloperOptionsPadding) }, + toPaddingPage = { backStack.add(VerveDoScreen.Settings.DeveloperOptionsPadding) }, onNavigateUp = ::onBack ) } - entry(metadata = settingsTransition()) { + entry(metadata = settingsTransition()) { SettingsDeveloperOptionsPadding(onNavigateUp = ::onBack) } }, diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/navigation/VerveDoDestinations.kt b/app/src/main/kotlin/cn/super12138/todo/ui/navigation/VerveDoDestinations.kt new file mode 100644 index 0000000..83aacfc --- /dev/null +++ b/app/src/main/kotlin/cn/super12138/todo/ui/navigation/VerveDoDestinations.kt @@ -0,0 +1,33 @@ +package cn.super12138.todo.ui.navigation + +import androidx.annotation.DrawableRes +import androidx.annotation.StringRes +import androidx.navigation3.runtime.NavKey +import cn.super12138.todo.R + +enum class VerveDoDestinations( + val route: NavKey, + @param:StringRes val label: Int, + @param:DrawableRes val icon: Int, + @param:DrawableRes val selectedIcon: Int +) { + Overview( + route = VerveDoScreen.Overview, + label = R.string.page_overview, + icon = R.drawable.ic_dashboard, + selectedIcon = R.drawable.ic_dashboard_filled + ), + Tasks( + route = VerveDoScreen.Tasks, + label = R.string.page_tasks, + icon = R.drawable.ic_ballot, + selectedIcon = R.drawable.ic_ballot_filled + ), + Settings( + route = VerveDoScreen.Settings.Main, + label = R.string.page_settings, + icon = R.drawable.ic_settings, + selectedIcon = R.drawable.ic_settings_filled + ) +} + diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/navigation/TodoScreen.kt b/app/src/main/kotlin/cn/super12138/todo/ui/navigation/VerveDoScreen.kt similarity index 83% rename from app/src/main/kotlin/cn/super12138/todo/ui/navigation/TodoScreen.kt rename to app/src/main/kotlin/cn/super12138/todo/ui/navigation/VerveDoScreen.kt index 701464d..af011cb 100644 --- a/app/src/main/kotlin/cn/super12138/todo/ui/navigation/TodoScreen.kt +++ b/app/src/main/kotlin/cn/super12138/todo/ui/navigation/VerveDoScreen.kt @@ -5,15 +5,15 @@ import cn.super12138.todo.logic.database.TodoEntity import kotlinx.serialization.Serializable @Serializable -sealed class TodoScreen : NavKey { +sealed class VerveDoScreen : NavKey { @Serializable - data object Overview : TodoScreen() + data object Overview : VerveDoScreen() @Serializable - data object Tasks : TodoScreen() + data object Tasks : VerveDoScreen() @Serializable - sealed class Settings : TodoScreen() { + sealed class Settings : VerveDoScreen() { @Serializable data object Main : Settings() @@ -46,7 +46,7 @@ sealed class TodoScreen : NavKey { } @Serializable - sealed class Editor : TodoScreen() { + sealed class Editor : VerveDoScreen() { @Serializable data object Add : Editor() diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/editor/TodoEditorPage.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/editor/TaskEditorPage.kt similarity index 98% rename from app/src/main/kotlin/cn/super12138/todo/ui/pages/editor/TodoEditorPage.kt rename to app/src/main/kotlin/cn/super12138/todo/ui/pages/editor/TaskEditorPage.kt index f5040df..39eeabe 100644 --- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/editor/TodoEditorPage.kt +++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/editor/TaskEditorPage.kt @@ -48,11 +48,11 @@ import cn.super12138.todo.ui.pages.editor.components.TodoPrioritySlider import cn.super12138.todo.ui.pages.editor.state.rememberEditorState @Composable -fun SharedTransitionScope.TodoAddPage( +fun SharedTransitionScope.TaskAddPage( modifier: Modifier = Modifier, onSave: (TodoEntity) -> Unit, onNavigateUp: () -> Unit -) = TodoEditorPage( +) = TaskEditorPage( toDo = null, modifier = modifier .sharedBounds( @@ -67,13 +67,13 @@ fun SharedTransitionScope.TodoAddPage( ) @Composable -fun SharedTransitionScope.TodoEditPage( +fun SharedTransitionScope.TaskEditPage( modifier: Modifier = Modifier, toDo: TodoEntity, onSave: (TodoEntity) -> Unit, onDelete: () -> Unit, onNavigateUp: () -> Unit -) = TodoEditorPage( +) = TaskEditorPage( toDo = toDo, modifier = modifier.sharedBounds( sharedContentState = rememberSharedContentState(key = "${Constants.KEY_TODO_ITEM_TRANSITION}_${toDo.id}"), @@ -88,7 +88,7 @@ fun SharedTransitionScope.TodoEditPage( @OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable -fun SharedTransitionScope.TodoEditorPage( +fun SharedTransitionScope.TaskEditorPage( modifier: Modifier = Modifier, toDo: TodoEntity? = null, onSave: (TodoEntity) -> Unit, diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/theme/Theme.kt b/app/src/main/kotlin/cn/super12138/todo/ui/theme/Theme.kt index 0b0bda7..001aefa 100644 --- a/app/src/main/kotlin/cn/super12138/todo/ui/theme/Theme.kt +++ b/app/src/main/kotlin/cn/super12138/todo/ui/theme/Theme.kt @@ -11,7 +11,7 @@ import cn.super12138.todo.logic.model.PaletteStyle @OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable -fun ToDoTheme( +fun VerveDoTheme( color: Color? = null, darkTheme: Boolean = isSystemInDarkTheme(), style: PaletteStyle = PaletteStyle.TonalSpot, diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/viewmodels/MainViewModel.kt b/app/src/main/kotlin/cn/super12138/todo/ui/viewmodels/MainViewModel.kt index f8ae3a3..560bf43 100644 --- a/app/src/main/kotlin/cn/super12138/todo/ui/viewmodels/MainViewModel.kt +++ b/app/src/main/kotlin/cn/super12138/todo/ui/viewmodels/MainViewModel.kt @@ -8,13 +8,13 @@ import androidx.compose.runtime.mutableStateOf import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.navigation3.runtime.NavKey -import cn.super12138.todo.TodoApp +import cn.super12138.todo.VerveDoApp import cn.super12138.todo.constants.Constants import cn.super12138.todo.logic.Repository import cn.super12138.todo.logic.database.TodoEntity import cn.super12138.todo.logic.datastore.DataStoreManager import cn.super12138.todo.logic.model.SortingMethod -import cn.super12138.todo.ui.navigation.TodoScreen +import cn.super12138.todo.ui.navigation.VerveDoScreen import cn.super12138.todo.ui.navigation.TopLevelBackStack import cn.super12138.todo.utils.FileUtils import kotlinx.coroutines.Dispatchers @@ -40,7 +40,7 @@ import java.util.zip.ZipOutputStream @OptIn(ExperimentalCoroutinesApi::class) class MainViewModel : ViewModel() { - val mainBackStack = TopLevelBackStack(TodoScreen.Overview) + val mainBackStack = TopLevelBackStack(VerveDoScreen.Overview) // 待办 private val toDos: Flow> = Repository.getAllTodos() @@ -232,7 +232,7 @@ class MainViewModel : ViewModel() { * * DataStore Preferences 文件 */ private fun getBackupFiles(context: Context): List { - val dbPath = TodoApp.db.openHelper.writableDatabase.path + val dbPath = VerveDoApp.db.openHelper.writableDatabase.path val prefPath = "${context.filesDir}/datastore" return listOf( context.getDatabasePath(Constants.DB_NAME), // 数据库 diff --git a/app/src/main/kotlin/cn/super12138/todo/utils/SPUtils.kt b/app/src/main/kotlin/cn/super12138/todo/utils/SPUtils.kt index 453627f..124df58 100644 --- a/app/src/main/kotlin/cn/super12138/todo/utils/SPUtils.kt +++ b/app/src/main/kotlin/cn/super12138/todo/utils/SPUtils.kt @@ -2,12 +2,12 @@ package cn.super12138.todo.utils import android.content.Context import android.content.SharedPreferences -import cn.super12138.todo.TodoApp +import cn.super12138.todo.VerveDoApp import cn.super12138.todo.constants.Constants object SPUtils { private val sp: SharedPreferences by lazy { - TodoApp.context.getSharedPreferences(Constants.SP_NAME, Context.MODE_PRIVATE) + VerveDoApp.context.getSharedPreferences(Constants.SP_NAME, Context.MODE_PRIVATE) } fun getValue(name: String, default: T): T = with(sp) { diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 99cc6fc..619ac51 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -1,5 +1,4 @@ - قائمة المهام الإعدادات إضافة مهمة لا توجد مهام لإكمالها في الوقت الحالي.\nخذ قسطًا من الراحة! @@ -87,9 +86,7 @@ البيانات نسخ احتياطي واستعادة، إدارة البيانات نسخ احتياطي - حفظ بيانات تطبيق المهام على جهازك استعادة - استعادة بيانات التطبيق من جهازك تم النسخ الاحتياطي بنجاح فشل النسخ الاحتياطي تمت الاستعادة بنجاح، أعد تشغيل التطبيق لتحميل البيانات diff --git a/app/src/main/res/values-night-v27/themes.xml b/app/src/main/res/values-night-v27/themes.xml index 61103ee..a86d594 100644 --- a/app/src/main/res/values-night-v27/themes.xml +++ b/app/src/main/res/values-night-v27/themes.xml @@ -1,7 +1,7 @@ - -