From cb19729bf729418e36f267d026ef302d6305b68c Mon Sep 17 00:00:00 2001 From: Vince14Genius Date: Thu, 21 Dec 2023 17:37:06 -0800 Subject: [PATCH] 1.2.1 misc updates (#68) * fixed spacing issue that started arising when compiling for iOS 17 * layout switcher UI improvements * updated extIPA consonant superscripts layout, reverted interactableClearOpacity * translated "NumPad" --- .../Rows/Button Groups/PinnedSymbolKeys.swift | 2 - .../Rows/Buttons/LayoutSwitcher.swift | 25 ++-- .../Base.lproj/Localizable.strings | 2 + .../en.lproj/Localizable.strings | 2 + .../eo.lproj/Localizable.strings | 2 + .../ja.lproj/Localizable.strings | 2 + .../zh-Hans.lproj/Localizable.strings | 2 + .../zh-Hant-HK.lproj/Localizable.strings | 2 + .../zh-Hant.lproj/Localizable.strings | 2 + IPA Keyboard.xcodeproj/project.pbxproj | 16 ++- .../xcschemes/IPA Keyboard Extension.xcscheme | 108 ++++++++++++++++++ .../xcschemes/IPA Keyboard.xcscheme | 92 +++++++++++++++ Keyboard Layouts/ExtIPASymbols.swift | 33 +++--- 13 files changed, 253 insertions(+), 37 deletions(-) create mode 100644 IPA Keyboard.xcodeproj/xcshareddata/xcschemes/IPA Keyboard Extension.xcscheme create mode 100644 IPA Keyboard.xcodeproj/xcshareddata/xcschemes/IPA Keyboard.xcscheme diff --git a/Core Keyboard Functionality/View Elements/Rows/Button Groups/PinnedSymbolKeys.swift b/Core Keyboard Functionality/View Elements/Rows/Button Groups/PinnedSymbolKeys.swift index fe73e01..c9aafa3 100644 --- a/Core Keyboard Functionality/View Elements/Rows/Button Groups/PinnedSymbolKeys.swift +++ b/Core Keyboard Functionality/View Elements/Rows/Button Groups/PinnedSymbolKeys.swift @@ -69,8 +69,6 @@ struct PinnedSymbolKeys: View { .offset(y: 2) } .foregroundColor(Color(.label)) - .padding([.top, .bottom]) - .padding([.leading, .trailing], Layout.leftInsetRaw) .background(Color.clearInteractable) } } diff --git a/Core Keyboard Functionality/View Elements/Rows/Buttons/LayoutSwitcher.swift b/Core Keyboard Functionality/View Elements/Rows/Buttons/LayoutSwitcher.swift index a370327..388e989 100644 --- a/Core Keyboard Functionality/View Elements/Rows/Buttons/LayoutSwitcher.swift +++ b/Core Keyboard Functionality/View Elements/Rows/Buttons/LayoutSwitcher.swift @@ -19,13 +19,6 @@ struct LayoutSwitcher: View { @ObservedObject var state: LayoutSwitcherState let keyboardSizeClass: KeyboardSizeClass - private var menuIcon: String { - switch direction { - case .up: return "arrowtriangle.up.fill" - case .down: return "arrowtriangle.down.fill" - } - } - var body: some View { HStack(alignment: .center, spacing: 0) { Menu { @@ -36,28 +29,30 @@ struct LayoutSwitcher: View { } label: { if layout == state.currentLayout { Label(layout.fullDisplayName, systemImage: "checkmark") - .labelStyle(.iconOnly) } else if layout.isAvailable { Text(layout.fullDisplayName) } else { Label(layout.fullDisplayName, systemImage: "lock.fill") - .labelStyle(.iconOnly) } } .disabled(!layout.isAvailable) } } label: { HStack(spacing: 0) { - Label("Layout Switch Menu", systemImage: menuIcon) - .labelStyle(.iconOnly) Text(state.currentLayout.shortenedDisplayName) + Label("Layout Switch Menu", systemImage: "chevron.up.chevron.down") + .labelStyle(.iconOnly) } - .font(.footnote) + .font(keyboardSizeClass.isWide ? .body : .footnote) } - .foregroundColor(.secondary) + .foregroundColor(.primary) .padding(.horizontal, keyboardSizeClass.isWide ? 16 : 8) - .frame(height: BottomRow.rowHeight(keyboardSizeClass: keyboardSizeClass) - 6) - .background(BottomRow.underlayColor(colorScheme: colorScheme)) + .frame( + height: BottomRow.rowHeight(keyboardSizeClass: keyboardSizeClass) - 6 + ) + .lineLimit(1) + .truncationMode(.tail) + .background(keyboardSizeClass.isWide ? BottomRow.underlayColor(colorScheme: colorScheme) : .clearInteractable) .cornerRadius(.infinity) } } diff --git a/IPA Keyboard Extension/Base.lproj/Localizable.strings b/IPA Keyboard Extension/Base.lproj/Localizable.strings index bbe2bee..06f4ec8 100644 --- a/IPA Keyboard Extension/Base.lproj/Localizable.strings +++ b/IPA Keyboard Extension/Base.lproj/Localizable.strings @@ -16,6 +16,8 @@ "Extended IPA" = "Extended IPA"; "Nonstandard" = "Nonstandard"; "Nonstandard & Obsolete Symbols" = "Nonstandard & Obsolete Symbols"; +"NumPad" = "NumPad"; +"Number Pad" = "Number Pad"; /* Sections - IPA (Standard) */ "Consonants" = "Consonants"; diff --git a/IPA Keyboard Extension/en.lproj/Localizable.strings b/IPA Keyboard Extension/en.lproj/Localizable.strings index bbe2bee..06f4ec8 100644 --- a/IPA Keyboard Extension/en.lproj/Localizable.strings +++ b/IPA Keyboard Extension/en.lproj/Localizable.strings @@ -16,6 +16,8 @@ "Extended IPA" = "Extended IPA"; "Nonstandard" = "Nonstandard"; "Nonstandard & Obsolete Symbols" = "Nonstandard & Obsolete Symbols"; +"NumPad" = "NumPad"; +"Number Pad" = "Number Pad"; /* Sections - IPA (Standard) */ "Consonants" = "Consonants"; diff --git a/IPA Keyboard Extension/eo.lproj/Localizable.strings b/IPA Keyboard Extension/eo.lproj/Localizable.strings index ffb601d..3629869 100644 --- a/IPA Keyboard Extension/eo.lproj/Localizable.strings +++ b/IPA Keyboard Extension/eo.lproj/Localizable.strings @@ -16,6 +16,8 @@ "Extended IPA" = "extIFA (Aldonoj al la IFA)"; "Nonstandard" = "Nonstandard"; "Nonstandard & Obsolete Symbols" = "Nonstandard (Malvalidaj/Malaktualaj Simboloj)"; +"NumPad" = "Numeroj"; +"Number Pad" = "Klavaro de Numeroj"; /* Sections - IPA (Standard) */ "Consonants" = "Konsonantoj"; diff --git a/IPA Keyboard Extension/ja.lproj/Localizable.strings b/IPA Keyboard Extension/ja.lproj/Localizable.strings index 018c536..6df1ee4 100644 --- a/IPA Keyboard Extension/ja.lproj/Localizable.strings +++ b/IPA Keyboard Extension/ja.lproj/Localizable.strings @@ -16,6 +16,8 @@ "Extended IPA" = "extIPA（拡張IPA）"; "Nonstandard" = "非公式記号"; "Nonstandard & Obsolete Symbols" = "非公式・破棄された記号"; +"NumPad" = "数字入力"; +"Number Pad" = "数字入力"; /* Sections - IPA (Standard) */ "Consonants" = "子音"; diff --git a/IPA Keyboard Extension/zh-Hans.lproj/Localizable.strings b/IPA Keyboard Extension/zh-Hans.lproj/Localizable.strings index d5feda4..e30e43a 100644 --- a/IPA Keyboard Extension/zh-Hans.lproj/Localizable.strings +++ b/IPA Keyboard Extension/zh-Hans.lproj/Localizable.strings @@ -16,6 +16,8 @@ "Extended IPA" = "扩展IPA（extIPA）"; "Nonstandard" = "非官方字符"; "Nonstandard & Obsolete Symbols" = "非官方/已废弃字符（包括舌尖元音）"; +"NumPad" = "数字键盘"; +"Number Pad" = "数字键盘"; /* Sections - IPA (Standard) */ "Consonants" = "辅音"; diff --git a/IPA Keyboard Extension/zh-Hant-HK.lproj/Localizable.strings b/IPA Keyboard Extension/zh-Hant-HK.lproj/Localizable.strings index 02b1bdb..c81fd83 100644 --- a/IPA Keyboard Extension/zh-Hant-HK.lproj/Localizable.strings +++ b/IPA Keyboard Extension/zh-Hant-HK.lproj/Localizable.strings @@ -16,6 +16,8 @@ "Extended IPA" = "擴展IPA（extIPA）"; "Nonstandard" = "非正規符號"; "Nonstandard & Obsolete Symbols" = "非正規/已廢棄字元"; +"NumPad" = "數字鍵盤"; +"Number Pad" = "數字鍵盤"; /* Sections - IPA (Standard) */ "Consonants" = "輔音"; diff --git a/IPA Keyboard Extension/zh-Hant.lproj/Localizable.strings b/IPA Keyboard Extension/zh-Hant.lproj/Localizable.strings index 02b1bdb..c81fd83 100644 --- a/IPA Keyboard Extension/zh-Hant.lproj/Localizable.strings +++ b/IPA Keyboard Extension/zh-Hant.lproj/Localizable.strings @@ -16,6 +16,8 @@ "Extended IPA" = "擴展IPA（extIPA）"; "Nonstandard" = "非正規符號"; "Nonstandard & Obsolete Symbols" = "非正規/已廢棄字元"; +"NumPad" = "數字鍵盤"; +"Number Pad" = "數字鍵盤"; /* Sections - IPA (Standard) */ "Consonants" = "輔音"; diff --git a/IPA Keyboard.xcodeproj/project.pbxproj b/IPA Keyboard.xcodeproj/project.pbxproj index b15fa13..6a74fa8 100644 --- a/IPA Keyboard.xcodeproj/project.pbxproj +++ b/IPA Keyboard.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 53; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -621,7 +621,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; LastSwiftUpdateCheck = 1430; - LastUpgradeCheck = 1430; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = Vince14Genius; TargetAttributes = { 4E4993EA2A77649600616B4E = { @@ -945,6 +945,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -980,6 +981,7 @@ DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -1007,6 +1009,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -1042,6 +1045,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -1075,7 +1079,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.2; + MARKETING_VERSION = 1.2.1; PRODUCT_BUNDLE_IDENTIFIER = "com.Vince14Genius.IPA-Keyboard-iOS"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1100,7 +1104,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.2; + MARKETING_VERSION = 1.2.1; PRODUCT_BUNDLE_IDENTIFIER = "com.Vince14Genius.IPA-Keyboard-iOS"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1123,7 +1127,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.2; + MARKETING_VERSION = 1.2.1; PRODUCT_BUNDLE_IDENTIFIER = "com.Vince14Genius.IPA-Keyboard-iOS.IPA-Keyboard-Extension"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -1146,7 +1150,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.2; + MARKETING_VERSION = 1.2.1; PRODUCT_BUNDLE_IDENTIFIER = "com.Vince14Genius.IPA-Keyboard-iOS.IPA-Keyboard-Extension"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; diff --git a/IPA Keyboard.xcodeproj/xcshareddata/xcschemes/IPA Keyboard Extension.xcscheme b/IPA Keyboard.xcodeproj/xcshareddata/xcschemes/IPA Keyboard Extension.xcscheme new file mode 100644 index 0000000..81747ca --- /dev/null +++ b/IPA Keyboard.xcodeproj/xcshareddata/xcschemes/IPA Keyboard Extension.xcscheme @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/IPA Keyboard.xcodeproj/xcshareddata/xcschemes/IPA Keyboard.xcscheme b/IPA Keyboard.xcodeproj/xcshareddata/xcschemes/IPA Keyboard.xcscheme new file mode 100644 index 0000000..e80c053 --- /dev/null +++ b/IPA Keyboard.xcodeproj/xcshareddata/xcschemes/IPA Keyboard.xcscheme @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Keyboard Layouts/ExtIPASymbols.swift b/Keyboard Layouts/ExtIPASymbols.swift index 50db989..3c67249 100644 --- a/Keyboard Layouts/ExtIPASymbols.swift +++ b/Keyboard Layouts/ExtIPASymbols.swift @@ -110,20 +110,25 @@ enum ExtIPASymbols: KeyboardLayout { sections.consonantSuperscripts.rawValue: .init( sectionGlyph: "◌ᵝ", regularDisplayKeys: [ - "◌ᵖ", "◌ᵗ", "◌ᶜ", "◌ᵏ", - "◌ᵇ", "◌ᵈ", "◌ᶡ", "◌ᶢ", - "◌ˀ", nil, nil, nil, - "◌ᵐ", "◌ᶬ", nil, "◌ᶯ", - "◌ᶮ", "◌ᵑ", "◌ᶰ", nil, - "◌ᶲ", "◌ᶠ", "◌ᶿ", "◌ˢ", - "◌ᵝ", "◌ᵛ", "◌ᶞ", "◌ᶻ", - "◌ᶴ", "◌ᶝ", "◌ᶳ", nil, - "◌ᶾ", "◌ᶽ", "◌ᶼ", nil, - "◌ᶜ̧", "◌ˣ", "◌ᵡ", nil, - "◌ᶨ", nil, "◌ʶ", "◌ʱ", - "◌ᶹ", "◌ʴ", "◌ʵ", nil, - "◌ᶭ", nil, "◌ᶩ", "◌ᶫ", - "◌ᶣ", "◌ʳ", + "◌ᵖ", nil, "◌ᶲ", nil, + "◌ᵇ", "◌ᵐ", "◌ᵝ", nil, + nil, nil, "◌ᶠ", nil, + nil, "◌ᶬ", "◌ᵛ", "◌ᶹ", + "◌ᵗ", nil, "◌ˢ", nil, + "◌ᵈ", nil, "◌ᶻ", "◌ʴ", + "◌ᶿ", "◌ᶝ", nil, "◌ᶴ", + "◌ᶞ", "◌ᶽ", nil, "◌ᶾ", + nil, nil, "◌ᶳ", nil, + nil, "◌ᶯ", "◌ᶼ", "◌ʵ", + "◌ᶜ", nil, "◌ᶜ̧", nil, + "◌ᶡ", "◌ᶮ", "◌ᶨ", "◌ᶣ", + "◌ᵏ", nil, "◌ˣ", nil, + "◌ᶢ", "◌ᵑ", nil, "◌ᶭ", + nil, nil, "◌ᵡ", nil, + nil, "◌ᶰ", "◌ʶ", nil, + "◌ˀ", nil, nil, nil, + nil, nil, "◌ʱ", nil, + "◌ᶩ", "◌ᶫ", nil, "◌ʳ", ], largeDisplayKeys: [ "◌ᵖ", "◌ᵐ", "◌ᶲ", "◌ᶠ", "◌ᶿ", nil,