From a5cd3c8b7003bfd5ea54729b58492136ae7cb703 Mon Sep 17 00:00:00 2001
From: eana <coder@apps.1a23.com>
Date: Mon, 1 Apr 2024 15:08:01 +0000
Subject: [PATCH] Address comments

---
 packages/client/src/components/MkPullToRefresh.vue | 9 +++++----
 packages/client/src/scripts/touch.ts               | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/client/src/components/MkPullToRefresh.vue b/packages/client/src/components/MkPullToRefresh.vue
index dbd3a983c6..7898146fc3 100644
--- a/packages/client/src/components/MkPullToRefresh.vue
+++ b/packages/client/src/components/MkPullToRefresh.vue
@@ -16,8 +16,7 @@
 				/>
 				<i
 					v-else
-					class="ti ti-arrow-bar-to-down"
-					:class="[$style.icon, { [$style.refresh]: pullEnded }]"
+					:class="[$style.icon, icon('ph-arrow-down'), { [$style.refresh]: pullEnded }]"
 				></i>
 				<div :class="$style.text">
 					<template v-if="pullEnded">{{
@@ -39,12 +38,14 @@
 <script lang="ts" setup>
 import { onMounted, onUnmounted, ref, shallowRef } from "vue";
 import { i18n } from "@/i18n";
+import { defaultStore } from "@/store";
 import { getScrollContainer } from "@/scripts/scroll";
 import { isDuringHorizontalSwipe } from "@/scripts/touch";
+import icon from "@/scripts/icon";
 
 const SCROLL_STOP = 10;
 const MAX_PULL_DISTANCE = Infinity;
-const FIRE_THRESHOLD = 230;
+const FIRE_THRESHOLD = defaultStore.state.pullToRefreshThreshold;
 const RELEASE_TRANSITION_DURATION = 200;
 const PULL_BRAKE_BASE = 1.5;
 const PULL_BRAKE_FACTOR = 170;
@@ -197,7 +198,7 @@ function onScrollContainerScroll() {
 function registerEventListenersForReadyToPull() {
 	if (rootEl.value == null) return;
 	rootEl.value.addEventListener("touchstart", moveStart, { passive: true });
-	rootEl.value.addEventListener("touchmove", moving, { passive: false }); // passive: falseにしないとpreventDefaultが使えない
+	rootEl.value.addEventListener("touchmove", moving, { passive: false }); // setting passive to false to allow preventDefault
 }
 
 function unregisterEventListenersForReadyToPull() {
diff --git a/packages/client/src/scripts/touch.ts b/packages/client/src/scripts/touch.ts
index 1c8cbe6ffb..08bd03e28f 100644
--- a/packages/client/src/scripts/touch.ts
+++ b/packages/client/src/scripts/touch.ts
@@ -11,13 +11,13 @@ if (isTouchSupported && !isTouchUsing) {
 	window.addEventListener(
 		"touchstart",
 		() => {
-			// maxTouchPointsなどでの判定だけだと、「タッチ機能付きディスプレイを使っているがマウスでしか操作しない」場合にも
-			// タッチで使っていると判定されてしまうため、実際に一度でもタッチされたらtrueにする
+			// maxTuochPoints reflects the property of the display, but there are cases where the display has touch functionality but the user uses a mouse.
+			// Therefore, we need to check if the user actually uses touch functionality.
 			isTouchUsing = true;
 		},
 		{ passive: true },
 	);
 }
 
-/** (MkHorizontalSwipe) 横スワイプ中か？ */
+/** (MkHorizontalSwipe) is during horizontal swipe? */
 export const isDuringHorizontalSwipe = ref(false);