Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Keyboards/KeyboardsBase/InterfaceVariables.swift
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ let languagesAbbrDict = [
]

let languagesStringDict = [
"Danish": NSLocalizedString("app._global.danish", value: "Danish", comment: ""),
"English": NSLocalizedString("app._global.english", value: "English", comment: ""),
"French": NSLocalizedString("app._global.french", value: "French", comment: ""),
"German": NSLocalizedString("app._global.german", value: "German", comment: ""),
Expand Down
2 changes: 1 addition & 1 deletion Scribe/AboutTab/InformationScreenVC.swift
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class InformationScreenVC: UIViewController {
relativeView.backgroundColor = .clear

contentContainerView.backgroundColor = lightWhiteDarkBlackColor
applyCornerRadius(elem: contentContainerView, radius: contentContainerView.frame.width * 0.05)
applyCornerRadius(elem: contentContainerView, radius: 16)

contentContainerView.clipsToBounds = true

Expand Down
19 changes: 19 additions & 0 deletions Scribe/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,25 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
didFinishLaunchingWithOptions _: [UIApplication.LaunchOptionsKey: Any]?
) -> Bool {
// Override point for customization after application launch.

if #available(iOS 15.0, *) {
let appearance = UITabBarAppearance()
appearance.configureWithTransparentBackground()
appearance.backgroundEffect = UIBlurEffect(style: .systemChromeMaterial)
appearance.backgroundColor = .clear

let tabBarAppearance = UITabBar.appearance()
tabBarAppearance.standardAppearance = appearance
tabBarAppearance.scrollEdgeAppearance = appearance
} else {
let tabBarAppearance = UITabBar.appearance()
tabBarAppearance.backgroundImage = UIImage()
tabBarAppearance.shadowImage = UIImage()
tabBarAppearance.isTranslucent = true
tabBarAppearance.barTintColor = .clear
tabBarAppearance.backgroundColor = .clear
}

return true
}

Expand Down
4 changes: 2 additions & 2 deletions Scribe/Base.lproj/AppScreen.storyboard
Original file line number Diff line number Diff line change
Expand Up @@ -310,10 +310,10 @@
<scene sceneID="sLs-HO-3by">
<objects>
<tabBarController id="z4h-ME-igh" customClass="SwipeableTabBarController" customModule="SwipeableTabBarController" sceneMemberID="viewController">
<tabBar key="tabBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" translucent="NO" itemPositioning="fill" id="pcg-48-jfk">
<tabBar key="tabBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" translucent="YES" itemPositioning="fill" id="pcg-48-jfk">
<rect key="frame" x="0.0" y="0.0" width="393" height="49"/>
<autoresizingMask key="autoresizingMask"/>
<color key="backgroundColor" name="lightWhiteDarkBlack"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="selectedImageTintColor" name="linkBlue"/>
</tabBar>
<connections>
Expand Down
16 changes: 10 additions & 6 deletions Scribe/SettingsTab/SettingsTableData.swift
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,13 @@ enum SettingsTableData {
var sections = [Section]()

for lang in installedKeyboards {
guard let abbreviation = languagesAbbrDict[lang] else {
fatalError("Abbreviation not found for language: \(lang)")
guard let abbreviation = languagesAbbrDict[lang],
let title = languagesStringDict[lang] else {
continue
}

let newSection = Section(
sectionTitle: languagesStringDict[lang]!,
sectionTitle: title,
sectionState: .specificLang(abbreviation)
)

Expand All @@ -120,11 +122,13 @@ enum SettingsTableData {
var sections = [Section]()

for lang in languagesAbbrDict.keys.sorted() {
guard let abbreviation = languagesAbbrDict[lang] else {
fatalError("Abbreviation not found for language: \(lang)")
guard let abbreviation = languagesAbbrDict[lang],
let title = languagesStringDict[lang] else {
continue
}

let newSection = Section(
sectionTitle: languagesStringDict[lang]!,
sectionTitle: title,
sectionState: .specificLang(abbreviation)
)

Expand Down
4 changes: 2 additions & 2 deletions Scribe/SettingsTab/SettingsViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ final class SettingsViewController: UIViewController {
footerButton.layer.borderColor = scribeCTAColor.cgColor
}
footerButton.setTitleColor(lightTextDarkCTA, for: .normal)
footerFrame.layer.cornerRadius = footerFrame.frame.width * 0.025
footerButton.layer.cornerRadius = footerFrame.frame.width * 0.025
footerFrame.layer.cornerRadius = 16
footerButton.layer.cornerRadius = 16
footerButton.layer.shadowColor = UIColor(red: 0.247, green: 0.247, blue: 0.275, alpha: 0.25).cgColor
footerButton.layer.shadowOffset = CGSize(width: 0.0, height: 3.0)
footerButton.layer.shadowOpacity = 1.0
Expand Down
2 changes: 1 addition & 1 deletion Scribe/TipCard/TipCardView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ struct TipCardView: View {
private let buttonHeight = 70.0
private let multiplicityPadding = 0.5
private let leadingPadding = 40.0
private let cardCornerRadius: CGFloat = 10
private let cardCornerRadius: CGFloat = 16
var infoText: String
@Binding var tipCardState: Bool
var onDismiss: (() -> Void)?
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,13 @@ final class InfoChildTableViewCell: UITableViewCell {
}
}

override func layoutSubviews() {
super.layoutSubviews()

contentView.layer.cornerRadius = 16
contentView.layer.masksToBounds = true
}

@IBAction func switchDidChange(_: UISwitch) {
switch togglePurpose {
case .toggleCommaAndPeriod:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,11 @@ final class RadioTableViewCell: UITableViewCell {
titleLabel.text = section.sectionTitle
iconImageView.image = UIImage(named: "radioButton")
}

override func layoutSubviews() {
super.layoutSubviews()

contentView.layer.cornerRadius = 16
contentView.layer.masksToBounds = true
}
}
Loading