danvics/VerveDo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Code tidy

Browse source
This commit is contained in:
Super12138 2023-12-31 14:41:39 +08:00
parent c2175a9e76
commit fbb97bc933
21 changed files with 126 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/release/output-metadata.json
View file

@ -1,20 +0,0 @@
{
"version": 3,
"artifactType": {
"type": "APK",
"kind": "Directory"
},
"applicationId": "cn.super12138.todo",
"variantName": "release",
"elements": [
{
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 1,
"versionName": "1.0.0",
"outputFile": "app-release.apk"
}
],
"elementType": "File"
}

3
app/src/main/kotlin/cn/super12138/todo/logic/Repository.kt
View file

@ -16,5 +16,6 @@ object Repository {
fun getAllData() = DBHelper.getAllData() fun getAllData() = DBHelper.getAllData()
fun getPreferenceString(context: Context, key: String, defaultValue: String) = SPHelper.getPreferenceString(context, key, defaultValue) fun getPreferenceString(context: Context, key: String, defaultValue: String) =
SPHelper.getPreferenceString(context, key, defaultValue)
} }

4
app/src/main/kotlin/cn/super12138/todo/logic/database/DBHelper.kt
View file

@ -15,7 +15,7 @@ object DBHelper {
ToDoApplication.context, ToDoApplication.context,
Constants.DB_NAME, Constants.DB_NAME,
Constants.DB_VERSION Constants.DB_VERSION
).writableDatabase.use {db -> ).writableDatabase.use { db ->
db.insert(Constants.TABLE_NAME, null, data) db.insert(Constants.TABLE_NAME, null, data)
} }
} }
@ -74,7 +74,7 @@ object DBHelper {
} }
@SuppressLint("Range") @SuppressLint("Range")
fun getAllData() : MutableList<ToDo> { fun getAllData(): MutableList<ToDo> {
val todoList = mutableListOf<ToDo>() val todoList = mutableListOf<ToDo>()
ToDoDatabase( ToDoDatabase(
ToDoApplication.context, ToDoApplication.context,

3
app/src/main/kotlin/cn/super12138/todo/logic/database/SPHelper.kt
View file

@ -5,7 +5,8 @@ import androidx.preference.PreferenceManager
object SPHelper { object SPHelper {
fun getPreferenceString(context: Context, name: String, defaultValue: String): String? { fun getPreferenceString(context: Context, name: String, defaultValue: String): String? {
val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context /* Activity context */) val sharedPreferences =
PreferenceManager.getDefaultSharedPreferences(context /* Activity context */)
return sharedPreferences.getString(name, defaultValue) return sharedPreferences.getString(name, defaultValue)
} }
} }

1
app/src/main/kotlin/cn/super12138/todo/views/about/AboutActivity.kt
View file

@ -5,7 +5,6 @@ import android.net.Uri
import android.os.Build import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.view.WindowManager import android.view.WindowManager
import android.widget.Toast
import androidx.activity.enableEdgeToEdge import androidx.activity.enableEdgeToEdge
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import cn.super12138.todo.constant.Constants import cn.super12138.todo.constant.Constants

1
app/src/main/kotlin/cn/super12138/todo/views/main/MainActivity.kt
View file

@ -9,7 +9,6 @@ import android.view.WindowManager
import androidx.activity.enableEdgeToEdge import androidx.activity.enableEdgeToEdge
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.app.AppCompatDelegate import androidx.appcompat.app.AppCompatDelegate
import androidx.preference.PreferenceManager
import cn.super12138.todo.R import cn.super12138.todo.R
import cn.super12138.todo.ToDoApplication import cn.super12138.todo.ToDoApplication
import cn.super12138.todo.databinding.ActivityMainBinding import cn.super12138.todo.databinding.ActivityMainBinding

1
app/src/main/kotlin/cn/super12138/todo/views/todo/ToDoAdapter.kt
View file

@ -111,7 +111,6 @@ class ToDoAdapter(val todoList: MutableList<ToDo>, val viewModelStoreOwner: View
val todo = todoList[position] val todo = todoList[position]
holder.todoContext.text = todo.context holder.todoContext.text = todo.context
holder.todoSubject.text = todo.subject holder.todoSubject.text = todo.subject
} }
override fun getItemCount() = todoList.size override fun getItemCount() = todoList.size

2
app/src/main/res/layout-land/activity_main.xml
View file

@ -23,8 +23,8 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="horizontal"
android:fillViewport="true" android:fillViewport="true"
android:orientation="horizontal"
app:layout_behavior="@string/appbar_scrolling_view_behavior"> app:layout_behavior="@string/appbar_scrolling_view_behavior">
<androidx.fragment.app.FragmentContainerView <androidx.fragment.app.FragmentContainerView

2
app/src/main/res/layout/activity_crash.xml
View file

@ -41,8 +41,8 @@
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
android:layout_marginEnd="20dp" android:layout_marginEnd="20dp"
android:text="@string/no_crash_logs"
android:fontFamily="monospace" android:fontFamily="monospace"
android:text="@string/no_crash_logs"
android:textIsSelectable="true" android:textIsSelectable="true"
android:textSize="13sp" /> android:textSize="13sp" />
</LinearLayout> </LinearLayout>

2
app/src/main/res/layout/activity_main.xml
View file

@ -23,8 +23,8 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"
android:fillViewport="true" android:fillViewport="true"
android:orientation="vertical"
app:layout_behavior="@string/appbar_scrolling_view_behavior"> app:layout_behavior="@string/appbar_scrolling_view_behavior">
<androidx.fragment.app.FragmentContainerView <androidx.fragment.app.FragmentContainerView

2
app/src/main/res/layout/fragment_progress.xml
View file

@ -12,11 +12,11 @@
android:layout_marginRight="15dp" android:layout_marginRight="15dp"
android:max="100" android:max="100"
app:indicatorSize="160dp" app:indicatorSize="160dp"
app:trackColor="?attr/colorSurfaceContainerHighest"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:trackColor="?attr/colorSurfaceContainerHighest"
app:trackCornerRadius="5dp" app:trackCornerRadius="5dp"
app:trackThickness="10dp" /> app:trackThickness="10dp" />

6
app/src/main/res/layout/fragment_todo.xml
View file

@ -43,8 +43,8 @@
android:id="@+id/empty_tip" android:id="@+id/empty_tip"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:gravity="center"
android:text="@string/no_tasks" android:text="@string/no_tasks"
android:visibility="visible" /> android:visibility="visible" />
@ -52,9 +52,9 @@
android:id="@+id/add_item" android:id="@+id/add_item"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="16dp"
android:layout_gravity="bottom|end" android:layout_gravity="bottom|end"
android:layout_margin="16dp"
android:contentDescription="@string/add_task" android:contentDescription="@string/add_task"
android:text="@string/add_task" android:text="@string/add_task"
app:icon="@drawable/add_24"/> app:icon="@drawable/add_24" />
</androidx.coordinatorlayout.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>

1
app/src/main/res/layout/todo_item.xml
View file

@ -36,7 +36,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="15dp" android:layout_marginStart="15dp"
android:ellipsize="marquee"
android:singleLine="true" android:singleLine="true"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:textSize="11sp" /> android:textSize="11sp" />

4
app/src/main/res/menu/main.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<menu xmlns:app="http://schemas.android.com/apk/res-auto" <menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"> xmlns:app="http://schemas.android.com/apk/res-auto">
<item <item
android:id="@+id/item_settings" android:id="@+id/item_settings"
android:icon="@drawable/settings_24" android:icon="@drawable/settings_24"

6
app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@mipmap/ic_launcher_background"/> <background android:drawable="@mipmap/ic_launcher_background" />
<foreground android:drawable="@mipmap/ic_launcher_foreground"/> <foreground android:drawable="@mipmap/ic_launcher_foreground" />
<monochrome android:drawable="@mipmap/ic_launcher_monochrome"/> <monochrome android:drawable="@mipmap/ic_launcher_monochrome" />
</adaptive-icon> </adaptive-icon>

6
app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@mipmap/ic_launcher_round_background"/> <background android:drawable="@mipmap/ic_launcher_round_background" />
<foreground android:drawable="@mipmap/ic_launcher_round_foreground"/> <foreground android:drawable="@mipmap/ic_launcher_round_foreground" />
<monochrome android:drawable="@mipmap/ic_launcher_round_monochrome"/> <monochrome android:drawable="@mipmap/ic_launcher_round_monochrome" />
</adaptive-icon> </adaptive-icon>

70
app/src/main/res/values-night/theme_overlays.xml
View file

@ -1,17 +1,22 @@
<resources> <resources>
<style name="ThemeOverlay.ToDo.MediumContrast" parent="Theme.Material3.Dark.NoActionBar"> <style name="ThemeOverlay.ToDo.MediumContrast" parent="Theme.Material3.Dark.NoActionBar">
<item name="colorPrimary">@color/md_theme_primary_mediumContrast</item> <item name="colorPrimary">@color/md_theme_primary_mediumContrast</item>
<item name="colorOnPrimary">@color/md_theme_onPrimary_mediumContrast</item> <item name="colorOnPrimary">@color/md_theme_onPrimary_mediumContrast</item>
<item name="colorPrimaryContainer">@color/md_theme_primaryContainer_mediumContrast</item> <item name="colorPrimaryContainer">@color/md_theme_primaryContainer_mediumContrast</item>
<item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer_mediumContrast</item> <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer_mediumContrast
</item>
<item name="colorSecondary">@color/md_theme_secondary_mediumContrast</item> <item name="colorSecondary">@color/md_theme_secondary_mediumContrast</item>
<item name="colorOnSecondary">@color/md_theme_onSecondary_mediumContrast</item> <item name="colorOnSecondary">@color/md_theme_onSecondary_mediumContrast</item>
<item name="colorSecondaryContainer">@color/md_theme_secondaryContainer_mediumContrast</item> <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer_mediumContrast
<item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer_mediumContrast</item> </item>
<item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer_mediumContrast
</item>
<item name="colorTertiary">@color/md_theme_tertiary_mediumContrast</item> <item name="colorTertiary">@color/md_theme_tertiary_mediumContrast</item>
<item name="colorOnTertiary">@color/md_theme_onTertiary_mediumContrast</item> <item name="colorOnTertiary">@color/md_theme_onTertiary_mediumContrast</item>
<item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer_mediumContrast</item> <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer_mediumContrast</item>
<item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer_mediumContrast</item> <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer_mediumContrast
</item>
<item name="colorError">@color/md_theme_error_mediumContrast</item> <item name="colorError">@color/md_theme_error_mediumContrast</item>
<item name="colorOnError">@color/md_theme_onError_mediumContrast</item> <item name="colorOnError">@color/md_theme_onError_mediumContrast</item>
<item name="colorErrorContainer">@color/md_theme_errorContainer_mediumContrast</item> <item name="colorErrorContainer">@color/md_theme_errorContainer_mediumContrast</item>
@ -30,22 +35,34 @@
<item name="colorPrimaryFixed">@color/md_theme_primaryFixed_mediumContrast</item> <item name="colorPrimaryFixed">@color/md_theme_primaryFixed_mediumContrast</item>
<item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed_mediumContrast</item> <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed_mediumContrast</item>
<item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim_mediumContrast</item> <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim_mediumContrast</item>
<item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant_mediumContrast</item> <item name="colorOnPrimaryFixedVariant">
@color/md_theme_onPrimaryFixedVariant_mediumContrast
</item>
<item name="colorSecondaryFixed">@color/md_theme_secondaryFixed_mediumContrast</item> <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed_mediumContrast</item>
<item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed_mediumContrast</item> <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed_mediumContrast</item>
<item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim_mediumContrast</item> <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim_mediumContrast</item>
<item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant_mediumContrast</item> <item name="colorOnSecondaryFixedVariant">
@color/md_theme_onSecondaryFixedVariant_mediumContrast
</item>
<item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed_mediumContrast</item> <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed_mediumContrast</item>
<item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed_mediumContrast</item> <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed_mediumContrast</item>
<item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim_mediumContrast</item> <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim_mediumContrast</item>
<item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant_mediumContrast</item> <item name="colorOnTertiaryFixedVariant">
@color/md_theme_onTertiaryFixedVariant_mediumContrast
</item>
<item name="colorSurfaceDim">@color/md_theme_surfaceDim_mediumContrast</item> <item name="colorSurfaceDim">@color/md_theme_surfaceDim_mediumContrast</item>
<item name="colorSurfaceBright">@color/md_theme_surfaceBright_mediumContrast</item> <item name="colorSurfaceBright">@color/md_theme_surfaceBright_mediumContrast</item>
<item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest_mediumContrast</item> <item name="colorSurfaceContainerLowest">
<item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow_mediumContrast</item> @color/md_theme_surfaceContainerLowest_mediumContrast
</item>
<item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow_mediumContrast
</item>
<item name="colorSurfaceContainer">@color/md_theme_surfaceContainer_mediumContrast</item> <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer_mediumContrast</item>
<item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh_mediumContrast</item> <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh_mediumContrast
<item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest_mediumContrast</item> </item>
<item name="colorSurfaceContainerHighest">
@color/md_theme_surfaceContainerHighest_mediumContrast
</item>
</style> </style>
<style name="ThemeOverlay.ToDo.HighContrast" parent="Theme.Material3.Dark.NoActionBar"> <style name="ThemeOverlay.ToDo.HighContrast" parent="Theme.Material3.Dark.NoActionBar">
@ -56,11 +73,13 @@
<item name="colorSecondary">@color/md_theme_secondary_highContrast</item> <item name="colorSecondary">@color/md_theme_secondary_highContrast</item>
<item name="colorOnSecondary">@color/md_theme_onSecondary_highContrast</item> <item name="colorOnSecondary">@color/md_theme_onSecondary_highContrast</item>
<item name="colorSecondaryContainer">@color/md_theme_secondaryContainer_highContrast</item> <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer_highContrast</item>
<item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer_highContrast</item> <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer_highContrast
</item>
<item name="colorTertiary">@color/md_theme_tertiary_highContrast</item> <item name="colorTertiary">@color/md_theme_tertiary_highContrast</item>
<item name="colorOnTertiary">@color/md_theme_onTertiary_highContrast</item> <item name="colorOnTertiary">@color/md_theme_onTertiary_highContrast</item>
<item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer_highContrast</item> <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer_highContrast</item>
<item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer_highContrast</item> <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer_highContrast
</item>
<item name="colorError">@color/md_theme_error_highContrast</item> <item name="colorError">@color/md_theme_error_highContrast</item>
<item name="colorOnError">@color/md_theme_onError_highContrast</item> <item name="colorOnError">@color/md_theme_onError_highContrast</item>
<item name="colorErrorContainer">@color/md_theme_errorContainer_highContrast</item> <item name="colorErrorContainer">@color/md_theme_errorContainer_highContrast</item>
@ -79,21 +98,32 @@
<item name="colorPrimaryFixed">@color/md_theme_primaryFixed_highContrast</item> <item name="colorPrimaryFixed">@color/md_theme_primaryFixed_highContrast</item>
<item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed_highContrast</item> <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed_highContrast</item>
<item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim_highContrast</item> <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim_highContrast</item>
<item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant_highContrast</item> <item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant_highContrast
</item>
<item name="colorSecondaryFixed">@color/md_theme_secondaryFixed_highContrast</item> <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed_highContrast</item>
<item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed_highContrast</item> <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed_highContrast</item>
<item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim_highContrast</item> <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim_highContrast</item>
<item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant_highContrast</item> <item name="colorOnSecondaryFixedVariant">
@color/md_theme_onSecondaryFixedVariant_highContrast
</item>
<item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed_highContrast</item> <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed_highContrast</item>
<item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed_highContrast</item> <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed_highContrast</item>
<item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim_highContrast</item> <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim_highContrast</item>
<item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant_highContrast</item> <item name="colorOnTertiaryFixedVariant">
@color/md_theme_onTertiaryFixedVariant_highContrast
</item>
<item name="colorSurfaceDim">@color/md_theme_surfaceDim_highContrast</item> <item name="colorSurfaceDim">@color/md_theme_surfaceDim_highContrast</item>
<item name="colorSurfaceBright">@color/md_theme_surfaceBright_highContrast</item> <item name="colorSurfaceBright">@color/md_theme_surfaceBright_highContrast</item>
<item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest_highContrast</item> <item name="colorSurfaceContainerLowest">
<item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow_highContrast</item> @color/md_theme_surfaceContainerLowest_highContrast
</item>
<item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow_highContrast
</item>
<item name="colorSurfaceContainer">@color/md_theme_surfaceContainer_highContrast</item> <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer_highContrast</item>
<item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh_highContrast</item> <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh_highContrast
<item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest_highContrast</item> </item>
<item name="colorSurfaceContainerHighest">
@color/md_theme_surfaceContainerHighest_highContrast
</item>
</style> </style>
</resources> </resources>

1
app/src/main/res/values-night/themes.xml
View file

@ -1,4 +1,5 @@
<resources> <resources>
<style name="Base.Theme.ToDo" parent="Theme.Material3.Dark.NoActionBar"> <style name="Base.Theme.ToDo" parent="Theme.Material3.Dark.NoActionBar">
<item name="colorPrimary">@color/md_theme_primary</item> <item name="colorPrimary">@color/md_theme_primary</item>
<item name="colorOnPrimary">@color/md_theme_onPrimary</item> <item name="colorOnPrimary">@color/md_theme_onPrimary</item>

70
app/src/main/res/values/theme_overlays.xml
View file

@ -1,17 +1,22 @@
<resources> <resources>
<style name="ThemeOverlay.ToDo.MediumContrast" parent="Theme.Material3.Light.NoActionBar"> <style name="ThemeOverlay.ToDo.MediumContrast" parent="Theme.Material3.Light.NoActionBar">
<item name="colorPrimary">@color/md_theme_primary_mediumContrast</item> <item name="colorPrimary">@color/md_theme_primary_mediumContrast</item>
<item name="colorOnPrimary">@color/md_theme_onPrimary_mediumContrast</item> <item name="colorOnPrimary">@color/md_theme_onPrimary_mediumContrast</item>
<item name="colorPrimaryContainer">@color/md_theme_primaryContainer_mediumContrast</item> <item name="colorPrimaryContainer">@color/md_theme_primaryContainer_mediumContrast</item>
<item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer_mediumContrast</item> <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer_mediumContrast
</item>
<item name="colorSecondary">@color/md_theme_secondary_mediumContrast</item> <item name="colorSecondary">@color/md_theme_secondary_mediumContrast</item>
<item name="colorOnSecondary">@color/md_theme_onSecondary_mediumContrast</item> <item name="colorOnSecondary">@color/md_theme_onSecondary_mediumContrast</item>
<item name="colorSecondaryContainer">@color/md_theme_secondaryContainer_mediumContrast</item> <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer_mediumContrast
<item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer_mediumContrast</item> </item>
<item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer_mediumContrast
</item>
<item name="colorTertiary">@color/md_theme_tertiary_mediumContrast</item> <item name="colorTertiary">@color/md_theme_tertiary_mediumContrast</item>
<item name="colorOnTertiary">@color/md_theme_onTertiary_mediumContrast</item> <item name="colorOnTertiary">@color/md_theme_onTertiary_mediumContrast</item>
<item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer_mediumContrast</item> <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer_mediumContrast</item>
<item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer_mediumContrast</item> <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer_mediumContrast
</item>
<item name="colorError">@color/md_theme_error_mediumContrast</item> <item name="colorError">@color/md_theme_error_mediumContrast</item>
<item name="colorOnError">@color/md_theme_onError_mediumContrast</item> <item name="colorOnError">@color/md_theme_onError_mediumContrast</item>
<item name="colorErrorContainer">@color/md_theme_errorContainer_mediumContrast</item> <item name="colorErrorContainer">@color/md_theme_errorContainer_mediumContrast</item>
@ -30,22 +35,34 @@
<item name="colorPrimaryFixed">@color/md_theme_primaryFixed_mediumContrast</item> <item name="colorPrimaryFixed">@color/md_theme_primaryFixed_mediumContrast</item>
<item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed_mediumContrast</item> <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed_mediumContrast</item>
<item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim_mediumContrast</item> <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim_mediumContrast</item>
<item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant_mediumContrast</item> <item name="colorOnPrimaryFixedVariant">
@color/md_theme_onPrimaryFixedVariant_mediumContrast
</item>
<item name="colorSecondaryFixed">@color/md_theme_secondaryFixed_mediumContrast</item> <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed_mediumContrast</item>
<item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed_mediumContrast</item> <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed_mediumContrast</item>
<item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim_mediumContrast</item> <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim_mediumContrast</item>
<item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant_mediumContrast</item> <item name="colorOnSecondaryFixedVariant">
@color/md_theme_onSecondaryFixedVariant_mediumContrast
</item>
<item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed_mediumContrast</item> <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed_mediumContrast</item>
<item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed_mediumContrast</item> <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed_mediumContrast</item>
<item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim_mediumContrast</item> <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim_mediumContrast</item>
<item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant_mediumContrast</item> <item name="colorOnTertiaryFixedVariant">
@color/md_theme_onTertiaryFixedVariant_mediumContrast
</item>
<item name="colorSurfaceDim">@color/md_theme_surfaceDim_mediumContrast</item> <item name="colorSurfaceDim">@color/md_theme_surfaceDim_mediumContrast</item>
<item name="colorSurfaceBright">@color/md_theme_surfaceBright_mediumContrast</item> <item name="colorSurfaceBright">@color/md_theme_surfaceBright_mediumContrast</item>
<item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest_mediumContrast</item> <item name="colorSurfaceContainerLowest">
<item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow_mediumContrast</item> @color/md_theme_surfaceContainerLowest_mediumContrast
</item>
<item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow_mediumContrast
</item>
<item name="colorSurfaceContainer">@color/md_theme_surfaceContainer_mediumContrast</item> <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer_mediumContrast</item>
<item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh_mediumContrast</item> <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh_mediumContrast
<item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest_mediumContrast</item> </item>
<item name="colorSurfaceContainerHighest">
@color/md_theme_surfaceContainerHighest_mediumContrast
</item>
</style> </style>
<style name="ThemeOverlay.ToDO.HighContrast" parent="Theme.Material3.Light.NoActionBar"> <style name="ThemeOverlay.ToDO.HighContrast" parent="Theme.Material3.Light.NoActionBar">
@ -56,11 +73,13 @@
<item name="colorSecondary">@color/md_theme_secondary_highContrast</item> <item name="colorSecondary">@color/md_theme_secondary_highContrast</item>
<item name="colorOnSecondary">@color/md_theme_onSecondary_highContrast</item> <item name="colorOnSecondary">@color/md_theme_onSecondary_highContrast</item>
<item name="colorSecondaryContainer">@color/md_theme_secondaryContainer_highContrast</item> <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer_highContrast</item>
<item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer_highContrast</item> <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer_highContrast
</item>
<item name="colorTertiary">@color/md_theme_tertiary_highContrast</item> <item name="colorTertiary">@color/md_theme_tertiary_highContrast</item>
<item name="colorOnTertiary">@color/md_theme_onTertiary_highContrast</item> <item name="colorOnTertiary">@color/md_theme_onTertiary_highContrast</item>
<item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer_highContrast</item> <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer_highContrast</item>
<item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer_highContrast</item> <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer_highContrast
</item>
<item name="colorError">@color/md_theme_error_highContrast</item> <item name="colorError">@color/md_theme_error_highContrast</item>
<item name="colorOnError">@color/md_theme_onError_highContrast</item> <item name="colorOnError">@color/md_theme_onError_highContrast</item>
<item name="colorErrorContainer">@color/md_theme_errorContainer_highContrast</item> <item name="colorErrorContainer">@color/md_theme_errorContainer_highContrast</item>
@ -79,21 +98,32 @@
<item name="colorPrimaryFixed">@color/md_theme_primaryFixed_highContrast</item> <item name="colorPrimaryFixed">@color/md_theme_primaryFixed_highContrast</item>
<item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed_highContrast</item> <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed_highContrast</item>
<item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim_highContrast</item> <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim_highContrast</item>
<item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant_highContrast</item> <item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant_highContrast
</item>
<item name="colorSecondaryFixed">@color/md_theme_secondaryFixed_highContrast</item> <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed_highContrast</item>
<item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed_highContrast</item> <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed_highContrast</item>
<item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim_highContrast</item> <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim_highContrast</item>
<item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant_highContrast</item> <item name="colorOnSecondaryFixedVariant">
@color/md_theme_onSecondaryFixedVariant_highContrast
</item>
<item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed_highContrast</item> <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed_highContrast</item>
<item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed_highContrast</item> <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed_highContrast</item>
<item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim_highContrast</item> <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim_highContrast</item>
<item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant_highContrast</item> <item name="colorOnTertiaryFixedVariant">
@color/md_theme_onTertiaryFixedVariant_highContrast
</item>
<item name="colorSurfaceDim">@color/md_theme_surfaceDim_highContrast</item> <item name="colorSurfaceDim">@color/md_theme_surfaceDim_highContrast</item>
<item name="colorSurfaceBright">@color/md_theme_surfaceBright_highContrast</item> <item name="colorSurfaceBright">@color/md_theme_surfaceBright_highContrast</item>
<item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest_highContrast</item> <item name="colorSurfaceContainerLowest">
<item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow_highContrast</item> @color/md_theme_surfaceContainerLowest_highContrast
</item>
<item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow_highContrast
</item>
<item name="colorSurfaceContainer">@color/md_theme_surfaceContainer_highContrast</item> <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer_highContrast</item>
<item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh_highContrast</item> <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh_highContrast
<item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest_highContrast</item> </item>
<item name="colorSurfaceContainerHighest">
@color/md_theme_surfaceContainerHighest_highContrast
</item>
</style> </style>
</resources> </resources>

1
app/src/main/res/values/themes.xml
View file

@ -1,4 +1,5 @@
<resources> <resources>
<style name="Base.Theme.ToDo" parent="Theme.Material3.Light.NoActionBar"> <style name="Base.Theme.ToDo" parent="Theme.Material3.Light.NoActionBar">
<item name="colorPrimary">@color/md_theme_primary</item> <item name="colorPrimary">@color/md_theme_primary</item>
<item name="colorOnPrimary">@color/md_theme_onPrimary</item> <item name="colorOnPrimary">@color/md_theme_onPrimary</item>

7
app/src/main/res/xml/preferences.xml
View file

@ -1,5 +1,4 @@
<PreferenceScreen <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<PreferenceCategory app:title="@string/appearance"> <PreferenceCategory app:title="@string/appearance">
<ListPreference <ListPreference
@ -25,8 +24,8 @@
<PreferenceCategory android:title="@string/others"> <PreferenceCategory android:title="@string/others">
<Preference app:title="@string/about_label"> <Preference app:title="@string/about_label">
<intent <intent
android:targetPackage="cn.super12138.todo" android:targetClass="cn.super12138.todo.views.about.AboutActivity"
android:targetClass="cn.super12138.todo.views.about.AboutActivity" /> android:targetPackage="cn.super12138.todo" />
</Preference> </Preference>
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>