diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json deleted file mode 100644 index 54a4fa5..0000000 --- a/app/release/output-metadata.json +++ /dev/null @@ -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" -} \ No newline at end of file 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 13bbd7c..72be219 100644 --- a/app/src/main/kotlin/cn/super12138/todo/logic/Repository.kt +++ b/app/src/main/kotlin/cn/super12138/todo/logic/Repository.kt @@ -16,5 +16,6 @@ object Repository { 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) } \ No newline at end of file diff --git a/app/src/main/kotlin/cn/super12138/todo/logic/database/DBHelper.kt b/app/src/main/kotlin/cn/super12138/todo/logic/database/DBHelper.kt index 569d9be..7e62250 100644 --- a/app/src/main/kotlin/cn/super12138/todo/logic/database/DBHelper.kt +++ b/app/src/main/kotlin/cn/super12138/todo/logic/database/DBHelper.kt @@ -15,7 +15,7 @@ object DBHelper { ToDoApplication.context, Constants.DB_NAME, Constants.DB_VERSION - ).writableDatabase.use {db -> + ).writableDatabase.use { db -> db.insert(Constants.TABLE_NAME, null, data) } } @@ -74,7 +74,7 @@ object DBHelper { } @SuppressLint("Range") - fun getAllData() : MutableList { + fun getAllData(): MutableList { val todoList = mutableListOf() ToDoDatabase( ToDoApplication.context, diff --git a/app/src/main/kotlin/cn/super12138/todo/logic/database/SPHelper.kt b/app/src/main/kotlin/cn/super12138/todo/logic/database/SPHelper.kt index f3aab33..8a3b4bd 100644 --- a/app/src/main/kotlin/cn/super12138/todo/logic/database/SPHelper.kt +++ b/app/src/main/kotlin/cn/super12138/todo/logic/database/SPHelper.kt @@ -5,7 +5,8 @@ import androidx.preference.PreferenceManager object SPHelper { 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) } } \ No newline at end of file diff --git a/app/src/main/kotlin/cn/super12138/todo/views/about/AboutActivity.kt b/app/src/main/kotlin/cn/super12138/todo/views/about/AboutActivity.kt index 230a9f9..d9797c0 100644 --- a/app/src/main/kotlin/cn/super12138/todo/views/about/AboutActivity.kt +++ b/app/src/main/kotlin/cn/super12138/todo/views/about/AboutActivity.kt @@ -5,7 +5,6 @@ import android.net.Uri import android.os.Build import android.os.Bundle import android.view.WindowManager -import android.widget.Toast import androidx.activity.enableEdgeToEdge import androidx.appcompat.app.AppCompatActivity import cn.super12138.todo.constant.Constants diff --git a/app/src/main/kotlin/cn/super12138/todo/views/main/MainActivity.kt b/app/src/main/kotlin/cn/super12138/todo/views/main/MainActivity.kt index 0d0af3f..8747eca 100644 --- a/app/src/main/kotlin/cn/super12138/todo/views/main/MainActivity.kt +++ b/app/src/main/kotlin/cn/super12138/todo/views/main/MainActivity.kt @@ -9,7 +9,6 @@ import android.view.WindowManager import androidx.activity.enableEdgeToEdge import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatDelegate -import androidx.preference.PreferenceManager import cn.super12138.todo.R import cn.super12138.todo.ToDoApplication import cn.super12138.todo.databinding.ActivityMainBinding diff --git a/app/src/main/kotlin/cn/super12138/todo/views/todo/ToDoAdapter.kt b/app/src/main/kotlin/cn/super12138/todo/views/todo/ToDoAdapter.kt index 48cdd5b..1230bcc 100644 --- a/app/src/main/kotlin/cn/super12138/todo/views/todo/ToDoAdapter.kt +++ b/app/src/main/kotlin/cn/super12138/todo/views/todo/ToDoAdapter.kt @@ -111,7 +111,6 @@ class ToDoAdapter(val todoList: MutableList, val viewModelStoreOwner: View val todo = todoList[position] holder.todoContext.text = todo.context holder.todoSubject.text = todo.subject - } override fun getItemCount() = todoList.size diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml index d5ea165..dae02f0 100644 --- a/app/src/main/res/layout-land/activity_main.xml +++ b/app/src/main/res/layout-land/activity_main.xml @@ -23,8 +23,8 @@ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index b319978..1e78b67 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -23,8 +23,8 @@ diff --git a/app/src/main/res/layout/fragment_todo.xml b/app/src/main/res/layout/fragment_todo.xml index 4f9a32d..80d80f8 100644 --- a/app/src/main/res/layout/fragment_todo.xml +++ b/app/src/main/res/layout/fragment_todo.xml @@ -43,8 +43,8 @@ android:id="@+id/empty_tip" android:layout_width="match_parent" android:layout_height="wrap_content" - android:gravity="center" android:layout_marginTop="20dp" + android:gravity="center" android:text="@string/no_tasks" android:visibility="visible" /> @@ -52,9 +52,9 @@ android:id="@+id/add_item" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_margin="16dp" android:layout_gravity="bottom|end" + android:layout_margin="16dp" android:contentDescription="@string/add_task" android:text="@string/add_task" - app:icon="@drawable/add_24"/> + app:icon="@drawable/add_24" /> \ No newline at end of file diff --git a/app/src/main/res/layout/todo_item.xml b/app/src/main/res/layout/todo_item.xml index 6767100..2a30574 100644 --- a/app/src/main/res/layout/todo_item.xml +++ b/app/src/main/res/layout/todo_item.xml @@ -36,7 +36,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="15dp" - android:ellipsize="marquee" android:singleLine="true" android:textColor="?android:attr/textColorPrimary" android:textSize="11sp" /> diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml index 2c4e87d..9a0f782 100644 --- a/app/src/main/res/menu/main.xml +++ b/app/src/main/res/menu/main.xml @@ -1,6 +1,6 @@ - + - - - + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index b698387..7f2b607 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,6 @@ - - - + + + \ No newline at end of file diff --git a/app/src/main/res/values-night/theme_overlays.xml b/app/src/main/res/values-night/theme_overlays.xml index bcb9d03..6d5e108 100644 --- a/app/src/main/res/values-night/theme_overlays.xml +++ b/app/src/main/res/values-night/theme_overlays.xml @@ -1,17 +1,22 @@ + diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml index ffd70e6..7959f78 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -1,4 +1,5 @@ + diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 1684e13..3461da9 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,4 +1,5 @@ +