From dc4ffe0941dddb675b596dcaa41fa19114cdddf5 Mon Sep 17 00:00:00 2001 From: Super12138 <70494801+Super12138@users.noreply.github.com> Date: Sun, 9 Jun 2024 13:25:25 +0800 Subject: [PATCH] Refine code --- .../main/kotlin/cn/super12138/todo/utils/VibrationUtils.kt | 5 ++++- .../kotlin/cn/super12138/todo/views/about/AboutActivity.kt | 2 -- .../kotlin/cn/super12138/todo/views/all/AllTasksActivity.kt | 1 - .../kotlin/cn/super12138/todo/views/all/AllTasksAdapter.kt | 2 -- .../kotlin/cn/super12138/todo/views/crash/CrashActivity.kt | 3 --- .../kotlin/cn/super12138/todo/views/main/MainActivity.kt | 1 - .../cn/super12138/todo/views/settings/SettingsFragment.kt | 1 - .../main/kotlin/cn/super12138/todo/views/todo/ToDoAdapter.kt | 5 ++--- 8 files changed, 6 insertions(+), 14 deletions(-) diff --git a/app/src/main/kotlin/cn/super12138/todo/utils/VibrationUtils.kt b/app/src/main/kotlin/cn/super12138/todo/utils/VibrationUtils.kt index cbc7dfc..b7145af 100644 --- a/app/src/main/kotlin/cn/super12138/todo/utils/VibrationUtils.kt +++ b/app/src/main/kotlin/cn/super12138/todo/utils/VibrationUtils.kt @@ -5,7 +5,10 @@ import android.view.View import cn.super12138.todo.constant.GlobalValues object VibrationUtils { - fun performHapticFeedback(view: View, hapticFeedbackConstants: Int=HapticFeedbackConstants.CONTEXT_CLICK) { + fun performHapticFeedback( + view: View, + hapticFeedbackConstants: Int = HapticFeedbackConstants.CONTEXT_CLICK + ) { if (GlobalValues.hapticFeedback) { view.performHapticFeedback(hapticFeedbackConstants) } 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 35c41a7..65276fa 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 @@ -3,9 +3,7 @@ package cn.super12138.todo.views.about import android.content.Intent import android.net.Uri import android.os.Bundle -import android.view.HapticFeedbackConstants import cn.super12138.todo.constant.Constants -import cn.super12138.todo.constant.GlobalValues import cn.super12138.todo.databinding.ActivityAboutBinding import cn.super12138.todo.utils.VersionUtils import cn.super12138.todo.utils.VibrationUtils 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 cb25644..2366f63 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 @@ -1,7 +1,6 @@ package cn.super12138.todo.views.all import android.os.Bundle -import android.view.HapticFeedbackConstants import android.view.View import android.view.WindowManager import androidx.activity.viewModels 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 f4d014c..f56771f 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 @@ -1,6 +1,5 @@ package cn.super12138.todo.views.all -import android.view.HapticFeedbackConstants import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -8,7 +7,6 @@ import android.widget.TextView import androidx.fragment.app.FragmentManager import androidx.recyclerview.widget.RecyclerView import cn.super12138.todo.R -import cn.super12138.todo.constant.GlobalValues import cn.super12138.todo.logic.model.ToDo import cn.super12138.todo.utils.VibrationUtils diff --git a/app/src/main/kotlin/cn/super12138/todo/views/crash/CrashActivity.kt b/app/src/main/kotlin/cn/super12138/todo/views/crash/CrashActivity.kt index adae620..2eb7e7f 100644 --- a/app/src/main/kotlin/cn/super12138/todo/views/crash/CrashActivity.kt +++ b/app/src/main/kotlin/cn/super12138/todo/views/crash/CrashActivity.kt @@ -2,13 +2,10 @@ package cn.super12138.todo.views.crash import android.os.Build import android.os.Bundle -import android.view.HapticFeedbackConstants import android.view.ViewGroup -import androidx.activity.enableEdgeToEdge import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsCompat import androidx.core.view.updateLayoutParams -import cn.super12138.todo.constant.GlobalValues import cn.super12138.todo.databinding.ActivityCrashBinding import cn.super12138.todo.utils.VersionUtils import cn.super12138.todo.utils.VibrationUtils 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 e61c7a7..ef68cbd 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 @@ -2,7 +2,6 @@ package cn.super12138.todo.views.main // 2023.11.18立项 import android.content.Intent import android.os.Bundle -import android.view.HapticFeedbackConstants import android.view.WindowManager import cn.super12138.todo.R import cn.super12138.todo.ToDoApp diff --git a/app/src/main/kotlin/cn/super12138/todo/views/settings/SettingsFragment.kt b/app/src/main/kotlin/cn/super12138/todo/views/settings/SettingsFragment.kt index 92fab7f..bba895b 100644 --- a/app/src/main/kotlin/cn/super12138/todo/views/settings/SettingsFragment.kt +++ b/app/src/main/kotlin/cn/super12138/todo/views/settings/SettingsFragment.kt @@ -21,7 +21,6 @@ import cn.super12138.todo.databinding.DialogBackupBinding import cn.super12138.todo.databinding.DialogRestoreBinding import cn.super12138.todo.logic.Repository import cn.super12138.todo.logic.dao.ToDoRoom -import cn.super12138.todo.utils.showToast import cn.super12138.todo.views.about.AboutActivity import cn.super12138.todo.views.all.AllTasksActivity import cn.super12138.todo.views.main.MainActivity 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 1621a0b..d481acc 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 @@ -55,9 +55,8 @@ class ToDoAdapter( ViewModelProvider(viewModelStoreOwner)[ToDoFragmentViewModel::class.java] holder.checkToDoBtn.setOnClickListener { - if (GlobalValues.hapticFeedback) { - it.performHapticFeedback(HapticFeedbackConstants.CONTEXT_CLICK) - } + VibrationUtils.performHapticFeedback(it) + if (position < 0 || position >= todoList.size) { return@setOnClickListener }