Archived
CustomizationViewController now changes layout depending on the device's orientation
This commit is contained in:
Deniz Duezgoeren
@@ -23,9 +23,7 @@
|
|||||||
<navigationItem key="navigationItem" id="Qub-xW-2XJ">
|
<navigationItem key="navigationItem" id="Qub-xW-2XJ">
|
||||||
<barButtonItem key="rightBarButtonItem" title="Customize" id="bae-uC-OAx">
|
<barButtonItem key="rightBarButtonItem" title="Customize" id="bae-uC-OAx">
|
||||||
<connections>
|
<connections>
|
||||||
<segue destination="8XB-jK-YFD" kind="popoverPresentation" popoverAnchorBarButtonItem="bae-uC-OAx" id="0Bb-6a-gkf">
|
<action selector="customize:" destination="9pv-A4-QxB" id="aqn-9o-yj2"/>
|
||||||
<popoverArrowDirection key="popoverArrowDirection" up="YES" down="YES" left="YES" right="YES"/>
|
|
||||||
</segue>
|
|
||||||
</connections>
|
</connections>
|
||||||
</barButtonItem>
|
</barButtonItem>
|
||||||
</navigationItem>
|
</navigationItem>
|
||||||
@@ -47,9 +45,7 @@
|
|||||||
<navigationItem key="navigationItem" id="T1a-Dc-Mt0">
|
<navigationItem key="navigationItem" id="T1a-Dc-Mt0">
|
||||||
<barButtonItem key="rightBarButtonItem" title="Customize" id="zsF-Jh-U3n">
|
<barButtonItem key="rightBarButtonItem" title="Customize" id="zsF-Jh-U3n">
|
||||||
<connections>
|
<connections>
|
||||||
<segue destination="8XB-jK-YFD" kind="popoverPresentation" popoverAnchorBarButtonItem="zsF-Jh-U3n" id="OZ6-ZZ-xdo">
|
<action selector="customize:" destination="8rJ-Kc-sve" id="b80-Cd-4zl"/>
|
||||||
<popoverArrowDirection key="popoverArrowDirection" up="YES" down="YES" left="YES" right="YES"/>
|
|
||||||
</segue>
|
|
||||||
</connections>
|
</connections>
|
||||||
</barButtonItem>
|
</barButtonItem>
|
||||||
</navigationItem>
|
</navigationItem>
|
||||||
@@ -61,7 +57,7 @@
|
|||||||
<!--Customization View Controller-->
|
<!--Customization View Controller-->
|
||||||
<scene sceneID="gAv-U3-QPB">
|
<scene sceneID="gAv-U3-QPB">
|
||||||
<objects>
|
<objects>
|
||||||
<viewController id="8XB-jK-YFD" customClass="CustomizationViewController" customModule="AvH_Plan" customModuleProvider="target" sceneMemberID="viewController">
|
<viewController storyboardIdentifier="Customize" id="8XB-jK-YFD" customClass="CustomizationViewController" customModule="AvH_Plan" customModuleProvider="target" sceneMemberID="viewController">
|
||||||
<view key="view" contentMode="scaleToFill" id="3L4-c2-Pow">
|
<view key="view" contentMode="scaleToFill" id="3L4-c2-Pow">
|
||||||
<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"/>
|
||||||
@@ -78,51 +74,50 @@
|
|||||||
</navigationItem>
|
</navigationItem>
|
||||||
</items>
|
</items>
|
||||||
</navigationBar>
|
</navigationBar>
|
||||||
|
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iAl-ff-skU">
|
||||||
|
<rect key="frame" x="0.0" y="88" width="414" height="231"/>
|
||||||
|
<subviews>
|
||||||
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Your name" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="TpM-Mz-EpI">
|
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Your name" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="TpM-Mz-EpI">
|
||||||
<rect key="frame" x="24" y="112" width="366" height="30"/>
|
<rect key="frame" x="24" y="16" width="366" height="30"/>
|
||||||
<accessibility key="accessibilityConfiguration" hint="Name"/>
|
<accessibility key="accessibilityConfiguration" hint="Name"/>
|
||||||
<nil key="textColor"/>
|
<nil key="textColor"/>
|
||||||
<fontDescription key="fontDescription" type="system" pointSize="14"/>
|
<fontDescription key="fontDescription" type="system" pointSize="14"/>
|
||||||
<textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" smartDashesType="no" smartInsertDeleteType="no" smartQuotesType="no"/>
|
<textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" smartDashesType="no" smartInsertDeleteType="no" smartQuotesType="no"/>
|
||||||
</textField>
|
</textField>
|
||||||
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Your classes" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="bCV-w1-hVY">
|
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Your classes" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="bCV-w1-hVY">
|
||||||
<rect key="frame" x="24" y="158" width="366" height="30"/>
|
<rect key="frame" x="24" y="62" width="328" height="30"/>
|
||||||
<accessibility key="accessibilityConfiguration" hint="Classes"/>
|
<accessibility key="accessibilityConfiguration" hint="Classes"/>
|
||||||
<nil key="textColor"/>
|
<nil key="textColor"/>
|
||||||
<fontDescription key="fontDescription" type="system" pointSize="14"/>
|
<fontDescription key="fontDescription" type="system" pointSize="14"/>
|
||||||
<textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" smartDashesType="no" smartInsertDeleteType="no" smartQuotesType="no"/>
|
<textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" smartDashesType="no" smartInsertDeleteType="no" smartQuotesType="no"/>
|
||||||
</textField>
|
</textField>
|
||||||
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Your courses" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="69O-Fo-TQF">
|
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Your courses" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="69O-Fo-TQF">
|
||||||
<rect key="frame" x="24" y="204" width="366" height="30"/>
|
<rect key="frame" x="24" y="108" width="328" height="30"/>
|
||||||
<accessibility key="accessibilityConfiguration" hint="Courses"/>
|
<accessibility key="accessibilityConfiguration" hint="Courses"/>
|
||||||
<nil key="textColor"/>
|
<nil key="textColor"/>
|
||||||
<fontDescription key="fontDescription" type="system" pointSize="14"/>
|
<fontDescription key="fontDescription" type="system" pointSize="14"/>
|
||||||
<textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" smartDashesType="no" smartInsertDeleteType="no" smartQuotesType="no"/>
|
<textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" smartDashesType="no" smartInsertDeleteType="no" smartQuotesType="no"/>
|
||||||
</textField>
|
</textField>
|
||||||
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="hWP-3N-RUn">
|
|
||||||
<rect key="frame" x="8" y="352" width="398" height="510"/>
|
|
||||||
<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>
|
|
||||||
<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="hkV-XP-jXe">
|
<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="hkV-XP-jXe">
|
||||||
<rect key="frame" x="24" y="250" width="366" height="21"/>
|
<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>
|
|
||||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Custom colours" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rks-gf-AM4">
|
|
||||||
<rect key="frame" x="24" y="323" width="366" height="21"/>
|
|
||||||
<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>
|
||||||
|
<button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="detailDisclosure" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bcl-Ha-O4z">
|
||||||
|
<rect key="frame" x="368" y="66" width="22" height="22"/>
|
||||||
|
<connections>
|
||||||
|
<action selector="groupHelpButton:" destination="8XB-jK-YFD" eventType="touchUpInside" id="7xi-30-v0V"/>
|
||||||
|
</connections>
|
||||||
|
</button>
|
||||||
|
<button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="detailDisclosure" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eQo-BP-t2k">
|
||||||
|
<rect key="frame" x="368" y="112" width="22" height="22"/>
|
||||||
|
<connections>
|
||||||
|
<action selector="courseHelpButton:" destination="8XB-jK-YFD" eventType="touchUpInside" id="7fx-Ol-OkW"/>
|
||||||
|
</connections>
|
||||||
|
</button>
|
||||||
<segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="1" translatesAutoresizingMaskIntoConstraints="NO" id="omP-RH-Hlh">
|
<segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="1" translatesAutoresizingMaskIntoConstraints="NO" id="omP-RH-Hlh">
|
||||||
<rect key="frame" x="24" y="279" width="366" height="29"/>
|
<rect key="frame" x="24" y="187" width="366" height="29"/>
|
||||||
<segments>
|
<segments>
|
||||||
<segment title="General"/>
|
<segment title="General"/>
|
||||||
<segment title="Personal"/>
|
<segment title="Personal"/>
|
||||||
@@ -131,38 +126,138 @@
|
|||||||
</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="bottom" secondItem="hWP-3N-RUn" secondAttribute="bottom" id="3pJ-hl-GCJ"/>
|
<constraint firstItem="69O-Fo-TQF" firstAttribute="leading" secondItem="iAl-ff-skU" secondAttribute="leading" constant="24" id="2FL-7N-HJO"/>
|
||||||
<constraint firstItem="TpM-Mz-EpI" firstAttribute="leading" secondItem="iN7-lf-GS3" secondAttribute="leading" constant="24" id="7Ng-ON-AQ6"/>
|
<constraint firstAttribute="trailing" secondItem="hkV-XP-jXe" secondAttribute="trailing" constant="24" id="4ZG-c5-lUu"/>
|
||||||
<constraint firstItem="bCV-w1-hVY" firstAttribute="top" secondItem="TpM-Mz-EpI" secondAttribute="bottom" constant="16" id="9ex-Jw-qBO"/>
|
<constraint firstAttribute="trailing" secondItem="TpM-Mz-EpI" secondAttribute="trailing" constant="24" id="A4N-lD-pgd"/>
|
||||||
<constraint firstItem="hkV-XP-jXe" firstAttribute="top" secondItem="69O-Fo-TQF" secondAttribute="bottom" constant="16" id="9fR-TP-JaT"/>
|
<constraint firstAttribute="bottom" secondItem="omP-RH-Hlh" secondAttribute="bottom" constant="16" id="Aob-zt-PTb"/>
|
||||||
<constraint firstItem="TpM-Mz-EpI" firstAttribute="top" secondItem="1XB-6S-dGV" secondAttribute="bottom" constant="24" id="Bgw-zQ-6lf"/>
|
<constraint firstAttribute="trailing" secondItem="eQo-BP-t2k" secondAttribute="trailing" constant="24" id="CFc-LX-Cl4"/>
|
||||||
<constraint firstItem="bCV-w1-hVY" firstAttribute="leading" secondItem="iN7-lf-GS3" secondAttribute="leading" constant="24" id="CPw-u9-bVh"/>
|
<constraint firstItem="omP-RH-Hlh" firstAttribute="leading" secondItem="iAl-ff-skU" secondAttribute="leading" constant="24" id="GoG-3f-NFd"/>
|
||||||
<constraint firstItem="rks-gf-AM4" firstAttribute="leading" secondItem="iN7-lf-GS3" secondAttribute="leading" constant="24" id="HdU-p4-Goh"/>
|
<constraint firstItem="bcl-Ha-O4z" firstAttribute="leading" secondItem="bCV-w1-hVY" secondAttribute="trailing" constant="16" id="HEX-GP-NuJ"/>
|
||||||
<constraint firstItem="iN7-lf-GS3" firstAttribute="trailing" secondItem="TpM-Mz-EpI" secondAttribute="trailing" constant="24" id="JRY-Id-RvJ"/>
|
<constraint firstAttribute="trailing" secondItem="bcl-Ha-O4z" secondAttribute="trailing" constant="24" id="OA9-1L-OT9"/>
|
||||||
<constraint firstItem="iN7-lf-GS3" firstAttribute="trailing" secondItem="hWP-3N-RUn" secondAttribute="trailing" constant="8" id="Jty-qn-j3D"/>
|
<constraint firstItem="bcl-Ha-O4z" firstAttribute="centerY" secondItem="bCV-w1-hVY" secondAttribute="centerY" id="Qin-2R-y2G"/>
|
||||||
<constraint firstItem="hkV-XP-jXe" firstAttribute="leading" secondItem="iN7-lf-GS3" secondAttribute="leading" constant="24" id="LC6-o0-HSh"/>
|
<constraint firstItem="bCV-w1-hVY" firstAttribute="top" secondItem="TpM-Mz-EpI" secondAttribute="bottom" constant="16" id="R8P-Mm-bd0"/>
|
||||||
<constraint firstItem="iN7-lf-GS3" firstAttribute="trailing" secondItem="rks-gf-AM4" secondAttribute="trailing" constant="24" id="LNt-n8-sve"/>
|
<constraint firstAttribute="trailing" secondItem="omP-RH-Hlh" secondAttribute="trailing" constant="24" id="Ryt-Wu-QWj"/>
|
||||||
<constraint firstItem="iN7-lf-GS3" firstAttribute="trailing" secondItem="bCV-w1-hVY" secondAttribute="trailing" constant="24" id="ND8-7l-QRM"/>
|
<constraint firstItem="eQo-BP-t2k" firstAttribute="leading" secondItem="69O-Fo-TQF" secondAttribute="trailing" constant="16" id="VvK-jS-8qP"/>
|
||||||
<constraint firstItem="69O-Fo-TQF" firstAttribute="leading" secondItem="iN7-lf-GS3" secondAttribute="leading" constant="24" id="Rfy-KZ-OF1"/>
|
<constraint firstItem="TpM-Mz-EpI" firstAttribute="top" secondItem="iAl-ff-skU" secondAttribute="top" constant="16" id="WcH-lu-gmN"/>
|
||||||
|
<constraint firstItem="69O-Fo-TQF" firstAttribute="top" secondItem="bCV-w1-hVY" secondAttribute="bottom" constant="16" id="bOA-Dz-eB4"/>
|
||||||
|
<constraint firstItem="omP-RH-Hlh" firstAttribute="top" secondItem="hkV-XP-jXe" secondAttribute="bottom" constant="12" id="eAT-ba-MuB"/>
|
||||||
|
<constraint firstItem="hkV-XP-jXe" firstAttribute="leading" secondItem="iAl-ff-skU" secondAttribute="leading" constant="24" id="fXg-xr-nwy"/>
|
||||||
|
<constraint firstItem="eQo-BP-t2k" firstAttribute="centerY" secondItem="69O-Fo-TQF" secondAttribute="centerY" id="qQu-95-XUA"/>
|
||||||
|
<constraint firstItem="bCV-w1-hVY" firstAttribute="leading" secondItem="iAl-ff-skU" secondAttribute="leading" constant="24" id="twO-Ty-mtH"/>
|
||||||
|
<constraint firstItem="hkV-XP-jXe" firstAttribute="top" secondItem="69O-Fo-TQF" secondAttribute="bottom" constant="16" id="vL4-Uu-2Bd"/>
|
||||||
|
<constraint firstItem="TpM-Mz-EpI" firstAttribute="leading" secondItem="iAl-ff-skU" secondAttribute="leading" constant="24" id="ykh-Uy-8MV"/>
|
||||||
|
</constraints>
|
||||||
|
</view>
|
||||||
|
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3ae-Qn-llh">
|
||||||
|
<rect key="frame" x="0.0" y="319" width="414" height="543"/>
|
||||||
|
<subviews>
|
||||||
|
<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="0.0" 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="37" width="398" height="506"/>
|
||||||
|
<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" id="8kR-rm-gdJ"/>
|
||||||
|
<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"/>
|
||||||
|
</constraints>
|
||||||
|
</view>
|
||||||
|
</subviews>
|
||||||
|
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||||
|
<constraints>
|
||||||
|
<constraint firstItem="3ae-Qn-llh" firstAttribute="top" secondItem="iAl-ff-skU" secondAttribute="bottom" id="48i-EM-6px"/>
|
||||||
|
<constraint firstItem="iN7-lf-GS3" firstAttribute="trailing" secondItem="iAl-ff-skU" secondAttribute="trailing" id="AoD-6m-Zah"/>
|
||||||
|
<constraint firstItem="iN7-lf-GS3" firstAttribute="bottom" secondItem="3ae-Qn-llh" secondAttribute="bottom" id="H2b-Bw-SPo"/>
|
||||||
|
<constraint firstItem="3ae-Qn-llh" firstAttribute="leading" secondItem="iN7-lf-GS3" secondAttribute="leading" id="JSj-x6-uUy"/>
|
||||||
|
<constraint firstItem="iAl-ff-skU" firstAttribute="top" secondItem="1XB-6S-dGV" secondAttribute="bottom" id="KyF-sn-SYG"/>
|
||||||
|
<constraint firstItem="3ae-Qn-llh" firstAttribute="leading" secondItem="iAl-ff-skU" secondAttribute="trailing" id="Ojd-xl-Edq"/>
|
||||||
|
<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" constant="16" 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="iN7-lf-GS3" firstAttribute="trailing" secondItem="1XB-6S-dGV" secondAttribute="trailing" id="ViL-Rg-PN8"/>
|
||||||
<constraint firstItem="hWP-3N-RUn" firstAttribute="top" secondItem="rks-gf-AM4" secondAttribute="bottom" constant="8" id="YSc-4u-eGx"/>
|
<constraint firstItem="iAl-ff-skU" firstAttribute="width" secondItem="3ae-Qn-llh" secondAttribute="width" id="WSU-eO-T8S"/>
|
||||||
<constraint firstItem="iN7-lf-GS3" firstAttribute="trailing" secondItem="hkV-XP-jXe" secondAttribute="trailing" constant="24" id="YiF-gB-Ipi"/>
|
<constraint firstItem="iAl-ff-skU" firstAttribute="leading" secondItem="iN7-lf-GS3" secondAttribute="leading" id="efn-u4-JYI"/>
|
||||||
<constraint firstItem="hWP-3N-RUn" firstAttribute="leading" secondItem="iN7-lf-GS3" secondAttribute="leading" constant="8" id="c9W-lx-Lt1"/>
|
<constraint firstItem="iAl-ff-skU" firstAttribute="top" secondItem="1XB-6S-dGV" secondAttribute="bottom" constant="1" id="fxU-4n-vS8"/>
|
||||||
<constraint firstItem="69O-Fo-TQF" firstAttribute="top" secondItem="bCV-w1-hVY" secondAttribute="bottom" constant="16" id="d28-3O-3GO"/>
|
<constraint firstItem="iN7-lf-GS3" firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="iAl-ff-skU" secondAttribute="bottom" id="o0D-wq-Ew9"/>
|
||||||
<constraint firstItem="omP-RH-Hlh" firstAttribute="leading" secondItem="iN7-lf-GS3" secondAttribute="leading" constant="24" id="nDZ-Hu-019"/>
|
<constraint firstItem="iN7-lf-GS3" firstAttribute="trailing" secondItem="3ae-Qn-llh" secondAttribute="trailing" id="oT6-TL-SV4"/>
|
||||||
<constraint firstItem="iN7-lf-GS3" firstAttribute="trailing" secondItem="omP-RH-Hlh" secondAttribute="trailing" constant="24" id="per-wQ-baW"/>
|
<constraint firstAttribute="trailing" secondItem="3ae-Qn-llh" secondAttribute="trailing" id="qvo-A0-0im"/>
|
||||||
<constraint firstItem="iN7-lf-GS3" firstAttribute="trailing" secondItem="69O-Fo-TQF" secondAttribute="trailing" constant="24" id="tEy-M0-XwI"/>
|
|
||||||
<constraint firstItem="omP-RH-Hlh" firstAttribute="top" secondItem="hkV-XP-jXe" secondAttribute="bottom" constant="8" id="teR-bN-0UV"/>
|
|
||||||
<constraint firstItem="1XB-6S-dGV" firstAttribute="top" secondItem="iN7-lf-GS3" secondAttribute="top" id="uz5-3l-eKb"/>
|
<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"/>
|
<constraint firstItem="1XB-6S-dGV" firstAttribute="leading" secondItem="3L4-c2-Pow" secondAttribute="leading" id="vnV-AO-wgT"/>
|
||||||
<constraint firstItem="rks-gf-AM4" firstAttribute="top" secondItem="omP-RH-Hlh" secondAttribute="bottom" constant="16" id="xgD-fy-RGr"/>
|
|
||||||
</constraints>
|
</constraints>
|
||||||
<viewLayoutGuide key="safeArea" id="iN7-lf-GS3"/>
|
<viewLayoutGuide key="safeArea" id="iN7-lf-GS3"/>
|
||||||
|
<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="SI9-hB-Om4"/>
|
||||||
|
<exclude reference="WSU-eO-T8S"/>
|
||||||
|
<exclude reference="efn-u4-JYI"/>
|
||||||
|
<exclude reference="fxU-4n-vS8"/>
|
||||||
|
<exclude reference="48i-EM-6px"/>
|
||||||
|
<exclude reference="JSj-x6-uUy"/>
|
||||||
|
<exclude reference="Ojd-xl-Edq"/>
|
||||||
|
<exclude reference="T5g-Sq-0j2"/>
|
||||||
|
<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="48i-EM-6px"/>
|
||||||
|
<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="SI9-hB-Om4"/>
|
||||||
|
<include reference="48i-EM-6px"/>
|
||||||
|
<include reference="JSj-x6-uUy"/>
|
||||||
|
<include reference="qvo-A0-0im"/>
|
||||||
|
</mask>
|
||||||
|
</variation>
|
||||||
</view>
|
</view>
|
||||||
<navigationItem key="navigationItem" id="xDt-o1-FZQ"/>
|
<navigationItem key="navigationItem" id="xDt-o1-FZQ"/>
|
||||||
<connections>
|
<connections>
|
||||||
<outlet property="collectionView" destination="hWP-3N-RUn" id="RFo-DP-uPX"/>
|
<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="omP-RH-Hlh" id="hVo-ND-9EG"/>
|
<outlet property="defaultSegments" destination="omP-RH-Hlh" id="hVo-ND-9EG"/>
|
||||||
|
<outlet property="inputsView" destination="iAl-ff-skU" id="6a4-Dz-Lch"/>
|
||||||
<outlet property="textToolbar" destination="cDy-2Q-2zk" id="UlY-Aa-f41"/>
|
<outlet property="textToolbar" destination="cDy-2Q-2zk" id="UlY-Aa-f41"/>
|
||||||
<outlet property="txtClasses" destination="bCV-w1-hVY" id="lDD-NQ-f8f"/>
|
<outlet property="txtClasses" destination="bCV-w1-hVY" id="lDD-NQ-f8f"/>
|
||||||
<outlet property="txtCourses" destination="69O-Fo-TQF" id="AC7-pO-Jms"/>
|
<outlet property="txtCourses" destination="69O-Fo-TQF" id="AC7-pO-Jms"/>
|
||||||
@@ -183,7 +278,7 @@
|
|||||||
</items>
|
</items>
|
||||||
</toolbar>
|
</toolbar>
|
||||||
</objects>
|
</objects>
|
||||||
<point key="canvasLocation" x="2691" y="-514"/>
|
<point key="canvasLocation" x="2689.2857142857142" y="-514.49275362318849"/>
|
||||||
</scene>
|
</scene>
|
||||||
<!--Colour Picker View-->
|
<!--Colour Picker View-->
|
||||||
<scene sceneID="H2r-WV-fSr">
|
<scene sceneID="H2r-WV-fSr">
|
||||||
@@ -318,7 +413,6 @@
|
|||||||
<!--Information-->
|
<!--Information-->
|
||||||
<scene sceneID="8Mm-U7-JgF">
|
<scene sceneID="8Mm-U7-JgF">
|
||||||
<objects>
|
<objects>
|
||||||
<placeholder placeholderIdentifier="IBFirstResponder" id="IMM-XL-aYt" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
|
||||||
<navigationController automaticallyAdjustsScrollViewInsets="NO" id="QLo-hR-KTA" sceneMemberID="viewController">
|
<navigationController automaticallyAdjustsScrollViewInsets="NO" id="QLo-hR-KTA" sceneMemberID="viewController">
|
||||||
<tabBarItem key="tabBarItem" title="Information" image="ic_information" selectedImage="ic_information" id="BQ7-VO-yI4"/>
|
<tabBarItem key="tabBarItem" title="Information" image="ic_information" selectedImage="ic_information" id="BQ7-VO-yI4"/>
|
||||||
<toolbarItems/>
|
<toolbarItems/>
|
||||||
@@ -328,6 +422,7 @@
|
|||||||
</navigationBar>
|
</navigationBar>
|
||||||
<nil name="viewControllers"/>
|
<nil name="viewControllers"/>
|
||||||
</navigationController>
|
</navigationController>
|
||||||
|
<placeholder placeholderIdentifier="IBFirstResponder" id="IMM-XL-aYt" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||||
</objects>
|
</objects>
|
||||||
<point key="canvasLocation" x="721.73913043478262" y="572.54464285714278"/>
|
<point key="canvasLocation" x="721.73913043478262" y="572.54464285714278"/>
|
||||||
</scene>
|
</scene>
|
||||||
@@ -357,7 +452,4 @@
|
|||||||
<image name="ic_tomato" width="25" height="25"/>
|
<image name="ic_tomato" width="25" height="25"/>
|
||||||
<image name="ic_writing" width="25" height="25"/>
|
<image name="ic_writing" width="25" height="25"/>
|
||||||
</resources>
|
</resources>
|
||||||
<inferredMetricsTieBreakers>
|
|
||||||
<segue reference="OZ6-ZZ-xdo"/>
|
|
||||||
</inferredMetricsTieBreakers>
|
|
||||||
</document>
|
</document>
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ class ColourPickerView: UIViewController, UICollectionViewDataSource, UICollecti
|
|||||||
}
|
}
|
||||||
|
|
||||||
func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
|
func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
|
||||||
// For remove previously selection
|
// For removing the previous selection
|
||||||
if currentSelected != nil {
|
if currentSelected != nil {
|
||||||
if let cell = collectionView.cellForItem(at: currentSelected!) as? ColourViewCell {
|
if let cell = collectionView.cellForItem(at: currentSelected!) as? ColourViewCell {
|
||||||
cell.imageView.image = UIImage(named: "ic_empty")
|
cell.imageView.image = UIImage(named: "ic_empty")
|
||||||
@@ -59,7 +59,7 @@ class ColourPickerView: UIViewController, UICollectionViewDataSource, UICollecti
|
|||||||
|
|
||||||
currentSelected = indexPath
|
currentSelected = indexPath
|
||||||
|
|
||||||
// For reload the selected cell
|
// For reloading the selected cell
|
||||||
self.collectionView.reloadItems(at: [currentSelected!])
|
self.collectionView.reloadItems(at: [currentSelected!])
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -24,10 +24,21 @@ class CustomizationViewController: UIViewController, UICollectionViewDataSource,
|
|||||||
@IBOutlet weak var defaultSegments: UISegmentedControl!
|
@IBOutlet weak var defaultSegments: UISegmentedControl!
|
||||||
@IBOutlet weak var textToolbar: UIToolbar!
|
@IBOutlet weak var textToolbar: UIToolbar!
|
||||||
|
|
||||||
@IBAction func textDismissButton(_ sender: Any) {
|
@IBOutlet weak var inputsView: UIView!
|
||||||
|
@IBOutlet weak var colourView: UIView!
|
||||||
|
|
||||||
|
@IBAction func textDismissButton(_ sender: UIBarButtonItem) {
|
||||||
view.endEditing(true)
|
view.endEditing(true)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@IBAction func groupHelpButton(_ sender: UIButton) {
|
||||||
|
self.present(self.getAlert(for: "grade"), animated: true)
|
||||||
|
}
|
||||||
|
|
||||||
|
@IBAction func courseHelpButton(_ sender: UIButton) {
|
||||||
|
self.present(self.getAlert(for: "course"), animated: true)
|
||||||
|
}
|
||||||
|
|
||||||
func textFieldDidBeginEditing(_ textField: UITextField) {
|
func textFieldDidBeginEditing(_ textField: UITextField) {
|
||||||
textField.inputAccessoryView = textToolbar
|
textField.inputAccessoryView = textToolbar
|
||||||
}
|
}
|
||||||
@@ -126,4 +137,11 @@ class CustomizationViewController: UIViewController, UICollectionViewDataSource,
|
|||||||
cell.backgroundColor = #colorLiteral(red: 1.0, green: 1.0, blue: 1.0, alpha: 1.0)
|
cell.backgroundColor = #colorLiteral(red: 1.0, green: 1.0, blue: 1.0, alpha: 1.0)
|
||||||
return cell
|
return cell
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func getAlert(for type: String) -> UIAlertController {
|
||||||
|
let alert = UIAlertController(title: NSLocalizedString("enter_\(type)_title", comment: ""), message: NSLocalizedString("enter_\(type)_help", comment: ""), preferredStyle: .alert)
|
||||||
|
alert.addAction(UIAlertAction(title: NSLocalizedString("dismiss", comment: ""), style: .default) { action in
|
||||||
|
})
|
||||||
|
return alert
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -395,16 +395,6 @@ class DataFetcher {
|
|||||||
let alert = UIAlertController(title: NSLocalizedString("information", comment: ""), message: self.readInformation(), preferredStyle: .alert)
|
let alert = UIAlertController(title: NSLocalizedString("information", comment: ""), message: self.readInformation(), preferredStyle: .alert)
|
||||||
alert.addAction(UIAlertAction(title: NSLocalizedString("dismiss", comment: ""), style: .default) { action in
|
alert.addAction(UIAlertAction(title: NSLocalizedString("dismiss", comment: ""), style: .default) { action in
|
||||||
})
|
})
|
||||||
let paragraphStyle = NSMutableParagraphStyle()
|
|
||||||
paragraphStyle.alignment = NSTextAlignment.left
|
|
||||||
let messageText = NSMutableAttributedString(
|
|
||||||
string: self.readInformation(),
|
|
||||||
attributes: [
|
|
||||||
NSAttributedString.Key.paragraphStyle: paragraphStyle,
|
|
||||||
NSAttributedString.Key.font: UIFont.preferredFont(forTextStyle: UIFont.TextStyle.caption1)
|
|
||||||
]
|
|
||||||
)
|
|
||||||
alert.setValue(messageText, forKey: "attributedMessage")
|
|
||||||
return alert
|
return alert
|
||||||
} else {
|
} else {
|
||||||
return nil
|
return nil
|
||||||
|
|||||||
@@ -10,6 +10,12 @@ import UIKit
|
|||||||
|
|
||||||
class GeneralViewController: PlanViewController {
|
class GeneralViewController: PlanViewController {
|
||||||
|
|
||||||
|
@IBAction func customize(_ sender: UIBarButtonItem) {
|
||||||
|
if let s = storyboard?.instantiateViewController(withIdentifier: "Customize") as? CustomizationViewController {
|
||||||
|
self.present(s, animated: true)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
override func viewDidLoad() {
|
override func viewDidLoad() {
|
||||||
super.viewDidLoad()
|
super.viewDidLoad()
|
||||||
self.navigationController?.navigationBar.topItem?.title = NSLocalizedString("avh_plan", comment: "")
|
self.navigationController?.navigationBar.topItem?.title = NSLocalizedString("avh_plan", comment: "")
|
||||||
|
|||||||
@@ -12,6 +12,12 @@ class PersonalPlanViewController: PlanViewController {
|
|||||||
|
|
||||||
let prefs = UserDefaults.standard
|
let prefs = UserDefaults.standard
|
||||||
|
|
||||||
|
@IBAction func customize(_ sender: UIBarButtonItem) {
|
||||||
|
if let s = storyboard?.instantiateViewController(withIdentifier: "Customize") as? CustomizationViewController {
|
||||||
|
self.present(s, animated: true)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
override func viewWillAppear(_ animated: Bool) {
|
override func viewWillAppear(_ animated: Bool) {
|
||||||
super.viewWillAppear(animated)
|
super.viewWillAppear(animated)
|
||||||
let user = self.prefs.string(forKey: "username")
|
let user = self.prefs.string(forKey: "username")
|
||||||
|
|||||||
@@ -76,3 +76,8 @@
|
|||||||
"back" = "Zurück";
|
"back" = "Zurück";
|
||||||
"your_plan" = "Dein Plan";
|
"your_plan" = "Dein Plan";
|
||||||
"dismiss" = "Schließen";
|
"dismiss" = "Schließen";
|
||||||
|
|
||||||
|
"enter_grade_title" = "Wie du deine Klasse eintragen kannst";
|
||||||
|
"enter_course_title" = "Wie du deine Kurse eintragen kannst";
|
||||||
|
"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.";
|
||||||
|
|||||||
@@ -77,3 +77,8 @@
|
|||||||
"back" = "Back";
|
"back" = "Back";
|
||||||
"your_plan" = "Your Plan";
|
"your_plan" = "Your Plan";
|
||||||
"dismiss" = "Dismiss";
|
"dismiss" = "Dismiss";
|
||||||
|
|
||||||
|
"enter_grade_title" = "How to enter your grade";
|
||||||
|
"enter_course_title" = "How to enter your courses";
|
||||||
|
"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.";
|
||||||
|
|||||||
Reference in New Issue
Block a user