@@ -9,68 +9,57 @@ import Alamofire
99* Since iOS 10 extension's height is 110 pixels
1010*/
1111
12- let spinner = UIActivityIndicatorView ( style: . whiteLarge)
1312
1413class TodayViewController : UIViewController , NCWidgetProviding {
1514 @IBOutlet weak var label : UILabel !
15+ @IBOutlet weak var spinner : UIActivityIndicatorView !
16+
1617 var labelHeight : CGFloat = 0.0 ;
1718
1819 override func viewDidLoad( ) {
1920 super. viewDidLoad ( )
20- }
21-
22- override func viewDidAppear( _ animated: Bool ) {
23- spinner. hidesWhenStopped = true
24- self . view. addSubview ( spinner)
25- spinner. center = self . view. center
26- spinner. startAnimating ( )
27- }
28-
29- override func viewDidLayoutSubviews( ) {
30- super. viewDidLayoutSubviews ( )
31- labelHeight = self . label. frame. size. height
32- if ( labelHeight > 110 ) {
33- extensionContext? . widgetLargestAvailableDisplayMode = . expanded
34- } else {
35- extensionContext? . widgetLargestAvailableDisplayMode = . compact
36- }
37- }
38-
39- func widgetActiveDisplayModeDidChange( _ activeDisplayMode: NCWidgetDisplayMode , withMaximumSize maxSize: CGSize ) {
40- if ( activeDisplayMode == NCWidgetDisplayMode . compact) {
41- self . preferredContentSize = maxSize;
42- } else {
43- self . preferredContentSize = CGSize ( width: 0 , height: labelHeight + 5.0 ) ;
44- }
45- }
46-
47- func widgetPerformUpdate( completionHandler: ( @escaping ( NCUpdateResult ) -> Void ) ) {
4821 self . label. text = " "
4922 self . label. textAlignment = . left
50- spinner. startAnimating ( )
51-
5223 let keychain = KeychainSwift ( )
5324 keychain. accessGroup = " NDJHDNKXD6.dev.yannick.MigrosUsage "
5425
5526 guard let username = keychain. get ( " username " ) , let password = keychain. get ( " password " ) else {
5627 self . label. text = NSLocalizedString ( " Please provide credentials. " , comment: " " )
57- completionHandler ( . failed)
5828 return
5929 }
6030 getUsageFromPortal ( username: username, password: password) { error, data in
6131 if ( error != " " ) {
6232 self . label. textAlignment = . center
6333 self . label!. text = error
64- spinner. stopAnimating ( )
65- completionHandler ( . failed)
34+ self . spinner. stopAnimating ( )
6635 return
6736 }
6837 DispatchQueue . main. async {
6938 let percentage = Int ( round ( ( data. used / data. total) * 100 ) )
7039 self . label!. text = " \( percentage) % " + usageTextGB( totalFloat: data. total, usedFloat: data. used)
71- spinner. stopAnimating ( )
72- completionHandler ( . newData)
40+ self . spinner. stopAnimating ( )
7341 }
7442 }
7543 }
44+
45+ override func viewDidLayoutSubviews( ) {
46+ super. viewDidLayoutSubviews ( )
47+ labelHeight = self . label. frame. size. height
48+ if ( labelHeight > 110 ) {
49+ extensionContext? . widgetLargestAvailableDisplayMode = . expanded
50+ } else {
51+ extensionContext? . widgetLargestAvailableDisplayMode = . compact
52+ }
53+ }
54+
55+ func widgetActiveDisplayModeDidChange( _ activeDisplayMode: NCWidgetDisplayMode , withMaximumSize maxSize: CGSize ) {
56+ if ( activeDisplayMode == NCWidgetDisplayMode . compact) {
57+ self . preferredContentSize = maxSize;
58+ } else {
59+ self . preferredContentSize = CGSize ( width: 0 , height: labelHeight + 5.0 ) ;
60+ }
61+ }
62+
63+ // Not implementing widgetPerformUpdate means our app will not be called in the background.
64+ // func widgetPerformUpdate(completionHandler: (@escaping (NCUpdateResult) -> Void)) {}
7665}
0 commit comments