Archived
Attempt to fix jumpy pull-to-refresh behaviour, revamped settings page to suit the iOS design better
This commit is contained in:
Deniz Duezgoeren
@@ -24,6 +24,7 @@
|
|||||||
A96133A22299867A00B541D4 /* AvH_PlanUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A96133A12299867A00B541D4 /* AvH_PlanUITests.swift */; };
|
A96133A22299867A00B541D4 /* AvH_PlanUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A96133A12299867A00B541D4 /* AvH_PlanUITests.swift */; };
|
||||||
A96D4CC822DDE01A006BAB34 /* GeneralPlanViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A96D4CC722DDE01A006BAB34 /* GeneralPlanViewController.swift */; };
|
A96D4CC822DDE01A006BAB34 /* GeneralPlanViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A96D4CC722DDE01A006BAB34 /* GeneralPlanViewController.swift */; };
|
||||||
A96D4CCA22DDE184006BAB34 /* PersonalPlanViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A96D4CC922DDE184006BAB34 /* PersonalPlanViewController.swift */; };
|
A96D4CCA22DDE184006BAB34 /* PersonalPlanViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A96D4CC922DDE184006BAB34 /* PersonalPlanViewController.swift */; };
|
||||||
|
A976907A233F2E680015AF1A /* CoursePickerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9769079233F2E680015AF1A /* CoursePickerViewController.swift */; };
|
||||||
A996BFF922E05AAB00E7BE42 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = A996BFFB22E05AAB00E7BE42 /* InfoPlist.strings */; };
|
A996BFF922E05AAB00E7BE42 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = A996BFFB22E05AAB00E7BE42 /* InfoPlist.strings */; };
|
||||||
A99AB5F8230155DE00555295 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = A99AB5F7230155DE00555295 /* GoogleService-Info.plist */; };
|
A99AB5F8230155DE00555295 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = A99AB5F7230155DE00555295 /* GoogleService-Info.plist */; };
|
||||||
A9A3496C22D4859200F35AE0 /* SubstModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9A3496B22D4859200F35AE0 /* SubstModel.swift */; };
|
A9A3496C22D4859200F35AE0 /* SubstModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9A3496B22D4859200F35AE0 /* SubstModel.swift */; };
|
||||||
@@ -95,6 +96,7 @@
|
|||||||
A96133A32299867A00B541D4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
A96133A32299867A00B541D4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
||||||
A96D4CC722DDE01A006BAB34 /* GeneralPlanViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeneralPlanViewController.swift; sourceTree = "<group>"; };
|
A96D4CC722DDE01A006BAB34 /* GeneralPlanViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeneralPlanViewController.swift; sourceTree = "<group>"; };
|
||||||
A96D4CC922DDE184006BAB34 /* PersonalPlanViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersonalPlanViewController.swift; sourceTree = "<group>"; };
|
A96D4CC922DDE184006BAB34 /* PersonalPlanViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersonalPlanViewController.swift; sourceTree = "<group>"; };
|
||||||
|
A9769079233F2E680015AF1A /* CoursePickerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoursePickerViewController.swift; sourceTree = "<group>"; };
|
||||||
A996BFF322E05AAB00E7BE42 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Base; path = Base.lproj/Info.plist; sourceTree = "<group>"; };
|
A996BFF322E05AAB00E7BE42 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Base; path = Base.lproj/Info.plist; sourceTree = "<group>"; };
|
||||||
A996BFFC22E05AAB00E7BE42 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
|
A996BFFC22E05AAB00E7BE42 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
|
||||||
A996BFFD22E05AAB00E7BE42 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = "<group>"; };
|
A996BFFD22E05AAB00E7BE42 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = "<group>"; };
|
||||||
@@ -206,6 +208,7 @@
|
|||||||
A96D4CC922DDE184006BAB34 /* PersonalPlanViewController.swift */,
|
A96D4CC922DDE184006BAB34 /* PersonalPlanViewController.swift */,
|
||||||
A9C1D2FF22D656DD00139043 /* MenuViewController.swift */,
|
A9C1D2FF22D656DD00139043 /* MenuViewController.swift */,
|
||||||
A9B0464D22E1F75A005FB0DB /* CustomizationViewController.swift */,
|
A9B0464D22E1F75A005FB0DB /* CustomizationViewController.swift */,
|
||||||
|
A9769079233F2E680015AF1A /* CoursePickerViewController.swift */,
|
||||||
A9B0464F22E21207005FB0DB /* ColourPickerView.swift */,
|
A9B0464F22E21207005FB0DB /* ColourPickerView.swift */,
|
||||||
A9C1D30122D7237200139043 /* DataFetcher.swift */,
|
A9C1D30122D7237200139043 /* DataFetcher.swift */,
|
||||||
A96133852299867400B541D4 /* Main.storyboard */,
|
A96133852299867400B541D4 /* Main.storyboard */,
|
||||||
@@ -480,7 +483,7 @@
|
|||||||
);
|
);
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
shellPath = /bin/sh;
|
shellPath = /bin/sh;
|
||||||
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-AvH Plan/Pods-AvH Plan-frameworks.sh\"\n\"${PODS_ROOT}/Fabric/run\"\n";
|
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-AvH Plan/Pods-AvH Plan-frameworks.sh\"\n";
|
||||||
showEnvVarsInLog = 0;
|
showEnvVarsInLog = 0;
|
||||||
};
|
};
|
||||||
/* End PBXShellScriptBuildPhase section */
|
/* End PBXShellScriptBuildPhase section */
|
||||||
@@ -495,6 +498,7 @@
|
|||||||
A96133802299867400B541D4 /* AppDelegate.swift in Sources */,
|
A96133802299867400B541D4 /* AppDelegate.swift in Sources */,
|
||||||
A9378D352336015000C07D07 /* LoginViewController.swift in Sources */,
|
A9378D352336015000C07D07 /* LoginViewController.swift in Sources */,
|
||||||
A9A3496C22D4859200F35AE0 /* SubstModel.swift in Sources */,
|
A9A3496C22D4859200F35AE0 /* SubstModel.swift in Sources */,
|
||||||
|
A976907A233F2E680015AF1A /* CoursePickerViewController.swift in Sources */,
|
||||||
A9C1D30022D656DD00139043 /* MenuViewController.swift in Sources */,
|
A9C1D30022D656DD00139043 /* MenuViewController.swift in Sources */,
|
||||||
A957A75122DDC15500E0A2ED /* MenuViewCell.swift in Sources */,
|
A957A75122DDC15500E0A2ED /* MenuViewCell.swift in Sources */,
|
||||||
A9B0464C22E1F255005FB0DB /* CustomTabBarController.swift in Sources */,
|
A9B0464C22E1F255005FB0DB /* CustomTabBarController.swift in Sources */,
|
||||||
|
|||||||
+311
-282
@@ -32,6 +32,279 @@
|
|||||||
</objects>
|
</objects>
|
||||||
<point key="canvasLocation" x="1628" y="-790"/>
|
<point key="canvasLocation" x="1628" y="-790"/>
|
||||||
</scene>
|
</scene>
|
||||||
|
<!--Customize-->
|
||||||
|
<scene sceneID="Qs1-wD-U6L">
|
||||||
|
<objects>
|
||||||
|
<tableViewController id="5GD-rn-jaq" customClass="CustomizationViewController" customModule="AvH_Plan" customModuleProvider="target" sceneMemberID="viewController">
|
||||||
|
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" allowsSelection="NO" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" id="8Fj-Vm-IOk">
|
||||||
|
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||||
|
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
|
||||||
|
<sections>
|
||||||
|
<tableViewSection headerTitle="Personalize" id="whN-45-XN6">
|
||||||
|
<cells>
|
||||||
|
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="aGd-tl-E6D">
|
||||||
|
<rect key="frame" x="0.0" y="55.333333333333343" width="414" height="44"/>
|
||||||
|
<autoresizingMask key="autoresizingMask"/>
|
||||||
|
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="aGd-tl-E6D" id="orr-O8-P2M">
|
||||||
|
<rect key="frame" x="0.0" y="0.0" width="414" height="43.666666666666664"/>
|
||||||
|
<autoresizingMask key="autoresizingMask"/>
|
||||||
|
<subviews>
|
||||||
|
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Your name" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="A2b-5v-r2j">
|
||||||
|
<rect key="frame" x="16" y="8.0000000000000018" width="382" height="27.666666666666671"/>
|
||||||
|
<nil key="textColor"/>
|
||||||
|
<fontDescription key="fontDescription" type="system" pointSize="14"/>
|
||||||
|
<textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" smartDashesType="no" smartInsertDeleteType="no" smartQuotesType="no"/>
|
||||||
|
</textField>
|
||||||
|
</subviews>
|
||||||
|
<constraints>
|
||||||
|
<constraint firstAttribute="trailing" secondItem="A2b-5v-r2j" secondAttribute="trailing" constant="16" id="EKZ-7B-Cmd"/>
|
||||||
|
<constraint firstItem="A2b-5v-r2j" firstAttribute="leading" secondItem="orr-O8-P2M" secondAttribute="leading" constant="16" id="L1E-av-Kvr"/>
|
||||||
|
<constraint firstAttribute="bottom" secondItem="A2b-5v-r2j" secondAttribute="bottom" constant="8" id="SRa-sr-922"/>
|
||||||
|
<constraint firstItem="A2b-5v-r2j" firstAttribute="top" secondItem="orr-O8-P2M" secondAttribute="top" constant="8" id="mVv-l0-oS3"/>
|
||||||
|
</constraints>
|
||||||
|
</tableViewCellContentView>
|
||||||
|
</tableViewCell>
|
||||||
|
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="20f-v9-Ea0">
|
||||||
|
<rect key="frame" x="0.0" y="99.333333333333343" width="414" height="44"/>
|
||||||
|
<autoresizingMask key="autoresizingMask"/>
|
||||||
|
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="20f-v9-Ea0" id="RFv-Y7-Amv">
|
||||||
|
<rect key="frame" x="0.0" y="0.0" width="414" height="43.666666666666664"/>
|
||||||
|
<autoresizingMask key="autoresizingMask"/>
|
||||||
|
<subviews>
|
||||||
|
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jng-S6-ZuJ">
|
||||||
|
<rect key="frame" x="16" y="8.0000000000000018" width="382" height="27.666666666666671"/>
|
||||||
|
<state key="normal" title="Customize course colors"/>
|
||||||
|
<connections>
|
||||||
|
<action selector="customizeColoursButton:" destination="5GD-rn-jaq" eventType="touchUpInside" id="35i-it-53Q"/>
|
||||||
|
</connections>
|
||||||
|
</button>
|
||||||
|
</subviews>
|
||||||
|
<constraints>
|
||||||
|
<constraint firstItem="jng-S6-ZuJ" firstAttribute="top" secondItem="RFv-Y7-Amv" secondAttribute="top" constant="8" id="0Xf-na-Ot4"/>
|
||||||
|
<constraint firstItem="jng-S6-ZuJ" firstAttribute="leading" secondItem="RFv-Y7-Amv" secondAttribute="leading" constant="16" id="BkY-i5-aoq"/>
|
||||||
|
<constraint firstAttribute="bottom" secondItem="jng-S6-ZuJ" secondAttribute="bottom" constant="8" id="Ksd-jh-YgZ"/>
|
||||||
|
<constraint firstAttribute="trailing" secondItem="jng-S6-ZuJ" secondAttribute="trailing" constant="16" id="ezW-Cd-928"/>
|
||||||
|
</constraints>
|
||||||
|
</tableViewCellContentView>
|
||||||
|
</tableViewCell>
|
||||||
|
</cells>
|
||||||
|
</tableViewSection>
|
||||||
|
<tableViewSection headerTitle="Filters" id="BHV-EE-xi3">
|
||||||
|
<cells>
|
||||||
|
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="1Sl-WQ-myP">
|
||||||
|
<rect key="frame" x="0.0" y="199.33333333333334" width="414" height="44"/>
|
||||||
|
<autoresizingMask key="autoresizingMask"/>
|
||||||
|
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="1Sl-WQ-myP" id="Ppe-Bk-pw7">
|
||||||
|
<rect key="frame" x="0.0" y="0.0" width="414" height="43.666666666666664"/>
|
||||||
|
<autoresizingMask key="autoresizingMask"/>
|
||||||
|
<subviews>
|
||||||
|
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Your grade" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="x8A-kh-LX4">
|
||||||
|
<rect key="frame" x="16" y="8.0000000000000018" width="336" height="27.666666666666671"/>
|
||||||
|
<nil key="textColor"/>
|
||||||
|
<fontDescription key="fontDescription" type="system" pointSize="14"/>
|
||||||
|
<textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" smartDashesType="no" smartInsertDeleteType="no" smartQuotesType="no"/>
|
||||||
|
</textField>
|
||||||
|
<button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" horizontalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="detailDisclosure" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tGW-2L-bfh">
|
||||||
|
<rect key="frame" x="368" y="8.0000000000000018" width="22" height="27.666666666666671"/>
|
||||||
|
<connections>
|
||||||
|
<action selector="groupHelpButton:" destination="5GD-rn-jaq" eventType="touchUpInside" id="b1G-MP-U4Q"/>
|
||||||
|
</connections>
|
||||||
|
</button>
|
||||||
|
</subviews>
|
||||||
|
<constraints>
|
||||||
|
<constraint firstItem="x8A-kh-LX4" firstAttribute="top" secondItem="Ppe-Bk-pw7" secondAttribute="top" constant="8" id="1DB-0a-62h"/>
|
||||||
|
<constraint firstAttribute="trailing" secondItem="tGW-2L-bfh" secondAttribute="trailing" constant="24" id="KlK-a2-BHf"/>
|
||||||
|
<constraint firstItem="tGW-2L-bfh" firstAttribute="top" secondItem="Ppe-Bk-pw7" secondAttribute="top" constant="8" id="Tpw-AU-Nd8"/>
|
||||||
|
<constraint firstItem="tGW-2L-bfh" firstAttribute="leading" secondItem="x8A-kh-LX4" secondAttribute="trailing" constant="16" id="W3Z-94-NnJ"/>
|
||||||
|
<constraint firstItem="x8A-kh-LX4" firstAttribute="leading" secondItem="Ppe-Bk-pw7" secondAttribute="leading" constant="16" id="eYN-Sw-g4U"/>
|
||||||
|
<constraint firstAttribute="bottom" secondItem="x8A-kh-LX4" secondAttribute="bottom" constant="8" id="xzb-We-wzf"/>
|
||||||
|
<constraint firstAttribute="bottom" secondItem="tGW-2L-bfh" secondAttribute="bottom" constant="8" id="yhM-5a-t5v"/>
|
||||||
|
</constraints>
|
||||||
|
</tableViewCellContentView>
|
||||||
|
</tableViewCell>
|
||||||
|
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="ADr-9Q-aFd">
|
||||||
|
<rect key="frame" x="0.0" y="243.33333333333337" width="414" height="44"/>
|
||||||
|
<autoresizingMask key="autoresizingMask"/>
|
||||||
|
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="ADr-9Q-aFd" id="sWM-ta-aIS">
|
||||||
|
<rect key="frame" x="0.0" y="0.0" width="414" height="43.666666666666664"/>
|
||||||
|
<autoresizingMask key="autoresizingMask"/>
|
||||||
|
<subviews>
|
||||||
|
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Your courses" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="zxv-h1-Q8u">
|
||||||
|
<rect key="frame" x="16" y="8.0000000000000018" width="336" height="27.666666666666671"/>
|
||||||
|
<nil key="textColor"/>
|
||||||
|
<fontDescription key="fontDescription" type="system" pointSize="14"/>
|
||||||
|
<textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" smartDashesType="yes" smartInsertDeleteType="no" smartQuotesType="no"/>
|
||||||
|
</textField>
|
||||||
|
<button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" horizontalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="detailDisclosure" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9Jr-BA-G9n">
|
||||||
|
<rect key="frame" x="368" y="8.0000000000000018" width="22" height="27.666666666666671"/>
|
||||||
|
<connections>
|
||||||
|
<action selector="courseHelpButton:" destination="5GD-rn-jaq" eventType="touchUpInside" id="s6W-7N-y6f"/>
|
||||||
|
</connections>
|
||||||
|
</button>
|
||||||
|
</subviews>
|
||||||
|
<constraints>
|
||||||
|
<constraint firstAttribute="bottom" secondItem="zxv-h1-Q8u" secondAttribute="bottom" constant="8" id="3TL-ae-PMo"/>
|
||||||
|
<constraint firstItem="zxv-h1-Q8u" firstAttribute="leading" secondItem="sWM-ta-aIS" secondAttribute="leading" constant="16" id="6Gi-if-hvj"/>
|
||||||
|
<constraint firstItem="9Jr-BA-G9n" firstAttribute="top" secondItem="sWM-ta-aIS" secondAttribute="top" constant="8" id="8Yh-XK-fBH"/>
|
||||||
|
<constraint firstItem="9Jr-BA-G9n" firstAttribute="leading" secondItem="zxv-h1-Q8u" secondAttribute="trailing" constant="16" id="J4C-rD-AVv"/>
|
||||||
|
<constraint firstAttribute="trailing" secondItem="9Jr-BA-G9n" secondAttribute="trailing" constant="24" id="RXG-Pv-5C1"/>
|
||||||
|
<constraint firstAttribute="bottom" secondItem="9Jr-BA-G9n" secondAttribute="bottom" constant="8" id="zJ2-jV-8Mu"/>
|
||||||
|
<constraint firstItem="zxv-h1-Q8u" firstAttribute="top" secondItem="sWM-ta-aIS" secondAttribute="top" constant="8" id="zuH-M7-EuZ"/>
|
||||||
|
</constraints>
|
||||||
|
</tableViewCellContentView>
|
||||||
|
</tableViewCell>
|
||||||
|
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="c1h-S1-7hb">
|
||||||
|
<rect key="frame" x="0.0" y="287.33333333333337" width="414" height="44"/>
|
||||||
|
<autoresizingMask key="autoresizingMask"/>
|
||||||
|
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="c1h-S1-7hb" id="oF0-xm-wEa">
|
||||||
|
<rect key="frame" x="0.0" y="0.0" width="414" height="43.666666666666664"/>
|
||||||
|
<autoresizingMask key="autoresizingMask"/>
|
||||||
|
<subviews>
|
||||||
|
<segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="1Nm-Wb-8js">
|
||||||
|
<rect key="frame" x="16" y="8.0000000000000018" width="336" height="28.666666666666671"/>
|
||||||
|
<segments>
|
||||||
|
<segment title="App order"/>
|
||||||
|
<segment title="Website order"/>
|
||||||
|
</segments>
|
||||||
|
</segmentedControl>
|
||||||
|
<button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" horizontalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="detailDisclosure" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="d3J-cU-Fkz">
|
||||||
|
<rect key="frame" x="368" y="8.0000000000000018" width="22" height="27.666666666666671"/>
|
||||||
|
<connections>
|
||||||
|
<action selector="orderHelpButton:" destination="5GD-rn-jaq" eventType="touchUpInside" id="0eZ-qg-y9V"/>
|
||||||
|
</connections>
|
||||||
|
</button>
|
||||||
|
</subviews>
|
||||||
|
<constraints>
|
||||||
|
<constraint firstItem="1Nm-Wb-8js" firstAttribute="top" secondItem="oF0-xm-wEa" secondAttribute="top" constant="8" id="7b8-2C-GwB"/>
|
||||||
|
<constraint firstAttribute="bottom" secondItem="d3J-cU-Fkz" secondAttribute="bottom" constant="8" id="Qc2-N3-Xyu"/>
|
||||||
|
<constraint firstItem="d3J-cU-Fkz" firstAttribute="top" secondItem="oF0-xm-wEa" secondAttribute="top" constant="8" id="S8U-Vg-OCe"/>
|
||||||
|
<constraint firstItem="1Nm-Wb-8js" firstAttribute="leading" secondItem="oF0-xm-wEa" secondAttribute="leading" constant="16" id="i0z-t8-25y"/>
|
||||||
|
<constraint firstItem="d3J-cU-Fkz" firstAttribute="leading" secondItem="1Nm-Wb-8js" secondAttribute="trailing" constant="16" id="oiR-d6-Yd9"/>
|
||||||
|
<constraint firstAttribute="trailing" secondItem="d3J-cU-Fkz" secondAttribute="trailing" constant="24" id="rnX-P2-PUt"/>
|
||||||
|
<constraint firstAttribute="bottom" secondItem="1Nm-Wb-8js" secondAttribute="bottom" constant="8" id="sCI-hI-oDh"/>
|
||||||
|
</constraints>
|
||||||
|
</tableViewCellContentView>
|
||||||
|
</tableViewCell>
|
||||||
|
</cells>
|
||||||
|
</tableViewSection>
|
||||||
|
<tableViewSection headerTitle="Miscellaneous" id="N8h-rV-nYA">
|
||||||
|
<cells>
|
||||||
|
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="XDL-nE-bMY">
|
||||||
|
<rect key="frame" x="0.0" y="387.33333333333337" width="414" height="44"/>
|
||||||
|
<autoresizingMask key="autoresizingMask"/>
|
||||||
|
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="XDL-nE-bMY" id="wHS-8D-vX0">
|
||||||
|
<rect key="frame" x="0.0" y="0.0" width="414" height="43.666666666666664"/>
|
||||||
|
<autoresizingMask key="autoresizingMask"/>
|
||||||
|
<subviews>
|
||||||
|
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Evc-f7-YMZ">
|
||||||
|
<rect key="frame" x="349" y="8.0000000000000018" width="51" height="27.666666666666671"/>
|
||||||
|
<color key="onTintColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||||
|
</switch>
|
||||||
|
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Personalized plan as default" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Dkg-Jy-5Sf">
|
||||||
|
<rect key="frame" x="16" y="8.0000000000000018" width="317" height="27.666666666666671"/>
|
||||||
|
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||||
|
<nil key="textColor"/>
|
||||||
|
<nil key="highlightedColor"/>
|
||||||
|
</label>
|
||||||
|
</subviews>
|
||||||
|
<constraints>
|
||||||
|
<constraint firstItem="Dkg-Jy-5Sf" firstAttribute="top" secondItem="wHS-8D-vX0" secondAttribute="top" constant="8" id="1Lz-rk-TwE"/>
|
||||||
|
<constraint firstItem="Evc-f7-YMZ" firstAttribute="top" secondItem="wHS-8D-vX0" secondAttribute="top" constant="8" id="8wR-u8-4Pb"/>
|
||||||
|
<constraint firstAttribute="bottom" secondItem="Evc-f7-YMZ" secondAttribute="bottom" constant="8" id="CRQ-5B-R2L"/>
|
||||||
|
<constraint firstAttribute="bottom" secondItem="Dkg-Jy-5Sf" secondAttribute="bottom" constant="8" id="G0z-yF-ykK"/>
|
||||||
|
<constraint firstItem="Evc-f7-YMZ" firstAttribute="leading" secondItem="Dkg-Jy-5Sf" secondAttribute="trailing" constant="16" id="j4T-hj-I7j"/>
|
||||||
|
<constraint firstItem="Dkg-Jy-5Sf" firstAttribute="leading" secondItem="wHS-8D-vX0" secondAttribute="leading" constant="16" id="kCK-Cg-q6R"/>
|
||||||
|
<constraint firstAttribute="trailing" secondItem="Evc-f7-YMZ" secondAttribute="trailing" constant="16" id="p2p-Y1-REw"/>
|
||||||
|
</constraints>
|
||||||
|
</tableViewCellContentView>
|
||||||
|
</tableViewCell>
|
||||||
|
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="5BJ-Ob-uur">
|
||||||
|
<rect key="frame" x="0.0" y="431.33333333333337" width="414" height="44"/>
|
||||||
|
<autoresizingMask key="autoresizingMask"/>
|
||||||
|
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="5BJ-Ob-uur" id="ge8-YB-y6z">
|
||||||
|
<rect key="frame" x="0.0" y="0.0" width="414" height="43.666666666666664"/>
|
||||||
|
<autoresizingMask key="autoresizingMask"/>
|
||||||
|
<subviews>
|
||||||
|
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="MmI-fr-TwC">
|
||||||
|
<rect key="frame" x="349" y="8.0000000000000018" width="51" height="27.666666666666671"/>
|
||||||
|
<color key="onTintColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||||
|
</switch>
|
||||||
|
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Auto refresh on app start" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oiQ-2o-sH8">
|
||||||
|
<rect key="frame" x="16" y="8.0000000000000018" width="317" height="27.666666666666671"/>
|
||||||
|
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||||
|
<nil key="textColor"/>
|
||||||
|
<nil key="highlightedColor"/>
|
||||||
|
</label>
|
||||||
|
</subviews>
|
||||||
|
<constraints>
|
||||||
|
<constraint firstItem="MmI-fr-TwC" firstAttribute="leading" secondItem="oiQ-2o-sH8" secondAttribute="trailing" constant="16" id="6me-jj-9xB"/>
|
||||||
|
<constraint firstAttribute="bottom" secondItem="oiQ-2o-sH8" secondAttribute="bottom" constant="8" id="88D-Qg-1Oc"/>
|
||||||
|
<constraint firstItem="MmI-fr-TwC" firstAttribute="top" secondItem="ge8-YB-y6z" secondAttribute="top" constant="8" id="LX2-EC-lzG"/>
|
||||||
|
<constraint firstItem="oiQ-2o-sH8" firstAttribute="leading" secondItem="ge8-YB-y6z" secondAttribute="leading" constant="16" id="U1T-1B-NGD"/>
|
||||||
|
<constraint firstAttribute="trailing" secondItem="MmI-fr-TwC" secondAttribute="trailing" constant="16" id="d9I-N9-Fd9"/>
|
||||||
|
<constraint firstAttribute="bottom" secondItem="MmI-fr-TwC" secondAttribute="bottom" constant="8" id="j8D-gH-okF"/>
|
||||||
|
<constraint firstItem="oiQ-2o-sH8" firstAttribute="top" secondItem="ge8-YB-y6z" secondAttribute="top" constant="8" id="jIF-Mz-cw5"/>
|
||||||
|
</constraints>
|
||||||
|
</tableViewCellContentView>
|
||||||
|
</tableViewCell>
|
||||||
|
</cells>
|
||||||
|
</tableViewSection>
|
||||||
|
</sections>
|
||||||
|
<connections>
|
||||||
|
<outlet property="dataSource" destination="5GD-rn-jaq" id="TDd-lR-gVx"/>
|
||||||
|
<outlet property="delegate" destination="5GD-rn-jaq" id="nt7-yr-n4U"/>
|
||||||
|
</connections>
|
||||||
|
</tableView>
|
||||||
|
<navigationItem key="navigationItem" title="Customize" id="in4-ZK-bqT">
|
||||||
|
<barButtonItem key="rightBarButtonItem" title="Save" id="FhN-ih-qVW">
|
||||||
|
<connections>
|
||||||
|
<action selector="done:" destination="5GD-rn-jaq" id="41Z-mE-1g6"/>
|
||||||
|
</connections>
|
||||||
|
</barButtonItem>
|
||||||
|
</navigationItem>
|
||||||
|
<connections>
|
||||||
|
<outlet property="autoRefreshToggle" destination="MmI-fr-TwC" id="OQW-Z7-t1S"/>
|
||||||
|
<outlet property="defaultSwitch" destination="Evc-f7-YMZ" id="lTz-cN-Cud"/>
|
||||||
|
<outlet property="orderingSegments" destination="1Nm-Wb-8js" id="XhR-GP-Y26"/>
|
||||||
|
<outlet property="textToolbar" destination="8oS-yh-q36" id="s0y-mh-0Bi"/>
|
||||||
|
<outlet property="txtClasses" destination="x8A-kh-LX4" id="pNd-XJ-EWf"/>
|
||||||
|
<outlet property="txtCourses" destination="zxv-h1-Q8u" id="bMV-Qq-MLu"/>
|
||||||
|
<outlet property="txtName" destination="A2b-5v-r2j" id="MLD-qu-wjf"/>
|
||||||
|
</connections>
|
||||||
|
</tableViewController>
|
||||||
|
<placeholder placeholderIdentifier="IBFirstResponder" id="PeF-JK-bpT" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||||
|
<toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="8oS-yh-q36">
|
||||||
|
<rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
|
||||||
|
<items>
|
||||||
|
<barButtonItem style="plain" systemItem="flexibleSpace" id="XBw-1h-UWe"/>
|
||||||
|
<barButtonItem systemItem="done" id="rN2-Pb-zFN">
|
||||||
|
<connections>
|
||||||
|
<action selector="textDismissButton:" destination="5GD-rn-jaq" id="sNV-N0-aPA"/>
|
||||||
|
</connections>
|
||||||
|
</barButtonItem>
|
||||||
|
</items>
|
||||||
|
</toolbar>
|
||||||
|
</objects>
|
||||||
|
<point key="canvasLocation" x="3471" y="-1221"/>
|
||||||
|
</scene>
|
||||||
|
<!--Navigation Controller-->
|
||||||
|
<scene sceneID="vtu-Vb-onU">
|
||||||
|
<objects>
|
||||||
|
<navigationController storyboardIdentifier="CustomizationNavigationController" id="3Wf-Vg-vcy" sceneMemberID="viewController">
|
||||||
|
<navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="57o-iQ-uC4">
|
||||||
|
<rect key="frame" x="0.0" y="44" width="414" height="44"/>
|
||||||
|
<autoresizingMask key="autoresizingMask"/>
|
||||||
|
</navigationBar>
|
||||||
|
<connections>
|
||||||
|
<segue destination="5GD-rn-jaq" kind="relationship" relationship="rootViewController" id="Dw2-eL-b2I"/>
|
||||||
|
</connections>
|
||||||
|
</navigationController>
|
||||||
|
<placeholder placeholderIdentifier="IBFirstResponder" id="4az-jZ-qze" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||||
|
</objects>
|
||||||
|
<point key="canvasLocation" x="2688" y="-1221"/>
|
||||||
|
</scene>
|
||||||
<!--Personal Plan View Controller-->
|
<!--Personal Plan View Controller-->
|
||||||
<scene sceneID="wg7-f3-ORb">
|
<scene sceneID="wg7-f3-ORb">
|
||||||
<objects>
|
<objects>
|
||||||
@@ -54,307 +327,52 @@
|
|||||||
</objects>
|
</objects>
|
||||||
<point key="canvasLocation" x="1628" y="-112"/>
|
<point key="canvasLocation" x="1628" y="-112"/>
|
||||||
</scene>
|
</scene>
|
||||||
<!--Customization View Controller-->
|
<!--Course Picker View Controller-->
|
||||||
<scene sceneID="gAv-U3-QPB">
|
<scene sceneID="yOs-dE-M5j">
|
||||||
<objects>
|
<objects>
|
||||||
<viewController storyboardIdentifier="Customize" id="8XB-jK-YFD" customClass="CustomizationViewController" customModule="AvH_Plan" customModuleProvider="target" sceneMemberID="viewController">
|
<viewController storyboardIdentifier="CoursePickerViewController" id="whN-0o-req" customClass="CoursePickerViewController" customModule="AvH_Plan" customModuleProvider="target" sceneMemberID="viewController">
|
||||||
<view key="view" contentMode="scaleToFill" id="3L4-c2-Pow">
|
<view key="view" contentMode="scaleToFill" id="2fc-pv-kuH">
|
||||||
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
|
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
|
||||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||||
<subviews>
|
<subviews>
|
||||||
<scrollView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iAl-ff-skU">
|
<navigationBar contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" layoutMarginsFollowReadableWidth="YES" translucent="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pyq-c3-PYx">
|
||||||
<rect key="frame" x="0.0" y="89.000000000000028" width="414" height="386.66666666666674"/>
|
|
||||||
<subviews>
|
|
||||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qtg-4Y-ylA">
|
|
||||||
<rect key="frame" x="0.0" y="0.0" width="414" height="343"/>
|
|
||||||
<subviews>
|
|
||||||
<textField opaque="NO" contentMode="scaleToFill" horizontalCompressionResistancePriority="749" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Your courses" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="EDB-Mm-gGh">
|
|
||||||
<rect key="frame" x="24" y="108" width="328" height="30"/>
|
|
||||||
<accessibility key="accessibilityConfiguration" hint="Courses"/>
|
|
||||||
<nil key="textColor"/>
|
|
||||||
<fontDescription key="fontDescription" type="system" pointSize="14"/>
|
|
||||||
<textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" smartDashesType="no" smartInsertDeleteType="no" smartQuotesType="no"/>
|
|
||||||
</textField>
|
|
||||||
<button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="detailDisclosure" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pBV-74-ixQ">
|
|
||||||
<rect key="frame" x="368" y="66" width="22" height="22"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="groupHelpButton:" destination="8XB-jK-YFD" eventType="touchUpInside" id="0Tg-rj-Kiz"/>
|
|
||||||
</connections>
|
|
||||||
</button>
|
|
||||||
<button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="detailDisclosure" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Fjp-fp-qWH">
|
|
||||||
<rect key="frame" x="368" y="112" width="22" height="22"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="courseHelpButton:" destination="8XB-jK-YFD" eventType="touchUpInside" id="Ie8-OI-gSz"/>
|
|
||||||
</connections>
|
|
||||||
</button>
|
|
||||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Default plan" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JMH-JV-eMe">
|
|
||||||
<rect key="frame" x="24" y="154" width="366" height="21"/>
|
|
||||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
|
||||||
<nil key="textColor"/>
|
|
||||||
<nil key="highlightedColor"/>
|
|
||||||
</label>
|
|
||||||
<textField opaque="NO" contentMode="scaleToFill" horizontalCompressionResistancePriority="749" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Your classes" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="gOX-RF-Brg">
|
|
||||||
<rect key="frame" x="24" y="62" width="328" height="30"/>
|
|
||||||
<accessibility key="accessibilityConfiguration" hint="Classes"/>
|
|
||||||
<nil key="textColor"/>
|
|
||||||
<fontDescription key="fontDescription" type="system" pointSize="14"/>
|
|
||||||
<textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" smartDashesType="no" smartInsertDeleteType="no" smartQuotesType="no"/>
|
|
||||||
</textField>
|
|
||||||
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Your name" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ZCm-7a-IUx">
|
|
||||||
<rect key="frame" x="24" y="16" width="366" height="30"/>
|
|
||||||
<accessibility key="accessibilityConfiguration" hint="Name"/>
|
|
||||||
<nil key="textColor"/>
|
|
||||||
<fontDescription key="fontDescription" type="system" pointSize="14"/>
|
|
||||||
<textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" smartDashesType="no" smartInsertDeleteType="no" smartQuotesType="no"/>
|
|
||||||
</textField>
|
|
||||||
<segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="1" translatesAutoresizingMaskIntoConstraints="NO" id="DPm-52-1Ww">
|
|
||||||
<rect key="frame" x="24" y="183" width="366" height="29"/>
|
|
||||||
<segments>
|
|
||||||
<segment title="General"/>
|
|
||||||
<segment title="Personal"/>
|
|
||||||
</segments>
|
|
||||||
</segmentedControl>
|
|
||||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Ordering system" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3iB-va-Cjs">
|
|
||||||
<rect key="frame" x="24" y="223" width="328" height="21"/>
|
|
||||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
|
||||||
<nil key="textColor"/>
|
|
||||||
<nil key="highlightedColor"/>
|
|
||||||
</label>
|
|
||||||
<segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="1" translatesAutoresizingMaskIntoConstraints="NO" id="ol8-tW-I69">
|
|
||||||
<rect key="frame" x="24" y="252" width="366" height="29"/>
|
|
||||||
<segments>
|
|
||||||
<segment title="App specific"/>
|
|
||||||
<segment title="Website original"/>
|
|
||||||
</segments>
|
|
||||||
</segmentedControl>
|
|
||||||
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="EWJ-Yo-CtW">
|
|
||||||
<rect key="frame" x="341" y="296" width="51" height="31"/>
|
|
||||||
<color key="onTintColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
|
||||||
</switch>
|
|
||||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Auto refresh on app startup" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YlM-R8-zk5">
|
|
||||||
<rect key="frame" x="24" y="301" width="301" height="21"/>
|
|
||||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
|
||||||
<nil key="textColor"/>
|
|
||||||
<nil key="highlightedColor"/>
|
|
||||||
</label>
|
|
||||||
<button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="252" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="detailDisclosure" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="teY-2x-Plv">
|
|
||||||
<rect key="frame" x="368" y="222.66666666666669" width="22" height="22"/>
|
|
||||||
<connections>
|
|
||||||
<action selector="orderHelpButton:" destination="8XB-jK-YFD" eventType="touchUpInside" id="7SG-ka-imy"/>
|
|
||||||
</connections>
|
|
||||||
</button>
|
|
||||||
</subviews>
|
|
||||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
|
||||||
<constraints>
|
|
||||||
<constraint firstAttribute="trailing" secondItem="JMH-JV-eMe" secondAttribute="trailing" constant="24" id="093-HT-vRO"/>
|
|
||||||
<constraint firstItem="YlM-R8-zk5" firstAttribute="centerY" secondItem="EWJ-Yo-CtW" secondAttribute="centerY" id="5wN-hP-lMT"/>
|
|
||||||
<constraint firstItem="ol8-tW-I69" firstAttribute="top" secondItem="3iB-va-Cjs" secondAttribute="bottom" constant="8" id="7oJ-2S-EF2"/>
|
|
||||||
<constraint firstAttribute="trailing" secondItem="ZCm-7a-IUx" secondAttribute="trailing" constant="24" id="8r6-R6-pq1"/>
|
|
||||||
<constraint firstItem="EDB-Mm-gGh" firstAttribute="leading" secondItem="qtg-4Y-ylA" secondAttribute="leading" constant="24" id="ARl-RY-O2q"/>
|
|
||||||
<constraint firstItem="DPm-52-1Ww" firstAttribute="leading" secondItem="qtg-4Y-ylA" secondAttribute="leading" constant="24" id="AoV-52-XcC"/>
|
|
||||||
<constraint firstItem="teY-2x-Plv" firstAttribute="centerY" secondItem="3iB-va-Cjs" secondAttribute="centerY" id="CNh-d1-kdt"/>
|
|
||||||
<constraint firstItem="3iB-va-Cjs" firstAttribute="leading" secondItem="qtg-4Y-ylA" secondAttribute="leading" constant="24" id="E2z-XG-LjJ"/>
|
|
||||||
<constraint firstAttribute="trailing" secondItem="Fjp-fp-qWH" secondAttribute="trailing" constant="24" id="EYn-tQ-h6h"/>
|
|
||||||
<constraint firstItem="Fjp-fp-qWH" firstAttribute="centerY" secondItem="EDB-Mm-gGh" secondAttribute="centerY" id="FdK-vg-kax"/>
|
|
||||||
<constraint firstAttribute="trailing" secondItem="DPm-52-1Ww" secondAttribute="trailing" constant="24" id="G2l-nv-qY6"/>
|
|
||||||
<constraint firstItem="EDB-Mm-gGh" firstAttribute="top" secondItem="gOX-RF-Brg" secondAttribute="bottom" constant="16" id="GV7-lY-x7p"/>
|
|
||||||
<constraint firstItem="teY-2x-Plv" firstAttribute="leading" secondItem="3iB-va-Cjs" secondAttribute="trailing" constant="16" id="Gac-Q0-cKv"/>
|
|
||||||
<constraint firstItem="ol8-tW-I69" firstAttribute="leading" secondItem="qtg-4Y-ylA" secondAttribute="leading" constant="24" id="HTK-sJ-rjE"/>
|
|
||||||
<constraint firstAttribute="trailing" secondItem="EWJ-Yo-CtW" secondAttribute="trailing" constant="24" id="If9-Ye-lmS"/>
|
|
||||||
<constraint firstItem="gOX-RF-Brg" firstAttribute="leading" secondItem="qtg-4Y-ylA" secondAttribute="leading" constant="24" id="JUo-WS-6j2"/>
|
|
||||||
<constraint firstItem="3iB-va-Cjs" firstAttribute="top" secondItem="DPm-52-1Ww" secondAttribute="bottom" constant="12" id="OGC-uf-xYk"/>
|
|
||||||
<constraint firstItem="ZCm-7a-IUx" firstAttribute="top" secondItem="qtg-4Y-ylA" secondAttribute="top" constant="16" id="POd-Sp-Xcd"/>
|
|
||||||
<constraint firstItem="DPm-52-1Ww" firstAttribute="top" secondItem="JMH-JV-eMe" secondAttribute="bottom" constant="8" id="Rnd-dX-Ywk"/>
|
|
||||||
<constraint firstItem="JMH-JV-eMe" firstAttribute="leading" secondItem="qtg-4Y-ylA" secondAttribute="leading" constant="24" id="ZtE-nY-Bjy"/>
|
|
||||||
<constraint firstItem="Fjp-fp-qWH" firstAttribute="leading" secondItem="EDB-Mm-gGh" secondAttribute="trailing" constant="16" id="buX-Cn-u5w"/>
|
|
||||||
<constraint firstItem="EWJ-Yo-CtW" firstAttribute="leading" secondItem="YlM-R8-zk5" secondAttribute="trailing" constant="16" id="bzg-iq-EiS"/>
|
|
||||||
<constraint firstItem="ZCm-7a-IUx" firstAttribute="leading" secondItem="qtg-4Y-ylA" secondAttribute="leading" constant="24" id="cB0-MQ-url"/>
|
|
||||||
<constraint firstAttribute="bottom" secondItem="EWJ-Yo-CtW" secondAttribute="bottom" constant="16" id="cJi-jL-tJe"/>
|
|
||||||
<constraint firstAttribute="trailing" secondItem="teY-2x-Plv" secondAttribute="trailing" constant="24" id="eZ4-jd-Tcy"/>
|
|
||||||
<constraint firstAttribute="trailing" secondItem="pBV-74-ixQ" secondAttribute="trailing" constant="24" id="gSE-LM-Pgg"/>
|
|
||||||
<constraint firstAttribute="trailing" secondItem="ol8-tW-I69" secondAttribute="trailing" constant="24" id="gVp-is-Q10"/>
|
|
||||||
<constraint firstItem="YlM-R8-zk5" firstAttribute="leading" secondItem="qtg-4Y-ylA" secondAttribute="leading" constant="24" id="k26-N7-3f1"/>
|
|
||||||
<constraint firstItem="JMH-JV-eMe" firstAttribute="top" secondItem="EDB-Mm-gGh" secondAttribute="bottom" constant="16" id="oBN-Vp-yTh"/>
|
|
||||||
<constraint firstItem="pBV-74-ixQ" firstAttribute="leading" secondItem="gOX-RF-Brg" secondAttribute="trailing" constant="16" id="oOD-wb-nkh"/>
|
|
||||||
<constraint firstItem="gOX-RF-Brg" firstAttribute="top" secondItem="ZCm-7a-IUx" secondAttribute="bottom" constant="16" id="oTV-EW-U78"/>
|
|
||||||
<constraint firstItem="EWJ-Yo-CtW" firstAttribute="top" secondItem="ol8-tW-I69" secondAttribute="bottom" constant="16" id="oaG-aE-Rcv"/>
|
|
||||||
<constraint firstItem="pBV-74-ixQ" firstAttribute="centerY" secondItem="gOX-RF-Brg" secondAttribute="centerY" id="zo8-q4-BjH"/>
|
|
||||||
</constraints>
|
|
||||||
</view>
|
|
||||||
</subviews>
|
|
||||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
|
||||||
<constraints>
|
|
||||||
<constraint firstItem="qtg-4Y-ylA" firstAttribute="width" secondItem="iAl-ff-skU" secondAttribute="width" id="6GC-RJ-mSY"/>
|
|
||||||
<constraint firstAttribute="trailing" secondItem="qtg-4Y-ylA" secondAttribute="trailing" id="DRw-aL-agj"/>
|
|
||||||
<constraint firstAttribute="bottom" secondItem="qtg-4Y-ylA" secondAttribute="bottom" id="McH-CB-hVU"/>
|
|
||||||
<constraint firstItem="qtg-4Y-ylA" firstAttribute="leading" secondItem="iAl-ff-skU" secondAttribute="leading" id="rTW-Al-SaN"/>
|
|
||||||
<constraint firstItem="qtg-4Y-ylA" firstAttribute="top" secondItem="iAl-ff-skU" secondAttribute="top" id="wyu-TK-k91"/>
|
|
||||||
</constraints>
|
|
||||||
</scrollView>
|
|
||||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3ae-Qn-llh">
|
|
||||||
<rect key="frame" x="0.0" y="475.66666666666674" width="414" height="386.33333333333326"/>
|
|
||||||
<subviews>
|
|
||||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sNo-gi-NHQ">
|
|
||||||
<rect key="frame" x="16" y="3" width="382" height="1"/>
|
|
||||||
<color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
|
||||||
<variation key="heightClass=compact" hidden="YES"/>
|
|
||||||
</view>
|
|
||||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="Custom colours" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rks-gf-AM4">
|
|
||||||
<rect key="frame" x="24" y="16" width="366" height="21"/>
|
|
||||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
|
||||||
<nil key="textColor"/>
|
|
||||||
<nil key="highlightedColor"/>
|
|
||||||
</label>
|
|
||||||
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="hWP-3N-RUn">
|
|
||||||
<rect key="frame" x="8" y="52.999999999999943" width="398" height="333.33333333333331"/>
|
|
||||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
|
||||||
<collectionViewLayout key="collectionViewLayout" id="sCM-Sc-0Zw" customClass="MagazineLayout" customModule="MagazineLayout"/>
|
|
||||||
<cells/>
|
|
||||||
<connections>
|
|
||||||
<outlet property="dataSource" destination="8XB-jK-YFD" id="mHC-Am-kkd"/>
|
|
||||||
<outlet property="delegate" destination="8XB-jK-YFD" id="cTM-du-BOk"/>
|
|
||||||
</connections>
|
|
||||||
</collectionView>
|
|
||||||
</subviews>
|
|
||||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
|
||||||
<constraints>
|
|
||||||
<constraint firstItem="hWP-3N-RUn" firstAttribute="leading" secondItem="3ae-Qn-llh" secondAttribute="leading" constant="8" id="1ht-Ws-T8Y"/>
|
|
||||||
<constraint firstItem="hWP-3N-RUn" firstAttribute="top" secondItem="rks-gf-AM4" secondAttribute="bottom" constant="16" id="5Ss-pW-THK"/>
|
|
||||||
<constraint firstAttribute="trailing" secondItem="hWP-3N-RUn" secondAttribute="trailing" constant="8" id="72H-9z-A6Z"/>
|
|
||||||
<constraint firstItem="rks-gf-AM4" firstAttribute="top" secondItem="3ae-Qn-llh" secondAttribute="top" constant="16" id="8kR-rm-gdJ"/>
|
|
||||||
<constraint firstItem="sNo-gi-NHQ" firstAttribute="top" secondItem="3ae-Qn-llh" secondAttribute="top" constant="3" id="9Pu-Yg-Xe8"/>
|
|
||||||
<constraint firstItem="rks-gf-AM4" firstAttribute="top" secondItem="sNo-gi-NHQ" secondAttribute="bottom" constant="12" id="FaY-u1-rgA"/>
|
|
||||||
<constraint firstAttribute="trailing" secondItem="sNo-gi-NHQ" secondAttribute="trailing" constant="16" id="H2W-Gn-eHO"/>
|
|
||||||
<constraint firstAttribute="bottom" secondItem="hWP-3N-RUn" secondAttribute="bottom" id="bPr-ng-hbt"/>
|
|
||||||
<constraint firstAttribute="trailing" secondItem="rks-gf-AM4" secondAttribute="trailing" constant="24" id="deG-Uk-50h"/>
|
|
||||||
<constraint firstItem="rks-gf-AM4" firstAttribute="leading" secondItem="3ae-Qn-llh" secondAttribute="leading" constant="24" id="eQ0-7G-zMb"/>
|
|
||||||
<constraint firstItem="sNo-gi-NHQ" firstAttribute="leading" secondItem="3ae-Qn-llh" secondAttribute="leading" constant="16" id="otd-pX-fbe"/>
|
|
||||||
</constraints>
|
|
||||||
</view>
|
|
||||||
<navigationBar contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" layoutMarginsFollowReadableWidth="YES" translucent="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1XB-6S-dGV">
|
|
||||||
<rect key="frame" x="0.0" y="44" width="414" height="44"/>
|
<rect key="frame" x="0.0" y="44" width="414" height="44"/>
|
||||||
<items>
|
<items>
|
||||||
<navigationItem title="Customize" id="9Pf-pB-wLS">
|
<navigationItem title="Customize colours" id="bj2-hB-vVb">
|
||||||
<barButtonItem key="rightBarButtonItem" title="Save" id="PWA-cp-z6o">
|
<barButtonItem key="rightBarButtonItem" title="Done" id="g4a-cE-7bJ">
|
||||||
<connections>
|
<connections>
|
||||||
<action selector="done:" destination="8XB-jK-YFD" id="7wR-PO-v0i"/>
|
<action selector="saveButton:" destination="whN-0o-req" id="Z83-bM-1yv"/>
|
||||||
</connections>
|
</connections>
|
||||||
</barButtonItem>
|
</barButtonItem>
|
||||||
</navigationItem>
|
</navigationItem>
|
||||||
</items>
|
</items>
|
||||||
</navigationBar>
|
</navigationBar>
|
||||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Hjo-bd-Xxz">
|
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="osl-6A-DdT">
|
||||||
<rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
|
<rect key="frame" x="0.0" y="89" width="414" height="773"/>
|
||||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||||
</view>
|
<collectionViewLayout key="collectionViewLayout" id="Rj8-fR-cpM" customClass="MagazineLayout" customModule="MagazineLayout"/>
|
||||||
|
<cells/>
|
||||||
|
</collectionView>
|
||||||
</subviews>
|
</subviews>
|
||||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||||
<constraints>
|
<constraints>
|
||||||
<constraint firstItem="iN7-lf-GS3" firstAttribute="trailing" secondItem="iAl-ff-skU" secondAttribute="trailing" id="AoD-6m-Zah"/>
|
<constraint firstItem="pyq-c3-PYx" firstAttribute="top" secondItem="hyb-lI-39K" secondAttribute="top" id="ICp-uJ-Gf8"/>
|
||||||
<constraint firstItem="Hjo-bd-Xxz" firstAttribute="top" secondItem="3L4-c2-Pow" secondAttribute="top" id="GNh-7e-neI"/>
|
<constraint firstAttribute="trailing" secondItem="osl-6A-DdT" secondAttribute="trailing" id="VbM-jY-jbB"/>
|
||||||
<constraint firstItem="iN7-lf-GS3" firstAttribute="bottom" secondItem="3ae-Qn-llh" secondAttribute="bottom" id="H2b-Bw-SPo"/>
|
<constraint firstItem="hyb-lI-39K" firstAttribute="bottom" secondItem="osl-6A-DdT" secondAttribute="bottom" id="XTp-jd-vxs"/>
|
||||||
<constraint firstItem="3ae-Qn-llh" firstAttribute="leading" secondItem="iN7-lf-GS3" secondAttribute="leading" id="JSj-x6-uUy"/>
|
<constraint firstItem="hyb-lI-39K" firstAttribute="trailing" secondItem="pyq-c3-PYx" secondAttribute="trailing" id="dZt-Hu-jad"/>
|
||||||
<constraint firstItem="iAl-ff-skU" firstAttribute="top" secondItem="1XB-6S-dGV" secondAttribute="bottom" constant="1" id="KyF-sn-SYG"/>
|
<constraint firstItem="osl-6A-DdT" firstAttribute="leading" secondItem="hyb-lI-39K" secondAttribute="leading" id="hHO-M8-dy2"/>
|
||||||
<constraint firstItem="Hjo-bd-Xxz" firstAttribute="bottom" secondItem="iN7-lf-GS3" secondAttribute="top" id="M3x-Aa-eXW"/>
|
<constraint firstItem="osl-6A-DdT" firstAttribute="top" secondItem="pyq-c3-PYx" secondAttribute="bottom" constant="1" id="jd6-3S-R8v"/>
|
||||||
<constraint firstAttribute="trailing" secondItem="Hjo-bd-Xxz" secondAttribute="trailing" id="MYQ-uI-g81"/>
|
<constraint firstItem="pyq-c3-PYx" firstAttribute="leading" secondItem="hyb-lI-39K" secondAttribute="leading" id="vg9-aA-Z8f"/>
|
||||||
<constraint firstItem="3ae-Qn-llh" firstAttribute="leading" secondItem="iAl-ff-skU" secondAttribute="trailing" id="Ojd-xl-Edq"/>
|
|
||||||
<constraint firstItem="iAl-ff-skU" firstAttribute="height" secondItem="3ae-Qn-llh" secondAttribute="height" id="SB2-jE-rZX"/>
|
|
||||||
<constraint firstItem="iAl-ff-skU" firstAttribute="leading" secondItem="3L4-c2-Pow" secondAttribute="leading" id="SI9-hB-Om4"/>
|
|
||||||
<constraint firstItem="3ae-Qn-llh" firstAttribute="top" secondItem="1XB-6S-dGV" secondAttribute="bottom" id="T5g-Sq-0j2"/>
|
|
||||||
<constraint firstItem="iN7-lf-GS3" firstAttribute="bottom" secondItem="3ae-Qn-llh" secondAttribute="bottom" id="VHJ-b1-MUU"/>
|
|
||||||
<constraint firstItem="iN7-lf-GS3" firstAttribute="trailing" secondItem="1XB-6S-dGV" secondAttribute="trailing" id="ViL-Rg-PN8"/>
|
|
||||||
<constraint firstItem="iAl-ff-skU" firstAttribute="width" secondItem="3ae-Qn-llh" secondAttribute="width" id="WSU-eO-T8S"/>
|
|
||||||
<constraint firstItem="iAl-ff-skU" firstAttribute="leading" secondItem="iN7-lf-GS3" secondAttribute="leading" id="efn-u4-JYI"/>
|
|
||||||
<constraint firstItem="iAl-ff-skU" firstAttribute="top" secondItem="1XB-6S-dGV" secondAttribute="bottom" constant="1" id="fxU-4n-vS8"/>
|
|
||||||
<constraint firstItem="Hjo-bd-Xxz" firstAttribute="leading" secondItem="iN7-lf-GS3" secondAttribute="leading" id="lzs-fS-tfJ"/>
|
|
||||||
<constraint firstItem="3ae-Qn-llh" firstAttribute="top" secondItem="iAl-ff-skU" secondAttribute="bottom" id="mwV-zq-iVp"/>
|
|
||||||
<constraint firstItem="iN7-lf-GS3" firstAttribute="bottom" secondItem="iAl-ff-skU" secondAttribute="bottom" id="o0D-wq-Ew9"/>
|
|
||||||
<constraint firstItem="iN7-lf-GS3" firstAttribute="trailing" secondItem="3ae-Qn-llh" secondAttribute="trailing" id="oT6-TL-SV4"/>
|
|
||||||
<constraint firstAttribute="trailing" secondItem="3ae-Qn-llh" secondAttribute="trailing" id="qvo-A0-0im"/>
|
|
||||||
<constraint firstItem="1XB-6S-dGV" firstAttribute="top" secondItem="iN7-lf-GS3" secondAttribute="top" id="uz5-3l-eKb"/>
|
|
||||||
<constraint firstItem="1XB-6S-dGV" firstAttribute="leading" secondItem="3L4-c2-Pow" secondAttribute="leading" id="vnV-AO-wgT"/>
|
|
||||||
</constraints>
|
</constraints>
|
||||||
<viewLayoutGuide key="safeArea" id="iN7-lf-GS3"/>
|
<viewLayoutGuide key="safeArea" id="hyb-lI-39K"/>
|
||||||
<variation key="default">
|
|
||||||
<mask key="constraints">
|
|
||||||
<exclude reference="AoD-6m-Zah"/>
|
|
||||||
<exclude reference="H2b-Bw-SPo"/>
|
|
||||||
<exclude reference="VHJ-b1-MUU"/>
|
|
||||||
<exclude reference="o0D-wq-Ew9"/>
|
|
||||||
<exclude reference="oT6-TL-SV4"/>
|
|
||||||
<exclude reference="KyF-sn-SYG"/>
|
|
||||||
<exclude reference="SB2-jE-rZX"/>
|
|
||||||
<exclude reference="SI9-hB-Om4"/>
|
|
||||||
<exclude reference="WSU-eO-T8S"/>
|
|
||||||
<exclude reference="efn-u4-JYI"/>
|
|
||||||
<exclude reference="fxU-4n-vS8"/>
|
|
||||||
<exclude reference="JSj-x6-uUy"/>
|
|
||||||
<exclude reference="Ojd-xl-Edq"/>
|
|
||||||
<exclude reference="T5g-Sq-0j2"/>
|
|
||||||
<exclude reference="mwV-zq-iVp"/>
|
|
||||||
<exclude reference="qvo-A0-0im"/>
|
|
||||||
</mask>
|
|
||||||
</variation>
|
|
||||||
<variation key="heightClass=compact">
|
|
||||||
<mask key="constraints">
|
|
||||||
<exclude reference="AoD-6m-Zah"/>
|
|
||||||
<exclude reference="H2b-Bw-SPo"/>
|
|
||||||
<include reference="VHJ-b1-MUU"/>
|
|
||||||
<include reference="o0D-wq-Ew9"/>
|
|
||||||
<include reference="oT6-TL-SV4"/>
|
|
||||||
<exclude reference="KyF-sn-SYG"/>
|
|
||||||
<exclude reference="SI9-hB-Om4"/>
|
|
||||||
<include reference="WSU-eO-T8S"/>
|
|
||||||
<include reference="efn-u4-JYI"/>
|
|
||||||
<include reference="fxU-4n-vS8"/>
|
|
||||||
<exclude reference="JSj-x6-uUy"/>
|
|
||||||
<include reference="Ojd-xl-Edq"/>
|
|
||||||
<include reference="T5g-Sq-0j2"/>
|
|
||||||
<exclude reference="qvo-A0-0im"/>
|
|
||||||
</mask>
|
|
||||||
</variation>
|
|
||||||
<variation key="heightClass=regular-widthClass=compact">
|
|
||||||
<mask key="constraints">
|
|
||||||
<include reference="AoD-6m-Zah"/>
|
|
||||||
<include reference="H2b-Bw-SPo"/>
|
|
||||||
<include reference="KyF-sn-SYG"/>
|
|
||||||
<include reference="SB2-jE-rZX"/>
|
|
||||||
<include reference="SI9-hB-Om4"/>
|
|
||||||
<include reference="JSj-x6-uUy"/>
|
|
||||||
<include reference="mwV-zq-iVp"/>
|
|
||||||
<include reference="qvo-A0-0im"/>
|
|
||||||
</mask>
|
|
||||||
</variation>
|
|
||||||
</view>
|
</view>
|
||||||
<navigationItem key="navigationItem" id="xDt-o1-FZQ"/>
|
|
||||||
<connections>
|
<connections>
|
||||||
<outlet property="autoRefreshToggle" destination="EWJ-Yo-CtW" id="YoG-qo-G5G"/>
|
<outlet property="collectionView" destination="osl-6A-DdT" id="rHV-7n-1gL"/>
|
||||||
<outlet property="collectionView" destination="hWP-3N-RUn" id="RFo-DP-uPX"/>
|
|
||||||
<outlet property="colourView" destination="3ae-Qn-llh" id="do8-yi-0xg"/>
|
|
||||||
<outlet property="defaultSegments" destination="DPm-52-1Ww" id="4C8-tU-r8F"/>
|
|
||||||
<outlet property="inputsView" destination="iAl-ff-skU" id="6a4-Dz-Lch"/>
|
|
||||||
<outlet property="orderingSegments" destination="ol8-tW-I69" id="gKp-bt-Up7"/>
|
|
||||||
<outlet property="textToolbar" destination="cDy-2Q-2zk" id="UlY-Aa-f41"/>
|
|
||||||
<outlet property="txtClasses" destination="gOX-RF-Brg" id="fhm-pP-s7F"/>
|
|
||||||
<outlet property="txtCourses" destination="EDB-Mm-gGh" id="GbC-4F-MOa"/>
|
|
||||||
<outlet property="txtName" destination="ZCm-7a-IUx" id="Y3J-02-nMZ"/>
|
|
||||||
</connections>
|
</connections>
|
||||||
</viewController>
|
</viewController>
|
||||||
<placeholder placeholderIdentifier="IBFirstResponder" id="fIE-1y-qpc" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
<placeholder placeholderIdentifier="IBFirstResponder" id="DYt-qf-rc5" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||||
<toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="cDy-2Q-2zk">
|
|
||||||
<rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
|
|
||||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
|
|
||||||
<items>
|
|
||||||
<barButtonItem style="plain" systemItem="flexibleSpace" id="Tsa-Dg-qek"/>
|
|
||||||
<barButtonItem systemItem="done" id="nSG-vf-dVd">
|
|
||||||
<connections>
|
|
||||||
<action selector="textDismissButton:" destination="8XB-jK-YFD" id="aXf-TS-Wxk"/>
|
|
||||||
</connections>
|
|
||||||
</barButtonItem>
|
|
||||||
</items>
|
|
||||||
</toolbar>
|
|
||||||
</objects>
|
</objects>
|
||||||
<point key="canvasLocation" x="2689.2857142857142" y="-514.49275362318849"/>
|
<point key="canvasLocation" x="3472" y="-514"/>
|
||||||
</scene>
|
</scene>
|
||||||
<!--Colour Picker View-->
|
<!--Colour Picker View-->
|
||||||
<scene sceneID="H2r-WV-fSr">
|
<scene sceneID="H2r-WV-fSr">
|
||||||
@@ -411,7 +429,7 @@
|
|||||||
</viewController>
|
</viewController>
|
||||||
<placeholder placeholderIdentifier="IBFirstResponder" id="hiX-3i-iLz" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
<placeholder placeholderIdentifier="IBFirstResponder" id="hiX-3i-iLz" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||||
</objects>
|
</objects>
|
||||||
<point key="canvasLocation" x="3503" y="-514"/>
|
<point key="canvasLocation" x="4245" y="-515"/>
|
||||||
</scene>
|
</scene>
|
||||||
<!--Menu View Controller-->
|
<!--Menu View Controller-->
|
||||||
<scene sceneID="JTo-oO-5Xc">
|
<scene sceneID="JTo-oO-5Xc">
|
||||||
@@ -664,14 +682,12 @@ Tell me your name.</string>
|
|||||||
<rect key="frame" x="372" y="179.33333333333331" width="22" height="22"/>
|
<rect key="frame" x="372" y="179.33333333333331" width="22" height="22"/>
|
||||||
<connections>
|
<connections>
|
||||||
<action selector="gradeInfoButton:" destination="rnZ-JC-kBT" eventType="touchUpInside" id="Ec2-kW-LH4"/>
|
<action selector="gradeInfoButton:" destination="rnZ-JC-kBT" eventType="touchUpInside" id="Ec2-kW-LH4"/>
|
||||||
<action selector="groupHelpButton:" destination="8XB-jK-YFD" eventType="touchUpInside" id="P6s-da-euY"/>
|
|
||||||
</connections>
|
</connections>
|
||||||
</button>
|
</button>
|
||||||
<button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="detailDisclosure" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vTq-Xg-Vnx">
|
<button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="detailDisclosure" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vTq-Xg-Vnx">
|
||||||
<rect key="frame" x="372" y="302.33333333333331" width="22" height="22"/>
|
<rect key="frame" x="372" y="302.33333333333331" width="22" height="22"/>
|
||||||
<connections>
|
<connections>
|
||||||
<action selector="courseInfoButton:" destination="rnZ-JC-kBT" eventType="touchUpInside" id="jDC-Pi-wy4"/>
|
<action selector="courseInfoButton:" destination="rnZ-JC-kBT" eventType="touchUpInside" id="jDC-Pi-wy4"/>
|
||||||
<action selector="groupHelpButton:" destination="8XB-jK-YFD" eventType="touchUpInside" id="au7-hN-6i5"/>
|
|
||||||
</connections>
|
</connections>
|
||||||
</button>
|
</button>
|
||||||
</subviews>
|
</subviews>
|
||||||
@@ -740,9 +756,22 @@ Tell me your name.</string>
|
|||||||
<outlet property="gradeTextField" destination="b6K-FB-rfo" id="PbA-qF-Wgb"/>
|
<outlet property="gradeTextField" destination="b6K-FB-rfo" id="PbA-qF-Wgb"/>
|
||||||
<outlet property="nameTextField" destination="pH1-JE-B6v" id="bgN-VN-Cfn"/>
|
<outlet property="nameTextField" destination="pH1-JE-B6v" id="bgN-VN-Cfn"/>
|
||||||
<outlet property="scrollView" destination="IP4-V7-jcg" id="Xxo-ES-TSj"/>
|
<outlet property="scrollView" destination="IP4-V7-jcg" id="Xxo-ES-TSj"/>
|
||||||
|
<outlet property="textToolbar" destination="es0-5E-wOu" id="T5a-vu-Xrh"/>
|
||||||
</connections>
|
</connections>
|
||||||
</viewController>
|
</viewController>
|
||||||
<placeholder placeholderIdentifier="IBFirstResponder" id="nGa-db-93s" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
<placeholder placeholderIdentifier="IBFirstResponder" id="nGa-db-93s" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||||
|
<toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="es0-5E-wOu">
|
||||||
|
<rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
|
||||||
|
<items>
|
||||||
|
<barButtonItem style="plain" systemItem="flexibleSpace" id="sKi-7F-ZIV"/>
|
||||||
|
<barButtonItem systemItem="done" id="97h-uH-pvf">
|
||||||
|
<connections>
|
||||||
|
<action selector="textDismissButton:" destination="rnZ-JC-kBT" id="tzR-ME-56J"/>
|
||||||
|
</connections>
|
||||||
|
</barButtonItem>
|
||||||
|
</items>
|
||||||
|
</toolbar>
|
||||||
</objects>
|
</objects>
|
||||||
<point key="canvasLocation" x="3495.652173913044" y="881.91964285714278"/>
|
<point key="canvasLocation" x="3495.652173913044" y="881.91964285714278"/>
|
||||||
</scene>
|
</scene>
|
||||||
|
|||||||
@@ -43,6 +43,8 @@ class ColourPickerView: UIViewController, UICollectionViewDataSource, UICollecti
|
|||||||
super.viewDidLoad()
|
super.viewDidLoad()
|
||||||
index = prefs.integer(forKey: key)
|
index = prefs.integer(forKey: key)
|
||||||
self.toolbar!.topItem!.title = "\(course)"
|
self.toolbar!.topItem!.title = "\(course)"
|
||||||
|
self.collectionView.delegate = self
|
||||||
|
self.collectionView.dataSource = self
|
||||||
}
|
}
|
||||||
|
|
||||||
func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
|
func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
|
||||||
|
|||||||
+22
-23
@@ -13,27 +13,23 @@
|
|||||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
|
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
|
||||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
||||||
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="gTV-IL-0wX" customClass="ColourViewCell" customModule="AvH_Plan" customModuleProvider="target">
|
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="gTV-IL-0wX" customClass="ColourViewCell" customModule="AvH_Plan" customModuleProvider="target">
|
||||||
<rect key="frame" x="0.0" y="0.0" width="437" height="55"/>
|
<rect key="frame" x="0.0" y="0.0" width="437" height="50"/>
|
||||||
<autoresizingMask key="autoresizingMask"/>
|
<autoresizingMask key="autoresizingMask"/>
|
||||||
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
|
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
|
||||||
<rect key="frame" x="0.0" y="0.0" width="437" height="55"/>
|
<rect key="frame" x="0.0" y="0.0" width="437" height="50"/>
|
||||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||||
<subviews>
|
<subviews>
|
||||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="190-8v-eT2">
|
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="190-8v-eT2">
|
||||||
<rect key="frame" x="71" y="8" width="342" height="39"/>
|
<rect key="frame" x="76" y="12" width="337" height="26"/>
|
||||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||||
<nil key="textColor"/>
|
<nil key="textColor"/>
|
||||||
<nil key="highlightedColor"/>
|
<nil key="highlightedColor"/>
|
||||||
</label>
|
</label>
|
||||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pXw-Js-My4">
|
|
||||||
<rect key="frame" x="16" y="54" width="405" height="1"/>
|
|
||||||
<color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
|
||||||
</view>
|
|
||||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HcR-OC-IDt">
|
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HcR-OC-IDt">
|
||||||
<rect key="frame" x="16" y="8" width="39" height="39"/>
|
<rect key="frame" x="24" y="7" width="36" height="36"/>
|
||||||
<subviews>
|
<subviews>
|
||||||
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="psw-Nb-1ak">
|
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="psw-Nb-1ak">
|
||||||
<rect key="frame" x="12" y="12" width="15" height="15"/>
|
<rect key="frame" x="12" y="12" width="12" height="12"/>
|
||||||
</imageView>
|
</imageView>
|
||||||
</subviews>
|
</subviews>
|
||||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||||
@@ -45,30 +41,33 @@
|
|||||||
<constraint firstItem="psw-Nb-1ak" firstAttribute="top" secondItem="HcR-OC-IDt" secondAttribute="top" constant="12" id="hje-Pu-PPR"/>
|
<constraint firstItem="psw-Nb-1ak" firstAttribute="top" secondItem="HcR-OC-IDt" secondAttribute="top" constant="12" id="hje-Pu-PPR"/>
|
||||||
</constraints>
|
</constraints>
|
||||||
</view>
|
</view>
|
||||||
|
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Fud-ah-v5C">
|
||||||
|
<rect key="frame" x="24" y="49" width="413" height="1"/>
|
||||||
|
<color key="backgroundColor" name="separatorColor" catalog="System" colorSpace="catalog"/>
|
||||||
|
</view>
|
||||||
</subviews>
|
</subviews>
|
||||||
</view>
|
</view>
|
||||||
<constraints>
|
<constraints>
|
||||||
<constraint firstAttribute="leading" secondItem="HcR-OC-IDt" secondAttribute="trailing" constant="-55" id="52w-ff-fKd"/>
|
<constraint firstItem="190-8v-eT2" firstAttribute="leading" secondItem="HcR-OC-IDt" secondAttribute="trailing" constant="16" id="A8V-G8-mcv"/>
|
||||||
<constraint firstAttribute="trailing" secondItem="pXw-Js-My4" secondAttribute="trailing" constant="16" id="5Re-eN-o1T"/>
|
<constraint firstItem="Fud-ah-v5C" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" constant="24" id="N0t-DL-DYu"/>
|
||||||
<constraint firstItem="HcR-OC-IDt" firstAttribute="top" secondItem="190-8v-eT2" secondAttribute="top" priority="999" id="8DG-j8-Ojn"/>
|
<constraint firstItem="ZTg-uK-7eu" firstAttribute="leading" secondItem="HcR-OC-IDt" secondAttribute="trailing" constant="-60" id="OW3-CV-2xd"/>
|
||||||
<constraint firstAttribute="trailing" secondItem="190-8v-eT2" secondAttribute="trailing" constant="24" id="8Uf-UV-G9Y"/>
|
<constraint firstItem="HcR-OC-IDt" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" constant="24" id="Ui2-Og-5Hi"/>
|
||||||
<constraint firstAttribute="bottom" secondItem="pXw-Js-My4" secondAttribute="bottom" id="BP5-Xn-rR4"/>
|
<constraint firstItem="Fud-ah-v5C" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="bottom" constant="-1" id="bET-hG-rlh"/>
|
||||||
<constraint firstItem="HcR-OC-IDt" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" constant="16" id="HWa-bE-RAc"/>
|
<constraint firstAttribute="trailing" secondItem="190-8v-eT2" secondAttribute="trailing" constant="24" id="cCQ-92-k1q"/>
|
||||||
<constraint firstItem="190-8v-eT2" firstAttribute="bottom" secondItem="HcR-OC-IDt" secondAttribute="bottom" priority="999" id="Qib-8w-kx3"/>
|
<constraint firstAttribute="bottom" secondItem="190-8v-eT2" secondAttribute="bottom" constant="12" id="l9x-Uc-okU"/>
|
||||||
<constraint firstItem="190-8v-eT2" firstAttribute="leading" secondItem="HcR-OC-IDt" secondAttribute="trailing" constant="16" id="if6-co-5BB"/>
|
<constraint firstAttribute="trailing" secondItem="Fud-ah-v5C" secondAttribute="trailing" id="m60-OB-EIA"/>
|
||||||
<constraint firstItem="190-8v-eT2" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" constant="8" id="j5f-Jb-cBH"/>
|
<constraint firstAttribute="bottom" secondItem="Fud-ah-v5C" secondAttribute="bottom" id="n20-zE-D1Z"/>
|
||||||
<constraint firstAttribute="bottom" secondItem="190-8v-eT2" secondAttribute="bottom" constant="8" id="lcL-aR-dl6"/>
|
<constraint firstItem="190-8v-eT2" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" constant="12" id="n9S-Tz-k1f"/>
|
||||||
<constraint firstItem="pXw-Js-My4" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" constant="16" id="nCr-5a-USw"/>
|
<constraint firstItem="190-8v-eT2" firstAttribute="centerY" secondItem="HcR-OC-IDt" secondAttribute="centerY" id="uJE-7A-i8w"/>
|
||||||
<constraint firstItem="pXw-Js-My4" firstAttribute="top" secondItem="190-8v-eT2" secondAttribute="bottom" constant="7" id="nTa-Og-B8E"/>
|
|
||||||
</constraints>
|
</constraints>
|
||||||
<viewLayoutGuide key="safeArea" id="ZTg-uK-7eu"/>
|
<viewLayoutGuide key="safeArea" id="ZTg-uK-7eu"/>
|
||||||
<size key="customSize" width="437" height="71"/>
|
<size key="customSize" width="437" height="66"/>
|
||||||
<connections>
|
<connections>
|
||||||
<outlet property="colorView" destination="HcR-OC-IDt" id="qB6-fL-D3e"/>
|
<outlet property="colorView" destination="HcR-OC-IDt" id="qB6-fL-D3e"/>
|
||||||
<outlet property="imageView" destination="psw-Nb-1ak" id="oew-Yu-sU3"/>
|
<outlet property="imageView" destination="psw-Nb-1ak" id="oew-Yu-sU3"/>
|
||||||
<outlet property="label" destination="190-8v-eT2" id="Xnc-ZG-PDp"/>
|
<outlet property="label" destination="190-8v-eT2" id="Xnc-ZG-PDp"/>
|
||||||
</connections>
|
</connections>
|
||||||
<point key="canvasLocation" x="412.31884057971018" y="160.37946428571428"/>
|
<point key="canvasLocation" x="412.31884057971018" y="158.70535714285714"/>
|
||||||
</collectionViewCell>
|
</collectionViewCell>
|
||||||
</objects>
|
</objects>
|
||||||
</document>
|
</document>
|
||||||
|
|||||||
@@ -0,0 +1,102 @@
|
|||||||
|
//
|
||||||
|
// CoursePickerViewController.swift
|
||||||
|
// AvH Plan
|
||||||
|
//
|
||||||
|
// Created by Deniz Duezgoeren on 28.09.19.
|
||||||
|
// Copyright © 2019 Deniz Duezgoeren. All rights reserved.
|
||||||
|
//
|
||||||
|
|
||||||
|
import UIKit
|
||||||
|
import MagazineLayout
|
||||||
|
|
||||||
|
class CoursePickerViewController: UIViewController, UICollectionViewDataSource, UICollectionViewDelegateMagazineLayout {
|
||||||
|
|
||||||
|
@IBOutlet weak var collectionView: UICollectionView!
|
||||||
|
let identifier = "customisation_cell"
|
||||||
|
let df = DataFetcher.sharedInstance
|
||||||
|
var courses = [String]()
|
||||||
|
var translatedCourses = [String]()
|
||||||
|
let prefs = UserDefaults.standard
|
||||||
|
|
||||||
|
@IBAction func saveButton(_ sender: UIBarButtonItem) {
|
||||||
|
self.dismiss(animated: true, completion: nil)
|
||||||
|
}
|
||||||
|
|
||||||
|
override func viewWillAppear(_ animated: Bool) {
|
||||||
|
super.viewWillAppear(animated)
|
||||||
|
|
||||||
|
courses = self.df.courses
|
||||||
|
translatedCourses = self.df.translatedCourses
|
||||||
|
self.collectionView.register(UINib(nibName: "ColourViewCell", bundle: nil), forCellWithReuseIdentifier: identifier)
|
||||||
|
}
|
||||||
|
|
||||||
|
override func viewDidLoad() {
|
||||||
|
super.viewDidLoad()
|
||||||
|
|
||||||
|
self.collectionView.delegate = self
|
||||||
|
self.collectionView.dataSource = self
|
||||||
|
NotificationCenter.default.addObserver(self, selector: #selector(loadList), name: NSNotification.Name(rawValue: "load"), object: nil)
|
||||||
|
}
|
||||||
|
|
||||||
|
@objc func loadList(notification: NSNotification){
|
||||||
|
self.collectionView.reloadItems(at: [notification.userInfo?["indexPath"] as! IndexPath])
|
||||||
|
}
|
||||||
|
|
||||||
|
func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
|
||||||
|
if let s = storyboard?.instantiateViewController(withIdentifier: "ColourPickerView") as? ColourPickerView {
|
||||||
|
s.course = self.translatedCourses[indexPath.item]
|
||||||
|
s.internalCourse = self.courses[indexPath.item]
|
||||||
|
s.currentIndexPath = indexPath
|
||||||
|
self.present(s, animated: true)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeModeForItemAt indexPath: IndexPath) -> MagazineLayoutItemSizeMode {
|
||||||
|
let widthMode = MagazineLayoutItemWidthMode.fullWidth(respectsHorizontalInsets: true)
|
||||||
|
let heightMode = MagazineLayoutItemHeightMode.static(height: 55)
|
||||||
|
return MagazineLayoutItemSizeMode(widthMode: widthMode, heightMode: heightMode)
|
||||||
|
}
|
||||||
|
|
||||||
|
func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, visibilityModeForHeaderInSectionAtIndex index: Int) -> MagazineLayoutHeaderVisibilityMode {
|
||||||
|
return .hidden
|
||||||
|
}
|
||||||
|
|
||||||
|
func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, visibilityModeForFooterInSectionAtIndex index: Int) -> MagazineLayoutFooterVisibilityMode {
|
||||||
|
return .hidden
|
||||||
|
}
|
||||||
|
|
||||||
|
func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, visibilityModeForBackgroundInSectionAtIndex index: Int) -> MagazineLayoutBackgroundVisibilityMode {
|
||||||
|
return .hidden
|
||||||
|
}
|
||||||
|
|
||||||
|
func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, horizontalSpacingForItemsInSectionAtIndex index: Int) -> CGFloat {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, verticalSpacingForElementsInSectionAtIndex index: Int) -> CGFloat {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, insetsForSectionAtIndex index: Int) -> UIEdgeInsets {
|
||||||
|
return UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, insetsForItemsInSectionAtIndex index: Int) -> UIEdgeInsets {
|
||||||
|
return UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
|
||||||
|
return self.courses.count
|
||||||
|
}
|
||||||
|
|
||||||
|
func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
|
||||||
|
let cell = collectionView.dequeueReusableCell(withReuseIdentifier: identifier, for: indexPath as IndexPath) as! ColourViewCell
|
||||||
|
cell.label.text = self.translatedCourses[indexPath.item]
|
||||||
|
cell.colorView.layer.cornerRadius = cell.colorView.frame.height / 2
|
||||||
|
cell.colorView.layer.borderWidth = 0.4
|
||||||
|
cell.colorView.layer.borderColor = #colorLiteral(red: 0.2549019754, green: 0.2745098174, blue: 0.3019607961, alpha: 1)
|
||||||
|
cell.colorView.backgroundColor = self.df.getColourPalette()[prefs.integer(forKey: "colour-index-\(courses[indexPath.item])")]
|
||||||
|
cell.backgroundColor = #colorLiteral(red: 1.0, green: 1.0, blue: 1.0, alpha: 1.0)
|
||||||
|
return cell
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -7,28 +7,20 @@
|
|||||||
//
|
//
|
||||||
|
|
||||||
import UIKit
|
import UIKit
|
||||||
import MagazineLayout
|
|
||||||
|
|
||||||
class CustomizationViewController: UIViewController, UICollectionViewDataSource, UICollectionViewDelegateMagazineLayout, UITextFieldDelegate {
|
class CustomizationViewController: UITableViewController, UITextFieldDelegate {
|
||||||
|
|
||||||
var courses = [String]()
|
|
||||||
var translatedCourses = [String]()
|
|
||||||
@IBOutlet weak var collectionView: UICollectionView!
|
|
||||||
let identifier = "customisation_cell"
|
|
||||||
let prefs = UserDefaults.standard
|
let prefs = UserDefaults.standard
|
||||||
let df = DataFetcher.sharedInstance
|
let df = DataFetcher.sharedInstance
|
||||||
|
|
||||||
@IBOutlet weak var txtName: UITextField!
|
@IBOutlet weak var txtName: UITextField!
|
||||||
@IBOutlet weak var txtClasses: UITextField!
|
@IBOutlet weak var txtClasses: UITextField!
|
||||||
@IBOutlet weak var txtCourses: UITextField!
|
@IBOutlet weak var txtCourses: UITextField!
|
||||||
@IBOutlet weak var defaultSegments: UISegmentedControl!
|
@IBOutlet weak var defaultSwitch: UISwitch!
|
||||||
@IBOutlet weak var textToolbar: UIToolbar!
|
@IBOutlet weak var textToolbar: UIToolbar!
|
||||||
@IBOutlet weak var orderingSegments: UISegmentedControl!
|
@IBOutlet weak var orderingSegments: UISegmentedControl!
|
||||||
@IBOutlet weak var autoRefreshToggle: UISwitch!
|
@IBOutlet weak var autoRefreshToggle: UISwitch!
|
||||||
|
|
||||||
@IBOutlet weak var inputsView: UIView!
|
|
||||||
@IBOutlet weak var colourView: UIView!
|
|
||||||
|
|
||||||
@IBAction func textDismissButton(_ sender: UIBarButtonItem) {
|
@IBAction func textDismissButton(_ sender: UIBarButtonItem) {
|
||||||
view.endEditing(true)
|
view.endEditing(true)
|
||||||
}
|
}
|
||||||
@@ -49,26 +41,31 @@ class CustomizationViewController: UIViewController, UICollectionViewDataSource,
|
|||||||
textField.inputAccessoryView = textToolbar
|
textField.inputAccessoryView = textToolbar
|
||||||
}
|
}
|
||||||
|
|
||||||
override func viewWillAppear(_ animated: Bool) {
|
|
||||||
super.viewWillAppear(animated)
|
|
||||||
courses = self.df.courses
|
|
||||||
translatedCourses = self.df.translatedCourses
|
|
||||||
self.collectionView.register(UINib(nibName: "ColourViewCell", bundle: nil), forCellWithReuseIdentifier: identifier)
|
|
||||||
}
|
|
||||||
|
|
||||||
@IBAction func done(_ sender: UIBarButtonItem) {
|
@IBAction func done(_ sender: UIBarButtonItem) {
|
||||||
|
|
||||||
self.prefs.set(self.txtName.text, forKey: "username")
|
self.prefs.set(self.txtName.text, forKey: "username")
|
||||||
self.prefs.set(self.txtClasses.text, forKey: "classes")
|
self.prefs.set(self.txtClasses.text, forKey: "classes")
|
||||||
self.prefs.set(self.txtCourses.text, forKey: "courses")
|
self.prefs.set(self.txtCourses.text, forKey: "courses")
|
||||||
self.prefs.set(self.defaultSegments.selectedSegmentIndex, forKey: "default-plan")
|
|
||||||
|
var defaultPlan: Int
|
||||||
|
if self.defaultSwitch.isOn {
|
||||||
|
defaultPlan = 1
|
||||||
|
} else {
|
||||||
|
defaultPlan = 0
|
||||||
|
}
|
||||||
|
self.prefs.set(defaultPlan, forKey: "default-plan")
|
||||||
self.prefs.set(self.orderingSegments.selectedSegmentIndex == 1, forKey: "original_sorting")
|
self.prefs.set(self.orderingSegments.selectedSegmentIndex == 1, forKey: "original_sorting")
|
||||||
self.prefs.set(self.autoRefreshToggle.isOn, forKey: "auto_refresh")
|
self.prefs.set(self.autoRefreshToggle.isOn, forKey: "auto_refresh")
|
||||||
|
|
||||||
self.prefs.synchronize()
|
|
||||||
self.dismiss(animated: true, completion: nil)
|
self.dismiss(animated: true, completion: nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@IBAction func customizeColoursButton(_ sender: UIButton) {
|
||||||
|
if let s = storyboard?.instantiateViewController(withIdentifier: "CoursePickerViewController") as? CoursePickerViewController {
|
||||||
|
self.present(s, animated: true)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
override func viewDidLoad() {
|
override func viewDidLoad() {
|
||||||
super.viewDidLoad()
|
super.viewDidLoad()
|
||||||
|
|
||||||
@@ -79,7 +76,11 @@ class CustomizationViewController: UIViewController, UICollectionViewDataSource,
|
|||||||
self.txtName.text = prefs.string(forKey: "username")
|
self.txtName.text = prefs.string(forKey: "username")
|
||||||
self.txtClasses.text = prefs.string(forKey: "classes")
|
self.txtClasses.text = prefs.string(forKey: "classes")
|
||||||
self.txtCourses.text = prefs.string(forKey: "courses")
|
self.txtCourses.text = prefs.string(forKey: "courses")
|
||||||
self.defaultSegments.selectedSegmentIndex = prefs.integer(forKey: "default-plan")
|
if self.prefs.integer(forKey: "default-plan") == 1 {
|
||||||
|
self.defaultSwitch.isOn = true
|
||||||
|
} else {
|
||||||
|
self.defaultSwitch.isOn = false
|
||||||
|
}
|
||||||
var order: Int
|
var order: Int
|
||||||
if self.prefs.bool(forKey: "original_sorting") {
|
if self.prefs.bool(forKey: "original_sorting") {
|
||||||
order = 1
|
order = 1
|
||||||
@@ -88,69 +89,5 @@ class CustomizationViewController: UIViewController, UICollectionViewDataSource,
|
|||||||
}
|
}
|
||||||
self.orderingSegments.selectedSegmentIndex = order
|
self.orderingSegments.selectedSegmentIndex = order
|
||||||
self.autoRefreshToggle.isOn = self.prefs.bool(forKey: "auto_refresh")
|
self.autoRefreshToggle.isOn = self.prefs.bool(forKey: "auto_refresh")
|
||||||
|
|
||||||
NotificationCenter.default.addObserver(self, selector: #selector(loadList), name: NSNotification.Name(rawValue: "load"), object: nil)
|
|
||||||
}
|
|
||||||
|
|
||||||
@objc func loadList(notification: NSNotification){
|
|
||||||
self.collectionView.reloadItems(at: [notification.userInfo?["indexPath"] as! IndexPath])
|
|
||||||
}
|
|
||||||
|
|
||||||
func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
|
|
||||||
if let s = storyboard?.instantiateViewController(withIdentifier: "ColourPickerView") as? ColourPickerView {
|
|
||||||
s.course = self.translatedCourses[indexPath.item]
|
|
||||||
s.internalCourse = self.courses[indexPath.item]
|
|
||||||
s.currentIndexPath = indexPath
|
|
||||||
self.present(s, animated: true)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeModeForItemAt indexPath: IndexPath) -> MagazineLayoutItemSizeMode {
|
|
||||||
let widthMode = MagazineLayoutItemWidthMode.fullWidth(respectsHorizontalInsets: true)
|
|
||||||
let heightMode = MagazineLayoutItemHeightMode.dynamic
|
|
||||||
return MagazineLayoutItemSizeMode(widthMode: widthMode, heightMode: heightMode)
|
|
||||||
}
|
|
||||||
|
|
||||||
func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, visibilityModeForHeaderInSectionAtIndex index: Int) -> MagazineLayoutHeaderVisibilityMode {
|
|
||||||
return .hidden
|
|
||||||
}
|
|
||||||
|
|
||||||
func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, visibilityModeForFooterInSectionAtIndex index: Int) -> MagazineLayoutFooterVisibilityMode {
|
|
||||||
return .hidden
|
|
||||||
}
|
|
||||||
|
|
||||||
func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, visibilityModeForBackgroundInSectionAtIndex index: Int) -> MagazineLayoutBackgroundVisibilityMode {
|
|
||||||
return .hidden
|
|
||||||
}
|
|
||||||
|
|
||||||
func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, horizontalSpacingForItemsInSectionAtIndex index: Int) -> CGFloat {
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, verticalSpacingForElementsInSectionAtIndex index: Int) -> CGFloat {
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, insetsForSectionAtIndex index: Int) -> UIEdgeInsets {
|
|
||||||
return UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0)
|
|
||||||
}
|
|
||||||
|
|
||||||
func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, insetsForItemsInSectionAtIndex index: Int) -> UIEdgeInsets {
|
|
||||||
return UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0)
|
|
||||||
}
|
|
||||||
|
|
||||||
func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
|
|
||||||
return self.courses.count
|
|
||||||
}
|
|
||||||
|
|
||||||
func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
|
|
||||||
let cell = collectionView.dequeueReusableCell(withReuseIdentifier: identifier, for: indexPath as IndexPath) as! ColourViewCell
|
|
||||||
cell.label.text = self.translatedCourses[indexPath.item]
|
|
||||||
cell.colorView.layer.cornerRadius = cell.colorView.frame.height / 2
|
|
||||||
cell.colorView.layer.borderWidth = 0.4
|
|
||||||
cell.colorView.layer.borderColor = #colorLiteral(red: 0.2549019754, green: 0.2745098174, blue: 0.3019607961, alpha: 1)
|
|
||||||
cell.colorView.backgroundColor = self.df.getColourPalette()[prefs.integer(forKey: "colour-index-\(courses[indexPath.item])")]
|
|
||||||
cell.backgroundColor = #colorLiteral(red: 1.0, green: 1.0, blue: 1.0, alpha: 1.0)
|
|
||||||
return cell
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -133,28 +133,17 @@ class DataFetcher {
|
|||||||
|
|
||||||
private func assignRanking(for group: String, _ isPSA: Bool) -> Int {
|
private func assignRanking(for group: String, _ isPSA: Bool) -> Int {
|
||||||
if isPSA {
|
if isPSA {
|
||||||
return -31
|
return -102
|
||||||
}
|
}
|
||||||
|
|
||||||
if group.count > 0 {
|
if group.count > 0 {
|
||||||
let a = String(group[...group.startIndex])
|
let a = String(group[...group.startIndex])
|
||||||
if self.checkStringForArray(s: a, checking: juniors) == true {
|
if group.count > 1, let b = Int(String(group[group.index(group.startIndex, offsetBy: 0)...group.index(group.startIndex, offsetBy: 1)])) {
|
||||||
return -30
|
return -b
|
||||||
} else if a == "1" || a == "2" {
|
} else if self.checkStringForArray(s: a, checking: juniors) == true {
|
||||||
if group.count > 1 {
|
return -101
|
||||||
|
|
||||||
let b = Int(String(group[group.index(group.startIndex, offsetBy: 1)...group.index(group.startIndex, offsetBy: 1)]))
|
|
||||||
|
|
||||||
if b == nil {
|
|
||||||
return 0
|
|
||||||
} else {
|
|
||||||
return (b! - (b! * 2))
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
return -29
|
return -100
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -8,13 +8,18 @@
|
|||||||
|
|
||||||
import UIKit
|
import UIKit
|
||||||
|
|
||||||
class FirstTimeViewController: UIViewController {
|
class FirstTimeViewController: UIViewController, UITextFieldDelegate {
|
||||||
|
|
||||||
|
|
||||||
@IBOutlet weak var scrollView: UIScrollView!
|
@IBOutlet weak var scrollView: UIScrollView!
|
||||||
let df = DataFetcher.sharedInstance
|
let df = DataFetcher.sharedInstance
|
||||||
let prefs = UserDefaults.standard
|
let prefs = UserDefaults.standard
|
||||||
|
|
||||||
|
@IBOutlet weak var nameTextField: UITextField!
|
||||||
|
@IBOutlet weak var gradeTextField: UITextField!
|
||||||
|
@IBOutlet weak var courseTextField: UITextField!
|
||||||
|
@IBOutlet weak var defaultPlanSegmentedControl: UISegmentedControl!
|
||||||
|
@IBOutlet weak var textToolbar: UIToolbar!
|
||||||
|
|
||||||
@IBAction func gradeInfoButton(_ sender: UIButton) {
|
@IBAction func gradeInfoButton(_ sender: UIButton) {
|
||||||
self.present(self.df.getInfoAlert(for: "grade"), animated: true)
|
self.present(self.df.getInfoAlert(for: "grade"), animated: true)
|
||||||
}
|
}
|
||||||
@@ -23,10 +28,13 @@ class FirstTimeViewController: UIViewController {
|
|||||||
self.present(self.df.getInfoAlert(for: "course"), animated: true)
|
self.present(self.df.getInfoAlert(for: "course"), animated: true)
|
||||||
}
|
}
|
||||||
|
|
||||||
@IBOutlet weak var nameTextField: UITextField!
|
@IBAction func textDismissButton(_ sender: UIBarButtonItem) {
|
||||||
@IBOutlet weak var gradeTextField: UITextField!
|
view.endEditing(true)
|
||||||
@IBOutlet weak var courseTextField: UITextField!
|
}
|
||||||
@IBOutlet weak var defaultPlanSegmentedControl: UISegmentedControl!
|
|
||||||
|
func textFieldDidBeginEditing(_ textField: UITextField) {
|
||||||
|
textField.inputAccessoryView = textToolbar
|
||||||
|
}
|
||||||
|
|
||||||
@IBAction func finishSetupButton(_ sender: UIBarButtonItem) {
|
@IBAction func finishSetupButton(_ sender: UIBarButtonItem) {
|
||||||
self.prefs.set(self.nameTextField.text, forKey: "username")
|
self.prefs.set(self.nameTextField.text, forKey: "username")
|
||||||
@@ -41,10 +49,12 @@ class FirstTimeViewController: UIViewController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
override func viewDidLoad() {
|
override func viewDidLoad() {
|
||||||
super.viewDidLoad()
|
super.viewDidLoad()
|
||||||
|
|
||||||
|
self.nameTextField.delegate = self
|
||||||
|
self.gradeTextField.delegate = self
|
||||||
|
self.courseTextField.delegate = self
|
||||||
self.scrollView.isDirectionalLockEnabled = true
|
self.scrollView.isDirectionalLockEnabled = true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import UIKit
|
|||||||
class GeneralViewController: PlanViewController {
|
class GeneralViewController: PlanViewController {
|
||||||
|
|
||||||
@IBAction func customize(_ sender: UIBarButtonItem) {
|
@IBAction func customize(_ sender: UIBarButtonItem) {
|
||||||
if let s = storyboard?.instantiateViewController(withIdentifier: "Customize") as? CustomizationViewController {
|
if let s = storyboard?.instantiateViewController(withIdentifier: "CustomizationNavigationController") as? UINavigationController {
|
||||||
self.present(s, animated: true)
|
self.present(s, animated: true)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -58,6 +58,7 @@ class MenuViewController : UICollectionViewController, UICollectionViewDelegateM
|
|||||||
self.extendedLayoutIncludesOpaqueBars = true
|
self.extendedLayoutIncludesOpaqueBars = true
|
||||||
self.collectionView.contentInsetAdjustmentBehavior = .always
|
self.collectionView.contentInsetAdjustmentBehavior = .always
|
||||||
self.navigationController?.navigationBar.topItem?.title = NSLocalizedString("food_menu", comment: "")
|
self.navigationController?.navigationBar.topItem?.title = NSLocalizedString("food_menu", comment: "")
|
||||||
|
self.collectionView.isPrefetchingEnabled = false
|
||||||
}
|
}
|
||||||
|
|
||||||
@objc private func objDoAsync(_ sender: Any) {
|
@objc private func objDoAsync(_ sender: Any) {
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import UIKit
|
|||||||
class PersonalPlanViewController: PlanViewController {
|
class PersonalPlanViewController: PlanViewController {
|
||||||
|
|
||||||
@IBAction func customize(_ sender: UIBarButtonItem) {
|
@IBAction func customize(_ sender: UIBarButtonItem) {
|
||||||
if let s = storyboard?.instantiateViewController(withIdentifier: "Customize") as? CustomizationViewController {
|
if let s = storyboard?.instantiateViewController(withIdentifier: "CustomizationNavigationController") as? UINavigationController {
|
||||||
self.present(s, animated: true)
|
self.present(s, animated: true)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -89,6 +89,7 @@ class PlanViewController : UICollectionViewController, UICollectionViewDelegateM
|
|||||||
|
|
||||||
self.collectionView.contentInsetAdjustmentBehavior = .always
|
self.collectionView.contentInsetAdjustmentBehavior = .always
|
||||||
self.df.setTabBarBadge(for: self.tabBarController?.tabBar.items)
|
self.df.setTabBarBadge(for: self.tabBarController?.tabBar.items)
|
||||||
|
self.collectionView.isPrefetchingEnabled = false
|
||||||
}
|
}
|
||||||
|
|
||||||
func getViewType() -> String {
|
func getViewType() -> String {
|
||||||
|
|||||||
@@ -82,4 +82,4 @@
|
|||||||
"enter_order_title" = "Informationen über Sortierweisen";
|
"enter_order_title" = "Informationen über Sortierweisen";
|
||||||
"enter_grade_help" = "Trage deine derzeitige Klasse ein, damit sie in deinem persönlichen Plan auftaucht.\n\nAnmerkung:\n\nIn der Mittelstufe müssen Nummer und Buchstabe zusammen geschrieben werden, Beispiel: \"5a\".\n\nIn der E-Phase müssen diese durch ein Leerzeichen getrennt werden, Beispiel: \"18 a\".\n\nIn der Q1/Q2 sollen nur die Nummern eingetragen werden, Beispiel: \"17\".\n\nMehrere Klassen können nur eingetragen werden, wenn keine Kurse eingetragen sind.";
|
"enter_grade_help" = "Trage deine derzeitige Klasse ein, damit sie in deinem persönlichen Plan auftaucht.\n\nAnmerkung:\n\nIn der Mittelstufe müssen Nummer und Buchstabe zusammen geschrieben werden, Beispiel: \"5a\".\n\nIn der E-Phase müssen diese durch ein Leerzeichen getrennt werden, Beispiel: \"18 a\".\n\nIn der Q1/Q2 sollen nur die Nummern eingetragen werden, Beispiel: \"17\".\n\nMehrere Klassen können nur eingetragen werden, wenn keine Kurse eingetragen sind.";
|
||||||
"enter_course_help" = "Trag die Kürzel für die Kurse ein, welche in deinem persönlichen Plan auftauchen sollen. Du kannst diese auf deinem Stundenplan finden.\n\nHier sind einige Beispiele:\n\nMathe in der 5. Klasse (Mittelstufe) wäre MAT.\n\nDer Englisch-Profilkurs in der E-Phase könnte ENP1 sein.\n\nDer Bio-Grundkurs in der Q1 ist z.B. bio1.\n\nMeist müssen Kurse für Mittelstufenschüler nicht eingetragen werden.\nTrenne mehrere Kurse mit Leerzeichen, Kommas sind optional.\nGroß- und Kleinschreibung wird beachtet.";
|
"enter_course_help" = "Trag die Kürzel für die Kurse ein, welche in deinem persönlichen Plan auftauchen sollen. Du kannst diese auf deinem Stundenplan finden.\n\nHier sind einige Beispiele:\n\nMathe in der 5. Klasse (Mittelstufe) wäre MAT.\n\nDer Englisch-Profilkurs in der E-Phase könnte ENP1 sein.\n\nDer Bio-Grundkurs in der Q1 ist z.B. bio1.\n\nMeist müssen Kurse für Mittelstufenschüler nicht eingetragen werden.\nTrenne mehrere Kurse mit Leerzeichen, Kommas sind optional.\nGroß- und Kleinschreibung wird beachtet.";
|
||||||
"enter_order_help" = "Du kannst zwischen zwei Sortierweisen auswählen, welche die Reihenfolge der Einträge auf dem Vertretungsplan bestimmen.\n\nStandardmäßig ist \'App-spezifisch\' ausgewählt; dies bietet einen konsistenten Plan sortiert nach Klassen, dann nach Stunden.\n\n\'Website-Original\' bietet die Original-Reihenfolge der Website. Diese ist jedoch nicht konsistent, weswegen \'App-spezifisch\' standardmäßig ausgewählt ist.";
|
"enter_order_help" = "Du kannst zwischen zwei Sortierweisen auswählen, welche die Reihenfolge der Einträge auf dem Vertretungsplan bestimmen.\n\nStandardmäßig ist \'App-Sortierung\' ausgewählt; dies bietet einen konsistenten Plan sortiert nach Klassen, dann nach Stunden.\n\n\'Website-Sortierung\' bietet die Original-Reihenfolge der Website. Diese ist jedoch nicht konsistent, weswegen \'App-Sortierung\' standardmäßig ausgewählt ist.";
|
||||||
|
|||||||
@@ -110,11 +110,11 @@
|
|||||||
/* Class = "UIBarButtonItem"; title = "Customize"; ObjectID = "zsF-Jh-U3n"; */
|
/* Class = "UIBarButtonItem"; title = "Customize"; ObjectID = "zsF-Jh-U3n"; */
|
||||||
"zsF-Jh-U3n.title" = "Anpassen";
|
"zsF-Jh-U3n.title" = "Anpassen";
|
||||||
|
|
||||||
"ZCm-7a-IUx.placeholder" = "Dein Name";
|
"A2b-5v-r2j.placeholder" = "Dein Name";
|
||||||
|
|
||||||
"gOX-RF-Brg.placeholder" = "Deine Klasse";
|
"x8A-kh-LX4.placeholder" = "Deine Klasse";
|
||||||
|
|
||||||
"EDB-Mm-gGh.placeholder" = "Deine Kurse";
|
"zxv-h1-Q8u.placeholder" = "Deine Kurse";
|
||||||
|
|
||||||
"JMH-JV-eMe.text" = "Standardplan";
|
"JMH-JV-eMe.text" = "Standardplan";
|
||||||
|
|
||||||
@@ -122,10 +122,26 @@
|
|||||||
|
|
||||||
"DPm-52-1Ww.segmentTitles[1]" = "Persönlich";
|
"DPm-52-1Ww.segmentTitles[1]" = "Persönlich";
|
||||||
|
|
||||||
"3iB-va-Cjs.text" = "Sortierweise";
|
"1Nm-Wb-8js.segmentTitles[0]" = "App-Sortierung";
|
||||||
|
|
||||||
"ol8-tW-I69.segmentTitles[0]" = "App-spezifisch";
|
"1Nm-Wb-8js.segmentTitles[1]" = "Website-Sortierung";
|
||||||
|
|
||||||
"ol8-tW-I69.segmentTitles[1]" = "Website-Original";
|
"Dkg-Jy-5Sf.text" = "Persönlichen Plan bei App-Start öffnen";
|
||||||
|
|
||||||
"YlM-R8-zk5.text" = "Aktualisiere Plan automatisch";
|
"oiQ-2o-sH8.text" = "Bei App-Start aktualisieren";
|
||||||
|
|
||||||
|
"jng-S6-ZuJ.normalTitle" = "Stelle Kursfarben ein";
|
||||||
|
|
||||||
|
"bj2-hB-vVb.title" = "Benutzerdefinierte Farben";
|
||||||
|
|
||||||
|
"FhN-ih-qVW.title" = "Speichern";
|
||||||
|
|
||||||
|
"in4-ZK-bqT.title" = "Anpassen";
|
||||||
|
|
||||||
|
"g4a-cE-7bJ.title" = "Fertig";
|
||||||
|
|
||||||
|
"whN-45-XN6.headerTitle" = "Personalisieren";
|
||||||
|
|
||||||
|
"BHV-EE-xi3.headerTitle" = "Filter";
|
||||||
|
|
||||||
|
"N8h-rV-nYA.headerTitle" = "Diverses";
|
||||||
|
|||||||
@@ -83,4 +83,4 @@
|
|||||||
"enter_order_title" = "Information on ordering systems";
|
"enter_order_title" = "Information on ordering systems";
|
||||||
"enter_grade_help" = "Enter your current grade to have it appear in your personal plan.\n\nNote:\n\nIn junior phase, put the number and letter together, as in \"5a\".\n\nIn E-Phase, separate them by a space, as in \"18 a\".\n\nIn Q1/Q2, only put in the number, as in \"17\".\n\nMultiple grades can only be entered when no courses have been entered.";
|
"enter_grade_help" = "Enter your current grade to have it appear in your personal plan.\n\nNote:\n\nIn junior phase, put the number and letter together, as in \"5a\".\n\nIn E-Phase, separate them by a space, as in \"18 a\".\n\nIn Q1/Q2, only put in the number, as in \"17\".\n\nMultiple grades can only be entered when no courses have been entered.";
|
||||||
"enter_course_help" = "You need to enter the course abbreviation for every course you want in your personal plan. You can find them on your time table.\n\nHere\'s a few examples:\n\nMathematics in 5th grade (juniors) would be MAT.\n\nAdvanced English in E-Phase (seniors) for the English profile may be ENP1.\n\nBasic Biology in Q1 could be bio1.\n\nIn most cases, entering courses while in junior phase is redundant.\nSeparate multiple courses by spaces, commas are optional.\nCapitalisation is required.";
|
"enter_course_help" = "You need to enter the course abbreviation for every course you want in your personal plan. You can find them on your time table.\n\nHere\'s a few examples:\n\nMathematics in 5th grade (juniors) would be MAT.\n\nAdvanced English in E-Phase (seniors) for the English profile may be ENP1.\n\nBasic Biology in Q1 could be bio1.\n\nIn most cases, entering courses while in junior phase is redundant.\nSeparate multiple courses by spaces, commas are optional.\nCapitalisation is required.";
|
||||||
"enter_order_help" = "You may pick between two ordering systems that dictate the order in which the items on the substitution plan will appear in.\n\nThe default \'app-specific\' is an algorithm implemented in this app that provides a consistently-sorted substitution plan ordered just like the substitution plan on the website used to; sorted by classes, then by time.\n\n\'Website original\' offers the items on the substitution plan just like they\'re presented on the school website, but since these are not guaranteed to be consistent, \'app-specific\' is picked by default.";
|
"enter_order_help" = "You may pick between two ordering systems that dictate the order in which the items on the substitution plan will appear in.\n\nThe default \'app order\' is an algorithm implemented in this app that provides a consistently-sorted substitution plan ordered just like the substitution plan on the website used to; sorted by classes, then by time.\n\n\'Website order\' offers the items on the substitution plan just like they\'re presented on the school website, but since these are not guaranteed to be consistent, \'app order\' is picked by default.";
|
||||||
|
|||||||
Reference in New Issue
Block a user