renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'ios-release' into main

Browse Source
This commit is contained in:
Maurice Parker
2020-11-02 11:30:56 -06:00
parent e9989052e5 9621021b9c
commit ef1829618f
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
iOS/Account/FeedbinAccountViewController.swift
View File

@@ -82,7 +82,7 @@ class FeedbinAccountViewController: UITableViewController {
// When you fill in the email address via auto-complete it adds extra whitespace
let trimmedEmail = email.trimmingCharacters(in: .whitespaces)
guard !AccountManager.shared.duplicateServiceAccount(type: .feedbin, username: trimmedEmail) else {
guard account != nil || !AccountManager.shared.duplicateServiceAccount(type: .feedbin, username: trimmedEmail) else {
showError(NSLocalizedString("There is already a Feedbin account with that username created.", comment: "Duplicate Error"))
return
}

4
iOS/AppAssets.swift
View File

@@ -154,7 +154,7 @@ struct AppAssets {
}()
static var masterFolderImage: IconImage = {
return IconImage(UIImage(systemName: "folder.fill")!)
return IconImage(UIImage(systemName: "folder.fill")!, isSymbol: true)
}()
static var moreImage: UIImage = {
@@ -186,7 +186,7 @@ struct AppAssets {
}()
static var searchFeedImage: IconImage = {
return IconImage(UIImage(systemName: "magnifyingglass")!)
return IconImage(UIImage(systemName: "magnifyingglass")!, isSymbol: true)
}()
static var secondaryAccentColor: UIColor = {

4
iOS/IconView.swift
View File

@@ -52,7 +52,7 @@ final class IconView: UIView {
}
private var isSymbolImage: Bool {
return imageView.image?.isSymbolImage ?? false
return iconImage?.isSymbol ?? false
}
override init(frame: CGRect) {
@@ -75,7 +75,7 @@ final class IconView: UIView {
override func layoutSubviews() {
imageView.setFrameIfNotEqual(rectForImageView())
if (iconImage != nil && isVerticalBackgroundExposed && !isSymbolImage) || !isDisconcernable {
if !isSymbolImage && ((iconImage != nil && isVerticalBackgroundExposed) || !isDisconcernable) {
backgroundColor = AppAssets.iconBackgroundColor
} else {
backgroundColor = nil

6
iOS/SceneDelegate.swift
View File

@@ -114,11 +114,11 @@ private extension SceneDelegate {
DispatchQueue.main.async {
switch AppDefaults.userInterfaceColorPalette {
case .automatic:
self.window!.overrideUserInterfaceStyle = .unspecified
self.window?.overrideUserInterfaceStyle = .unspecified
case .light:
self.window!.overrideUserInterfaceStyle = .light
self.window?.overrideUserInterfaceStyle = .light
case .dark:
self.window!.overrideUserInterfaceStyle = .dark
self.window?.overrideUserInterfaceStyle = .dark
}
}
}

4
xcconfig/common/NetNewsWire_ios_target_common.xcconfig
View File

@@ -1,7 +1,7 @@
// High Level Settings common to both the iOS application and any extensions we bundle with it
MARKETING_VERSION = 5.0.4
CURRENT_PROJECT_VERSION = 53
MARKETING_VERSION = 5.0.5
CURRENT_PROJECT_VERSION = 56
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon