Skip to content

Commit f6e9da1

Browse files
piscoTechpiscoTech
committed
- Don't use SF Symbols in storyboard
- Update screenshots
1 parent 4840f55 commit f6e9da1

File tree

19 files changed

+34
-32
lines changed

19 files changed

+34
-32
lines changed

‎Gym Tracker iOS/AppDelegate.swift

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,16 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
5959

6060
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
6161
dataManager = DataManager(for: .application)
62-
62+
63+
tabController = self.window?.rootViewController as? TabBarController
6364
if #available(iOS 13.0, *) {
6465
let window = TraitOverriderWindow(frame: UIScreen.main.bounds)
6566
window.colorScheme = .dark
66-
tabController = UIStoryboard(name: "Main", bundle: nil).instantiateInitialViewController() as? TabBarController
6767
window.rootViewController = tabController
68-
68+
6969
self.window = window
7070
window.makeKeyAndVisible()
7171
} else {
72-
tabController = self.window!.rootViewController as? TabBarController
7372
tabController.tabBar.barStyle = .black
7473
}
7574
tabController.delegate = tabController
@@ -122,11 +121,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
122121
center.delegate = self
123122

124123
UITabBar.appearance().tintColor = customTint
125-
if #available(iOS 13, *) {} else {
126-
tabController.tabBar.items![0].image = #imageLiteral(resourceName: "Workout List")
127-
tabController.tabBar.items![3].image = #imageLiteral(resourceName: "Settings")
128-
tabController.tabBar.items![3].selectedImage = #imageLiteral(resourceName: "Settings Active")
129-
124+
if #available(iOS 13, *) {
125+
// These can be done in storyboard
126+
tabController.tabBar.items![0].image = UIImage(systemName: "list.bullet")
127+
tabController.tabBar.items![3].image = UIImage(systemName: "gear")
128+
// Override also the selected images just to be sure
129+
tabController.tabBar.items![0].selectedImage = UIImage(systemName: "list.bullet")
130+
tabController.tabBar.items![3].selectedImage = UIImage(systemName: "gear")
131+
} else {
130132
let table = UITableView.appearance()
131133
table.backgroundColor = .black
132134
table.separatorColor = #colorLiteral(red: 0.2243117094, green: 0.2243117094, blue: 0.2243117094, alpha: 1)

‎Gym Tracker iOS/Base.lproj/Main.storyboard

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14835.7" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="bX0-Oh-Bd3">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="bX0-Oh-Bd3">
33
<device id="retina4_7" orientation="portrait" appearance="dark"/>
44
<dependencies>
55
<deployment identifier="iOS"/>
6-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14790.5"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/>
77
<capability name="Named colors" minToolsVersion="9.0"/>
88
<capability name="Stack View standard spacing" minToolsVersion="9.0"/>
99
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
10-
<capability name="iOS 13.0 system colors" minToolsVersion="11.0"/>
1110
</dependencies>
1211
<scenes>
1312
<!--Tab Bar Controller-->
@@ -195,7 +194,7 @@
195194
</subviews>
196195
</stackView>
197196
</subviews>
198-
<color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
197+
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
199198
<constraints>
200199
<constraint firstAttribute="bottom" secondItem="8Cz-Rz-oht" secondAttribute="bottom" constant="8" id="758-XK-OIg"/>
201200
<constraint firstAttribute="trailing" secondItem="95O-vc-k3V" secondAttribute="trailing" constant="8" id="EWB-S7-cF8"/>
@@ -256,7 +255,7 @@
256255
<scene sceneID="x2c-YM-sg4">
257256
<objects>
258257
<navigationController id="tEt-eo-Qvy" sceneMemberID="viewController">
259-
<tabBarItem key="tabBarItem" title="List" image="list.bullet" catalog="system" id="hjI-Uz-unY"/>
258+
<tabBarItem key="tabBarItem" title="List" image="Workout List" id="hjI-Uz-unY"/>
260259
<navigationBar key="navigationBar" contentMode="scaleToFill" largeTitles="YES" id="Lov-RP-mj5">
261260
<rect key="frame" x="0.0" y="0.0" width="375" height="96"/>
262261
<autoresizingMask key="autoresizingMask"/>
@@ -508,7 +507,7 @@
508507
</subviews>
509508
</stackView>
510509
</subviews>
511-
<color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
510+
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
512511
<constraints>
513512
<constraint firstItem="viH-kh-aJE" firstAttribute="leading" secondItem="2mb-Xb-0k7" secondAttribute="leadingMargin" id="9gJ-8B-CNC"/>
514513
<constraint firstItem="oZT-C9-42x" firstAttribute="centerY" secondItem="2mb-Xb-0k7" secondAttribute="centerY" id="H6z-xX-5zP"/>
@@ -573,7 +572,7 @@
573572
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" indicatorStyle="black" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="7Fy-I0-mr8">
574573
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
575574
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
576-
<color key="backgroundColor" cocoaTouchSystemColor="systemGroupedBackgroundColor"/>
575+
<color key="backgroundColor" systemColor="systemGroupedBackgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
577576
<prototypes>
578577
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="workout" textLabel="llI-Ha-Hte" detailTextLabel="E4T-li-sKb" style="IBUITableViewCellStyleSubtitle" id="faA-IJ-sv5">
579578
<rect key="frame" x="0.0" y="55.5" width="375" height="44"/>
@@ -644,7 +643,7 @@
644643
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" id="71j-T8-EI1">
645644
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
646645
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
647-
<color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
646+
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
648647
<prototypes>
649648
<tableViewCell clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="noWorkout" textLabel="d1k-C9-CkZ" style="IBUITableViewCellStyleDefault" id="cE5-m0-WQm">
650649
<rect key="frame" x="0.0" y="28" width="375" height="44"/>
@@ -760,7 +759,7 @@
760759
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" indicatorStyle="black" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="afT-BX-1jR">
761760
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
762761
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
763-
<color key="backgroundColor" cocoaTouchSystemColor="systemGroupedBackgroundColor"/>
762+
<color key="backgroundColor" systemColor="systemGroupedBackgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
764763
<prototypes>
765764
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="enableBackup" id="qGz-bD-kFg">
766765
<rect key="frame" x="0.0" y="55.5" width="375" height="44"/>
@@ -877,7 +876,7 @@
877876
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" id="b6w-BO-aV6">
878877
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
879878
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
880-
<color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
879+
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
881880
<prototypes>
882881
<tableViewCell clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="noBackup" textLabel="nXe-sF-yIl" style="IBUITableViewCellStyleDefault" id="fm0-Dq-JD8">
883882
<rect key="frame" x="0.0" y="28" width="375" height="44"/>
@@ -935,7 +934,7 @@
935934
<scene sceneID="MnO-BP-spP">
936935
<objects>
937936
<navigationController automaticallyAdjustsScrollViewInsets="NO" id="CvL-4C-vxP" sceneMemberID="viewController">
938-
<tabBarItem key="tabBarItem" title="Settings" image="gear" catalog="system" id="9ed-Fx-Anb"/>
937+
<tabBarItem key="tabBarItem" title="Settings" image="Settings" selectedImage="Settings Active" id="9ed-Fx-Anb"/>
939938
<toolbarItems/>
940939
<navigationBar key="navigationBar" contentMode="scaleToFill" largeTitles="YES" id="aFh-ly-qZp">
941940
<rect key="frame" x="0.0" y="0.0" width="375" height="96"/>
@@ -957,7 +956,7 @@
957956
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" indicatorStyle="black" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="bK0-Rv-dAv">
958957
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
959958
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
960-
<color key="backgroundColor" cocoaTouchSystemColor="systemGroupedBackgroundColor"/>
959+
<color key="backgroundColor" systemColor="systemGroupedBackgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
961960
<prototypes>
962961
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="title" id="RB5-QP-Xed" customClass="MultilineCell" customModule="Gym_Tracker" customModuleProvider="target">
963962
<rect key="frame" x="0.0" y="55.5" width="375" height="44"/>
@@ -1030,7 +1029,7 @@
10301029
</label>
10311030
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="0" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Okb-Pp-Iov">
10321031
<rect key="frame" x="46.5" y="0.0" width="101" height="44"/>
1033-
<color key="textColor" cocoaTouchSystemColor="secondaryLabelColor"/>
1032+
<color key="textColor" systemColor="secondaryLabelColor" red="0.23529411764705882" green="0.23529411764705882" blue="0.2627450980392157" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
10341033
<fontDescription key="fontDescription" type="system" pointSize="15"/>
10351034
<textInputTraits key="textInputTraits" keyboardType="numberPad"/>
10361035
<connections>
@@ -1046,7 +1045,7 @@
10461045
</label>
10471046
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="0" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="MyJ-w6-z8i">
10481047
<rect key="frame" x="217.5" y="0.0" width="101" height="44"/>
1049-
<color key="textColor" cocoaTouchSystemColor="secondaryLabelColor"/>
1048+
<color key="textColor" systemColor="secondaryLabelColor" red="0.23529411764705882" green="0.23529411764705882" blue="0.2627450980392157" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
10501049
<fontDescription key="fontDescription" type="system" pointSize="15"/>
10511050
<textInputTraits key="textInputTraits" keyboardType="decimalPad"/>
10521051
<connections>
@@ -1057,7 +1056,7 @@
10571056
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="kg" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="W5D-Kj-TnA">
10581057
<rect key="frame" x="326.5" y="0.0" width="16.5" height="44"/>
10591058
<fontDescription key="fontDescription" type="system" pointSize="15"/>
1060-
<color key="textColor" cocoaTouchSystemColor="secondaryLabelColor"/>
1059+
<color key="textColor" systemColor="secondaryLabelColor" red="0.23529411764705882" green="0.23529411764705882" blue="0.2627450980392157" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
10611060
<nil key="highlightedColor"/>
10621061
</label>
10631062
</subviews>
@@ -1178,7 +1177,7 @@
11781177
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="qTQ-wT-fuj">
11791178
<rect key="frame" x="0.0" y="0.0" width="300" height="300"/>
11801179
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
1181-
<color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
1180+
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
11821181
<prototypes>
11831182
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="exercise" textLabel="M4Z-fq-rGq" detailTextLabel="fta-aA-tQM" style="IBUITableViewCellStyleSubtitle" id="bRJ-Ve-Yxh">
11841183
<rect key="frame" x="0.0" y="28" width="300" height="44"/>
@@ -1285,10 +1284,11 @@
12851284
<resources>
12861285
<image name="Completed List" width="25" height="25"/>
12871286
<image name="Completed List Active" width="25" height="25"/>
1287+
<image name="Settings" width="25" height="25"/>
1288+
<image name="Settings Active" width="25" height="25"/>
12881289
<image name="Workout" width="25" height="25"/>
12891290
<image name="Workout Active" width="25" height="25"/>
1290-
<image name="gear" catalog="system" width="64" height="60"/>
1291-
<image name="list.bullet" catalog="system" width="64" height="44"/>
1291+
<image name="Workout List" width="25" height="25"/>
12921292
<namedColor name="Green Tint">
12931293
<color red="0.0" green="0.75294117647058822" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
12941294
</namedColor>

‎Gym Tracker watchOS/Base.lproj/Interface.storyboard

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder.WatchKit.Storyboard" version="3.0" toolsVersion="14835.7" targetRuntime="watchKit" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="f3a-Tn-603">
2+
<document type="com.apple.InterfaceBuilder.WatchKit.Storyboard" version="3.0" toolsVersion="14868" targetRuntime="watchKit" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="f3a-Tn-603">
33
<device id="watch44"/>
44
<dependencies>
55
<deployment identifier="watchOS"/>
6-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14790.5"/>
7-
<plugIn identifier="com.apple.InterfaceBuilder.IBWatchKitPlugin" version="14631.1"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/>
7+
<plugIn identifier="com.apple.InterfaceBuilder.IBWatchKitPlugin" version="14643"/>
88
<capability name="Named colors" minToolsVersion="9.0"/>
99
</dependencies>
1010
<scenes>

‎Gym Tracker.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1701,7 +1701,7 @@
17011701
GCC_WARN_UNUSED_VARIABLE = YES;
17021702
HEALTH_READ_DATA = "Monitor heart rate during workout and read data for creating a workout.";
17031703
HEALTH_WRITE_DATA = "Save completed gym workout.";
1704-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
1704+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
17051705
MACOSX_DEPLOYMENT_TARGET = 10.10;
17061706
MARKETING_VERSION = 3.1;
17071707
MTL_ENABLE_DEBUG_INFO = YES;
@@ -1761,7 +1761,7 @@
17611761
GCC_WARN_UNUSED_VARIABLE = YES;
17621762
HEALTH_READ_DATA = "Monitor heart rate during workout and read data for creating a workout.";
17631763
HEALTH_WRITE_DATA = "Save completed gym workout.";
1764-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
1764+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
17651765
MACOSX_DEPLOYMENT_TARGET = 10.10;
17661766
MARKETING_VERSION = 3.1;
17671767
MTL_ENABLE_DEBUG_INFO = NO;

‎Image Files/Screenshots/en/1.png

-99.4 KB
Binary file not shown.

‎Image Files/Screenshots/en/2.png

-141 KB
Binary file not shown.

‎Image Files/Screenshots/en/3.png

-145 KB
Binary file not shown.

‎Image Files/Screenshots/en/4.png

-3.34 MB
Binary file not shown.

‎Image Files/Screenshots/iPhone X/en/1.png

116 KB
Loading

‎Image Files/Screenshots/iPhone X/en/2.png

157 KB
Loading

‎Image Files/Screenshots/iPhone X/en/3.png

173 KB
Loading

‎Image Files/Screenshots/iPhone X/en/4.png

4.2 MB
Loading

‎Image Files/Screenshots/iPhone/en/1.png

104 KB
Loading

‎Image Files/Screenshots/iPhone/en/2.png

145 KB
Loading

‎Image Files/Screenshots/iPhone/en/3.png

161 KB
Loading

‎Image Files/Screenshots/iPhone/en/4.png

3.19 MB
Loading

‎Image Files/Screenshots/watchOS/en/1.png

-203 Bytes
Loading

‎Image Files/Screenshots/watchOS/en/2.png

673 Bytes
Loading

‎Image Files/Screenshots/watchOS/en/3.png

1.81 KB
Loading

0 commit comments

Comments
 (0)