David Walter 2 years ago
parent
commit
17dc179ceb
Signed by: David Walter <hello@davidwalter.at> GPG key ID: 9D6D093366A35900

+ 3
- 3
Cartfile View File

@@ -1,8 +1,8 @@
1
-github "divadretlaw/UserDefaults" "master"
2
-github "divadretlaw/Themeable" "master"
1
+github "divadretlaw/UserDefaults"
2
+github "divadretlaw/Themeable" ~> 1.0
3 3
 github "realm/realm-cocoa"
4 4
 github "xmartlabs/Eureka" ~> 4.0
5 5
 github "hyperoslo/Hue"
6 6
 github "lexrus/LTMorphingLabel"
7 7
 github "evgenyneu/keychain-swift" ~> 10.0
8
-github "marcosgriselli/SwipeableTabBarController"
8
+github "marcosgriselli/SwipeableTabBarController"

+ 6
- 5
Cartfile.resolved View File

@@ -1,7 +1,8 @@
1
-github "divadretlaw/Themeable" "dec7ba3d946fb2b37a668901bd94a16ab776a37d"
2
-github "divadretlaw/UserDefaults" "0f38caf601eb52fea76c585814b7c0bd7893fa80"
1
+github "divadretlaw/Themeable" "1.0"
2
+github "divadretlaw/UserDefaults" "1.2.1"
3 3
 github "evgenyneu/keychain-swift" "10.0.0"
4 4
 github "hyperoslo/Hue" "3.0.1"
5
-github "marcosgriselli/SwipeableTabBarController" "1.0.11"
6
-github "realm/realm-cocoa" "v3.1.1"
7
-github "xmartlabs/Eureka" "4.0.1"
5
+github "lexrus/LTMorphingLabel" "0.5.6"
6
+github "marcosgriselli/SwipeableTabBarController" "1.0.15"
7
+github "realm/realm-cocoa" "v3.3.2"
8
+github "xmartlabs/Eureka" "4.1.1"

+ 24
- 6
UntilSince.xcodeproj/project.pbxproj View File

@@ -33,7 +33,6 @@
33 33
 		634F546D201D311800B85422 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 634F546C201D311800B85422 /* Settings.bundle */; };
34 34
 		634F5497201D4DE600B85422 /* light.json in Resources */ = {isa = PBXBuildFile; fileRef = 634F5495201D4DE600B85422 /* light.json */; };
35 35
 		634F5498201D4DE600B85422 /* dark.json in Resources */ = {isa = PBXBuildFile; fileRef = 634F5496201D4DE600B85422 /* dark.json */; };
36
-		6350F5AF20277F9700897240 /* Themeable.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6350F5AE20277F9700897240 /* Themeable.framework */; };
37 36
 		6350F5B020277F9D00897240 /* Themeable.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6350F5AE20277F9700897240 /* Themeable.framework */; };
38 37
 		6350F5B120277F9D00897240 /* Themeable.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 6350F5AE20277F9700897240 /* Themeable.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
39 38
 		63561A4A203F126F00E56AF8 /* EventDateTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63561A49203F126F00E56AF8 /* EventDateTableViewCell.swift */; };
@@ -135,7 +134,6 @@
135 134
 				632F30C5201CFA8D00DCCA4E /* Eureka.framework in Frameworks */,
136 135
 				632F30BB201CFA8D00DCCA4E /* SwipeableTabBarController.framework in Frameworks */,
137 136
 				632F30BF201CFA8D00DCCA4E /* RealmSwift.framework in Frameworks */,
138
-				6350F5AF20277F9700897240 /* Themeable.framework in Frameworks */,
139 137
 			);
140 138
 			runOnlyForDeploymentPostprocessing = 0;
141 139
 		};
@@ -270,7 +268,8 @@
270 268
 				63C1439D201363510002860F /* Frameworks */,
271 269
 				63C1439E201363510002860F /* Resources */,
272 270
 				631AE88220136BBA00930268 /* Embed Frameworks */,
273
-				6323C45A2021C995004BE10A /* ShellScript */,
271
+				6323C45A2021C995004BE10A /* swiftlint */,
272
+				6315BAB120873AEE00B14A26 /* taylor */,
274 273
 			);
275 274
 			buildRules = (
276 275
 			);
@@ -288,7 +287,7 @@
288 287
 			isa = PBXProject;
289 288
 			attributes = {
290 289
 				LastSwiftUpdateCheck = 0920;
291
-				LastUpgradeCheck = 0920;
290
+				LastUpgradeCheck = 0930;
292 291
 				ORGANIZATIONNAME = "David Walter";
293 292
 				TargetAttributes = {
294 293
 					63C1439F201363510002860F = {
@@ -335,18 +334,33 @@
335 334
 /* End PBXResourcesBuildPhase section */
336 335
 
337 336
 /* Begin PBXShellScriptBuildPhase section */
338
-		6323C45A2021C995004BE10A /* ShellScript */ = {
337
+		6315BAB120873AEE00B14A26 /* taylor */ = {
339 338
 			isa = PBXShellScriptBuildPhase;
340 339
 			buildActionMask = 2147483647;
341 340
 			files = (
342 341
 			);
343 342
 			inputPaths = (
344 343
 			);
344
+			name = taylor;
345 345
 			outputPaths = (
346 346
 			);
347 347
 			runOnlyForDeploymentPostprocessing = 0;
348 348
 			shellPath = /bin/sh;
349
-			shellScript = "if which swiftlint >/dev/null; then\n    pwd\n# swiftlint\nelse\necho \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi";
349
+			shellScript = "if which taylor >/dev/null; then\n    taylor -p ${PROJECT_DIR} -r xcode\nelse\n    echo \"Taylor not installed\"\nfi";
350
+		};
351
+		6323C45A2021C995004BE10A /* swiftlint */ = {
352
+			isa = PBXShellScriptBuildPhase;
353
+			buildActionMask = 2147483647;
354
+			files = (
355
+			);
356
+			inputPaths = (
357
+			);
358
+			name = swiftlint;
359
+			outputPaths = (
360
+			);
361
+			runOnlyForDeploymentPostprocessing = 0;
362
+			shellPath = /bin/sh;
363
+			shellScript = "if which swiftlint >/dev/null; then\n#swiftlint\npwd\nelse\necho \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi";
350 364
 		};
351 365
 /* End PBXShellScriptBuildPhase section */
352 366
 
@@ -424,6 +438,7 @@
424 438
 				CLANG_WARN_BOOL_CONVERSION = YES;
425 439
 				CLANG_WARN_COMMA = YES;
426 440
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
441
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
427 442
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
428 443
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
429 444
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -431,6 +446,7 @@
431 446
 				CLANG_WARN_INFINITE_RECURSION = YES;
432 447
 				CLANG_WARN_INT_CONVERSION = YES;
433 448
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
449
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
434 450
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
435 451
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
436 452
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -482,6 +498,7 @@
482 498
 				CLANG_WARN_BOOL_CONVERSION = YES;
483 499
 				CLANG_WARN_COMMA = YES;
484 500
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
501
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
485 502
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
486 503
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
487 504
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -489,6 +506,7 @@
489 506
 				CLANG_WARN_INFINITE_RECURSION = YES;
490 507
 				CLANG_WARN_INT_CONVERSION = YES;
491 508
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
509
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
492 510
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
493 511
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
494 512
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

+ 1
- 1
UntilSince/AppConfig.swift View File

@@ -26,7 +26,7 @@ struct AppConfig {
26 26
             Theme.shared.colors = UserDefaults.standard[.dark] ? .dark : .light
27 27
         }
28 28
         
29
-        Theme.shared.eureka = true
29
+        Theme.shared.features.append(.eureka)
30 30
         
31 31
         Theme.shared.customAppearance = {
32 32
             // Empty View

+ 3
- 3
UntilSince/Views/Base.lproj/Main.storyboard View File

@@ -108,7 +108,6 @@
108 108
         <!--Navigation Controller-->
109 109
         <scene sceneID="Qeb-1a-z1I">
110 110
             <objects>
111
-                <placeholder placeholderIdentifier="IBFirstResponder" id="pym-Ka-ICP" userLabel="First Responder" sceneMemberID="firstResponder"/>
112 111
                 <navigationController id="DKv-cA-tDa" sceneMemberID="viewController">
113 112
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" largeTitles="YES" id="4Q6-JT-kmd">
114 113
                         <rect key="frame" x="0.0" y="20" width="375" height="96"/>
@@ -118,6 +117,7 @@
118 117
                         <segue destination="49e-Tb-3d3" kind="relationship" relationship="rootViewController" id="q2C-hy-P6a"/>
119 118
                     </connections>
120 119
                 </navigationController>
120
+                <placeholder placeholderIdentifier="IBFirstResponder" id="pym-Ka-ICP" userLabel="First Responder" sceneMemberID="firstResponder"/>
121 121
             </objects>
122 122
             <point key="canvasLocation" x="-1834" y="10"/>
123 123
         </scene>
@@ -125,7 +125,7 @@
125 125
         <scene sceneID="yl2-sM-qoP">
126 126
             <objects>
127 127
                 <tabBarController title="UntilSince" id="49e-Tb-3d3" customClass="TabBarController" customModule="UntilSince" customModuleProvider="target" sceneMemberID="viewController">
128
-                    <navigationItem key="navigationItem" title="UntilSince" id="r2o-vC-UpF">
128
+                    <navigationItem key="navigationItem" title="UntilSince" largeTitleDisplayMode="always" id="r2o-vC-UpF">
129 129
                         <barButtonItem key="leftBarButtonItem" image="settings" id="hKx-oD-FRU">
130 130
                             <connections>
131 131
                                 <segue destination="cfi-1e-L8z" kind="show" identifier="settingsSegue" id="f9u-Vk-i1G"/>
@@ -560,7 +560,7 @@ until</string>
560 560
     </resources>
561 561
     <inferredMetricsTieBreakers>
562 562
         <segue reference="k4i-HM-BI3"/>
563
-        <segue reference="jtC-Yf-gF6"/>
563
+        <segue reference="f6b-Au-Xw3"/>
564 564
     </inferredMetricsTieBreakers>
565 565
     <color key="tintColor" red="0.31764705879999999" green="0.76470588240000004" blue="0.30980392159999998" alpha="1" colorSpace="calibratedRGB"/>
566 566
 </document>

+ 6
- 0
UntilSince/Views/MainTableViewController.swift View File

@@ -61,6 +61,12 @@ class MainTableViewController: UITableViewController  {
61 61
         }
62 62
     }
63 63
     
64
+    override func viewDidAppear(_ animated: Bool) {
65
+        super.viewDidAppear(animated)
66
+        self.navigationItem.largeTitleDisplayMode = .always
67
+        
68
+    }
69
+    
64 70
     override func viewDidDisappear(_ animated: Bool) {
65 71
         timer?.invalidate()
66 72
     }

+ 1
- 1
UntilSince/Views/TabBarController.swift View File

@@ -18,5 +18,5 @@ class TabBarController: SwipeableTabBarController {
18 18
     @IBAction func returnToMain(segue:UIStoryboardSegue) {
19 19
         
20 20
     }
21
-    
21
+
22 22
 }