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

Standardize file names

Browse source
This commit is contained in:
Super12138 2024-08-14 13:21:23 +08:00
parent 46b1747dee
commit 9fd6d41aed
6 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/kotlin/cn/super12138/todo/views/bottomsheet/ToDoBottomSheet.kt
View file

@ -15,8 +15,8 @@ import cn.super12138.todo.utils.TextUtils
import cn.super12138.todo.utils.VibrationUtils import cn.super12138.todo.utils.VibrationUtils
import cn.super12138.todo.utils.showToast import cn.super12138.todo.utils.showToast
import cn.super12138.todo.utils.toEditable import cn.super12138.todo.utils.toEditable
import cn.super12138.todo.views.progress.ProgressFragmentViewModel import cn.super12138.todo.views.progress.ProgressViewModel
import cn.super12138.todo.views.todo.ToDoFragmentViewModel import cn.super12138.todo.views.todo.ToDoViewModel
import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetBehavior
import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.bottomsheet.BottomSheetDialog
import com.google.android.material.bottomsheet.BottomSheetDialogFragment import com.google.android.material.bottomsheet.BottomSheetDialogFragment
@ -25,8 +25,8 @@ import java.util.UUID
class ToDoBottomSheet : BottomSheetDialogFragment() { class ToDoBottomSheet : BottomSheetDialogFragment() {
private lateinit var binding: BottomSheetTodoBinding private lateinit var binding: BottomSheetTodoBinding
private val progressViewModel: ProgressFragmentViewModel by viewModels({ requireActivity() }) private val progressViewModel: ProgressViewModel by viewModels({ requireActivity() })
private val todoViewModel: ToDoFragmentViewModel by viewModels({ requireActivity() }) private val todoViewModel: ToDoViewModel by viewModels({ requireActivity() })
private var editMode: Boolean = false private var editMode: Boolean = false
private var todoState: Int = 0 private var todoState: Int = 0

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

@ -12,7 +12,7 @@ import cn.super12138.todo.databinding.FragmentProgressBinding
class ProgressFragment : Fragment() { class ProgressFragment : Fragment() {
private val viewModel: ProgressFragmentViewModel by viewModels({ requireActivity() }) private val viewModel: ProgressViewModel by viewModels({ requireActivity() })
private lateinit var binding: FragmentProgressBinding private lateinit var binding: FragmentProgressBinding
override fun onCreateView( override fun onCreateView(

2
app/src/main/kotlin/cn/super12138/todo/views/progress/ProgressFragmentViewModel.kt → app/src/main/kotlin/cn/super12138/todo/views/progress/ProgressViewModel.kt
View file

@ -7,7 +7,7 @@ import cn.super12138.todo.logic.Repository
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
class ProgressFragmentViewModel : ViewModel() { class ProgressViewModel : ViewModel() {
val totalCount: MutableLiveData<Int> = MutableLiveData() val totalCount: MutableLiveData<Int> = MutableLiveData()
val completeCount: MutableLiveData<Int> = MutableLiveData() val completeCount: MutableLiveData<Int> = MutableLiveData()
val remainCount: MutableLiveData<Int> = MutableLiveData() val remainCount: MutableLiveData<Int> = MutableLiveData()

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

@ -15,7 +15,7 @@ import cn.super12138.todo.logic.model.ToDo
import cn.super12138.todo.utils.VibrationUtils import cn.super12138.todo.utils.VibrationUtils
import cn.super12138.todo.utils.showToast import cn.super12138.todo.utils.showToast
import cn.super12138.todo.views.bottomsheet.ToDoBottomSheet import cn.super12138.todo.views.bottomsheet.ToDoBottomSheet
import cn.super12138.todo.views.progress.ProgressFragmentViewModel import cn.super12138.todo.views.progress.ProgressViewModel
class ToDoAdapter( class ToDoAdapter(
private val todoList: MutableList<ToDo>, private val todoList: MutableList<ToDo>,
@ -48,9 +48,9 @@ class ToDoAdapter(
}*/ }*/
val progressViewModel = val progressViewModel =
ViewModelProvider(viewModelStoreOwner)[ProgressFragmentViewModel::class.java] ViewModelProvider(viewModelStoreOwner)[ProgressViewModel::class.java]
val todoViewModel = val todoViewModel =
ViewModelProvider(viewModelStoreOwner)[ToDoFragmentViewModel::class.java] ViewModelProvider(viewModelStoreOwner)[ToDoViewModel::class.java]
holder.checkToDoBtn.setOnClickListener { holder.checkToDoBtn.setOnClickListener {
VibrationUtils.performHapticFeedback(it) VibrationUtils.performHapticFeedback(it)

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

@ -19,14 +19,14 @@ import cn.super12138.todo.databinding.FragmentTodoBinding
import cn.super12138.todo.logic.Repository import cn.super12138.todo.logic.Repository
import cn.super12138.todo.utils.VibrationUtils import cn.super12138.todo.utils.VibrationUtils
import cn.super12138.todo.views.bottomsheet.ToDoBottomSheet import cn.super12138.todo.views.bottomsheet.ToDoBottomSheet
import cn.super12138.todo.views.progress.ProgressFragmentViewModel import cn.super12138.todo.views.progress.ProgressViewModel
import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.dialog.MaterialAlertDialogBuilder
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import me.zhanghai.android.fastscroll.FastScrollerBuilder import me.zhanghai.android.fastscroll.FastScrollerBuilder
class ToDoFragment : Fragment() { class ToDoFragment : Fragment() {
private val progressViewModel: ProgressFragmentViewModel by viewModels({ requireActivity() }) private val progressViewModel: ProgressViewModel by viewModels({ requireActivity() })
private val todoViewModel: ToDoFragmentViewModel by viewModels({ requireActivity() }) private val todoViewModel: ToDoViewModel by viewModels({ requireActivity() })
private lateinit var binding: FragmentTodoBinding private lateinit var binding: FragmentTodoBinding
override fun onCreateView( override fun onCreateView(

2
app/src/main/kotlin/cn/super12138/todo/views/todo/ToDoFragmentViewModel.kt → app/src/main/kotlin/cn/super12138/todo/views/todo/ToDoViewModel.kt
View file

@ -9,7 +9,7 @@ import cn.super12138.todo.logic.dao.ToDoRoom
import cn.super12138.todo.logic.model.ToDo import cn.super12138.todo.logic.model.ToDo
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
class ToDoFragmentViewModel : ViewModel() { class ToDoViewModel : ViewModel() {
val emptyTipVis = MutableLiveData<Int>(View.GONE) val emptyTipVis = MutableLiveData<Int>(View.GONE)
val addData = MutableLiveData<Int>(0) val addData = MutableLiveData<Int>(0)