From 391c18270b75b7c47d36181cf891cc0572a28fd1 Mon Sep 17 00:00:00 2001
From: Super12138 <70494801+Super12138@users.noreply.github.com>
Date: Sat, 20 Apr 2024 17:45:57 +0800
Subject: [PATCH] Fix wrong view model owner

---
 .../super12138/todo/views/progress/ProgressFragment.kt   | 3 +--
 .../kotlin/cn/super12138/todo/views/todo/ToDoFragment.kt | 9 ++++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/src/main/kotlin/cn/super12138/todo/views/progress/ProgressFragment.kt b/app/src/main/kotlin/cn/super12138/todo/views/progress/ProgressFragment.kt
index 2fdc2fa..0d95324 100644
--- a/app/src/main/kotlin/cn/super12138/todo/views/progress/ProgressFragment.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/views/progress/ProgressFragment.kt
@@ -7,13 +7,12 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModelProvider
 import cn.super12138.todo.R
 import cn.super12138.todo.databinding.FragmentProgressBinding
 
 
 class ProgressFragment : Fragment() {
-    private val viewModel by viewModels<ProgressFragmentViewModel>()
+    private val viewModel: ProgressFragmentViewModel by viewModels({ requireActivity() })
     private lateinit var binding: FragmentProgressBinding
 
     override fun onCreateView(
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 cbc1b49..6cbba39 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
@@ -8,7 +8,6 @@ import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -29,8 +28,8 @@ import me.zhanghai.android.fastscroll.FastScrollerBuilder
 import java.util.UUID
 
 class ToDoFragment : Fragment() {
-    private val progressViewModel by viewModels<ProgressFragmentViewModel>()
-    private val todoViewModel by viewModels<ToDoFragmentViewModel>()
+    private val progressViewModel: ProgressFragmentViewModel by viewModels({ requireActivity() })
+    private val todoViewModel: ToDoFragmentViewModel by viewModels({ requireActivity() })
     private lateinit var binding: FragmentTodoBinding
     private lateinit var toDoDialogBinding: DialogAddTodoBinding
 
@@ -136,9 +135,9 @@ class ToDoFragment : Fragment() {
                                     )
                                 )
                                 progressViewModel.updateProgress()
-                                binding.todoList.adapter?.notifyItemInserted(todoList.size + 1)
-                                dialog.dismiss()
                             }
+                            binding.todoList.adapter?.notifyItemInserted(todoList.size + 1)
+                            dialog.dismiss()
                         }
                     }
                 }