Commit fd4ad65b authored by Jose Blaya's avatar Jose Blaya
Browse files

Refactor

parent ac742fa8
......@@ -599,14 +599,8 @@ You will not be charged during this process.</string>
<outlet property="delegate" destination="J5T-ys-Of8" id="AOl-VK-KTQ"/>
</connections>
</collectionView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fC1-Bg-SaI">
<rect key="frame" x="0.0" y="388.5" width="321" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" text="&lt;Agreement&gt;" textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="KyF-30-stz">
<rect key="frame" x="0.0" y="419.5" width="321" height="218.5"/>
<rect key="frame" x="0.0" y="388.5" width="321" height="249.5"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
<dataDetectorType key="dataDetectorTypes" link="YES"/>
......@@ -630,17 +624,14 @@ You will not be charged during this process.</string>
<constraint firstAttribute="bottom" secondItem="KyF-30-stz" secondAttribute="bottom" id="30v-I9-NUH"/>
<constraint firstItem="1AP-NP-8y0" firstAttribute="top" secondItem="Peu-Da-gWl" secondAttribute="bottom" constant="33" id="3L3-SU-nCw"/>
<constraint firstItem="KyF-30-stz" firstAttribute="leading" secondItem="hTy-4A-jv9" secondAttribute="leading" id="7kA-ah-cv8"/>
<constraint firstItem="fC1-Bg-SaI" firstAttribute="leading" secondItem="hTy-4A-jv9" secondAttribute="leading" id="8NT-pe-CDy"/>
<constraint firstAttribute="trailing" secondItem="1AP-NP-8y0" secondAttribute="trailing" id="ESc-uJ-tfw"/>
<constraint firstItem="KyF-30-stz" firstAttribute="top" secondItem="fC1-Bg-SaI" secondAttribute="bottom" constant="10" id="MBl-ca-MnN"/>
<constraint firstItem="KyF-30-stz" firstAttribute="top" secondItem="G5a-CO-RKC" secondAttribute="bottom" constant="10" id="FQm-bp-qj9"/>
<constraint firstItem="Peu-Da-gWl" firstAttribute="centerX" secondItem="hTy-4A-jv9" secondAttribute="centerX" id="QdA-NI-LNZ"/>
<constraint firstAttribute="trailing" secondItem="G5a-CO-RKC" secondAttribute="trailing" id="U1a-XQ-E6d"/>
<constraint firstItem="1AP-NP-8y0" firstAttribute="leading" secondItem="hTy-4A-jv9" secondAttribute="leading" id="WTU-4M-U31"/>
<constraint firstAttribute="trailing" secondItem="KyF-30-stz" secondAttribute="trailing" id="ZBr-4g-lGZ"/>
<constraint firstItem="G5a-CO-RKC" firstAttribute="leading" secondItem="hTy-4A-jv9" secondAttribute="leading" id="ZxJ-o3-ToY"/>
<constraint firstItem="G5a-CO-RKC" firstAttribute="top" secondItem="1AP-NP-8y0" secondAttribute="bottom" constant="20" id="afu-UC-s1H"/>
<constraint firstAttribute="trailing" secondItem="fC1-Bg-SaI" secondAttribute="trailing" id="c9x-f5-ESH"/>
<constraint firstItem="fC1-Bg-SaI" firstAttribute="top" secondItem="G5a-CO-RKC" secondAttribute="bottom" constant="10" id="cR1-gg-0fq"/>
<constraint firstItem="hPa-uO-IxH" firstAttribute="centerX" secondItem="hTy-4A-jv9" secondAttribute="centerX" id="hF5-2v-dnV"/>
<constraint firstItem="Peu-Da-gWl" firstAttribute="top" secondItem="hPa-uO-IxH" secondAttribute="bottom" constant="12" id="qnZ-7w-aXv"/>
<constraint firstItem="hPa-uO-IxH" firstAttribute="top" secondItem="hTy-4A-jv9" secondAttribute="top" id="re9-Hq-JJu"/>
......
......@@ -36,4 +36,3 @@
"purchase.uncredited.alert.button.cancel" = "Cancel";
"purchase.uncredited.alert.button.recover" = "Recover account";
"purchase.subscription.apple.terms" = "Payment will be charged to your Apple ID account at the confirmation of purchase. Subscription automatically renews unless it is canceled at least 24 hours before the end of the current period. Your account will be charged for renewal within 24 hours prior to the end of the current period. You can manage and cancel your subscriptions by going to your account settings on the App Store after purchase.";
......@@ -57,7 +57,7 @@
"iap.error.message.unavailable" = "Apple servers currently unavailable. Please try again later.";
"iap.error.title" = "Error";
"agreement.message" = "Signing up constitutes acceptance of the $1 and the $2.";
"agreement.message" = "Payment will be charged to your Apple ID account at the confirmation of purchase. Subscription automatically renews unless it is canceled at least 24 hours before the end of the current period. Your account will be charged for renewal within 24 hours prior to the end of the current period. You can manage and cancel your subscriptions by going to your account settings on the App Store after purchase.\n\nSigning up constitutes acceptance of the $1 and the $2.";
"agreement.message.tos" = "Terms of Service";
"agreement.message.privacy" = "Privacy Policy";
......
......@@ -119,7 +119,7 @@ internal enum L10n {
}
internal enum Welcome {
internal enum Agreement {
/// Signing up constitutes acceptance of the $1 and the $2.
/// Payment will be charged to your Apple ID account at the confirmation of purchase. Subscription automatically renews unless it is canceled at least 24 hours before the end of the current period. Your account will be charged for renewal within 24 hours prior to the end of the current period. You can manage and cancel your subscriptions by going to your account settings on the App Store after purchase.\n\nSigning up constitutes acceptance of the $1 and the $2.
internal static let message = L10n.tr("Welcome", "agreement.message")
internal enum Message {
/// Privacy Policy
......
......@@ -21,8 +21,7 @@ class PurchaseViewController: AutolayoutViewController, WelcomeChild {
@IBOutlet private weak var labelTitle: UILabel!
@IBOutlet private weak var labelSubtitle: UILabel!
@IBOutlet private weak var labelAppleTerms: UILabel!
@IBOutlet private weak var collectionPlans: UICollectionView!
@IBOutlet private weak var textAgreement: UITextView!
......@@ -52,7 +51,6 @@ class PurchaseViewController: AutolayoutViewController, WelcomeChild {
labelTitle.text = L10n.Welcome.Purchase.title
labelSubtitle.text = L10n.Welcome.Purchase.subtitle
labelAppleTerms.text = L10n.Signup.Purchase.Subscription.Apple.terms
textAgreement.attributedText = Theme.current.agreementText(
withMessage: L10n.Welcome.Agreement.message,
tos: L10n.Welcome.Agreement.Message.tos,
......@@ -171,7 +169,6 @@ class PurchaseViewController: AutolayoutViewController, WelcomeChild {
Theme.current.applyPrincipalBackground(collectionPlans)
Theme.current.applyTitle(labelTitle, appearance: .dark)
Theme.current.applySubtitle(labelSubtitle)
Theme.current.applySubtitle(labelAppleTerms)
Theme.current.applyLinkAttributes(textAgreement)
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment