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 b40a4f2..657cb61 100644 --- a/app/src/main/kotlin/cn/super12138/todo/logic/Repository.kt +++ b/app/src/main/kotlin/cn/super12138/todo/logic/Repository.kt @@ -9,7 +9,7 @@ object Repository { // Room private val db get() = ToDoApp.db - val todoDao = db.toDoRoomDao() + private val todoDao = db.toDoRoomDao() /** * @param toDoRoom 要插入的数据 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 4c900ed..c900789 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) { - var isAnimated = false + // var isAnimated = false } \ No newline at end of file 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 21fb946..f7448a7 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 @@ -41,11 +41,11 @@ class AllTasksAdapter(private val todoList: MutableList, infoBottomSheet.show(fragmentManager, InfoBottomSheet.TAG) } - if (!todo.isAnimated) { + /*if (!todo.isAnimated) { holder.itemView.alpha = 0f holder.itemView.animate().alpha(1f).duration = 200 todo.isAnimated = true - } + }*/ } override fun getItemCount() = todoList.size 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 e5b4fd6..b7bcace 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 @@ -17,7 +17,7 @@ import com.google.android.material.snackbar.Snackbar import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch -class ToDoAdapter(val todoList: MutableList, val viewModelStoreOwner: ViewModelStoreOwner) : +class ToDoAdapter(private val todoList: MutableList, private val viewModelStoreOwner: ViewModelStoreOwner) : RecyclerView.Adapter() { inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) { @@ -29,9 +29,9 @@ class ToDoAdapter(val todoList: MutableList, val viewModelStoreOwner: View override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { val progressViewModel = - ViewModelProvider(viewModelStoreOwner).get(ProgressFragmentViewModel::class.java) + ViewModelProvider(viewModelStoreOwner)[ProgressFragmentViewModel::class.java] val todoViewModel = - ViewModelProvider(viewModelStoreOwner).get(ToDoFragmentViewModel::class.java) + ViewModelProvider(viewModelStoreOwner)[ToDoFragmentViewModel::class.java] val view = LayoutInflater.from(parent.context) .inflate(R.layout.item_todo, parent, false) @@ -87,8 +87,6 @@ class ToDoAdapter(val todoList: MutableList, val viewModelStoreOwner: View } todoList.add(ToDo(todo.uuid, 0, todo.content, todo.subject)) - todoViewModel.refreshData.value = 1 - todoViewModel.insertTask( ToDoRoom( todo.uuid, @@ -97,6 +95,9 @@ class ToDoAdapter(val todoList: MutableList, val viewModelStoreOwner: View todo.content ) ) + + todoViewModel.refreshData.value = 1 + progressViewModel.updateProgress() } .show() @@ -108,11 +109,11 @@ class ToDoAdapter(val todoList: MutableList, val viewModelStoreOwner: View val todo = todoList[position] holder.todoContext.text = todo.content holder.todoSubject.text = todo.subject - if (!todo.isAnimated) { + /*if (!todo.isAnimated) { holder.itemView.alpha = 0f holder.itemView.animate().alpha(1f).duration = 200 todo.isAnimated = true - } + }*/ } override fun getItemCount() = todoList.size