From a97f7e580dfd7ae000a409e50e2eeef38499f710 Mon Sep 17 00:00:00 2001 From: henrikth93 Date: Tue, 19 Nov 2024 19:45:35 +0100 Subject: [PATCH 1/8] Remove corner image and icon image This commit will remove the corner image view and the icon image view. --- Scribe/AboutTab/InformationScreenVC.swift | 39 +---------------------- Scribe/Base.lproj/AppScreen.storyboard | 26 ++------------- 2 files changed, 3 insertions(+), 62 deletions(-) diff --git a/Scribe/AboutTab/InformationScreenVC.swift b/Scribe/AboutTab/InformationScreenVC.swift index 03437258..7f9820b5 100644 --- a/Scribe/AboutTab/InformationScreenVC.swift +++ b/Scribe/AboutTab/InformationScreenVC.swift @@ -43,14 +43,6 @@ class InformationScreenVC: UIViewController { @IBOutlet var textViewPad: UITextView! var textView: UITextView! - @IBOutlet var cornerImageViewPhone: UIImageView! - @IBOutlet var cornerImageViewPad: UIImageView! - var cornerImageView: UIImageView! - - @IBOutlet var iconImageViewPhone: UIImageView! - @IBOutlet var iconImageViewPad: UIImageView! - var iconImageView: UIImageView! - var text: String = "" var section: SectionState = .privacyPolicy @@ -61,8 +53,6 @@ class InformationScreenVC: UIViewController { contentContainerView = contentContainerViewPad headingLabel = headingLabelPad textView = textViewPad - cornerImageView = cornerImageViewPad - iconImageView = iconImageViewPad scrollViewPhone.removeFromSuperview() scrollContainerViewPhone.removeFromSuperview() @@ -70,17 +60,13 @@ class InformationScreenVC: UIViewController { contentContainerViewPhone.removeFromSuperview() headingLabelPhone.removeFromSuperview() textViewPhone.removeFromSuperview() - cornerImageViewPhone.removeFromSuperview() - iconImageViewPhone.removeFromSuperview() - + } else { scrollContainerView = scrollContainerViewPhone relativeView = relativeViewPhone contentContainerView = contentContainerViewPhone headingLabel = headingLabelPhone textView = textViewPhone - cornerImageView = cornerImageViewPhone - iconImageView = iconImageViewPhone scrollViewPad.removeFromSuperview() scrollContainerViewPad.removeFromSuperview() @@ -88,8 +74,6 @@ class InformationScreenVC: UIViewController { contentContainerViewPad.removeFromSuperview() headingLabelPad.removeFromSuperview() textViewPad.removeFromSuperview() - cornerImageViewPad.removeFromSuperview() - iconImageViewPad.removeFromSuperview() } } @@ -122,7 +106,6 @@ class InformationScreenVC: UIViewController { func setupInformationPageUI() { setAppTextView() - setCornerImageView() textView.backgroundColor = .clear scrollContainerView.backgroundColor = .clear @@ -131,24 +114,11 @@ class InformationScreenVC: UIViewController { contentContainerView.backgroundColor = lightWhiteDarkBlackColor applyCornerRadius(elem: contentContainerView, radius: contentContainerView.frame.width * 0.05) - cornerImageView.clipsToBounds = true contentContainerView.clipsToBounds = true textView.isEditable = false } - func setCornerImageView() { - if DeviceType.isPhone { - for constraint in cornerImageView.constraints where constraint.identifier == "cornerImageView" { - constraint.constant = 70 - } - } else if DeviceType.isPad { - for constraint in cornerImageView.constraints where constraint.identifier == "cornerImageView" { - constraint.constant = 125 - } - } - } - func setupPrivacyPolicyPage() { navigationItem.title = NSLocalizedString("app.about.legal.privacy_policy", value: "Privacy policy", comment: "") headingLabel.attributedText = NSMutableAttributedString( @@ -214,9 +184,6 @@ This POLICY is effective as of the 24th of May, 2022. textView.linkTextAttributes = [ NSAttributedString.Key.foregroundColor: linkBlueColor ] - - iconImageView.image = UIImage.availableIconImage(with: "lock.shield") - iconImageView.tintColor = UITraitCollection.current.userInterfaceStyle == .dark ? scribeCTAColor : keyCharColor } func setupLicensesPage() { @@ -232,9 +199,6 @@ This POLICY is effective as of the 24th of May, 2022. textView.linkTextAttributes = [ NSAttributedString.Key.foregroundColor: linkBlueColor ] - - iconImageView.image = UIImage.availableIconImage(with: "doc.text") - iconImageView.tintColor = UITraitCollection.current.userInterfaceStyle == .dark ? scribeCTAColor : keyCharColor } func setupWikimediaAndScribePage() { @@ -247,6 +211,5 @@ This POLICY is effective as of the 24th of May, 2022. text: wikimediaAndScribeText, fontSize: fontSize, imageWidth: contentContainerView.frame.width * 0.6 ) textView.textColor = keyCharColor - iconImageView.image = UIImage.availableIconImage(with: "wikimediaInfoPage") } } diff --git a/Scribe/Base.lproj/AppScreen.storyboard b/Scribe/Base.lproj/AppScreen.storyboard index 8a442724..0f14ca26 100644 --- a/Scribe/Base.lproj/AppScreen.storyboard +++ b/Scribe/Base.lproj/AppScreen.storyboard @@ -1,9 +1,9 @@ - + - + @@ -147,19 +147,6 @@ - - - - - - - - - - - - - @@ -171,13 +158,8 @@ - - - - - @@ -232,12 +214,8 @@ - - - - From e57f9d086e9b3ee83279df52fb19c53bcb3d6fdd Mon Sep 17 00:00:00 2001 From: henrikth93 Date: Tue, 19 Nov 2024 23:01:22 +0100 Subject: [PATCH 2/8] Fix lint errors This commit will fix lint errors --- Scribe/AboutTab/InformationScreenVC.swift | 1 - Scribe/i18n/Scribe-i18n/Localizable.xcstrings | 178 +++++++----------- 2 files changed, 68 insertions(+), 111 deletions(-) diff --git a/Scribe/AboutTab/InformationScreenVC.swift b/Scribe/AboutTab/InformationScreenVC.swift index 7f9820b5..1c3a270a 100644 --- a/Scribe/AboutTab/InformationScreenVC.swift +++ b/Scribe/AboutTab/InformationScreenVC.swift @@ -60,7 +60,6 @@ class InformationScreenVC: UIViewController { contentContainerViewPhone.removeFromSuperview() headingLabelPhone.removeFromSuperview() textViewPhone.removeFromSuperview() - } else { scrollContainerView = scrollContainerViewPhone relativeView = relativeViewPhone diff --git a/Scribe/i18n/Scribe-i18n/Localizable.xcstrings b/Scribe/i18n/Scribe-i18n/Localizable.xcstrings index aaafff72..df001a3f 100644 --- a/Scribe/i18n/Scribe-i18n/Localizable.xcstrings +++ b/Scribe/i18n/Scribe-i18n/Localizable.xcstrings @@ -1369,6 +1369,7 @@ }, "app.about.feedback.app_hints" : { "comment" : "", + "extractionState" : "stale", "localizations" : { "ar" : { "stringUnit" : { @@ -1432,6 +1433,17 @@ } } }, + "app.about.feedback.appHints" : { + "extractionState" : "extracted_with_value", + "localizations" : { + "en" : { + "stringUnit" : { + "state" : "new", + "value" : "Reset app hints" + } + } + } + }, "app.about.feedback.bug_report" : { "comment" : "", "localizations" : { @@ -1760,7 +1772,6 @@ }, "app.about.feedback.version" : { "comment" : "", - "extractionState" : "stale", "localizations" : { "ar" : { "stringUnit" : { @@ -4917,26 +4928,26 @@ } } }, - "app.settings.keyboard.functionality.default_emoji_tone.caption" : { + "app.settings.keyboard.functionality.default_emoji_tone_description" : { "comment" : "", "extractionState" : "stale", "localizations" : { "ar" : { "stringUnit" : { "state" : "", - "value" : "لون البشرة المستخدم" + "value" : "حدد لون البشرة الافتراضي لاقتراحات واكتملات الرموز التعبيرية." } }, "bn" : { "stringUnit" : { "state" : "", - "value" : "ব্যবহার করা স্কিন টোন" + "value" : "ইমোজি প্রস্তাবনা এবং পূর্ণকরণের জন্য একটি ডিফল্ট স্কিন টোন সেট করুন।" } }, "de" : { "stringUnit" : { "state" : "", - "value" : "Die zu benutzende Hautfarbe" + "value" : "Stelle einen Standardhautton für automatische Emoji-Vorschläge ein." } }, "en" : { @@ -4948,60 +4959,61 @@ "es" : { "stringUnit" : { "state" : "", - "value" : "Color de piel a utilizar" + "value" : "Establece un tono de piel predeterminado para las autosugerencias y los complementos emoji." } }, "fr" : { "stringUnit" : { "state" : "", - "value" : "Couleur de peau à utiliser" + "value" : "Définir la couleur de peau par défaut pour les suggestions automatiques et les complétions des émojis." } }, "hi" : { "stringUnit" : { "state" : "", - "value" : "उपयोग होने वाला त्वचा का रंग" + "value" : "इमोजी सुझाव और समाप्ति के लिए एक डिफ़ॉल्ट त्वचा रंग सेट करें।" } }, "ko" : { "stringUnit" : { "state" : "", - "value" : "사용할 피부 톤" + "value" : "이모지 자동 추천 및 완성을 위한 피부 톤의 기본값을 설정합니다." } }, "mr" : { "stringUnit" : { "state" : "", - "value" : "वापरल्या जाणाऱ्या त्वचेचा रंग" + "value" : "इमोजीच्या सुचवण्या आणि समाप्ति साठी डिफॉल्ट त्वचा रंग सेट करा." } }, "sv" : { "stringUnit" : { "state" : "", - "value" : "Hudton som ska användas" + "value" : "Välj en standard-hudton för automatiska förslag och komplettering gällande emojis." } } } }, - "app.settings.keyboard.functionality.default_emoji_tone_description" : { + "app.settings.keyboard.functionality.default_emoji_tone.caption" : { "comment" : "", + "extractionState" : "stale", "localizations" : { "ar" : { "stringUnit" : { "state" : "", - "value" : "حدد لون البشرة الافتراضي لاقتراحات واكتملات الرموز التعبيرية." + "value" : "لون البشرة المستخدم" } }, "bn" : { "stringUnit" : { "state" : "", - "value" : "ইমোজি প্রস্তাবনা এবং পূর্ণকরণের জন্য একটি ডিফল্ট স্কিন টোন সেট করুন।" + "value" : "ব্যবহার করা স্কিন টোন" } }, "de" : { "stringUnit" : { "state" : "", - "value" : "Stelle einen Standardhautton für automatische Emoji-Vorschläge ein." + "value" : "Die zu benutzende Hautfarbe" } }, "en" : { @@ -5013,37 +5025,37 @@ "es" : { "stringUnit" : { "state" : "", - "value" : "Establece un tono de piel predeterminado para las autosugerencias y los complementos emoji." + "value" : "Color de piel a utilizar" } }, "fr" : { "stringUnit" : { "state" : "", - "value" : "Définir la couleur de peau par défaut pour les suggestions automatiques et les complétions des émojis." + "value" : "Couleur de peau à utiliser" } }, "hi" : { "stringUnit" : { "state" : "", - "value" : "इमोजी सुझाव और समाप्ति के लिए एक डिफ़ॉल्ट त्वचा रंग सेट करें।" + "value" : "उपयोग होने वाला त्वचा का रंग" } }, "ko" : { "stringUnit" : { "state" : "", - "value" : "이모지 자동 추천 및 완성을 위한 피부 톤의 기본값을 설정합니다." + "value" : "사용할 피부 톤" } }, "mr" : { "stringUnit" : { "state" : "", - "value" : "इमोजीच्या सुचवण्या आणि समाप्ति साठी डिफॉल्ट त्वचा रंग सेट करा." + "value" : "वापरल्या जाणाऱ्या त्वचेचा रंग" } }, "sv" : { "stringUnit" : { "state" : "", - "value" : "Välj en standard-hudton för automatiska förslag och komplettering gällande emojis." + "value" : "Hudton som ska användas" } } } @@ -5969,133 +5981,134 @@ } } }, - "app.settings.keyboard.layout.default_currency.caption" : { + "app.settings.keyboard.layout.default_currency_description" : { "comment" : "", "extractionState" : "stale", "localizations" : { "ar" : { "stringUnit" : { "state" : "", - "value" : "رمز لمفاتيح 123" + "value" : "اختر أي رمز للعملة يظهر على مفاتيح الأرقام." } }, "bn" : { "stringUnit" : { "state" : "", - "value" : "১২৩ কীগুলির জন্য প্রতীক" + "value" : "সংখ্যার কীগুলিতে কোন মুদ্রা প্রতীক প্রদর্শিত হবে তা নির্বাচন করুন।" } }, "de" : { "stringUnit" : { "state" : "", - "value" : "Symbol für Nummerntasten" + "value" : "Auswählen, welches Währungssymbol bei den Nummerntasten auftaucht." } }, "en" : { "stringUnit" : { "state" : "", - "value" : "Select a keyboard layout that suits your typing preference and language needs." + "value" : "Select which currency symbol appears on the number keys." } }, "es" : { "stringUnit" : { "state" : "", - "value" : "Símbolo para las teclas 123" + "value" : "Seleccione el símbolo de moneda que aparecerá en las teclas numéricas." } }, "fr" : { "stringUnit" : { "state" : "", - "value" : "Symbole pour les touches 123" + "value" : "Sélectionner le symbole de la devise qui apparaît sur les touches numériques." } }, "hi" : { "stringUnit" : { "state" : "", - "value" : "123 कुंजियों के लिए प्रतीक" + "value" : "संख्या कुंजियों पर कौन सा मुद्रा प्रतीक दिखाई देगा, उसका चयन करें।" } }, "ko" : { "stringUnit" : { "state" : "", - "value" : "숫자 키 기호" + "value" : "숫자 키에 어떤 통화 기호가 표시될지를 선택하세요." } }, "mr" : { "stringUnit" : { "state" : "", - "value" : "123 किजसाठी चिन्ह" + "value" : "संक्येत कुञ्जींवर कोणते चलन चिन्ह दिसेल ते निवडा." } }, "sv" : { "stringUnit" : { "state" : "", - "value" : "Symbol för 123-tangenter" + "value" : "Välj vilken valutasymbol som ska visas på sifferknapparna." } } } }, - "app.settings.keyboard.layout.default_currency_description" : { + "app.settings.keyboard.layout.default_currency.caption" : { "comment" : "", + "extractionState" : "stale", "localizations" : { "ar" : { "stringUnit" : { "state" : "", - "value" : "اختر أي رمز للعملة يظهر على مفاتيح الأرقام." + "value" : "رمز لمفاتيح 123" } }, "bn" : { "stringUnit" : { "state" : "", - "value" : "সংখ্যার কীগুলিতে কোন মুদ্রা প্রতীক প্রদর্শিত হবে তা নির্বাচন করুন।" + "value" : "১২৩ কীগুলির জন্য প্রতীক" } }, "de" : { "stringUnit" : { "state" : "", - "value" : "Auswählen, welches Währungssymbol bei den Nummerntasten auftaucht." + "value" : "Symbol für Nummerntasten" } }, "en" : { "stringUnit" : { "state" : "", - "value" : "Select which currency symbol appears on the number keys." + "value" : "Select a keyboard layout that suits your typing preference and language needs." } }, "es" : { "stringUnit" : { "state" : "", - "value" : "Seleccione el símbolo de moneda que aparecerá en las teclas numéricas." + "value" : "Símbolo para las teclas 123" } }, "fr" : { "stringUnit" : { "state" : "", - "value" : "Sélectionner le symbole de la devise qui apparaît sur les touches numériques." + "value" : "Symbole pour les touches 123" } }, "hi" : { "stringUnit" : { "state" : "", - "value" : "संख्या कुंजियों पर कौन सा मुद्रा प्रतीक दिखाई देगा, उसका चयन करें।" + "value" : "123 कुंजियों के लिए प्रतीक" } }, "ko" : { "stringUnit" : { "state" : "", - "value" : "숫자 키에 어떤 통화 기호가 표시될지를 선택하세요." + "value" : "숫자 키 기호" } }, "mr" : { "stringUnit" : { "state" : "", - "value" : "संक्येत कुञ्जींवर कोणते चलन चिन्ह दिसेल ते निवडा." + "value" : "123 किजसाठी चिन्ह" } }, "sv" : { "stringUnit" : { "state" : "", - "value" : "Välj vilken valutasymbol som ska visas på sifferknapparna." + "value" : "Symbol för 123-tangenter" } } } @@ -6754,9 +6767,19 @@ } } }, + "app.settings.keyboard.translation.select_source_description" : { + "extractionState" : "extracted_with_value", + "localizations" : { + "en" : { + "stringUnit" : { + "state" : "new", + "value" : "Change the language to translate from." + } + } + } + }, "app.settings.keyboard.translation.select_source.caption" : { "comment" : "", - "extractionState" : "stale", "localizations" : { "ar" : { "stringUnit" : { @@ -7434,71 +7457,6 @@ } } }, - "app.settings.menu.app_language_description" : { - "comment" : "", - "localizations" : { - "ar" : { - "stringUnit" : { - "state" : "", - "value" : "تغيير اللغة التي يتم بها عرض تطبيق Scribe." - } - }, - "bn" : { - "stringUnit" : { - "state" : "", - "value" : "Scribe অ্যাপ কোন ভাষায় থাকবে তা পরিবর্তন করুন।" - } - }, - "de" : { - "stringUnit" : { - "state" : "", - "value" : "Ändern, welche Sprache für die Scribe-App benutzt wird." - } - }, - "en" : { - "stringUnit" : { - "state" : "", - "value" : "Change which language the Scribe app is in." - } - }, - "es" : { - "stringUnit" : { - "state" : "", - "value" : "Cambiar el idioma de la aplicación Scribe." - } - }, - "fr" : { - "stringUnit" : { - "state" : "", - "value" : "Modifier la langue de l'application Scribe." - } - }, - "hi" : { - "stringUnit" : { - "state" : "", - "value" : "स्क्राइब ऐप किस भाषा में होगा, उसे बदलें।" - } - }, - "ko" : { - "stringUnit" : { - "state" : "", - "value" : "Scribe 앱에서 사용할 언어를 변경합니다." - } - }, - "mr" : { - "stringUnit" : { - "state" : "", - "value" : "स्क्राइब अ‍ॅप कोणत्या भाषेत असेल ते बदला." - } - }, - "sv" : { - "stringUnit" : { - "state" : "", - "value" : "Ändra vilket språk Scribe-appen är på." - } - } - } - }, "app.settings.menu.high_color_contrast" : { "comment" : "", "extractionState" : "stale", @@ -8155,4 +8113,4 @@ } }, "version" : "1.0" -} +} \ No newline at end of file From c3fdfd76dd27d2b48f825b3c1ee807fb16ca1101 Mon Sep 17 00:00:00 2001 From: Andrew Tavis McAllister Date: Wed, 20 Nov 2024 23:38:51 +0100 Subject: [PATCH 3/8] Try passing allowProvisioningUpdates to PR CI --- .github/workflows/pr_ci.yaml | 4 ++-- CHANGELOG.md | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr_ci.yaml b/.github/workflows/pr_ci.yaml index 4e036248..337f0f0a 100644 --- a/.github/workflows/pr_ci.yaml +++ b/.github/workflows/pr_ci.yaml @@ -26,8 +26,8 @@ jobs: ${{ runner.os }}-xcode- - name: Build run: | - xcodebuild -scheme Scribe -destination 'platform=iOS Simulator,name=iPhone 15,OS=latest' clean build + xcodebuild -scheme Scribe -destination 'platform=iOS Simulator,name=iPhone 16,OS=latest' -allowProvisioningUpdates clean build - name: Test run: | - xcodebuild -scheme Scribe -destination 'platform=iOS Simulator,name=iPhone 15,OS=latest' test + xcodebuild -scheme Scribe -destination 'platform=iOS Simulator,name=iPhone 16,OS=latest' -allowProvisioningUpdates test diff --git a/CHANGELOG.md b/CHANGELOG.md index 2533a157..fe8681a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,10 @@ Emojis for the following are chosen based on [gitmoji](https://gitmoji.dev/). - Scribe commands can now be triggered directly on a selected word by pressing the Scribe key and then choosing which command to use ([#141](https://github.com/scribe-org/Scribe-iOS/issues/141)). - Users can toggle whether the double space period shortcut is enabled on a per keyboard basis ([#479](https://github.com/scribe-org/Scribe-iOS/issues/479)). +### 🎨 Design Changes + +- The About tab corner icons were removed to make RTL language menus easier to maintain ([#514](https://github.com/scribe-org/Scribe-iOS/issues/425)). + ### ♻️ Code Refactoring - All orphaned documentation comments have been removed from the codebase ([#425](https://github.com/scribe-org/Scribe-iOS/issues/425)). From ce907b7aff5450464359b6bedbc0707438dd61bc Mon Sep 17 00:00:00 2001 From: Andrew Tavis McAllister Date: Thu, 21 Nov 2024 00:03:07 +0100 Subject: [PATCH 4/8] Minor comment edit and remove unneeded arg to xcodebuild in CI --- .github/workflows/pr_ci.yaml | 4 ++-- Scribe/AboutTab/AboutViewController.swift | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pr_ci.yaml b/.github/workflows/pr_ci.yaml index 337f0f0a..5d944b2a 100644 --- a/.github/workflows/pr_ci.yaml +++ b/.github/workflows/pr_ci.yaml @@ -26,8 +26,8 @@ jobs: ${{ runner.os }}-xcode- - name: Build run: | - xcodebuild -scheme Scribe -destination 'platform=iOS Simulator,name=iPhone 16,OS=latest' -allowProvisioningUpdates clean build + xcodebuild -scheme Scribe -destination 'platform=iOS Simulator,name=iPhone 16,OS=latest' clean build - name: Test run: | - xcodebuild -scheme Scribe -destination 'platform=iOS Simulator,name=iPhone 16,OS=latest' -allowProvisioningUpdates test + xcodebuild -scheme Scribe -destination 'platform=iOS Simulator,name=iPhone 16,OS=latest' test diff --git a/Scribe/AboutTab/AboutViewController.swift b/Scribe/AboutTab/AboutViewController.swift index 164d58f7..4a41765d 100644 --- a/Scribe/AboutTab/AboutViewController.swift +++ b/Scribe/AboutTab/AboutViewController.swift @@ -178,7 +178,7 @@ extension AboutViewController { present(mailComposeViewController, animated: true, completion: nil) } else { - /// Show alert mentioning the email address + // Show alert mentioning the email address. let alert = UIAlertController( title: "Send us an email?", message: "Reach out to us at team@scri.be", preferredStyle: .alert ) @@ -241,12 +241,12 @@ extension AboutViewController { let currentOffset = scrollView.contentOffset.y if currentOffset > tableViewOffset { - // Scrolling up + // Scrolling up. UIView.animate(withDuration: 0.2) { hostingController.view.alpha = 0 } } else if currentOffset == tableViewOffset { - // Show the view only when scrolled to the top + // Show the view only when scrolled to the top. UIView.animate(withDuration: 0.1) { hostingController.view.alpha = 1 } From a782f7d7af5c694e64582b307134f23ddc0df2de Mon Sep 17 00:00:00 2001 From: henrikth93 Date: Sat, 23 Nov 2024 16:24:37 +0100 Subject: [PATCH 5/8] Change height in the storyboard This commit will change the height in the storyboard for the AppScreen, related to the settings view. --- Scribe/Base.lproj/AppScreen.storyboard | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Scribe/Base.lproj/AppScreen.storyboard b/Scribe/Base.lproj/AppScreen.storyboard index 0f14ca26..a8cfd0b6 100644 --- a/Scribe/Base.lproj/AppScreen.storyboard +++ b/Scribe/Base.lproj/AppScreen.storyboard @@ -130,7 +130,7 @@ - + - + - + - + Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda. @@ -160,7 +160,7 @@ - + @@ -241,7 +241,7 @@ - + @@ -274,7 +274,7 @@ - + From 85ac3ee5667979d3c18879ff2a8bcb2cdb7c1648 Mon Sep 17 00:00:00 2001 From: Andrew Tavis McAllister Date: Sat, 23 Nov 2024 23:28:39 +0100 Subject: [PATCH 6/8] Revert "Change height in the storyboard" This reverts commit a782f7d7af5c694e64582b307134f23ddc0df2de. --- Scribe/Base.lproj/AppScreen.storyboard | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Scribe/Base.lproj/AppScreen.storyboard b/Scribe/Base.lproj/AppScreen.storyboard index a8cfd0b6..0f14ca26 100644 --- a/Scribe/Base.lproj/AppScreen.storyboard +++ b/Scribe/Base.lproj/AppScreen.storyboard @@ -130,7 +130,7 @@ - + - + - + - + Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda. @@ -160,7 +160,7 @@ - + @@ -241,7 +241,7 @@ - + @@ -274,7 +274,7 @@ - + From dbe04446ff6b68e738fc2ab22cf0a40dd39a7ec3 Mon Sep 17 00:00:00 2001 From: Andrew Tavis McAllister Date: Sat, 23 Nov 2024 23:31:19 +0100 Subject: [PATCH 7/8] Remove added space from the top of Wikimedia and Scribe --- Scribe/AppTexts/WikimediaAndScribe.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Scribe/AppTexts/WikimediaAndScribe.swift b/Scribe/AppTexts/WikimediaAndScribe.swift index 62cc023d..6f897e00 100644 --- a/Scribe/AppTexts/WikimediaAndScribe.swift +++ b/Scribe/AppTexts/WikimediaAndScribe.swift @@ -22,7 +22,7 @@ import SwiftUI let wikimediaAndScribeTitle = NSLocalizedString("app.about.community.wikimedia", value: "Wikimedia and Scribe", comment: "") let wikimediaAndScribeCaption = NSLocalizedString("app.about.community.wikimedia.caption", value: "How we work together", comment: "") -let wikimediaAndScribeText1 = "\n" + NSLocalizedString("app.about.community.wikimedia.text_1", value: "Scribe would not be possible without countless contributions by Wikimedia contributors to the many projects that they support. Specifically Scribe makes use of data from the Wikidata Lexicographical data community, as well as data from Wikipedia for each language that Scribe supports.", comment: "") + "\n\n" +let wikimediaAndScribeText1 = NSLocalizedString("app.about.community.wikimedia.text_1", value: "Scribe would not be possible without countless contributions by Wikimedia contributors to the many projects that they support. Specifically Scribe makes use of data from the Wikidata Lexicographical data community, as well as data from Wikipedia for each language that Scribe supports.", comment: "") + "\n\n" let wikimediaAndScribeText2 = "\n\n" + NSLocalizedString("app.about.community.wikimedia.text_2", value: "Wikidata is a collaboratively edited multilingual knowledge graph hosted by the Wikimedia Foundation. It provides freely available data that anyone can use under a Creative Commons Public Domain license (CC0). Scribe uses language data from Wikidata to provide users with verb conjugations, noun-form annotations, noun plurals, and many other features.", comment: "") + "\n\n" let wikimediaAndScribeText3 = "\n\n" + NSLocalizedString("app.about.community.wikimedia.text_3", value: "Wikipedia is a multilingual free online encyclopedia written and maintained by a community of volunteers through open collaboration and a wiki-based editing system. Scribe uses data from Wikipedia to produce autosuggestions by deriving the most common words in a language as well as the most common words that follow them.", comment: "") + "\n" From 211a1448b76d89ee5a9e114ead6e6dd9f3048867 Mon Sep 17 00:00:00 2001 From: Andrew Tavis McAllister Date: Sat, 23 Nov 2024 23:41:17 +0100 Subject: [PATCH 8/8] Revert CI build destination to iPhone 15 as 16 isn't available --- .github/workflows/pr_ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr_ci.yaml b/.github/workflows/pr_ci.yaml index 5d944b2a..4e036248 100644 --- a/.github/workflows/pr_ci.yaml +++ b/.github/workflows/pr_ci.yaml @@ -26,8 +26,8 @@ jobs: ${{ runner.os }}-xcode- - name: Build run: | - xcodebuild -scheme Scribe -destination 'platform=iOS Simulator,name=iPhone 16,OS=latest' clean build + xcodebuild -scheme Scribe -destination 'platform=iOS Simulator,name=iPhone 15,OS=latest' clean build - name: Test run: | - xcodebuild -scheme Scribe -destination 'platform=iOS Simulator,name=iPhone 16,OS=latest' test + xcodebuild -scheme Scribe -destination 'platform=iOS Simulator,name=iPhone 15,OS=latest' test