Merge branch 'develop'

Kentzo · Aug 17, 2022 · c86ce0f · c86ce0f
2 parents 07b0650 + c2ad80c
commit c86ce0f
Show file tree

Hide file tree

Showing 38 changed files with 140 additions and 486 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,15 @@
+3.4.0 (2022-08-17)
+---
+
+Improvements:
+
+- Remove most of the deprecated methods with exception of delegates
+- Fix missing NS_DESIGNATED_INITIALIZER
+
+Fixes:
+
+- Fix incorrect comparison of style image cache keys that led to 100% miss by [@ninjaprox](https://github.com/ninjaprox)
+
 3.3.0 (2020-07-12)
 ---
 

diff --git a/README.md b/README.md
@@ -4,6 +4,7 @@
 
 [![CocoaPods Compatible](https://img.shields.io/badge/CocoaPods-Compatible%201.8+-success.svg)](https://cocoapods.org/pods/ShortcutRecorder)
 [![Carthage Compatible](https://img.shields.io/badge/Carthage-Compatible-success.svg)](https://github.com/Carthage/Carthage)
+[![SPM Compatible](https://img.shields.io/badge/SPM-Compatible-success.svg)](https://swiftpackageindex.com/Kentzo/ShortcutRecorder)
 
 [![Coverage](https://codecov.io/gh/Kentzo/ShortcutRecorder/branch/master/graph/badge.svg)](https://codecov.io/gh/Kentzo/ShortcutRecorder)
 [![Build Status](https://travis-ci.org/Kentzo/ShortcutRecorder.svg?branch=master)](https://travis-ci.org/Kentzo/ShortcutRecorder)
@@ -86,15 +87,15 @@ The framework supports [module maps](https://clang.llvm.org/docs/Modules.html),
 
 ### Swift Package Manager
 
-	.package(url: "git://github.com/Kentzo/ShortcutRecorder.git", from: "3.3.0")
+	.package(url: "git://github.com/Kentzo/ShortcutRecorder.git", from: "3.4.0")
 
 ### CocoaPods
 
-    pod 'ShortcutRecorder', '~> 3.3.0'
+    pod 'ShortcutRecorder', '~> 3.4.0'
 
 ### Carthage
 
-    github "Kentzo/ShortcutRecorder" ~> 3.3.0
+    github "Kentzo/ShortcutRecorder" ~> 3.4.0
 
 Prebuilt frameworks are available via GitHub releases.
 

diff --git a/ShortcutRecorder.xcodeproj/project.pbxproj b/ShortcutRecorder.xcodeproj/project.pbxproj
@@ -645,7 +645,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 3.1;
-				DYLIB_CURRENT_VERSION = 3.3;
+				DYLIB_CURRENT_VERSION = 3.4;
 				FRAMEWORK_VERSION = A;
 				INFOPLIST_FILE = Sources/ShortcutRecorder/Info.plist;
 				INSTALL_PATH = "@rpath";
@@ -672,7 +672,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 3.1;
-				DYLIB_CURRENT_VERSION = 3.3;
+				DYLIB_CURRENT_VERSION = 3.4;
 				FRAMEWORK_VERSION = A;
 				INFOPLIST_FILE = Sources/ShortcutRecorder/Info.plist;
 				INSTALL_PATH = "@rpath";

diff --git a/Sources/ShortcutRecorder/Info.plist b/Sources/ShortcutRecorder/Info.plist
@@ -13,11 +13,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.3.0</string>
+	<string>3.4.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>3.3.0</string>
+	<string>3.4.0</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2019 ShortcutRecorder attributors</string>
 </dict>

diff --git a/Sources/ShortcutRecorder/Resources/ca.lproj/ShortcutRecorder.strings b/Sources/ShortcutRecorder/Resources/ca.lproj/ShortcutRecorder.strings
@@ -5,7 +5,7 @@
 "Shortcut" = "Drecera";
 
 /* VoiceOver value for the value-less control */
-"Empty" = "Buida";
+"Not set" = "Sense definir";
 
 /* Tooltip for the cancel button when the control has a value */
 "Use old shortcut" = "Utilitza la drecera antiga";
@@ -16,8 +16,8 @@
 /* Tooltip for the clear button */
 "Delete current shortcut" = "Elimineu la drecera actual";
 
-/* Tooltip for the recording mode */
-"Type shortcut" = "Determina drecera";
+/* Label and tooltip for the recording mode */
+"Press keys now" = "Prémer tecles ara";
 
 /* Label for the value-less control */
 "Record Shortcut" = "Gravar drecera";

diff --git a/Sources/ShortcutRecorder/Resources/cs.lproj/ShortcutRecorder.strings b/Sources/ShortcutRecorder/Resources/cs.lproj/ShortcutRecorder.strings
@@ -5,7 +5,7 @@
 "Shortcut" = "Kl. Zkratku";
 
 /* VoiceOver value for the value-less control */
-"Empty" = "Prázdné";
+"Not set" = "Nenastaveno";
 
 /* Tooltip for the cancel button when the control has a value */
 "Use old shortcut" = "Použít starou kl. zkratku";
@@ -16,8 +16,8 @@
 /* Tooltip for the clear button */
 "Delete current shortcut" = "Odstranit aktuální kl. zkratku";
 
-/* Tooltip for the recording mode */
-"Type shortcut" = "Zadejte kl. zkratku";
+/* Label and tooltip for the recording mode */
+"Press keys now" = "Stiskněte klávesy";
 
 /* Label for the value-less control */
 "Record Shortcut" = "Nahrát kl. zkratku";

diff --git a/Sources/ShortcutRecorder/Resources/de.lproj/ShortcutRecorder.strings b/Sources/ShortcutRecorder/Resources/de.lproj/ShortcutRecorder.strings
@@ -5,7 +5,7 @@
 "Shortcut" = "Tastaturkurzbefehl";
 
 /* VoiceOver value for the value-less control */
-"Empty" = "Leer";
+"Not set" = "Keine Angabe";
 
 /* Tooltip for the cancel button when the control has a value */
 "Use old shortcut" = "Alten Kurzbefehl benutzen";
@@ -16,8 +16,8 @@
 /* Tooltip for the clear button */
 "Delete current shortcut" = "Aktuellen Kurzbefehl löschen";
 
-/* Tooltip for the recording mode */
-"Type shortcut" = "Kurzbefehl eingeben";
+/* Label and tooltip for the recording mode */
+"Press keys now" = "Tasten jetzt drücken";
 
 /* Label for the value-less control */
 "Record Shortcut" = "Kurzbefehl aufnehmen";

diff --git a/Sources/ShortcutRecorder/Resources/el.lproj/ShortcutRecorder.strings b/Sources/ShortcutRecorder/Resources/el.lproj/ShortcutRecorder.strings
@@ -5,7 +5,7 @@
 "Shortcut" = "Συντόμευσης";
 
 /* VoiceOver value for the value-less control */
-"Empty" = "Κενό";
+"Not set" = "Κενό";
 
 /* Tooltip for the cancel button when the control has a value */
 "Use old shortcut" = "Χρήση παλιάς συντόμευσης";
@@ -16,8 +16,8 @@
 /* Tooltip for the clear button */
 "Delete current shortcut" = "Διαγραφή τρέχουσας συντομεύσεως";
 
-/* Tooltip for the recording mode */
-"Type shortcut" = "Εισαγωγή συντόμευσης";
+/* Label and tooltip for the recording mode */
+"Press keys now" = "Εισαγωγή συντόμευσης";
 
 /* Label for the value-less control */
 "Record Shortcut" = "Εγγραφή Συντόμευσης";

diff --git a/Sources/ShortcutRecorder/Resources/en.lproj/ShortcutRecorder.strings b/Sources/ShortcutRecorder/Resources/en.lproj/ShortcutRecorder.strings
@@ -5,7 +5,7 @@
 "Shortcut" = "Shortcut";
 
 /* VoiceOver value for the value-less control */
-"Empty" = "Empty";
+"Not set" = "Not set";
 
 /* Tooltip for the cancel button when the control has a value */
 "Use old shortcut" = "Use old shortcut";
@@ -16,8 +16,8 @@
 /* Tooltip for the clear button */
 "Delete current shortcut" = "Delete current shortcut";
 
-/* Tooltip for the recording mode */
-"Type shortcut" = "Type shortcut";
+/* Label and tooltip for the recording mode */
+"Press keys now" = "Press keys now";
 
 /* Label for the value-less control */
 "Record Shortcut" = "Record Shortcut";

diff --git a/Sources/ShortcutRecorder/Resources/es.lproj/ShortcutRecorder.strings b/Sources/ShortcutRecorder/Resources/es.lproj/ShortcutRecorder.strings
@@ -5,7 +5,7 @@
 "Shortcut" = "Función rápida";
 
 /* VoiceOver value for the value-less control */
-"Empty" = "Vacío";
+"Not set" = "Sin definir";
 
 /* Tooltip for the cancel button when the control has a value */
 "Use old shortcut" = "Usar la anterior función rápida";
@@ -16,8 +16,8 @@
 /* Tooltip for the clear button */
 "Delete current shortcut" = "Eliminar la actual función rápida";
 
-/* Tooltip for the recording mode */
-"Type shortcut" = "Teclear función rápida";
+/* Label and tooltip for the recording mode */
+"Press keys now" = "Pulsa las teclas ahora";
 
 /* Label for the value-less control */
 "Record Shortcut" = "Grabar función rápida";

diff --git a/Sources/ShortcutRecorder/Resources/fr.lproj/ShortcutRecorder.strings b/Sources/ShortcutRecorder/Resources/fr.lproj/ShortcutRecorder.strings
@@ -5,7 +5,7 @@
 "Shortcut" = "Raccourci";
 
 /* VoiceOver value for the value-less control */
-"Empty" = "Vide";
+"Not set" = "Non défini";
 
 /* Tooltip for the cancel button when the control has a value */
 "Use old shortcut" = "Utiliser l’ancien raccourci";
@@ -16,8 +16,8 @@
 /* Tooltip for the clear button */
 "Delete current shortcut" = "Supprimer le raccourci actuel";
 
-/* Tooltip for the recording mode */
-"Type shortcut" = "Taper le raccourci";
+/* Label and tooltip for the recording mode */
+"Press keys now" = "Taper le raccourci";
 
 /* Label for the value-less control */
 "Record Shortcut" = "Enregistrer le raccourci";

diff --git a/Sources/ShortcutRecorder/Resources/it.lproj/ShortcutRecorder.strings b/Sources/ShortcutRecorder/Resources/it.lproj/ShortcutRecorder.strings
@@ -5,7 +5,7 @@
 "Shortcut" = "Abbreviazione";
 
 /* VoiceOver value for the value-less control */
-"Empty" = "Vuota";
+"Not set" = "Non impostato";
 
 /* Tooltip for the cancel button when the control has a value */
 "Use old shortcut" = "Usa vecchia abbreviazione";
@@ -16,8 +16,8 @@
 /* Tooltip for the clear button */
 "Delete current shortcut" = "Elimina l'abbreviazione corrente";
 
-/* Tooltip for the recording mode */
-"Type shortcut" = "Digita abbreviazione";
+/* Label and tooltip for the recording mode */
+"Press keys now" = "Premi tasti adesso";
 
 /* Label for the value-less control */
 "Record Shortcut" = "Registra abbreviazione";

diff --git a/Sources/ShortcutRecorder/Resources/ja.lproj/ShortcutRecorder.strings b/Sources/ShortcutRecorder/Resources/ja.lproj/ShortcutRecorder.strings
@@ -5,7 +5,7 @@
 "Shortcut" = "ショートカット";
 
 /* VoiceOver value for the value-less control */
-"Empty" = "空の";
+"Not set" = "未設定";
 
 /* Tooltip for the cancel button when the control has a value */
 "Use old shortcut" = "古いショートカット設定を使用";
@@ -16,8 +16,8 @@
 /* Tooltip for the clear button */
 "Delete current shortcut" = "現在のショートカットを削除";
 
-/* Tooltip for the recording mode */
-"Type shortcut" = "ショートカットを入力してください";
+/* Label and tooltip for the recording mode */
+"Press keys now" = "今すぐキーを押してください";
 
 /* Label for the value-less control */
 "Record Shortcut" = "ショートカットを入力";

diff --git a/Sources/ShortcutRecorder/Resources/ko.lproj/ShortcutRecorder.strings b/Sources/ShortcutRecorder/Resources/ko.lproj/ShortcutRecorder.strings
@@ -5,7 +5,7 @@
 "Shortcut" = "단축키";
 
 /* VoiceOver value for the value-less control */
-"Empty" = "비어 있음";
+"Not set" = "설정 안 됨";
 
 /* Tooltip for the cancel button when the control has a value */
 "Use old shortcut" = "예전 단축키 사용";
@@ -16,8 +16,8 @@
 /* Tooltip for the clear button */
 "Delete current shortcut" = "현재 단축키 삭제";
 
-/* Tooltip for the recording mode */
-"Type shortcut" = "단축키 입력";
+/* Label and tooltip for the recording mode */
+"Press keys now" = "지금 키 입력";
 
 /* Label for the value-less control */
 "Record Shortcut" = "단축키 입력";

diff --git a/Sources/ShortcutRecorder/Resources/nb.lproj/ShortcutRecorder.strings b/Sources/ShortcutRecorder/Resources/nb.lproj/ShortcutRecorder.strings
@@ -5,7 +5,7 @@
 "Shortcut" = "Snarvei";
 
 /* VoiceOver value for the value-less control */
-"Empty" = "Tomt";
+"Not set" = "Ikke angitt";
 
 /* Tooltip for the cancel button when the control has a value */
 "Use old shortcut" = "Bruk forrige snarvei";
@@ -16,8 +16,8 @@
 /* Tooltip for the clear button */
 "Delete current shortcut" = "Slett gjeldende snarvei";
 
-/* Tooltip for the recording mode */
-"Type shortcut" = "Trykk snarvei";
+/* Label and tooltip for the recording mode */
+"Press keys now" = "Trykk på taster nå";
 
 /* Label for the value-less control */
 "Record Shortcut" = "Spill inn snarvei";

diff --git a/Sources/ShortcutRecorder/Resources/nl.lproj/ShortcutRecorder.strings b/Sources/ShortcutRecorder/Resources/nl.lproj/ShortcutRecorder.strings
@@ -1,11 +1,11 @@
 /* Literal for the Space key */
-"Space" = "Spatiebalk";
+"Space" = "Spatie";
 
 /* VoiceOver type of the object recorded by the control */
 "Shortcut" = "Toetscombinatie";
 
 /* VoiceOver value for the value-less control */
-"Empty" = "Leeg";
+"Not set" = "Niet ingesteld";
 
 /* Tooltip for the cancel button when the control has a value */
 "Use old shortcut" = "Gebruik vorige toetscombinatie";
@@ -16,8 +16,8 @@
 /* Tooltip for the clear button */
 "Delete current shortcut" = "Huidige toetscombinatie verwijderen";
 
-/* Tooltip for the recording mode */
-"Type shortcut" = "Druk toetscombinatie in";
+/* Label and tooltip for the recording mode */
+"Press keys now" = "Druk nu op toetsen";
 
 /* Label for the value-less control */
 "Record Shortcut" = "Toetscombinatie opnemen";

diff --git a/Sources/ShortcutRecorder/Resources/pl.lproj/ShortcutRecorder.strings b/Sources/ShortcutRecorder/Resources/pl.lproj/ShortcutRecorder.strings
@@ -5,7 +5,7 @@
 "Shortcut" = "Skrót";
 
 /* VoiceOver value for the value-less control */
-"Empty" = "Pusty";
+"Not set" = "Nie ustawiono";
 
 /* Tooltip for the cancel button when the control has a value */
 "Use old shortcut" = "Użyj starego skrótu";
@@ -16,8 +16,8 @@
 /* Tooltip for the clear button */
 "Delete current shortcut" = "Skasuj bieżącym skrót";
 
-/* Tooltip for the recording mode */
-"Type shortcut" = "Podaj skrót";
+/* Label and tooltip for the recording mode */
+"Press keys now" = "Naciśnij klawisze teraz";
 
 /* Label for the value-less control */
 "Record Shortcut" = "Utwórz skrót";

diff --git a/Sources/ShortcutRecorder/Resources/pt-BR.lproj/ShortcutRecorder.strings b/Sources/ShortcutRecorder/Resources/pt-BR.lproj/ShortcutRecorder.strings
@@ -5,7 +5,7 @@
 "Shortcut" = "Atalho";
 
 /* VoiceOver value for the value-less control */
-"Empty" = "Vazia";
+"Not set" = "Não Definido";
 
 /* Tooltip for the cancel button when the control has a value */
 "Use old shortcut" = "Usar atalho antigo";
@@ -16,8 +16,8 @@
 /* Tooltip for the clear button */
 "Delete current shortcut" = "Apagar atalho atual";
 
-/* Tooltip for the recording mode */
-"Type shortcut" = "Digite atalho";
+/* Label and tooltip for the recording mode */
+"Press keys now" = "Pressione as teclas agora";
 
 /* Label for the value-less control */
 "Record Shortcut" = "Gravar Atalho";

diff --git a/Sources/ShortcutRecorder/Resources/pt.lproj/ShortcutRecorder.strings b/Sources/ShortcutRecorder/Resources/pt.lproj/ShortcutRecorder.strings
@@ -5,7 +5,7 @@
 "Shortcut" = "Atalho";
 
 /* VoiceOver value for the value-less control */
-"Empty" = "Vazia";
+"Not set" = "Por definir";
 
 /* Tooltip for the cancel button when the control has a value */
 "Use old shortcut" = "Usar atalho antigo";
@@ -16,8 +16,8 @@
 /* Tooltip for the clear button */
 "Delete current shortcut" = "Apagar atalho atual";
 
-/* Tooltip for the recording mode */
-"Type shortcut" = "Digitar atalho";
+/* Label and tooltip for the recording mode */
+"Press keys now" = "Premir teclas agora";
 
 /* Label for the value-less control */
 "Record Shortcut" = "Gravar Atalho";

diff --git a/Sources/ShortcutRecorder/Resources/ro.lproj/ShortcutRecorder.strings b/Sources/ShortcutRecorder/Resources/ro.lproj/ShortcutRecorder.strings
@@ -5,7 +5,7 @@
 "Shortcut" = "Scurtătură";
 
 /* VoiceOver value for the value-less control */
-"Empty" = "Gol";
+"Not set" = "Neconfigurat";
 
 /* Tooltip for the cancel button when the control has a value */
 "Use old shortcut" = "Folosește vechea scurtătură";
@@ -16,8 +16,8 @@
 /* Tooltip for the clear button */
 "Delete current shortcut" = "Ștergeți scurtătură curente";
 
-/* Tooltip for the recording mode */
-"Type shortcut" = "Tastează scurtătură";
+/* Label and tooltip for the recording mode */
+"Press keys now" = "Apăsați tastele acum";
 
 /* Label for the value-less control */
 "Record Shortcut" = "Înregistra scurtătură";