Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Install screen version update #448

Merged
merged 6 commits into from
Jun 1, 2024
Merged

Install screen version update #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c88deb4
Update to install screen
Jag-Marcel May 29, 2024
52ed677
Updated deployment target
Jag-Marcel May 29, 2024
44d73ed
Merge branch 'main' into version-update
Jag-Marcel May 31, 2024
231b3df
Specified colours in styling to ScribeColors
Jag-Marcel May 31, 2024
b302b7a
Finalized switch to iOS 15.0
Jag-Marcel May 31, 2024
9ebdd89
Removed deprecated attributes
Jag-Marcel May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions Keyboards/KeyboardsBase/KeyboardKeys.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,15 +130,12 @@ class KeyboardKey: UIButton {
&& !isSpecial
&& !["123", "´", spaceBar, languageTextForSpaceBar].contains(key)
&& shiftButtonState == .normal {
titleEdgeInsets = UIEdgeInsets(top: -4.0, left: 0.0, bottom: 0.0, right: 0.0)

if isLandscapeView {
titleLabel?.font = .systemFont(ofSize: letterKeyWidth / 2.4)
} else {
titleLabel?.font = .systemFont(ofSize: letterKeyWidth / 1.35)
}
} else {
titleEdgeInsets = UIEdgeInsets(top: 0.0, left: 0.0, bottom: 0.0, right: 0.0)
}
}

Expand Down Expand Up @@ -187,15 +184,12 @@ class KeyboardKey: UIButton {
&& !isSpecial
&& ![".?123", spaceBar, languageTextForSpaceBar, "ß", "´", ",", ".", "'", "-"].contains(key)
&& shiftButtonState == .normal {
titleEdgeInsets = UIEdgeInsets(top: -4.0, left: 0.0, bottom: 0.0, right: 0.0)

if isLandscapeView {
titleLabel?.font = .systemFont(ofSize: letterKeyWidth / 3.35)
} else {
titleLabel?.font = .systemFont(ofSize: letterKeyWidth / 2.75)
}
} else {
titleEdgeInsets = UIEdgeInsets(top: 0.0, left: 0.0, bottom: 0.0, right: 0.0)
}
}

Expand Down
26 changes: 7 additions & 19 deletions Keyboards/KeyboardsBase/KeyboardStyling.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,26 +30,14 @@ func styleBtn(btn: UIButton, title: String, radius: CGFloat) {
btn.layer.masksToBounds = false
btn.layer.cornerRadius = radius
btn.setTitle(title, for: .normal)
if #available(iOS 15.0, *) {
// Displays info button for missing data
if title == invalidCommandMsg {
btn.configuration = UIButton.Configuration.plain()
btn.configuration?.baseForegroundColor = UITraitCollection.current.userInterfaceStyle == .light ? specialKeyColor : keyColor
btn.configuration?.image = UIImage(systemName: "info.circle.fill")
btn.configuration?.imagePlacement = .trailing
btn.configuration?.imagePadding = 3
} else {
btn.configuration = nil
}
if title == invalidCommandMsg {
btn.configuration = UIButton.Configuration.plain()
btn.configuration?.baseForegroundColor = UITraitCollection.current.userInterfaceStyle == .light ? specialKeyColor : keyColor
btn.configuration?.image = UIImage(systemName: "info.circle.fill")
btn.configuration?.imagePlacement = .trailing
btn.configuration?.imagePadding = 3
} else {
if title == invalidCommandMsg {
btn.semanticContentAttribute = .forceLeftToRight // Has to be changed once support for RTL languages is implemented
btn.setImage(UIImage(systemName: "info.circle.fill"), for: .normal)
btn.tintColor = UITraitCollection.current.userInterfaceStyle == .light ? specialKeyColor : keyColor
} else {
btn.semanticContentAttribute = .unspecified
btn.setImage(nil, for: .normal)
}
btn.configuration = nil
}
btn.contentHorizontalAlignment = UIControl.ContentHorizontalAlignment.center
btn.setTitleColor(keyCharColor, for: .normal)
Expand Down
6 changes: 1 addition & 5 deletions Keyboards/KeyboardsBase/KeyboardViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,7 @@ class KeyboardViewController: UIInputViewController {
/// - btn: the button to be deactivated.
func deactivateBtn(btn: UIButton) {
btn.setTitle("", for: .normal)
if #available(iOS 15.0, *) {
btn.configuration?.image = nil
} else {
btn.setImage(nil, for: .normal)
}
btn.configuration?.image = nil
btn.backgroundColor = UIColor.clear
btn.removeTarget(self, action: #selector(executeKeyActions), for: .touchUpInside)
btn.removeTarget(self, action: #selector(keyTouchDown), for: .touchDown)
Expand Down
52 changes: 26 additions & 26 deletions Scribe.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2973,7 +2973,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
Expand Down Expand Up @@ -3032,7 +3032,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = iphoneos;
Expand All @@ -3053,7 +3053,7 @@
DEVELOPMENT_TEAM = ATJ9U3WZ27;
INFOPLIST_FILE = "$(SRCROOT)/Scribe/Info.plist";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -3081,7 +3081,7 @@
DEVELOPMENT_TEAM = ATJ9U3WZ27;
INFOPLIST_FILE = "$(SRCROOT)/Scribe/Info.plist";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -3108,7 +3108,7 @@
DEVELOPMENT_TEAM = CJJ59NJ7J8;
INFOPLIST_FILE = "$(SRCROOT)/Keyboards/LanguageKeyboards/German/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = "Deutsch (Scribe)";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -3134,7 +3134,7 @@
DEVELOPMENT_TEAM = CJJ59NJ7J8;
INFOPLIST_FILE = "$(SRCROOT)/Keyboards/LanguageKeyboards/German/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = "Deutsch (Scribe)";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -3160,7 +3160,7 @@
DEVELOPMENT_TEAM = ATJ9U3WZ27;
INFOPLIST_FILE = "$(SRCROOT)/Keyboards/LanguageKeyboards/French/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = "Français (Scribe)";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -3186,7 +3186,7 @@
DEVELOPMENT_TEAM = ATJ9U3WZ27;
INFOPLIST_FILE = "$(SRCROOT)/Keyboards/LanguageKeyboards/French/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = "Français (Scribe)";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -3211,7 +3211,7 @@
DEVELOPMENT_TEAM = ATJ9U3WZ27;
INFOPLIST_FILE = "$(SRCROOT)/Keyboards/LanguageKeyboards/Portuguese/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = "Português (Scribe)";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -3237,7 +3237,7 @@
DEVELOPMENT_TEAM = ATJ9U3WZ27;
INFOPLIST_FILE = "$(SRCROOT)/Keyboards/LanguageKeyboards/Portuguese/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = "Português (Scribe)";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -3263,7 +3263,7 @@
DEVELOPMENT_TEAM = ATJ9U3WZ27;
INFOPLIST_FILE = "$(SRCROOT)/Keyboards/LanguageKeyboards/Spanish/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = "Español (Scribe)";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -3289,7 +3289,7 @@
DEVELOPMENT_TEAM = ATJ9U3WZ27;
INFOPLIST_FILE = "$(SRCROOT)/Keyboards/LanguageKeyboards/Spanish/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = "Español (Scribe)";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -3315,7 +3315,7 @@
DEVELOPMENT_TEAM = ATJ9U3WZ27;
INFOPLIST_FILE = "$(SRCROOT)/Keyboards/LanguageKeyboards/Russian/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = "Русская (Scribe)";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -3341,7 +3341,7 @@
DEVELOPMENT_TEAM = ATJ9U3WZ27;
INFOPLIST_FILE = "$(SRCROOT)/Keyboards/LanguageKeyboards/Russian/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = "Русская (Scribe)";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -3367,7 +3367,7 @@
DEVELOPMENT_TEAM = ATJ9U3WZ27;
INFOPLIST_FILE = "$(SRCROOT)/Keyboards/LanguageKeyboards/Swedish/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = "Svenska (Scribe)";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -3393,7 +3393,7 @@
DEVELOPMENT_TEAM = ATJ9U3WZ27;
INFOPLIST_FILE = "$(SRCROOT)/Keyboards/LanguageKeyboards/Swedish/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = "Svenska (Scribe)";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -3418,7 +3418,7 @@
DEVELOPMENT_TEAM = ATJ9U3WZ27;
INFOPLIST_FILE = "$(SRCROOT)/Keyboards/LanguageKeyboards/Norwegian/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = "Norsk-Bokmål (Scribe)";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -3443,7 +3443,7 @@
DEVELOPMENT_TEAM = ATJ9U3WZ27;
INFOPLIST_FILE = "$(SRCROOT)/Keyboards/LanguageKeyboards/Norwegian/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = "Norsk-Bokmål (Scribe)";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -3468,7 +3468,7 @@
DEVELOPMENT_TEAM = ATJ9U3WZ27;
INFOPLIST_FILE = "$(SRCROOT)/Keyboards/LanguageKeyboards/English/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = "English (Scribe)";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -3493,7 +3493,7 @@
DEVELOPMENT_TEAM = ATJ9U3WZ27;
INFOPLIST_FILE = "$(SRCROOT)/Keyboards/LanguageKeyboards/English/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = "English (Scribe)";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -3518,7 +3518,7 @@
DEVELOPMENT_TEAM = ATJ9U3WZ27;
INFOPLIST_FILE = "$(SRCROOT)/Keyboards/LanguageKeyboards/Danish/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = "Dansk (Scribe)";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -3543,7 +3543,7 @@
DEVELOPMENT_TEAM = ATJ9U3WZ27;
INFOPLIST_FILE = "$(SRCROOT)/Keyboards/LanguageKeyboards/Danish/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = "Dansk (Scribe)";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -3568,7 +3568,7 @@
DEVELOPMENT_TEAM = ATJ9U3WZ27;
INFOPLIST_FILE = "$(SRCROOT)/Keyboards/LanguageKeyboards/Hebrew/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = "עִברִית (Scribe)";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -3593,7 +3593,7 @@
DEVELOPMENT_TEAM = ATJ9U3WZ27;
INFOPLIST_FILE = "$(SRCROOT)/Keyboards/LanguageKeyboards/Hebrew/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = "עִברִית (Scribe)";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -3619,7 +3619,7 @@
DEVELOPMENT_TEAM = ATJ9U3WZ27;
INFOPLIST_FILE = "$(SRCROOT)/Keyboards/LanguageKeyboards/Italian/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = "Italiano (Scribe)";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -3645,7 +3645,7 @@
DEVELOPMENT_TEAM = ATJ9U3WZ27;
INFOPLIST_FILE = "$(SRCROOT)/Keyboards/LanguageKeyboards/Italian/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = "Italiano (Scribe)";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down
13 changes: 2 additions & 11 deletions Scribe/AboutTab/AboutViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,17 +131,8 @@ extension AboutViewController {
}

private func showRateScribeUI() {
if #available(iOS 14.0, *) {
guard let scene = UIApplication.shared.foregroundActiveScene else { return }
SKStoreReviewController.requestReview(in: scene)
} else {
let alert = UIAlertController(
title: "Enjoying Scribe?", message: "Rate Scribe on the App Store.", preferredStyle: .alert
)
alert.addAction(UIAlertAction(title: "Continue", style: .default, handler: openScribeAppStore(alert:)))
alert.addAction(UIAlertAction(title: "Cancel", style: .cancel, handler: nil))
present(alert, animated: true)
}
guard let scene = UIApplication.shared.foregroundActiveScene else { return }
SKStoreReviewController.requestReview(in: scene)
}

private func openScribeAppStore(alert _: UIAlertAction) {
Expand Down
2 changes: 1 addition & 1 deletion Scribe/AppStyling.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import UIKit
/// - Parameters
/// - elem: the element to have shadows added to.
func applyShadowEffects(elem: AnyObject) {
elem.layer.shadowColor = UIColor(.keyShadow).light.cgColor
elem.layer.shadowColor = UIColor(ScribeColor.keyShadow).light.cgColor
elem.layer.shadowOffset = CGSize(width: 0.0, height: 3.0)
elem.layer.shadowOpacity = 1.0
elem.layer.shadowRadius = 3.0
Expand Down
4 changes: 2 additions & 2 deletions Scribe/AppTexts/AppTextStyling.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ func getArrowIcon(fontSize: CGFloat) -> NSAttributedString {
arrowAttachment.image = UIImage(
systemName: "arrow.turn.down.right",
withConfiguration: selectArrowIconConfig
)?.withTintColor(.init(.keyChar))
)?.withTintColor(.init(ScribeColor.keyChar))

return NSAttributedString(attachment: arrowAttachment)
}
Expand All @@ -107,7 +107,7 @@ func getGlobeIcon(fontSize: CGFloat) -> NSAttributedString {
globeAttachment.image = UIImage(
systemName: "globe",
withConfiguration: selectGlobeIconConfig
)?.withTintColor(.init(.keyChar))
)?.withTintColor(.init(ScribeColor.keyChar))

return NSAttributedString(attachment: globeAttachment)
}
Expand Down
Loading