feat(friendly): 通知領域とウィジェット領域の表示設定を「設定 - CherryPick」で変更することができる

kokonect-link · Sep 27, 2023 · 7749bbc · 7749bbc
1 parent 7767969
commit 7749bbc
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 8 deletions.
diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md
@@ -47,6 +47,7 @@
 
 ### Client
 - Feat: (Friendly) 길게 눌러 계정 메뉴를 표시하는 옵션을 비활성화 할 수 있음
+- Feat: (Friendly) 알림 영역과 위젯 영역의 표시 설정을 '설정 - CherryPick'에서 변경할 수 있음
 - Feat: about-misskey 페이지에서 클라이언트 버전을 누르면 변경 사항을 볼 수 있음
 - Feat: 이미지 압축 방식을 선택할 수 있음
   - 사이즈 변경 여부를 선택할 수 있음

diff --git a/locales/en-US.yml b/locales/en-US.yml
@@ -30,8 +30,10 @@ displayBanner: "Display Banner Image"
 requireRefresh: "When the page needs to refresh"
 performanceWarning: "High resource usage can result in higher device temperatures and faster battery consumption"
 photosensitiveSeizuresWarning: "Can cause photosensitive seizures"
-friendlyEnableNotifications: "Enable/Disable the notifications area"
-friendlyEnableWidgets: "Enable/Disable the widgets area"
+friendlyEnableNotifications: "Enable the notifications area"
+friendlyDisableNotifications: "Disable the notifications area"
+friendlyEnableWidgets: "Enable the widgets area"
+friendlyDisableWidgets: "Disable the widgets area"
 useBoldFont: "Bold Text"
 newNoteReceivedNotification: "When receive a new note notification"
 disableRightClick: "Prohibit right click"

diff --git a/locales/index.d.ts b/locales/index.d.ts
@@ -34,7 +34,9 @@ export interface Locale {
     "performanceWarning": string;
     "photosensitiveSeizuresWarning": string;
     "friendlyEnableNotifications": string;
+    "friendlyDisableNotifications": string;
     "friendlyEnableWidgets": string;
+    "friendlyDisableWidgets": string;
     "useBoldFont": string;
     "newNoteReceivedNotification": string;
     "disableRightClick": string;

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
@@ -30,8 +30,10 @@ displayBanner: "バナー画像の表示"
 requireRefresh: "ページの更新が必要なとき"
 performanceWarning: "リソースを多く使用するため、デバイスの温度が高くなり、バッテリーの消耗が速くなる可能性があります"
 photosensitiveSeizuresWarning: "光敏感性発作を起こす可能性があります"
-friendlyEnableNotifications: "通知領域を有効化/無効化"
-friendlyEnableWidgets: "ウィジェット領域を有効化/無効化"
+friendlyEnableNotifications: "通知領域を有効化"
+friendlyDisableNotifications: "通知領域を無効化"
+friendlyEnableWidgets: "ウィジェット領域を有効化"
+friendlyDisableWidgets: "ウィジェット領域を無効化"
 useBoldFont: "文字を太くする"
 newNoteReceivedNotification: "新しいノート通知を表示するとき"
 disableRightClick: "右クリックを禁止"

diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
@@ -30,8 +30,10 @@ displayBanner: "배너 이미지 표시"
 requireRefresh: "페이지 새로 고침이 필요할 때"
 performanceWarning: "리소스를 많이 사용하므로, 디바이스의 온도가 높아지고 배터리의 소모가 빨라질 수 있어요"
 photosensitiveSeizuresWarning: "광과민성 발작을 일으킬 수 있어요"
-friendlyEnableNotifications: "알림 영역 활성화/비활성화"
-friendlyEnableWidgets: "위젯 영역 활성화/비활성화"
+friendlyEnableNotifications: "알림 영역 활성화"
+friendlyDisableNotifications: "알림 영역 비활성화"
+friendlyEnableWidgets: "위젯 영역 활성화"
+friendlyDisableWidgets: "위젯 영역 비활성화"
 useBoldFont: "볼드체 텍스트"
 newNoteReceivedNotification: "새 노트 알림을 표시할 때"
 disableRightClick: "우클릭 방지"

diff --git a/packages/frontend/src/pages/settings/cherrypick.vue b/packages/frontend/src/pages/settings/cherrypick.vue
@@ -62,6 +62,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<FormSection>
 		<template #label>Friendly UI</template>
 		<div class="_gaps_m">
+			<MkSwitch v-model="friendlyEnableNotifications">{{ i18n.ts.friendlyEnableNotifications }}</MkSwitch>
+			<MkSwitch v-model="friendlyEnableWidgets">{{ i18n.ts.friendlyEnableWidgets }}</MkSwitch>
 			<MkSwitch v-model="enableLongPressOpenAccountMenu">{{ i18n.ts._cherrypick.enableLongPressOpenAccountMenu }}</MkSwitch>
 		</div>
 	</FormSection>
@@ -98,11 +100,15 @@ const showFollowingMessageInsteadOfButtonEnabled = computed(defaultStore.makeGet
 const mobileHeaderChange = computed(defaultStore.makeGetterSetter('mobileHeaderChange'));
 const displayHeaderNavBarWhenScroll = computed(defaultStore.makeGetterSetter('displayHeaderNavBarWhenScroll'));
 const renameTheButtonInPostFormToNya = computed(defaultStore.makeGetterSetter('renameTheButtonInPostFormToNya'));
+const friendlyEnableNotifications = computed(defaultStore.makeGetterSetter('friendlyEnableNotifications'));
+const friendlyEnableWidgets = computed(defaultStore.makeGetterSetter('friendlyEnableWidgets'));
 const enableLongPressOpenAccountMenu = computed(defaultStore.makeGetterSetter('enableLongPressOpenAccountMenu'));
 
 watch([
 	reactableRemoteReactionEnabled,
 	renameTheButtonInPostFormToNya,
+	friendlyEnableNotifications,
+	friendlyEnableWidgets,
 ], async () => {
 	await reloadAsk();
 });

diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue
@@ -187,14 +187,14 @@ async function reloadAsk() {
 
 const headerActions = $computed(() => [{
 	icon: friendlyEnableNotifications.value ? 'ti ti-notification' : 'ti ti-notification-off',
-	text: i18n.ts.friendlyEnableNotifications,
+	text: friendlyEnableNotifications.value ? i18n.ts.friendlyEnableNotifications : i18n.ts.friendlyDisableNotifications,
 	handler: () => {
 		friendlyEnableNotifications.value = !friendlyEnableNotifications.value;
 		reloadAsk();
 	},
 }, {
 	icon: friendlyEnableWidgets.value ? 'ti ti-apps' : 'ti ti-apps-off',
-	text: i18n.ts.friendlyEnableWidgets,
+	text: friendlyEnableWidgets.value ? i18n.ts.friendlyEnableWidgets : i18n.ts.friendlyDisableWidgets,
 	handler: () => {
 		friendlyEnableWidgets.value = !friendlyEnableWidgets.value;
 		reloadAsk();