Skip to content

Commit

Permalink
Merge pull request #318 from DP-3T/release/1.1.1
Browse files Browse the repository at this point in the history
Release 1.1.1
  • Loading branch information
UBaggeler authored Oct 5, 2020
2 parents dfb66c2 + f29929e commit 7e91d98
Show file tree
Hide file tree
Showing 47 changed files with 981 additions and 155 deletions.
50 changes: 38 additions & 12 deletions DP3TApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,12 @@
F8A6BE2824C9C76F00DE6B44 /* NSExpandableDisclaimerViewBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8A6BE2624C9C76F00DE6B44 /* NSExpandableDisclaimerViewBody.swift */; };
F8A6BE2A24CAB95000DE6B44 /* NSInfoBoxVisibilityManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8A6BE2924CAB95000DE6B44 /* NSInfoBoxVisibilityManager.swift */; };
F8A6BE2B24CAC2C700DE6B44 /* NSInfoBoxVisibilityManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8A6BE2924CAB95000DE6B44 /* NSInfoBoxVisibilityManager.swift */; };
F8ABA2CD2525FAD700A8D6B5 /* NSTutorialViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8ABA2CC2525FAD700A8D6B5 /* NSTutorialViewController.swift */; };
F8ABA2D32525FC3600A8D6B5 /* NSSettingsTutorialViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8ABA2D22525FC3600A8D6B5 /* NSSettingsTutorialViewController.swift */; };
F8ABA2E52526087D00A8D6B5 /* NSTutorialListItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8ABA2E42526087D00A8D6B5 /* NSTutorialListItemView.swift */; };
F8ABA2E62526087D00A8D6B5 /* NSTutorialListItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8ABA2E42526087D00A8D6B5 /* NSTutorialListItemView.swift */; };
F8ABA2EB2526089700A8D6B5 /* NSSettingsTutorialViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8ABA2D22525FC3600A8D6B5 /* NSSettingsTutorialViewController.swift */; };
F8ABA2F02526089E00A8D6B5 /* NSTutorialViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8ABA2CC2525FAD700A8D6B5 /* NSTutorialViewController.swift */; };
F8B30B5924D2C728006FBBBE /* DebugStrings.strings in Resources */ = {isa = PBXBuildFile; fileRef = F8B30B5824D2C728006FBBBE /* DebugStrings.strings */; };
F8B30B5A24D2C728006FBBBE /* DebugStrings.strings in Resources */ = {isa = PBXBuildFile; fileRef = F8B30B5824D2C728006FBBBE /* DebugStrings.strings */; };
/* End PBXBuildFile section */
Expand Down Expand Up @@ -639,6 +645,9 @@
F8A6BE2324C9C74A00DE6B44 /* NSExpandableDisclaimerViewHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSExpandableDisclaimerViewHeader.swift; sourceTree = "<group>"; };
F8A6BE2624C9C76F00DE6B44 /* NSExpandableDisclaimerViewBody.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSExpandableDisclaimerViewBody.swift; sourceTree = "<group>"; };
F8A6BE2924CAB95000DE6B44 /* NSInfoBoxVisibilityManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSInfoBoxVisibilityManager.swift; sourceTree = "<group>"; };
F8ABA2CC2525FAD700A8D6B5 /* NSTutorialViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSTutorialViewController.swift; sourceTree = "<group>"; };
F8ABA2D22525FC3600A8D6B5 /* NSSettingsTutorialViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSSettingsTutorialViewController.swift; sourceTree = "<group>"; };
F8ABA2E42526087D00A8D6B5 /* NSTutorialListItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSTutorialListItemView.swift; sourceTree = "<group>"; };
F8ABFC712474337000D621FF /* Entitlements_Calibration.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Entitlements_Calibration.entitlements; sourceTree = "<group>"; };
F8B30B5824D2C728006FBBBE /* DebugStrings.strings */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; path = DebugStrings.strings; sourceTree = "<group>"; };
/* End PBXFileReference section */
Expand Down Expand Up @@ -1191,6 +1200,7 @@
DC286A27242CE1D2001D5344 /* Screens */ = {
isa = PBXGroup;
children = (
F80465142525F58900311802 /* Tutorials */,
24780AF9242DF828003BB26C /* Navigation */,
2443948024463B01003ED582 /* Homescreen */,
F80E405E2508D4C000876906 /* Statistics */,
Expand Down Expand Up @@ -1274,6 +1284,16 @@
path = Views;
sourceTree = "<group>";
};
F80465142525F58900311802 /* Tutorials */ = {
isa = PBXGroup;
children = (
F8ABA2CC2525FAD700A8D6B5 /* NSTutorialViewController.swift */,
F8ABA2D22525FC3600A8D6B5 /* NSSettingsTutorialViewController.swift */,
F8ABA2E42526087D00A8D6B5 /* NSTutorialListItemView.swift */,
);
path = Tutorials;
sourceTree = "<group>";
};
F80E405E2508D4C000876906 /* Statistics */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1732,6 +1752,7 @@
242D21F7245C4BD8005DAEA8 /* UIImage+UBHelpers.m in Sources */,
B67A11AE24B8CB1700B46306 /* NSImageView.swift in Sources */,
242D21F8245C4BD8005DAEA8 /* UIStateManager.swift in Sources */,
F8ABA2EB2526089700A8D6B5 /* NSSettingsTutorialViewController.swift in Sources */,
242D21F9245C4BD8005DAEA8 /* NSNavigationController.swift in Sources */,
242D21FA245C4BD8005DAEA8 /* PhoneCallHelper.swift in Sources */,
242D21FB245C4BD8005DAEA8 /* NSTracingErrorView.swift in Sources */,
Expand All @@ -1743,6 +1764,7 @@
242D21FF245C4BD8005DAEA8 /* AuthorizationModels.swift in Sources */,
242D2200245C4BD8005DAEA8 /* NSModuleHeaderView.swift in Sources */,
242D2201245C4BD8005DAEA8 /* NSModuleBaseView.swift in Sources */,
F8ABA2E62526087D00A8D6B5 /* NSTutorialListItemView.swift in Sources */,
F84089F12493A2EC00A66CD1 /* Keychain.swift in Sources */,
F851223E250A2676009BE733 /* NSChartLineView.swift in Sources */,
242D2202245C4BD8005DAEA8 /* NSOnboardingPermissionsViewController.swift in Sources */,
Expand All @@ -1756,6 +1778,7 @@
242D2207245C4BD8005DAEA8 /* Environment.swift in Sources */,
242D2208245C4BD8005DAEA8 /* ConfigLoadOperation.swift in Sources */,
242D2209245C4BD8005DAEA8 /* String+NS.swift in Sources */,
F8ABA2F02526089E00A8D6B5 /* NSTutorialViewController.swift in Sources */,
242D220A245C4BD8005DAEA8 /* UBUserDefaultValue.swift in Sources */,
246FD176249B568F00FD36F8 /* Environment+AppStore.swift in Sources */,
242D220B245C4BD8005DAEA8 /* NSWhatToDoPositiveTestViewController.swift in Sources */,
Expand Down Expand Up @@ -1923,11 +1946,13 @@
2462BA1724520A260046906D /* Environment+Endpoints.swift in Sources */,
DCA3FFBA245092D50003F5AD /* NSHeaderImageBackgroundView.swift in Sources */,
6E3F65FD2449F31D00980A4E /* NSDebugScreenSDKStatusView.swift in Sources */,
F8ABA2CD2525FAD700A8D6B5 /* NSTutorialViewController.swift in Sources */,
F8A6BE2A24CAB95000DE6B44 /* NSInfoBoxVisibilityManager.swift in Sources */,
F8A6BE2724C9C76F00DE6B44 /* NSExpandableDisclaimerViewBody.swift in Sources */,
6E33086A24506E0600913B0E /* NSExplanationView.swift in Sources */,
8EF2A6E52490E26F002263C3 /* NSLastSyncronizationControl.swift in Sources */,
6E6E5185242F9586006E532E /* NSCheckboxControl.swift in Sources */,
F8ABA2E52526087D00A8D6B5 /* NSTutorialListItemView.swift in Sources */,
6E7C0D45242E4AA90017C4F9 /* NSLoadingView.swift in Sources */,
F85ED9A32499EF93007EBC49 /* Bundle+BuildInfo.swift in Sources */,
6E6E5188242F9586006E532E /* NSSendViewController.swift in Sources */,
Expand Down Expand Up @@ -1981,6 +2006,7 @@
8EF2A6EF249124F8002263C3 /* NSSynchronizationTableViewSectionView.swift in Sources */,
F80E407725092AE100876906 /* NSChartColumnView.swift in Sources */,
24780B11242DFD2F003BB26C /* NSReportsModuleView.swift in Sources */,
F8ABA2D32525FC3600A8D6B5 /* NSSettingsTutorialViewController.swift in Sources */,
6E6E516F242F4FE0006E532E /* ConfigManager.swift in Sources */,
6E6E5184242F9586006E532E /* NSInformThankYouViewController.swift in Sources */,
6E33085F24502BBD00913B0E /* NSWhatToDoButton.swift in Sources */,
Expand Down Expand Up @@ -2116,7 +2142,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = "${PRIMARY_BUNDLE_IDENTIFIER}";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "dep-3t DEV Deveopment";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "RELEASE_ABNAHME ENABLE_TESTING ENABLE_VERBOSE ENABLE_LOGGING ENABLE_OS_LOG";
SWIFT_OBJC_BRIDGING_HEADER = "DP3TApp/Supporting Files/DP3TApp-Bridging-Header.h";
SWIFT_VERSION = 5.0;
Expand All @@ -2141,7 +2167,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = "${PRIMARY_BUNDLE_IDENTIFIER}";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "dep-3t DEV Deveopment";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "RELEASE_PROD ENABLE_TESTING ENABLE_LOGGING ENABLE_VERBOSE ENABLE_OS_LOG";
SWIFT_OBJC_BRIDGING_HEADER = "DP3TApp/Supporting Files/DP3TApp-Bridging-Header.h";
SWIFT_VERSION = 5.0;
Expand Down Expand Up @@ -2228,7 +2254,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = "${PRIMARY_BUNDLE_IDENTIFIER}";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "dep-3t DEV Deveopment";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "RELEASE_DEV ENABLE_TESTING ENABLE_SYNC_LOGGING ENABLE_STATUS_OVERRIDE ENABLE_OS_LOG";
SWIFT_OBJC_BRIDGING_HEADER = "DP3TApp/Supporting Files/DP3TApp-Bridging-Header.h";
SWIFT_VERSION = 5.0;
Expand All @@ -2253,7 +2279,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = "${PRIMARY_BUNDLE_IDENTIFIER}";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "dep-3t DEV Deveopment";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "RELEASE_ABNAHME ENABLE_TESTING ENABLE_LOGGING ENABLE_VERBOSE ENABLE_SYNC_LOGGING ENABLE_STATUS_OVERRIDE ENABLE_OS_LOG";
SWIFT_OBJC_BRIDGING_HEADER = "DP3TApp/Supporting Files/DP3TApp-Bridging-Header.h";
SWIFT_VERSION = 5.0;
Expand Down Expand Up @@ -2371,7 +2397,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = "${PRIMARY_BUNDLE_IDENTIFIER}";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "dep-3t DEV Deveopment";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "RELEASE_DEV ENABLE_TESTING ENABLE_SYNC_LOGGING ENABLE_OS_LOG";
SWIFT_OBJC_BRIDGING_HEADER = "DP3TApp/Supporting Files/DP3TApp-Bridging-Header.h";
SWIFT_VERSION = 5.0;
Expand All @@ -2396,7 +2422,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = "${PRIMARY_BUNDLE_IDENTIFIER}";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "dep-3t DEV Deveopment";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "RELEASE_ABNAHME TEST_ENTITLEMENT ENABLE_TESTING ENABLE_LOGGING ENABLE_VERBOSE ENABLE_SYNC_LOGGING ENABLE_OS_LOG";
SWIFT_OBJC_BRIDGING_HEADER = "DP3TApp/Supporting Files/DP3TApp-Bridging-Header.h";
SWIFT_VERSION = 5.0;
Expand Down Expand Up @@ -2514,7 +2540,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = "${PRIMARY_BUNDLE_IDENTIFIER}";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "dep-3t DEV Deveopment";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "RELEASE_ABNAHME ENABLE_TESTING ENABLE_OS_LOG";
SWIFT_OBJC_BRIDGING_HEADER = "DP3TApp/Supporting Files/DP3TApp-Bridging-Header.h";
SWIFT_VERSION = 5.0;
Expand Down Expand Up @@ -2745,7 +2771,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = "${PRIMARY_BUNDLE_IDENTIFIER}";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "dep-3t DEV Deveopment";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "DP3TApp/Supporting Files/DP3TApp-Bridging-Header.h";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 1;
Expand Down Expand Up @@ -2872,7 +2898,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = "${PRIMARY_BUNDLE_IDENTIFIER}";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "dep-3t DEV Deveopment";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "RELEASE_TEST ENABLE_TESTING ENABLE_SYNC_LOGGING ENABLE_OS_LOG";
SWIFT_OBJC_BRIDGING_HEADER = "DP3TApp/Supporting Files/DP3TApp-Bridging-Header.h";
SWIFT_VERSION = 5.0;
Expand All @@ -2897,7 +2923,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = "${PRIMARY_BUNDLE_IDENTIFIER}";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "dep-3t DEV Deveopment";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "RELEASE_ABNAHME ENABLE_TESTING ENABLE_LOGGING ENABLE_VERBOSE ENABLE_SYNC_LOGGING ENABLE_OS_LOG";
SWIFT_OBJC_BRIDGING_HEADER = "DP3TApp/Supporting Files/DP3TApp-Bridging-Header.h";
SWIFT_VERSION = 5.0;
Expand Down Expand Up @@ -3015,7 +3041,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = "${PRIMARY_BUNDLE_IDENTIFIER}";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "dep-3t DEV Deveopment";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "RELEASE_PROD ENABLE_SYNC_LOGGING ENABLE_TESTING ENABLE_OS_LOG";
SWIFT_OBJC_BRIDGING_HEADER = "DP3TApp/Supporting Files/DP3TApp-Bridging-Header.h";
SWIFT_VERSION = 5.0;
Expand All @@ -3040,7 +3066,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = "${PRIMARY_BUNDLE_IDENTIFIER}";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "dep-3t DEV Deveopment";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "RELEASE_PROD ENABLE_TESTING ENABLE_LOGGING ENABLE_VERBOSE ENABLE_OS_LOG ENABLE_INTERNATIONALIZATION";
SWIFT_OBJC_BRIDGING_HEADER = "DP3TApp/Supporting Files/DP3TApp-Bridging-Header.h";
SWIFT_VERSION = 5.0;
Expand Down
5 changes: 2 additions & 3 deletions DP3TApp/Logic/Statistics/StatisticsLoader.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,18 @@
* SPDX-License-Identifier: MPL-2.0
*/

import Foundation
import DP3TSDK
import Foundation

class StatisticsLoader {
private let session = URLSession.certificatePinned

private var dataTask: URLSessionDataTask?

public func get(completionHandler: @escaping (Result<StatisticsResponse, NetworkError>) -> Void) {

let request = Endpoint.statistics().request()

dataTask = session.dataTask(with: request) { (data, response, error) in
dataTask = session.dataTask(with: request) { data, response, error in

if let error = error {
Logger.log("Failed to load statistics, error: \(error.localizedDescription)")
Expand Down
2 changes: 1 addition & 1 deletion DP3TApp/Logic/Tracing/DatabaseSyncer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ class DatabaseSyncer {
// Certificate error
UIStateManager.shared.immediatelyShowSyncError = false
UIStateManager.shared.syncErrorIsNetworkError = true
case let .HTTPFailureResponse(status: status, data: _) where (502 ... 504).contains(status):
case let .HTTPFailureResponse(status: _, data: _):
// this means the backend is under maintanance
UIStateManager.shared.immediatelyShowSyncError = false
UIStateManager.shared.syncErrorIsNetworkError = true
Expand Down
18 changes: 16 additions & 2 deletions DP3TApp/Logic/Tracing/TracingLocalPush.swift
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ class TracingLocalPush: NSObject, LocalPushProtocol {
center.removeAllDeliveredNotifications()
}

var now: Date {
.init()
}

@KeychainPersisted(key: "exposureIdentifiers", defaultValue: [])
private var exposureIdentifiers: [String] {
didSet {
Expand All @@ -88,6 +92,7 @@ class TracingLocalPush: NSObject, LocalPushProtocol {
let content = UNMutableNotificationContent()
content.title = "push_exposed_title".ub_localized
content.body = "push_exposed_text".ub_localized
content.sound = .default

let request = UNNotificationRequest(identifier: identifier, content: content, trigger: nil)
center.add(request, withCompletionHandler: nil)
Expand Down Expand Up @@ -219,13 +224,22 @@ class TracingLocalPush: NSObject, LocalPushProtocol {
guard !scheduledErrorIdentifiers.contains(identifier) else {
return
}

// skip if hour is between 23:00 and 07:00 in order to not schedule notifications during the night
let calendar = Calendar.current
let components = calendar.dateComponents([.hour], from: now)
guard let hour = components.hour,
hour > 7,
hour < 23 else {
return
}

scheduledErrorIdentifiers.append(identifier)

let content = UNMutableNotificationContent()
content.title = title
content.body = text
content.sound = .default
// set the notification to trigger in 1 minute since the state could only be temporäry
// set the notification to trigger in 1 minute since the state could only be temporary
let trigger = UNTimeIntervalNotificationTrigger(timeInterval: 60, repeats: false)
let request = UNNotificationRequest(identifier: identifier.rawValue, content: content, trigger: trigger)
center.add(request, withCompletionHandler: nil)
Expand Down
6 changes: 6 additions & 0 deletions DP3TApp/Resources/Assets.xcassets/tutorial/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "ic-en.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "ic-switch.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 3 additions & 5 deletions DP3TApp/Screens/Navigation/NSTabBarController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class NSTabBarController: UITabBarController {
.map(viewControler(for:))

navigationItem.title = "app_name".ub_localized

// navigation bar
let image = UIImage(named: "ic-info-outline")
navigationItem.rightBarButtonItem = UIBarButtonItem(image: image, landscapeImagePhone: image, style: .plain, target: self, action: #selector(infoButtonPressed))
Expand Down Expand Up @@ -96,7 +96,7 @@ class NSTabBarController: UITabBarController {

private func setTabBarItemColors(_ itemAppearance: UITabBarItemAppearance) {
let normalAttributes = [NSAttributedString.Key.foregroundColor: UIColor.ns_tabbarNormalBlue,
NSAttributedString.Key.font : NSLabelType.ultraSmallBold.font]
NSAttributedString.Key.font: NSLabelType.ultraSmallBold.font]

itemAppearance.normal.iconColor = .ns_tabbarNormalBlue
itemAppearance.focused.iconColor = .ns_tabbarNormalBlue
Expand All @@ -108,8 +108,6 @@ class NSTabBarController: UITabBarController {

itemAppearance.selected.iconColor = .ns_tabbarSelectedBlue
itemAppearance.selected.titleTextAttributes = [NSAttributedString.Key.foregroundColor: UIColor.ns_tabbarSelectedBlue,
NSAttributedString.Key.font : NSLabelType.ultraSmallBold.font]


NSAttributedString.Key.font: NSLabelType.ultraSmallBold.font]
}
}
Loading

0 comments on commit 7e91d98

Please sign in to comment.