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"
Vince14Genius · Dec 22, 2023 · cb19729 · cb19729
1 parent 47ab265
commit cb19729
Show file tree

Hide file tree

Showing 13 changed files with 253 additions and 37 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1510"
+   wasCreatedForAppExtension = "YES"
+   version = "2.0">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "4E84B1862140E9980078AC4B"
+               BuildableName = "IPA Keyboard Extension.appex"
+               BlueprintName = "IPA Keyboard Extension"
+               ReferencedContainer = "container:IPA Keyboard.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "4E84B1512140E92F0078AC4B"
+               BuildableName = "IPA Keyboard.app"
+               BlueprintName = "IPA Keyboard"
+               ReferencedContainer = "container:IPA Keyboard.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "4E4993EA2A77649600616B4E"
+               BuildableName = "IPA KeyboardTests.xctest"
+               BlueprintName = "IPA KeyboardTests"
+               ReferencedContainer = "container:IPA Keyboard.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = ""
+      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      launchStyle = "0"
+      askForAppToLaunch = "Yes"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES"
+      launchAutomaticallySubstyle = "2">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "4E84B1512140E92F0078AC4B"
+            BuildableName = "IPA Keyboard.app"
+            BlueprintName = "IPA Keyboard"
+            ReferencedContainer = "container:IPA Keyboard.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES"
+      askForAppToLaunch = "Yes"
+      launchAutomaticallySubstyle = "2">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "4E84B1512140E92F0078AC4B"
+            BuildableName = "IPA Keyboard.app"
+            BlueprintName = "IPA Keyboard"
+            ReferencedContainer = "container:IPA Keyboard.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>