From ecb1b83a8e8c633c43e5b2891be20bf8bf85e6a0 Mon Sep 17 00:00:00 2001 From: Ryan ZHAO <> Date: Fri, 31 May 2024 16:08:02 +1000 Subject: [PATCH] upgrade to minimum iOS 15.0 support --- Session.xcodeproj/project.pbxproj | 52 +++++------ Session/Closed Groups/NewClosedGroupVC.swift | 5 +- .../SwiftUI/LinkPreviewView_SwiftUI.swift | 6 +- .../SwiftUI/QuoteView_SwiftUI.swift | 6 +- Session/Home/HomeVC.swift | 7 +- .../New Conversation/NewMessageScreen.swift | 15 +--- .../DocumentTitleViewController.swift | 7 +- .../ImagePickerController.swift | 12 +-- .../Transitions/MediaInteractiveDismiss.swift | 2 +- Session/Meta/AppEnvironment.swift | 12 +-- Session/Meta/Translations/InfoPlist.xcstrings | 2 +- Session/Onboarding/DisplayNameScreen.swift | 6 +- Session/Onboarding/LandingScreen.swift | 6 +- Session/Onboarding/LoadAccountScreen.swift | 7 +- Session/Onboarding/LoadingScreen.swift | 6 +- Session/Onboarding/PNModeScreen.swift | 6 +- .../Shared/SessionCarouselView+SwiftUI.swift | 6 +- .../Shared/SessionTableViewController.swift | 7 +- Session/Utilities/Permissions.swift | 45 ++++------ .../SwiftUI/CompatibleScrollingVStack.swift | 6 +- .../Components/SwiftUI/SessionTextField.swift | 15 +--- SessionUIKit/Style Guide/ThemeManager.swift | 90 +++++++------------ .../Utilities/SwiftUI+Utilities.swift | 10 --- 23 files changed, 105 insertions(+), 231 deletions(-) diff --git a/Session.xcodeproj/project.pbxproj b/Session.xcodeproj/project.pbxproj index aedf60483..4f8457c37 100644 --- a/Session.xcodeproj/project.pbxproj +++ b/Session.xcodeproj/project.pbxproj @@ -6887,7 +6887,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; INFOPLIST_FILE = SessionShareExtension/Meta/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -6962,7 +6962,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = SessionShareExtension/Meta/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -7019,7 +7019,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; INFOPLIST_FILE = SessionNotificationServiceExtension/Meta/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -7096,7 +7096,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = SessionNotificationServiceExtension/Meta/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -7151,7 +7151,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; INFOPLIST_FILE = SessionUIKit/Meta/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -7231,7 +7231,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = SessionUIKit/Meta/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -7299,7 +7299,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; INFOPLIST_FILE = SignalUtilitiesKit/Meta/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -7387,7 +7387,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = SignalUtilitiesKit/Meta/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -7460,7 +7460,7 @@ ); INFOPLIST_FILE = SessionSnodeKit/Meta/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -7561,7 +7561,7 @@ ); INFOPLIST_FILE = SessionSnodeKit/Meta/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -7647,7 +7647,7 @@ ); INFOPLIST_FILE = SessionUtilitiesKit/Meta/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -7753,7 +7753,7 @@ ); INFOPLIST_FILE = SessionUtilitiesKit/Meta/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -7839,7 +7839,7 @@ ); INFOPLIST_FILE = SessionMessagingKit/Meta/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -7944,7 +7944,7 @@ ); INFOPLIST_FILE = SessionMessagingKit/Meta/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -8174,7 +8174,7 @@ "\"$(SRCROOT)/Libraries\"/**", ); INFOPLIST_FILE = "Session/Meta/Session-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -8244,7 +8244,7 @@ "\"$(SRCROOT)/Libraries\"/**", ); INFOPLIST_FILE = "Session/Meta/Session-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -8295,7 +8295,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS $(inherited) -D SQLITE_HAS_CODEC -D GRDBCIPHER -D SQLITE_ENABLE_FTS5 -Xfrontend -warn-long-expression-type-checking=100"; @@ -8358,7 +8358,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = io.oxen.SessionTests; @@ -8401,7 +8401,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; @@ -8464,7 +8464,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; @@ -8505,7 +8505,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS $(inherited) -D SQLITE_HAS_CODEC -D GRDBCIPHER -D SQLITE_ENABLE_FTS5 -Xfrontend -warn-long-expression-type-checking=100"; @@ -8567,7 +8567,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = io.oxen.SessionUtilitiesKitTests; @@ -8607,7 +8607,7 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MODULEMAP_FILE = "$(SRCROOT)/SessionMessagingKit/Meta/SessionUtil.modulemap"; MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++20"; @@ -8670,7 +8670,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; MODULEMAP_FILE = "$(SRCROOT)/SessionMessagingKit/Meta/SessionUtil.modulemap"; MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++20"; @@ -8714,7 +8714,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS $(inherited) -D SQLITE_HAS_CODEC -D GRDBCIPHER -D SQLITE_ENABLE_FTS5 -Xfrontend -warn-long-expression-type-checking=100"; @@ -8776,7 +8776,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = io.oxen.SessionMessagingKitTests; diff --git a/Session/Closed Groups/NewClosedGroupVC.swift b/Session/Closed Groups/NewClosedGroupVC.swift index 205365b65..4df2c4c81 100644 --- a/Session/Closed Groups/NewClosedGroupVC.swift +++ b/Session/Closed Groups/NewClosedGroupVC.swift @@ -110,10 +110,7 @@ final class NewClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegate result.touchDelegate = self result.dataSource = self result.delegate = self - - if #available(iOS 15.0, *) { - result.sectionHeaderTopPadding = 0 - } + result.sectionHeaderTopPadding = 0 return result }() diff --git a/Session/Conversations/Message Cells/Content Views/SwiftUI/LinkPreviewView_SwiftUI.swift b/Session/Conversations/Message Cells/Content Views/SwiftUI/LinkPreviewView_SwiftUI.swift index 49bed992d..99b67d10d 100644 --- a/Session/Conversations/Message Cells/Content Views/SwiftUI/LinkPreviewView_SwiftUI.swift +++ b/Session/Conversations/Message Cells/Content Views/SwiftUI/LinkPreviewView_SwiftUI.swift @@ -39,11 +39,7 @@ public struct LinkPreviewView_SwiftUI: View { alignment: .leading ) { if state is LinkPreview.SentState { - if #available(iOS 14.0, *) { - ThemeManager.currentTheme.colorSwiftUI(for: .messageBubble_overlay).ignoresSafeArea() - } else { - ThemeManager.currentTheme.colorSwiftUI(for: .messageBubble_overlay) - } + ThemeManager.currentTheme.colorSwiftUI(for: .messageBubble_overlay).ignoresSafeArea() } HStack( diff --git a/Session/Conversations/Message Cells/Content Views/SwiftUI/QuoteView_SwiftUI.swift b/Session/Conversations/Message Cells/Content Views/SwiftUI/QuoteView_SwiftUI.swift index ef056b846..4b1e2754b 100644 --- a/Session/Conversations/Message Cells/Content Views/SwiftUI/QuoteView_SwiftUI.swift +++ b/Session/Conversations/Message Cells/Content Views/SwiftUI/QuoteView_SwiftUI.swift @@ -208,11 +208,7 @@ struct QuoteView_SwiftUI: View { struct QuoteView_SwiftUI_Previews: PreviewProvider { static var previews: some View { ZStack { - if #available(iOS 14.0, *) { - ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary).ignoresSafeArea() - } else { - ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary) - } + ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary).ignoresSafeArea() QuoteView_SwiftUI( info: QuoteView_SwiftUI.Info( diff --git a/Session/Home/HomeVC.swift b/Session/Home/HomeVC.swift index bc05a5958..7d8a39b54 100644 --- a/Session/Home/HomeVC.swift +++ b/Session/Home/HomeVC.swift @@ -91,11 +91,8 @@ final class HomeVC: BaseVC, LibSessionRespondingViewController, UITableViewDataS result.register(view: FullConversationCell.self) result.dataSource = self result.delegate = self - - if #available(iOS 15.0, *) { - result.sectionHeaderTopPadding = 0 - } - + result.sectionHeaderTopPadding = 0 + return result }() diff --git a/Session/Home/New Conversation/NewMessageScreen.swift b/Session/Home/New Conversation/NewMessageScreen.swift index 7b5ec60ef..d9a008458 100644 --- a/Session/Home/New Conversation/NewMessageScreen.swift +++ b/Session/Home/New Conversation/NewMessageScreen.swift @@ -152,17 +152,10 @@ struct EnterAccountIdScreen: View { ) ) { ZStack { - if #available(iOS 14.0, *) { - Text("\("messageNewDescription".localized())\(Image(systemName: "questionmark.circle"))") - .font(.system(size: Values.verySmallFontSize)) - .foregroundColor(themeColor: .textSecondary) - .multilineTextAlignment(.center) - } else { - Text("messageNewDescription".localized()) - .font(.system(size: Values.verySmallFontSize)) - .foregroundColor(themeColor: .textSecondary) - .multilineTextAlignment(.center) - } + Text("\("messageNewDescription".localized())\(Image(systemName: "questionmark.circle"))") + .font(.system(size: Values.verySmallFontSize)) + .foregroundColor(themeColor: .textSecondary) + .multilineTextAlignment(.center) } .accessibility( Accessibility( diff --git a/Session/Media Viewing & Editing/DocumentTitleViewController.swift b/Session/Media Viewing & Editing/DocumentTitleViewController.swift index c79f404e1..fcd94e93e 100644 --- a/Session/Media Viewing & Editing/DocumentTitleViewController.swift +++ b/Session/Media Viewing & Editing/DocumentTitleViewController.swift @@ -64,11 +64,8 @@ public class DocumentTileViewController: UIViewController, UITableViewDelegate, result.dataSource = self // Feels a bit weird to have content smashed all the way to the bottom edge. result.contentInset = UIEdgeInsets(top: 0, left: 0, bottom: 20, right: 0) - - if #available(iOS 15.0, *) { - result.sectionHeaderTopPadding = 0 - } - + result.sectionHeaderTopPadding = 0 + return result }() diff --git a/Session/Media Viewing & Editing/ImagePickerController.swift b/Session/Media Viewing & Editing/ImagePickerController.swift index 96fdce4fa..ea1ea3cbc 100644 --- a/Session/Media Viewing & Editing/ImagePickerController.swift +++ b/Session/Media Viewing & Editing/ImagePickerController.swift @@ -91,18 +91,14 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat self.selectionPanGesture = selectionPanGesture collectionView.addGestureRecognizer(selectionPanGesture) - if #available(iOS 14, *) { - if PHPhotoLibrary.authorizationStatus(for: .readWrite) == .limited { - let addSeletedPhotoButton = UIBarButtonItem.init(barButtonSystemItem: .add, target: self, action: #selector(addSelectedPhoto)) - self.navigationItem.rightBarButtonItem = addSeletedPhotoButton - } + if PHPhotoLibrary.authorizationStatus(for: .readWrite) == .limited { + let addSeletedPhotoButton = UIBarButtonItem.init(barButtonSystemItem: .add, target: self, action: #selector(addSelectedPhoto)) + self.navigationItem.rightBarButtonItem = addSeletedPhotoButton } } @objc func addSelectedPhoto(_ sender: Any) { - if #available(iOS 14, *) { - PHPhotoLibrary.shared().presentLimitedLibraryPicker(from: self) - } + PHPhotoLibrary.shared().presentLimitedLibraryPicker(from: self) } var selectionPanGesture: UIPanGestureRecognizer? diff --git a/Session/Media Viewing & Editing/Transitions/MediaInteractiveDismiss.swift b/Session/Media Viewing & Editing/Transitions/MediaInteractiveDismiss.swift index ad1cb6fcd..44841c2ab 100644 --- a/Session/Media Viewing & Editing/Transitions/MediaInteractiveDismiss.swift +++ b/Session/Media Viewing & Editing/Transitions/MediaInteractiveDismiss.swift @@ -34,7 +34,7 @@ class MediaInteractiveDismiss: UIPercentDrivenInteractiveTransition { let gesture: DirectionalPanGestureRecognizer = DirectionalPanGestureRecognizer(direction: .vertical, target: self, action: #selector(handleGesture(_:))) // Allow panning with trackpad - if #available(iOS 13.4, *) { gesture.allowedScrollTypesMask = .continuous } + gesture.allowedScrollTypesMask = .continuous view.addGestureRecognizer(gesture) } diff --git a/Session/Meta/AppEnvironment.swift b/Session/Meta/AppEnvironment.swift index c021c5a54..f824956d0 100644 --- a/Session/Meta/AppEnvironment.swift +++ b/Session/Meta/AppEnvironment.swift @@ -104,8 +104,7 @@ public class AppEnvironment { defer { fileHandle.closeFile() } // Move to the end of the file to insert the logs - if #available(iOS 13.4, *) { try fileHandle.seekToEnd() } - else { fileHandle.seekToEndOfFile() } + try fileHandle.seekToEnd() try extensionLogs .grouped(by: \.type) @@ -126,14 +125,12 @@ public class AppEnvironment { // Write the type start separator if needed if !hasWrittenStartLog { - if #available(iOS 13.4, *) { try fileHandle.write(contentsOf: typeNameStartData) } - else { fileHandle.write(typeNameStartData) } + try fileHandle.write(contentsOf: typeNameStartData) hasWrittenStartLog = true } // Write the log data to the log file - if #available(iOS 13.4, *) { try fileHandle.write(contentsOf: logData) } - else { fileHandle.write(logData) } + try fileHandle.write(contentsOf: logData) // Extension logs have been writen to the app logs, remove them now try? FileManager.default.removeItem(atPath: path) @@ -141,8 +138,7 @@ public class AppEnvironment { // Write the type end separator if needed if hasWrittenStartLog { - if #available(iOS 13.4, *) { try fileHandle.write(contentsOf: typeNameEndData) } - else { fileHandle.write(typeNameEndData) } + try fileHandle.write(contentsOf: typeNameEndData) } } } diff --git a/Session/Meta/Translations/InfoPlist.xcstrings b/Session/Meta/Translations/InfoPlist.xcstrings index 9abfaa7a8..3e1e8147b 100644 --- a/Session/Meta/Translations/InfoPlist.xcstrings +++ b/Session/Meta/Translations/InfoPlist.xcstrings @@ -1 +1 @@ -{"strings":{"NSFaceIDUsageDescription":{"extractionState":"manual","localizations":{"th":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}},"sv-SE":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"id":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"ar":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"lt":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}},"hr":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}},"bg":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}},"ku":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"el":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}},"vi":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"ro":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"bn":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"en":{"stringUnit":{"state":"translated","value":"Session's Screen Lock feature uses Face ID."}},"fr":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"be":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}},"fi":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"de":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}},"pt-PT":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}},"cs":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"si-LK":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"sk":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}},"ru":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}},"zh-CN":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}},"pt-BR":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}},"fa":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}},"ja":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"lv":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"es-ES":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"ne-NP":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}},"sl":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"hi":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"pl":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}},"it":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"ko":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"nl":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}},"no":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"tr":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}},"fil":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}},"hu":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"da":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"eo":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}},"zh-TW":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}},"uk":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}}}},"CFBundleGetInfoString":{"comment":"Get Info string","localizations":{"en":{"stringUnit":{"state":"new","value":""}}},"extractionState":"extracted_with_value"},"CFBundleName":{"comment":"Bundle name","localizations":{"en":{"stringUnit":{"state":"new","value":"Session"}}},"extractionState":"extracted_with_value"},"NSAppleMusicUsageDescription":{"localizations":{"hu":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"es-ES":{"stringUnit":{"value":"{app_name} needs to use Apple Music to play media attachments.","state":"translated"}},"ku":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"fr":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"vi":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"pl":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"pt-BR":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"no":{"stringUnit":{"value":"{app_name} needs to use Apple Music to play media attachments.","state":"translated"}},"si-LK":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"el":{"stringUnit":{"value":"{app_name} needs to use Apple Music to play media attachments.","state":"translated"}},"fil":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"fi":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"ja":{"stringUnit":{"value":"{app_name} needs to use Apple Music to play media attachments.","state":"translated"}},"be":{"stringUnit":{"value":"{app_name} needs to use Apple Music to play media attachments.","state":"translated"}},"zh-CN":{"stringUnit":{"value":"{app_name} needs to use Apple Music to play media attachments.","state":"translated"}},"hr":{"stringUnit":{"value":"{app_name} needs to use Apple Music to play media attachments.","state":"translated"}},"ne-NP":{"stringUnit":{"value":"{app_name} needs to use Apple Music to play media attachments.","state":"translated"}},"tr":{"stringUnit":{"value":"{app_name} needs to use Apple Music to play media attachments.","state":"translated"}},"eo":{"stringUnit":{"value":"{app_name} needs to use Apple Music to play media attachments.","state":"translated"}},"id":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"zh_CN":{"stringUnit":{"state":"translated","value":"Session需要Apple Music的访问权限用以播放媒体附件。"}},"sl":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"hi":{"stringUnit":{"value":"{app_name} needs to use Apple Music to play media attachments.","state":"translated"}},"fa":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"sv-SE":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"nl":{"stringUnit":{"value":"{app_name} needs to use Apple Music to play media attachments.","state":"translated"}},"zh-TW":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"da":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"lt":{"stringUnit":{"value":"{app_name} needs to use Apple Music to play media attachments.","state":"translated"}},"de":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"lv":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"cs":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"pt-PT":{"stringUnit":{"value":"{app_name} needs to use Apple Music to play media attachments.","state":"translated"}},"th":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"ru":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"ar":{"stringUnit":{"value":"{app_name} needs to use Apple Music to play media attachments.","state":"translated"}},"bg":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"bn":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"sk":{"stringUnit":{"value":"{app_name} needs to use Apple Music to play media attachments.","state":"translated"}},"en":{"stringUnit":{"state":"translated","value":"Session needs to use Apple Music to play media attachments."}},"it":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"ro":{"stringUnit":{"value":"{app_name} needs to use Apple Music to play media attachments.","state":"translated"}},"ko":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"uk":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}}},"extractionState":"manual"},"NSMicrophoneUsageDescription":{"extractionState":"manual","localizations":{"zh-TW":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"lt":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"ar":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"fa":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"ja":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"zh-CN":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"si-LK":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"ne-NP":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"cs":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"eo":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"pl":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"fr":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"lv":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"ko":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"vi":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"sk":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"pt-BR":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"en":{"stringUnit":{"state":"translated","value":"Session needs access to your microphone for calls and to send to audio messages."}},"tr":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"bg":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"th":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"sv-SE":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"id":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"fil":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"ru":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"bn":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"pt-PT":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"hr":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"sl":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"it":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"hi":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"ro":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"el":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"fi":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"uk":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"de":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"no":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"ku":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"da":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"hu":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"nl":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"be":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"es-ES":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}}}},"NSPhotoLibraryAddUsageDescription":{"extractionState":"manual","localizations":{"en":{"stringUnit":{"state":"translated","value":"Session needs access to your library to save photos."}},"hi":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"ku":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"eo":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"hr":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"lt":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"sk":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"no":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"fa":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"hu":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"fil":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"sl":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"ro":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"th":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"tr":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"zh-CN":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"el":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"it":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"ja":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"si-LK":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"fr":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"de":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"be":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"zh-TW":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"bg":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"da":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"sv-SE":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"ko":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"id":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"fi":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"pl":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"uk":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"pt-BR":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"nl":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"pt-PT":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"ne-NP":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"ru":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"lv":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"es-ES":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"bn":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"vi":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"cs":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"ar":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}}}},"NSPhotoLibraryUsageDescription":{"localizations":{"tr":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"pt-PT":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"pt-BR":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"ja":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"da":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"ro":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"eo":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"bn":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"no":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"be":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"fa":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"fr":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"en":{"stringUnit":{"state":"translated","value":"Session needs access to your library to update your avatar and send photos."}},"bg":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"fi":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"cs":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"vi":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"id":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"hr":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"el":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"ku":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"pl":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"ar":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"lt":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"de":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"sl":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"hu":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"es-ES":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"zh-TW":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"sv-SE":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"it":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"th":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"uk":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"lv":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"sk":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"ko":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"si-LK":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"ru":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"hi":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"fil":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"nl":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"zh-CN":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"ne-NP":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}}},"extractionState":"manual"},"NSCameraUsageDescription":{"localizations":{"hi":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}},"no":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}},"da":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"it":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"zh-TW":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}},"ko":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"sv-SE":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"en":{"stringUnit":{"state":"translated","value":"Session needs camera access to take pictures and scan QR codes."}},"ku":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}},"de":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"fr":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"vi":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"bg":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}},"th":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}},"pt-BR":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}},"fi":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"ne-NP":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"fa":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"ru":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}},"sl":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}},"cs":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}},"lt":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}},"hr":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"uk":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}},"tr":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"pl":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"zh-CN":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}},"fil":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}},"nl":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"sk":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"eo":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"ja":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"bn":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"be":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"ro":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}},"es-ES":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}},"si-LK":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}},"id":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}},"el":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"hu":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}},"ar":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}},"pt-PT":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"lv":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}}},"extractionState":"manual"},"New Message":{},"NSHumanReadableCopyright":{"comment":"Copyright (human-readable)","localizations":{"en":{"stringUnit":{"state":"new","value":"com.loki-project.loki-messenger"}}},"extractionState":"extracted_with_value"},"CFBundleDisplayName":{"comment":"Bundle display name","localizations":{"en":{"stringUnit":{"state":"new","value":"Session"}}},"extractionState":"extracted_with_value"}},"version":"1.0","sourceLanguage":"en"} \ No newline at end of file +{"sourceLanguage":"en","version":"1.0","strings":{"NSPhotoLibraryAddUsageDescription":{"extractionState":"manual","localizations":{"zh-CN":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"sv-SE":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"be":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"zh-TW":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"ar":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"no":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"de":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"el":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"sl":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"lv":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"es-ES":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"ko":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"pt-PT":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"tr":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"fil":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"pt-BR":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"th":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"ro":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"sk":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"si-LK":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"lt":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"hr":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"hi":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"da":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"en":{"stringUnit":{"state":"translated","value":"Session needs access to your library to save photos."}},"ne-NP":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"vi":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"ja":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"eo":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"it":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"id":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"nl":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"cs":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"bg":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"fi":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"ru":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"uk":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"hu":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"pl":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"ku":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to save attachments and media."}},"bn":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"fa":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}},"fr":{"stringUnit":{"value":"{app_name} needs storage access to save attachments and media.","state":"translated"}}}},"NSHumanReadableCopyright":{"comment":"Copyright (human-readable)","localizations":{"en":{"stringUnit":{"state":"new","value":"com.loki-project.loki-messenger"}}},"extractionState":"extracted_with_value"},"NSPhotoLibraryUsageDescription":{"extractionState":"manual","localizations":{"sv-SE":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"bg":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"fi":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"it":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"ru":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"ne-NP":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"fil":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"pt-BR":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"be":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"eo":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"bn":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"ar":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"cs":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"es-ES":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"hu":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"zh-TW":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"zh-CN":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"fa":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"th":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"en":{"stringUnit":{"state":"translated","value":"Session needs access to your library to update your avatar and send photos."}},"vi":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"nl":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"pt-PT":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"ko":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"tr":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"ro":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"sl":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"sk":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"lv":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"si-LK":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"ku":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"ja":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"el":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"de":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"no":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"fr":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"uk":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"id":{"stringUnit":{"state":"translated","value":"{app_name} needs storage access to send photos and videos."}},"pl":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"hr":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"lt":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"da":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}},"hi":{"stringUnit":{"value":"{app_name} needs storage access to send photos and videos.","state":"translated"}}}},"NSAppleMusicUsageDescription":{"extractionState":"manual","localizations":{"zh_CN":{"stringUnit":{"state":"translated","value":"Session需要Apple Music的访问权限用以播放媒体附件。"}},"zh-CN":{"stringUnit":{"value":"{app_name} needs to use Apple Music to play media attachments.","state":"translated"}},"ar":{"stringUnit":{"value":"{app_name} needs to use Apple Music to play media attachments.","state":"translated"}},"lv":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"pt-BR":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"uk":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"es-ES":{"stringUnit":{"value":"{app_name} needs to use Apple Music to play media attachments.","state":"translated"}},"vi":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"be":{"stringUnit":{"value":"{app_name} needs to use Apple Music to play media attachments.","state":"translated"}},"hu":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"it":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"ne-NP":{"stringUnit":{"value":"{app_name} needs to use Apple Music to play media attachments.","state":"translated"}},"pl":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"tr":{"stringUnit":{"value":"{app_name} needs to use Apple Music to play media attachments.","state":"translated"}},"ja":{"stringUnit":{"value":"{app_name} needs to use Apple Music to play media attachments.","state":"translated"}},"sv-SE":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"ku":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"hr":{"stringUnit":{"value":"{app_name} needs to use Apple Music to play media attachments.","state":"translated"}},"pt-PT":{"stringUnit":{"value":"{app_name} needs to use Apple Music to play media attachments.","state":"translated"}},"sk":{"stringUnit":{"value":"{app_name} needs to use Apple Music to play media attachments.","state":"translated"}},"zh-TW":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"eo":{"stringUnit":{"value":"{app_name} needs to use Apple Music to play media attachments.","state":"translated"}},"bg":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"ru":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"el":{"stringUnit":{"value":"{app_name} needs to use Apple Music to play media attachments.","state":"translated"}},"si-LK":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"ko":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"fa":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"sl":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"bn":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"en":{"stringUnit":{"state":"translated","value":"Session needs to use Apple Music to play media attachments."}},"nl":{"stringUnit":{"value":"{app_name} needs to use Apple Music to play media attachments.","state":"translated"}},"th":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"hi":{"stringUnit":{"value":"{app_name} needs to use Apple Music to play media attachments.","state":"translated"}},"de":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"lt":{"stringUnit":{"value":"{app_name} needs to use Apple Music to play media attachments.","state":"translated"}},"ro":{"stringUnit":{"value":"{app_name} needs to use Apple Music to play media attachments.","state":"translated"}},"fi":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"fil":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"fr":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"da":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"no":{"stringUnit":{"value":"{app_name} needs to use Apple Music to play media attachments.","state":"translated"}},"cs":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}},"id":{"stringUnit":{"state":"translated","value":"{app_name} needs to use Apple Music to play media attachments."}}}},"NSCameraUsageDescription":{"localizations":{"it":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"bn":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"ko":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"id":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}},"fi":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"es-ES":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}},"en":{"stringUnit":{"state":"translated","value":"Session needs camera access to take pictures and scan QR codes."}},"sk":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"fil":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}},"ro":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}},"da":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"fr":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"zh-TW":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}},"hu":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}},"sl":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}},"pl":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"lv":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"el":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"bg":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}},"vi":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"nl":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"cs":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}},"ku":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}},"be":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"pt-BR":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}},"ja":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"ar":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}},"si-LK":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}},"de":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"fa":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"hr":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"sv-SE":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"no":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}},"pt-PT":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"ru":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}},"lt":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}},"ne-NP":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"th":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}},"tr":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"uk":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}},"eo":{"stringUnit":{"state":"translated","value":"{app_name} needs camera access to take photos or videos."}},"hi":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}},"zh-CN":{"stringUnit":{"value":"{app_name} needs camera access to take photos or videos.","state":"translated"}}},"extractionState":"manual"},"CFBundleDisplayName":{"comment":"Bundle display name","localizations":{"en":{"stringUnit":{"state":"new","value":"Session"}}},"extractionState":"extracted_with_value"},"NSMicrophoneUsageDescription":{"localizations":{"lt":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"id":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"be":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"cs":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"it":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"sk":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"en":{"stringUnit":{"state":"translated","value":"Session needs access to your microphone for calls and to send to audio messages."}},"sv-SE":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"ne-NP":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"es-ES":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"pl":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"ru":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"ko":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"eo":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"vi":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"hi":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"hr":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"de":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"fi":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"fr":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"tr":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"pt-PT":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"nl":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"ja":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"pt-BR":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"sl":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"bn":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"fa":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"zh-TW":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"hu":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"fil":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"ar":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"el":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"bg":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"zh-CN":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"ro":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"th":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"lv":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"uk":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"si-LK":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"da":{"stringUnit":{"state":"translated","value":"{app_name} needs microphone access to make calls and record audio messages."}},"ku":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}},"no":{"stringUnit":{"value":"{app_name} needs microphone access to make calls and record audio messages.","state":"translated"}}},"extractionState":"manual"},"CFBundleGetInfoString":{"comment":"Get Info string","localizations":{"en":{"stringUnit":{"state":"new","value":""}}},"extractionState":"extracted_with_value"},"CFBundleName":{"comment":"Bundle name","localizations":{"en":{"stringUnit":{"state":"new","value":"Session"}}},"extractionState":"extracted_with_value"},"New Message":{},"NSFaceIDUsageDescription":{"localizations":{"ku":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"bg":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}},"nl":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}},"hu":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"ja":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"sk":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}},"lt":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}},"ro":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"sv-SE":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"fa":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}},"no":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"pl":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}},"tr":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}},"bn":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"uk":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"zh-TW":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}},"sl":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"el":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}},"it":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"ar":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"da":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"hi":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"id":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"th":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}},"fr":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"pt-PT":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}},"si-LK":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"ne-NP":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}},"hr":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}},"ko":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"eo":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}},"en":{"stringUnit":{"state":"translated","value":"Session's Screen Lock feature uses Face ID."}},"es-ES":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"de":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}},"vi":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"lv":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"cs":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"pt-BR":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}},"be":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}},"ru":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}},"fil":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}},"fi":{"stringUnit":{"state":"translated","value":"The screen lock feature on {app_name} uses Face ID."}},"zh-CN":{"stringUnit":{"value":"The screen lock feature on {app_name} uses Face ID.","state":"translated"}}},"extractionState":"manual"}}} \ No newline at end of file diff --git a/Session/Onboarding/DisplayNameScreen.swift b/Session/Onboarding/DisplayNameScreen.swift index 9c24019f6..81ff5dd07 100644 --- a/Session/Onboarding/DisplayNameScreen.swift +++ b/Session/Onboarding/DisplayNameScreen.swift @@ -19,11 +19,7 @@ struct DisplayNameScreen: View { var body: some View { ZStack(alignment: .center) { - if #available(iOS 14.0, *) { - ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary).ignoresSafeArea() - } else { - ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary) - } + ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary).ignoresSafeArea() VStack( alignment: .leading, diff --git a/Session/Onboarding/LandingScreen.swift b/Session/Onboarding/LandingScreen.swift index 96f2eebdc..0b24782b7 100644 --- a/Session/Onboarding/LandingScreen.swift +++ b/Session/Onboarding/LandingScreen.swift @@ -11,11 +11,7 @@ struct LandingScreen: View { var body: some View { ZStack(alignment: .center) { - if #available(iOS 14.0, *) { - ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary).ignoresSafeArea() - } else { - ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary) - } + ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary).ignoresSafeArea() VStack( alignment: .center, diff --git a/Session/Onboarding/LoadAccountScreen.swift b/Session/Onboarding/LoadAccountScreen.swift index bd296d31f..4e3159a78 100644 --- a/Session/Onboarding/LoadAccountScreen.swift +++ b/Session/Onboarding/LoadAccountScreen.swift @@ -16,11 +16,8 @@ struct LoadAccountScreen: View { var body: some View { ZStack(alignment: .topLeading) { - if #available(iOS 14.0, *) { - ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary).ignoresSafeArea() - } else { - ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary) - } + ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary).ignoresSafeArea() + VStack( spacing: 0 ){ diff --git a/Session/Onboarding/LoadingScreen.swift b/Session/Onboarding/LoadingScreen.swift index 0ca9e2d17..7b672ea2d 100644 --- a/Session/Onboarding/LoadingScreen.swift +++ b/Session/Onboarding/LoadingScreen.swift @@ -21,11 +21,7 @@ struct LoadingScreen: View { var body: some View { ZStack(alignment: .center) { - if #available(iOS 14.0, *) { - ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary).ignoresSafeArea() - } else { - ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary) - } + ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary).ignoresSafeArea() VStack( alignment: .center, diff --git a/Session/Onboarding/PNModeScreen.swift b/Session/Onboarding/PNModeScreen.swift index ccb90d5f5..f86c9c367 100644 --- a/Session/Onboarding/PNModeScreen.swift +++ b/Session/Onboarding/PNModeScreen.swift @@ -50,11 +50,7 @@ struct PNModeScreen: View { var body: some View { ZStack(alignment: .center) { - if #available(iOS 14.0, *) { - ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary).ignoresSafeArea() - } else { - ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary) - } + ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary).ignoresSafeArea() VStack( alignment: .leading, diff --git a/Session/Shared/SessionCarouselView+SwiftUI.swift b/Session/Shared/SessionCarouselView+SwiftUI.swift index 9afec4950..5d89ee6fe 100644 --- a/Session/Shared/SessionCarouselView+SwiftUI.swift +++ b/Session/Shared/SessionCarouselView+SwiftUI.swift @@ -202,11 +202,7 @@ struct SessionCarouselView_SwiftUI_Previews: PreviewProvider { @State static var index = 1 static var previews: some View { ZStack { - if #available(iOS 14.0, *) { - Color.black.ignoresSafeArea() - } else { - Color.black - } + Color.black.ignoresSafeArea() SessionCarouselView_SwiftUI( index: $index, diff --git a/Session/Shared/SessionTableViewController.swift b/Session/Shared/SessionTableViewController.swift index 319397a94..8f7c45159 100644 --- a/Session/Shared/SessionTableViewController.swift +++ b/Session/Shared/SessionTableViewController.swift @@ -46,11 +46,8 @@ class SessionTableViewController: BaseVC, UITableViewDataSource, UITa result.registerHeaderFooterView(view: SessionFooterView.self) result.dataSource = self result.delegate = self - - if #available(iOS 15.0, *) { - result.sectionHeaderTopPadding = 0 - } - + result.sectionHeaderTopPadding = 0 + return result }() diff --git a/Session/Utilities/Permissions.swift b/Session/Utilities/Permissions.swift index 983c29503..354658102 100644 --- a/Session/Utilities/Permissions.swift +++ b/Session/Utilities/Permissions.swift @@ -95,35 +95,22 @@ public enum Permissions { presentingViewController: UIViewController? = nil, onAuthorized: @escaping () -> Void ) { - let authorizationStatus: PHAuthorizationStatus - if #available(iOS 14, *) { - authorizationStatus = PHPhotoLibrary.authorizationStatus(for: .readWrite) - if authorizationStatus == .notDetermined { - // When the user chooses to select photos (which is the .limit status), - // the PHPhotoUI will present the picker view on the top of the front view. - // Since we have the ScreenLockUI showing when we request premissions, - // the picker view will be presented on the top of the ScreenLockUI. - // However, the ScreenLockUI will dismiss with the permission request alert view, so - // the picker view then will dismiss, too. The selection process cannot be finished - // this way. So we add a flag (isRequestingPermission) to prevent the ScreenLockUI - // from showing when we request the photo library permission. - SessionEnvironment.shared?.isRequestingPermission = true - - PHPhotoLibrary.requestAuthorization(for: .readWrite) { status in - SessionEnvironment.shared?.isRequestingPermission = false - if [ PHAuthorizationStatus.authorized, PHAuthorizationStatus.limited ].contains(status) { - onAuthorized() - } - } - } - } - else { - authorizationStatus = PHPhotoLibrary.authorizationStatus() - if authorizationStatus == .notDetermined { - PHPhotoLibrary.requestAuthorization { status in - if status == .authorized { - onAuthorized() - } + let authorizationStatus = PHPhotoLibrary.authorizationStatus(for: .readWrite) + if authorizationStatus == .notDetermined { + // When the user chooses to select photos (which is the .limit status), + // the PHPhotoUI will present the picker view on the top of the front view. + // Since we have the ScreenLockUI showing when we request premissions, + // the picker view will be presented on the top of the ScreenLockUI. + // However, the ScreenLockUI will dismiss with the permission request alert view, so + // the picker view then will dismiss, too. The selection process cannot be finished + // this way. So we add a flag (isRequestingPermission) to prevent the ScreenLockUI + // from showing when we request the photo library permission. + SessionEnvironment.shared?.isRequestingPermission = true + + PHPhotoLibrary.requestAuthorization(for: .readWrite) { status in + SessionEnvironment.shared?.isRequestingPermission = false + if [ PHAuthorizationStatus.authorized, PHAuthorizationStatus.limited ].contains(status) { + onAuthorized() } } } diff --git a/SessionUIKit/Components/SwiftUI/CompatibleScrollingVStack.swift b/SessionUIKit/Components/SwiftUI/CompatibleScrollingVStack.swift index 81660ce1e..8ddfbbd34 100644 --- a/SessionUIKit/Components/SwiftUI/CompatibleScrollingVStack.swift +++ b/SessionUIKit/Components/SwiftUI/CompatibleScrollingVStack.swift @@ -16,11 +16,7 @@ public struct CompatibleScrollingVStack : View where Content : View { public var body: some View { ScrollView { - if #available(iOS 14, *) { - LazyVStack(alignment: alignment, spacing: spacing, pinnedViews: [], content:content) - } else { - VStack(alignment: alignment, spacing: spacing, content:content) - } + LazyVStack(alignment: alignment, spacing: spacing, pinnedViews: [], content:content) } } } diff --git a/SessionUIKit/Components/SwiftUI/SessionTextField.swift b/SessionUIKit/Components/SwiftUI/SessionTextField.swift index 0a9356086..f727e03eb 100644 --- a/SessionUIKit/Components/SwiftUI/SessionTextField.swift +++ b/SessionUIKit/Components/SwiftUI/SessionTextField.swift @@ -66,7 +66,7 @@ public struct SessionTextField: View where ExplanationView: Vie .font(.system(size: Values.smallFontSize)) .foregroundColor(themeColor: textThemeColor) .accessibility(self.accessibility) - } else if #available(iOS 14.0, *) { + } else { ZStack { TextEditor( text: $text.onChange{ value in @@ -94,19 +94,6 @@ public struct SessionTextField: View where ExplanationView: Vie ) } .fixedSize(horizontal: false, vertical: true) - } else { - SwiftUI.TextField( - "", - text: $text.onChange{ value in - if error?.isEmpty == false && text != value { - previousError = error! - error = nil - } - } - ) - .font(.system(size: Values.smallFontSize)) - .foregroundColor(themeColor: textThemeColor) - .accessibility(self.accessibility) } } .padding(.horizontal, Values.largeSpacing) diff --git a/SessionUIKit/Style Guide/ThemeManager.swift b/SessionUIKit/Style Guide/ThemeManager.swift index 766d533ef..f3897753a 100644 --- a/SessionUIKit/Style Guide/ThemeManager.swift +++ b/SessionUIKit/Style Guide/ThemeManager.swift @@ -150,55 +150,35 @@ public enum ThemeManager { ThemeManager.mainWindow?.tintColor = textPrimary ThemeManager.mainWindow?.rootViewController?.setNeedsStatusBarAppearanceUpdate() - // Update the nav bars to use the right colours (we default to the 'primary' value) - UINavigationBar.appearance().barTintColor = ThemeManager.currentTheme.color(for: .backgroundPrimary) - UINavigationBar.appearance().isTranslucent = false - UINavigationBar.appearance().tintColor = textPrimary - UINavigationBar.appearance().shadowImage = ThemeManager.currentTheme.color(for: .backgroundPrimary)?.toImage() - UINavigationBar.appearance().titleTextAttributes = [ + let appearance = UINavigationBarAppearance() + appearance.configureWithOpaqueBackground() + appearance.backgroundColor = ThemeManager.currentTheme.color(for: .backgroundPrimary) + appearance.shadowImage = ThemeManager.currentTheme.color(for: .backgroundPrimary)?.toImage() + appearance.titleTextAttributes = [ NSAttributedString.Key.foregroundColor: textPrimary ] - UINavigationBar.appearance().largeTitleTextAttributes = [ + appearance.largeTitleTextAttributes = [ NSAttributedString.Key.foregroundColor: textPrimary ] - // Update the bar button item appearance - UIBarButtonItem.appearance().tintColor = textPrimary + // Apply the button item appearance as well + let barButtonItemAppearance = UIBarButtonItemAppearance(style: .plain) + barButtonItemAppearance.normal.titleTextAttributes = [ .foregroundColor: textPrimary ] + barButtonItemAppearance.disabled.titleTextAttributes = [ .foregroundColor: textPrimary ] + barButtonItemAppearance.highlighted.titleTextAttributes = [ .foregroundColor: textPrimary ] + barButtonItemAppearance.focused.titleTextAttributes = [ .foregroundColor: textPrimary ] + appearance.buttonAppearance = barButtonItemAppearance + appearance.backButtonAppearance = barButtonItemAppearance + appearance.doneButtonAppearance = barButtonItemAppearance + + UINavigationBar.appearance().standardAppearance = appearance + UINavigationBar.appearance().scrollEdgeAppearance = appearance // Update toolbars to use the right colours UIToolbar.appearance().barTintColor = ThemeManager.currentTheme.color(for: .backgroundPrimary) UIToolbar.appearance().isTranslucent = false UIToolbar.appearance().tintColor = textPrimary - // Note: Looks like there were changes to the appearance behaviour in iOS 15, unfortunately - // this breaks parts of the old 'UINavigationBar.appearance()' logic so we need to do everything - // again using the new API... - if #available(iOS 15.0, *) { - let appearance = UINavigationBarAppearance() - appearance.configureWithOpaqueBackground() - appearance.backgroundColor = ThemeManager.currentTheme.color(for: .backgroundPrimary) - appearance.shadowImage = ThemeManager.currentTheme.color(for: .backgroundPrimary)?.toImage() - appearance.titleTextAttributes = [ - NSAttributedString.Key.foregroundColor: textPrimary - ] - appearance.largeTitleTextAttributes = [ - NSAttributedString.Key.foregroundColor: textPrimary - ] - - // Apply the button item appearance as well - let barButtonItemAppearance = UIBarButtonItemAppearance(style: .plain) - barButtonItemAppearance.normal.titleTextAttributes = [ .foregroundColor: textPrimary ] - barButtonItemAppearance.disabled.titleTextAttributes = [ .foregroundColor: textPrimary ] - barButtonItemAppearance.highlighted.titleTextAttributes = [ .foregroundColor: textPrimary ] - barButtonItemAppearance.focused.titleTextAttributes = [ .foregroundColor: textPrimary ] - appearance.buttonAppearance = barButtonItemAppearance - appearance.backButtonAppearance = barButtonItemAppearance - appearance.doneButtonAppearance = barButtonItemAppearance - - UINavigationBar.appearance().standardAppearance = appearance - UINavigationBar.appearance().scrollEdgeAppearance = appearance - } - // Note: 'UINavigationBar.appearance' only affects newly created nav bars so we need // to force-update any current navigation bar (unfortunately the only way to do this // is to remove the nav controller from the view hierarchy and then re-add it) @@ -251,28 +231,20 @@ public enum ThemeManager { let navigationBackground: ThemeValue = (navController.viewControllers.first as? ThemedNavigation)?.navigationBackground else { return } - navController.navigationBar.barTintColor = ThemeManager.currentTheme.color(for: navigationBackground) - navController.navigationBar.shadowImage = ThemeManager.currentTheme.color(for: navigationBackground)?.toImage() + let textPrimary: UIColor = (ThemeManager.currentTheme.color(for: .textPrimary) ?? .white) + let appearance = UINavigationBarAppearance() + appearance.configureWithOpaqueBackground() + appearance.backgroundColor = ThemeManager.currentTheme.color(for: navigationBackground) + appearance.shadowImage = ThemeManager.currentTheme.color(for: navigationBackground)?.toImage() + appearance.titleTextAttributes = [ + NSAttributedString.Key.foregroundColor: textPrimary + ] + appearance.largeTitleTextAttributes = [ + NSAttributedString.Key.foregroundColor: textPrimary + ] - // Note: Looks like there were changes to the appearance behaviour in iOS 15, unfortunately - // this breaks parts of the old 'UINavigationBar.appearance()' logic so we need to do everything - // again using the new API... - if #available(iOS 15.0, *) { - let textPrimary: UIColor = (ThemeManager.currentTheme.color(for: .textPrimary) ?? .white) - let appearance = UINavigationBarAppearance() - appearance.configureWithOpaqueBackground() - appearance.backgroundColor = ThemeManager.currentTheme.color(for: navigationBackground) - appearance.shadowImage = ThemeManager.currentTheme.color(for: navigationBackground)?.toImage() - appearance.titleTextAttributes = [ - NSAttributedString.Key.foregroundColor: textPrimary - ] - appearance.largeTitleTextAttributes = [ - NSAttributedString.Key.foregroundColor: textPrimary - ] - - navController.navigationBar.standardAppearance = appearance - navController.navigationBar.scrollEdgeAppearance = appearance - } + navController.navigationBar.standardAppearance = appearance + navController.navigationBar.scrollEdgeAppearance = appearance } private static func retrieveNavigationController(from viewController: UIViewController) -> UINavigationController? { diff --git a/SessionUIKit/Utilities/SwiftUI+Utilities.swift b/SessionUIKit/Utilities/SwiftUI+Utilities.swift index 888a8bd9f..f9af0712a 100644 --- a/SessionUIKit/Utilities/SwiftUI+Utilities.swift +++ b/SessionUIKit/Utilities/SwiftUI+Utilities.swift @@ -177,16 +177,6 @@ extension View { } } - public func hideListRowSeparator() -> some View { - if #available(iOS 15.0, *) { - return listRowSeparator(.hidden) - } else { - return onAppear { - UITableView.appearance().separatorStyle = .none - } - } - } - public func accessibility(_ accessibility: Accessibility) -> some View { if #available(iOSApplicationExtension 14.0, *) { guard let identifier = accessibility.identifier else {