diff --git a/app/src/main/kotlin/cn/super12138/todo/logic/model/ToDo.kt b/app/src/main/kotlin/cn/super12138/todo/logic/model/ToDo.kt index c900789..86a7caa 100644 --- a/app/src/main/kotlin/cn/super12138/todo/logic/model/ToDo.kt +++ b/app/src/main/kotlin/cn/super12138/todo/logic/model/ToDo.kt @@ -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 } \ No newline at end of file diff --git a/app/src/main/kotlin/cn/super12138/todo/views/BaseActivity.kt b/app/src/main/kotlin/cn/super12138/todo/views/BaseActivity.kt index ccadca6..cd5be81 100644 --- a/app/src/main/kotlin/cn/super12138/todo/views/BaseActivity.kt +++ b/app/src/main/kotlin/cn/super12138/todo/views/BaseActivity.kt @@ -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?) { 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 aa150fe..865276d 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 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 diff --git a/app/src/main/kotlin/cn/super12138/todo/views/all/AllTasksActivity.kt b/app/src/main/kotlin/cn/super12138/todo/views/all/AllTasksActivity.kt index 14d0313..ab6982f 100644 --- a/app/src/main/kotlin/cn/super12138/todo/views/all/AllTasksActivity.kt +++ b/app/src/main/kotlin/cn/super12138/todo/views/all/AllTasksActivity.kt @@ -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 diff --git a/app/src/main/kotlin/cn/super12138/todo/views/all/AllTasksAdapter.kt b/app/src/main/kotlin/cn/super12138/todo/views/all/AllTasksAdapter.kt index 0c09c9a..a62bf84 100644 --- a/app/src/main/kotlin/cn/super12138/todo/views/all/AllTasksAdapter.kt +++ b/app/src/main/kotlin/cn/super12138/todo/views/all/AllTasksAdapter.kt @@ -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, - private val fragmentManager: FragmentManager) : +class AllTasksAdapter( + private val todoList: MutableList, + private val fragmentManager: FragmentManager +) : RecyclerView.Adapter() { inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) { diff --git a/app/src/main/kotlin/cn/super12138/todo/views/all/InfoBottomSheet.kt b/app/src/main/kotlin/cn/super12138/todo/views/all/InfoBottomSheet.kt index 722d5ad..3fb60c0 100644 --- a/app/src/main/kotlin/cn/super12138/todo/views/all/InfoBottomSheet.kt +++ b/app/src/main/kotlin/cn/super12138/todo/views/all/InfoBottomSheet.kt @@ -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 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 caeb388..4250013 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 @@ -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 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 805aead..ae32823 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 @@ -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, private val viewModelStoreOwner: ViewModelStoreOwner) : +class ToDoAdapter( + private val todoList: MutableList, + private val viewModelStoreOwner: ViewModelStoreOwner +) : RecyclerView.Adapter() { inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) { diff --git a/app/src/main/kotlin/cn/super12138/todo/views/todo/ToDoFragment.kt b/app/src/main/kotlin/cn/super12138/todo/views/todo/ToDoFragment.kt index 8110159..121c771 100644 --- a/app/src/main/kotlin/cn/super12138/todo/views/todo/ToDoFragment.kt +++ b/app/src/main/kotlin/cn/super12138/todo/views/todo/ToDoFragment.kt @@ -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() diff --git a/app/src/main/res/layout/item_all_tasks.xml b/app/src/main/res/layout/item_all_tasks.xml index f6cd093..5b43534 100644 --- a/app/src/main/res/layout/item_all_tasks.xml +++ b/app/src/main/res/layout/item_all_tasks.xml @@ -2,13 +2,13 @@ + android:layout_marginBottom="5dp" + android:clickable="true" + android:focusable="true"> @android:color/transparent ?attr/isLightTheme +