Skip to content

Commit 2fdbe72

Browse files
3colorr3colorr
authored
Merge pull request #181 from 3colorr/v1.3.2
V1.3.2
2 parents 32be15a + b47cb38 commit 2fdbe72

File tree

6 files changed

+26
-22
lines changed

6 files changed

+26
-22
lines changed

‎Mizuame.xcodeproj/project.pbxproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@
519519
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
520520
GCC_WARN_UNUSED_FUNCTION = YES;
521521
GCC_WARN_UNUSED_VARIABLE = YES;
522-
INFOPLIST_KEY_NSHumanReadableCopyright = 1.3.1;
522+
INFOPLIST_KEY_NSHumanReadableCopyright = 1.3.2;
523523
MACOSX_DEPLOYMENT_TARGET = 15.0;
524524
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
525525
MTL_FAST_MATH = YES;
@@ -579,7 +579,7 @@
579579
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
580580
GCC_WARN_UNUSED_FUNCTION = YES;
581581
GCC_WARN_UNUSED_VARIABLE = YES;
582-
INFOPLIST_KEY_NSHumanReadableCopyright = 1.3.1;
582+
INFOPLIST_KEY_NSHumanReadableCopyright = 1.3.2;
583583
MACOSX_DEPLOYMENT_TARGET = 15.0;
584584
MTL_ENABLE_DEBUG_INFO = NO;
585585
MTL_FAST_MATH = YES;
@@ -599,7 +599,7 @@
599599
CODE_SIGN_ENTITLEMENTS = Mizuame/Mizuame.entitlements;
600600
CODE_SIGN_STYLE = Automatic;
601601
COMBINE_HIDPI_IMAGES = YES;
602-
CURRENT_PROJECT_VERSION = 1.3.1;
602+
CURRENT_PROJECT_VERSION = 1.3.2;
603603
DEAD_CODE_STRIPPING = YES;
604604
DEVELOPMENT_ASSET_PATHS = "\"Mizuame/Preview Content\"";
605605
DEVELOPMENT_TEAM = 4897P87J67;
@@ -609,13 +609,13 @@
609609
INFOPLIST_KEY_CFBundleDisplayName = Mizuame;
610610
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
611611
INFOPLIST_KEY_LSUIElement = YES;
612-
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright 2024 3colorr";
612+
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright 2025 3colorr";
613613
LD_RUNPATH_SEARCH_PATHS = (
614614
"$(inherited)",
615615
"@executable_path/../Frameworks",
616616
);
617617
MACOSX_DEPLOYMENT_TARGET = 13.3;
618-
MARKETING_VERSION = 1.3.1;
618+
MARKETING_VERSION = 1.3.2;
619619
PRODUCT_BUNDLE_IDENTIFIER = com.3colorr.Mizuame;
620620
PRODUCT_NAME = "$(TARGET_NAME)";
621621
SWIFT_EMIT_LOC_STRINGS = YES;
@@ -634,7 +634,7 @@
634634
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
635635
CODE_SIGN_STYLE = Automatic;
636636
COMBINE_HIDPI_IMAGES = YES;
637-
CURRENT_PROJECT_VERSION = 1.3.1;
637+
CURRENT_PROJECT_VERSION = 1.3.2;
638638
DEAD_CODE_STRIPPING = YES;
639639
DEVELOPMENT_ASSET_PATHS = "\"Mizuame/Preview Content\"";
640640
DEVELOPMENT_TEAM = 4897P87J67;
@@ -644,13 +644,13 @@
644644
INFOPLIST_KEY_CFBundleDisplayName = Mizuame;
645645
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
646646
INFOPLIST_KEY_LSUIElement = YES;
647-
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright 2024 3colorr";
647+
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright 2025 3colorr";
648648
LD_RUNPATH_SEARCH_PATHS = (
649649
"$(inherited)",
650650
"@executable_path/../Frameworks",
651651
);
652652
MACOSX_DEPLOYMENT_TARGET = 13.3;
653-
MARKETING_VERSION = 1.3.1;
653+
MARKETING_VERSION = 1.3.2;
654654
PRODUCT_BUNDLE_IDENTIFIER = com.gmail.3colorr.mizuame;
655655
PRODUCT_NAME = "$(TARGET_NAME)";
656656
PROVISIONING_PROFILE_SPECIFIER = "";

‎Mizuame/Settings/SettingKeys.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ struct SettingKeys {
129129

130130
struct KeyboardShortcuts {
131131
let keyKeyboardShortcutAction: String = "stickyNoteKeyboardShortcutAction"
132-
let initialKeyboardShortcutAction: Int = 0
132+
let initialKeyboardShortcutAction: Int = -1
133133

134134
let initialNoteOpenCounter: Int = 6
135135

‎Mizuame/Settings/TabGeneral.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,7 @@ struct TabGeneral: View {
301301
self.isAutomaticallyHideHeader = SettingKeys.StickyNote().initialAutomaticallyHideHeader
302302
self.isEnableMarkdown = SettingKeys.StickyNote().initialMarkdownAction
303303
self.showMarkdownPreview = SettingKeys.StickyNote().initialShowMarkdownPreview
304+
self.keyboardShortcutPattern = SettingKeys.StickyNote.KeyboardShortcuts.KeyboardPattern().none
304305
}) {
305306
Text("settings.tab.general.reset.button.caption")
306307
.padding(EdgeInsets(top: 2, leading: 10, bottom: 2, trailing: 10))

‎Mizuame/Settings/TabInfo.swift

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ struct TabInfo: View {
1111
@State private var isShowTermsOfService: Bool = false
1212
@State private var isShowPrivacyPolicy: Bool = false
1313

14-
@State private var heightSize: CGFloat = 300
15-
private let initHeightSize: CGFloat = 300
14+
@State private var heightSize: CGFloat = 350
15+
private let initHeightSize: CGFloat = 350
1616
private let expandHeightSize: CGFloat = 500
1717

1818
private let projectUrl: String = "https://github.com/3colorr/Mizuame"
@@ -30,7 +30,18 @@ struct TabInfo: View {
3030
}
3131

3232
VStack(alignment: .leading, spacing: 5) {
33-
Text("Version: 1.3.1").font(.body)
33+
Text("Version: 1.3.2").font(.body)
34+
HStack {
35+
Text("Web:")
36+
if let url = URL(string: websiteUrl) {
37+
Link(websiteUrl, destination: url)
38+
} else {
39+
Text(websiteUrl)
40+
}
41+
}
42+
}
43+
44+
VStack(alignment: .leading, spacing: 5) {
3445
Text("License: MIT license").font(.body)
3546
HStack {
3647
Text("settings.tab.info.src").font(.body)
@@ -53,14 +64,6 @@ struct TabInfo: View {
5364
Text(twUrl)
5465
}
5566
}
56-
HStack {
57-
Text("Web:")
58-
if let url = URL(string: websiteUrl) {
59-
Link(websiteUrl, destination: url)
60-
} else {
61-
Text(websiteUrl)
62-
}
63-
}
6467
}
6568

6669
Button(action: {

‎Mizuame/en.lproj/Localizable.strings

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
"settings.tab.general.note.note.loginitems.description" = "Mizuame will start when you login.";
9898
"settings.tab.general.note.note.keyboardshortcut" = "Keyboard:";
9999
"settings.tab.general.note.note.keyboardshortcut.title" = "Press the shortcut key 3 times consecutively to open the note.";
100-
"settings.tab.general.note.note.keyboardshortcut.description" = "To use the shortcut key, please add Mizuame to `[Settings] > [Privacy & Security] > [Accessibility]` and grant it accessibility permissions.";
100+
"settings.tab.general.note.note.keyboardshortcut.description" = "To use the shortcut key, please add Mizuame to `[Settings] > [Privacy & Security] > [Accessibility]` and grant it accessibility permissions.\nThen, please restart Mizuame.";
101101
"settings.tab.general.note.note.keyboardshortcut.warning" = "If you grant Mizuame accessibility permissions, it can detect whether keys are pressed.\nHowever, Mizuame never stores history of key inputs, nor does it transmit them over the network.";
102102
"settings.tab.general.note.note.keyboardshortcut.alert.title" = "Accessibility permission is required";
103103
"settings.tab.general.note.note.keyboardshortcut.choice.disable" = "Disable";

‎Mizuame/ja.lproj/Localizable.strings

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
"settings.tab.general.note.note.loginitems.description" = "ログインした時にMizuameが自動で起動します";
9898
"settings.tab.general.note.note.keyboardshortcut" = "キーボード:";
9999
"settings.tab.general.note.note.keyboardshortcut.title" = "ショートカットキーを連続で３回押してノートを開く";
100-
"settings.tab.general.note.note.keyboardshortcut.description" = "ショートカットキーを使うためには`[設定] > [プライバシーとセキュリティ] > [アクセシビリティ]`にMizuameを追加して、アクセシビリティ権限を許可してください";
100+
"settings.tab.general.note.note.keyboardshortcut.description" = "ショートカットキーを使うためには`[設定] > [プライバシーとセキュリティ] > [アクセシビリティ]`にMizuameを追加して、アクセシビリティ権限を許可してください\n最後に、Mizuameを再起動してください";
101101
"settings.tab.general.note.note.keyboardshortcut.warning" = "もしMizuameにアクセシビリティ権限を許可すると、キーが押されたかどうかを検出できるようになります\nしかし、Mizuameはキー入力の履歴を一切保存せず、ネットワークを通じて送信することもありません";
102102
"settings.tab.general.note.note.keyboardshortcut.alert.title" = "アクセシビリティの権限が必要です";
103103
"settings.tab.general.note.note.keyboardshortcut.choice.disable" = "無効にする";

0 commit comments

Comments
 (0)