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

Refine code

Browse source
This commit is contained in:
Super12138 2024-03-10 21:54:11 +08:00
parent 7f826e1bd3
commit 98b8b441f9
12 changed files with 18 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/kotlin/cn/super12138/todo/logic/model/ToDo.kt
View file

@ -1,5 +1,5 @@
package cn.super12138.todo.logic.model
data class ToDo(val uuid: String, val state:Int, val content: String, val subject: String) {
data class ToDo(val uuid: String, val state: Int, val content: String, val subject: String) {
// var isAnimated = false
}

4
app/src/main/kotlin/cn/super12138/todo/views/BaseActivity.kt
View file

@ -5,11 +5,7 @@ import android.os.Bundle
import android.view.WindowManager
import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.app.AppCompatDelegate
import cn.super12138.todo.R
import cn.super12138.todo.ToDoApp
import cn.super12138.todo.constant.Constants
import cn.super12138.todo.constant.GlobalValues
import cn.super12138.todo.logic.Repository
open class BaseActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {

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.Bundle
import cn.super12138.todo.constant.Constants
import cn.super12138.todo.constant.GlobalValues
import cn.super12138.todo.databinding.ActivityAboutBinding
import cn.super12138.todo.utils.showToast
import cn.super12138.todo.views.BaseActivity

2
app/src/main/kotlin/cn/super12138/todo/views/all/AllTasksActivity.kt
View file

@ -7,10 +7,8 @@ import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProvider
import androidx.recyclerview.widget.LinearLayoutManager
import cn.super12138.todo.ToDoApp
import cn.super12138.todo.constant.Constants
import cn.super12138.todo.constant.GlobalValues
import cn.super12138.todo.databinding.ActivityAllTasksBinding
import cn.super12138.todo.logic.Repository
import cn.super12138.todo.views.BaseActivity
import me.zhanghai.android.fastscroll.FastScrollerBuilder

6
app/src/main/kotlin/cn/super12138/todo/views/all/AllTasksAdapter.kt
View file

@ -9,8 +9,10 @@ import androidx.recyclerview.widget.RecyclerView
import cn.super12138.todo.R
import cn.super12138.todo.logic.model.ToDo
class AllTasksAdapter(private val todoList: MutableList<ToDo>,
private val fragmentManager: FragmentManager) :
class AllTasksAdapter(
private val todoList: MutableList<ToDo>,
private val fragmentManager: FragmentManager
) :
RecyclerView.Adapter<AllTasksAdapter.ViewHolder>() {
inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {

2
app/src/main/kotlin/cn/super12138/todo/views/all/InfoBottomSheet.kt
View file

@ -5,11 +5,9 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import cn.super12138.todo.R
import cn.super12138.todo.ToDoApp
import cn.super12138.todo.constant.Constants
import cn.super12138.todo.constant.GlobalValues
import cn.super12138.todo.databinding.BottomSheetInfoBinding
import cn.super12138.todo.logic.Repository
import com.google.android.material.bottomsheet.BottomSheetBehavior
import com.google.android.material.bottomsheet.BottomSheetDialog
import com.google.android.material.bottomsheet.BottomSheetDialogFragment

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

@ -5,10 +5,8 @@ import android.os.Bundle
import android.view.WindowManager
import cn.super12138.todo.R
import cn.super12138.todo.ToDoApp
import cn.super12138.todo.constant.Constants
import cn.super12138.todo.constant.GlobalValues
import cn.super12138.todo.databinding.ActivityMainBinding
import cn.super12138.todo.logic.Repository
import cn.super12138.todo.views.BaseActivity
import cn.super12138.todo.views.settings.SettingsActivity

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

@ -14,7 +14,10 @@ import cn.super12138.todo.logic.model.ToDo
import cn.super12138.todo.views.progress.ProgressFragmentViewModel
import com.google.android.material.snackbar.Snackbar
class ToDoAdapter(private val todoList: MutableList<ToDo>, private val viewModelStoreOwner: ViewModelStoreOwner) :
class ToDoAdapter(
private val todoList: MutableList<ToDo>,
private val viewModelStoreOwner: ViewModelStoreOwner
) :
RecyclerView.Adapter<ToDoAdapter.ViewHolder>() {
inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {

4
app/src/main/kotlin/cn/super12138/todo/views/todo/ToDoFragment.kt
View file

@ -20,11 +20,11 @@ import cn.super12138.todo.databinding.FragmentTodoBinding
import cn.super12138.todo.logic.Repository
import cn.super12138.todo.logic.dao.ToDoRoom
import cn.super12138.todo.logic.model.ToDo
import cn.super12138.todo.utils.showToast
import cn.super12138.todo.views.progress.ProgressFragmentViewModel
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import kotlinx.coroutines.launch
import me.zhanghai.android.fastscroll.FastScrollerBuilder
import cn.super12138.todo.utils.showToast
import java.util.UUID
class ToDoFragment : Fragment() {
@ -94,7 +94,7 @@ class ToDoFragment : Fragment() {
} else {
if (todoContent == Constants.STRING_DEV_MODE) {
if (GlobalValues.devMode) {
GlobalValues.devMode = false
GlobalValues.devMode = false
} else {
GlobalValues.devMode = true
"Dev Mode".showToast()

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

@ -2,13 +2,13 @@
<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
style="?attr/materialCardViewElevatedStyle"
android:layout_width="match_parent"
android:clickable="true"
android:focusable="true"
android:layout_height="80dp"
android:layout_marginLeft="10dp"
android:layout_marginTop="5dp"
android:layout_marginRight="10dp"
android:layout_marginBottom="5dp">
android:layout_marginBottom="5dp"
android:clickable="true"
android:focusable="true">
<LinearLayout
android:layout_width="match_parent"

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

@ -6,6 +6,7 @@
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:windowLightStatusBar">?attr/isLightTheme</item>
</style>
<style name="Theme.SpringFestival" parent="Base.Theme.SpringFestival">
<!-- Transparent system bars for edge-to-edge. -->
<item name="android:navigationBarColor">@android:color/transparent</item>

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

@ -7,8 +7,8 @@
app:entryValues="@array/appearance_value"
app:icon="@drawable/ic_dark_mode"
app:key="dark_mode"
app:title="@string/dark_mode"
app:summary="@string/dark_mode_summary" />
app:summary="@string/dark_mode_summary"
app:title="@string/dark_mode" />
</PreferenceCategory>
<PreferenceCategory app:title="@string/config">
@ -21,8 +21,8 @@
app:dialogMessage="多个项目请使用英文逗号隔开"
app:summary="自定义创建待办时文本框的预测项" />-->
<SwitchPreferenceCompat
app:icon="@drawable/ic_screenshot"
app:defaultValue="false"
app:icon="@drawable/ic_screenshot"
app:key="secure_mode"
app:summary="@string/secure_mode_summary"
app:title="@string/secure_mode" />