mirrors
/
xdripswift
mirror of https://github.com/JohanDegraeve/xdripswift.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

titles removed from UITabBarItem's

This commit is contained in:
Johan Degraeve 2019-12-20 18:49:57 +01:00
parent fd604caef6
commit 55bb9d7bee
5 changed files with 46 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xdrip.xcodeproj/project.pbxproj
View File

@ -59,6 +59,7 @@
F8297F56238ED07700D74D66 /* BluetoothPeripheralManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8297F55238ED07700D74D66 /* BluetoothPeripheralManager.swift */; };
F8297F59238EE14E00D74D66 /* TextsBluetoothPeripheralsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8297F57238EE14E00D74D66 /* TextsBluetoothPeripheralsView.swift */; };
F8297F5A238EE14E00D74D66 /* TextsBluetoothPeripheralView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8297F58238EE14E00D74D66 /* TextsBluetoothPeripheralView.swift */; };
F83098FE23AD3F84005741DF /* UITabBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F83098FD23AD3F84005741DF /* UITabBarController.swift */; };
F856CE5B22EDC8E50083E436 /* ConstantsBluetoothPairing.swift in Sources */ = {isa = PBXBuildFile; fileRef = F856CE5A22EDC8E50083E436 /* ConstantsBluetoothPairing.swift */; };
F85DC2ED21CFE2F500B9F74A /* BgReading+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = F85DC2E721CFE2F500B9F74A /* BgReading+CoreDataProperties.swift */; };
F85DC2EF21CFE2F500B9F74A /* Sensor+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = F85DC2E921CFE2F500B9F74A /* Sensor+CoreDataProperties.swift */; };
@ -306,6 +307,7 @@
F8297F55238ED07700D74D66 /* BluetoothPeripheralManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BluetoothPeripheralManager.swift; sourceTree = "<group>"; };
F8297F57238EE14E00D74D66 /* TextsBluetoothPeripheralsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextsBluetoothPeripheralsView.swift; sourceTree = "<group>"; };
F8297F58238EE14E00D74D66 /* TextsBluetoothPeripheralView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextsBluetoothPeripheralView.swift; sourceTree = "<group>"; };
F83098FD23AD3F84005741DF /* UITabBarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UITabBarController.swift; sourceTree = "<group>"; };
F846CDD523046BAC00DCF016 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/SettingsViews.strings"; sourceTree = "<group>"; };
F846CDD623046BAE00DCF016 /* pt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt; path = pt.lproj/SettingsViews.strings; sourceTree = "<group>"; };
F856CE5A22EDC8E50083E436 /* ConstantsBluetoothPairing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConstantsBluetoothPairing.swift; sourceTree = "<group>"; };
@ -710,6 +712,7 @@
F8BDD4232218790E006EAB84 /* UserDefaults.swift */,
F80859282364D61B00F3829D /* UserDefaults+charts.swift */,
F808592C23677D6A00F3829D /* ChartPoint.swift */,
F83098FD23AD3F84005741DF /* UITabBarController.swift */,
);
path = Extensions;
sourceTree = "<group>";
@ -1755,6 +1758,7 @@
F81FA006228E09D40028C70F /* TextsCalibration.swift in Sources */,
F8F9721923A5915900C3F17D /* CGMGNSEntryTransmitter.swift in Sources */,
F8B3A84A227F090E004BA588 /* SettingsViewGeneralSettingsViewModel.swift in Sources */,
F83098FE23AD3F84005741DF /* UITabBarController.swift in Sources */,
F8B3A85B2280CCD1004BA588 /* AlertSettingsViewController.swift in Sources */,
F8F9722E23A5915900C3F17D /* M5StackTransmitterOpCode.swift in Sources */,
F8F9720223A5915900C3F17D /* CGMG6Transmitter.swift in Sources */,
@ -2366,7 +2370,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 3.4.0;
PRODUCT_BUNDLE_IDENTIFIER = net.johandegraeve.xdripswift;
PRODUCT_BUNDLE_IDENTIFIER = net.johandegraeve.iosxdripreader;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "xdrip/xdrip-Bridging-Header.h";
@ -2394,7 +2398,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 3.4.0;
PRODUCT_BUNDLE_IDENTIFIER = net.johandegraeve.xdripswift;
PRODUCT_BUNDLE_IDENTIFIER = net.johandegraeve.iosxdripreader;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "xdrip/xdrip-Bridging-Header.h";

14
xdrip/Extensions/UITabBarController.swift Normal file
View File

@ -0,0 +1,14 @@
import Foundation
import UIKit
extension UITabBarController {
func cleanTitles() {
guard let items = self.tabBar.items else {
return
}
for item in items {
item.title = ""
item.imageInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0)
}
}
}

7
xdrip/View Controllers/BluetoothPeripheralsNavigationController/BluetoothPeripheralNavigationController.swift
View File

@ -29,6 +29,13 @@ final class BluetoothPeripheralNavigationController: UINavigationController {
delegate = self
}
override func viewDidAppear(_ animated: Bool) {
// remove titles from tabbar items
self.tabBarController?.cleanTitles()
}
}
extension BluetoothPeripheralNavigationController: UINavigationControllerDelegate {

12
xdrip/View Controllers/Root View Controller/RootViewController.swift
View File

@ -221,6 +221,13 @@ final class RootViewController: UIViewController {
}
override func viewDidAppear(_ animated: Bool) {
// remove titles from tabbar items
self.tabBarController?.cleanTitles()
}
override func viewDidLoad() {
super.viewDidLoad()
@ -577,6 +584,9 @@ final class RootViewController: UIViewController {
/// Configure View, only stuff that is independent of coredata
private func setupView() {
// remove titles from tabbar items
self.tabBarController?.cleanTitles()
// set texts for buttons on top
calibrateButtonOutlet.setTitle(Texts_HomeView.calibrationButton, for: .normal)
preSnoozeButtonOutlet.setTitle(Texts_HomeView.snoozeButton, for: .normal)
@ -1559,7 +1569,7 @@ extension RootViewController: UITabBarControllerDelegate {
} else if let navigationController = viewController as? BluetoothPeripheralNavigationController, let bluetoothPeripheralManager = bluetoothPeripheralManager, let coreDataManager = coreDataManager {
navigationController.configure(coreDataManager: coreDataManager, bluetoothPeripheralManager: bluetoothPeripheralManager)
}
}

8
xdrip/View Controllers/SettingsNavigationController/SettingsNavigationController.swift
View File

@ -29,6 +29,14 @@ final class SettingsNavigationController: UINavigationController {
delegate = self
}
override func viewDidAppear(_ animated: Bool) {
// remove titles from tabbar items
self.tabBarController?.cleanTitles()
}
}
extension SettingsNavigationController:UINavigationControllerDelegate {