Skip to content

Commit

Permalink
customization tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
@phillipthelen
phillipthelen committed Apr 22, 2024
1 parent bcc22e6 commit 73739c0
Show file tree
Hide file tree
Showing 10 changed files with 137 additions and 58 deletions.
1 change: 0 additions & 1 deletion HabitRPG/Generated/Assets-Images.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,6 @@ internal enum Asset {
internal static let notificationsClose = ImageAsset(name: "notifications_close")
internal static let notificationsMystery = ImageAsset(name: "notifications_mystery")
internal static let notificationsStats = ImageAsset(name: "notifications_stats")
internal static let npcGradient1 = ImageAsset(name: "npc_gradient 1")
internal static let npcGradient = ImageAsset(name: "npc_gradient")
internal static let onboardingDoneArt = ImageAsset(name: "onboardingDoneArt")
internal static let onboardingGoldLeft = ImageAsset(name: "onboardingGoldLeft")
Expand Down
18 changes: 18 additions & 0 deletions HabitRPG/Generated/Strings.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1445,10 +1445,14 @@ public enum L10n {
public static var animalTails: String { return L10n.tr("Mainstrings", "avatar.animal_tails") }
/// Background
public static var background: String { return L10n.tr("Mainstrings", "avatar.background") }
/// Backgrounds
public static var backgrounds: String { return L10n.tr("Mainstrings", "avatar.backgrounds") }
/// Bangs
public static var bangs: String { return L10n.tr("Mainstrings", "avatar.bangs") }
/// Beard
public static var beard: String { return L10n.tr("Mainstrings", "avatar.beard") }
/// Beards
public static var beards: String { return L10n.tr("Mainstrings", "avatar.beards") }
/// Body
public static var body: String { return L10n.tr("Mainstrings", "avatar.body") }
/// Extras
Expand All @@ -1461,20 +1465,34 @@ public enum L10n {
public static var hair: String { return L10n.tr("Mainstrings", "avatar.hair") }
/// Hair Style
public static var hairStyle: String { return L10n.tr("Mainstrings", "avatar.hair_style") }
/// Hair Styles
public static var hairStyles: String { return L10n.tr("Mainstrings", "avatar.hair_styles") }
/// Hair Color
public static var hairColor: String { return L10n.tr("Mainstrings", "avatar.hairColor") }
/// Hair Colors
public static var hairColors: String { return L10n.tr("Mainstrings", "avatar.hairColors") }
/// Head
public static var head: String { return L10n.tr("Mainstrings", "avatar.head") }
/// Mustache
public static var mustache: String { return L10n.tr("Mainstrings", "avatar.mustache") }
/// Mustaches
public static var mustaches: String { return L10n.tr("Mainstrings", "avatar.mustaches") }
/// Shirt
public static var shirt: String { return L10n.tr("Mainstrings", "avatar.shirt") }
/// Shirts
public static var shirts: String { return L10n.tr("Mainstrings", "avatar.shirts") }
/// Skin
public static var skin: String { return L10n.tr("Mainstrings", "avatar.skin") }
/// Skin Color
public static var skinColor: String { return L10n.tr("Mainstrings", "avatar.skin_color") }
/// Skin Colors
public static var skinColors: String { return L10n.tr("Mainstrings", "avatar.skin_colors") }
/// Skins
public static var skins: String { return L10n.tr("Mainstrings", "avatar.skins") }
/// Wheelchair
public static var wheelchair: String { return L10n.tr("Mainstrings", "avatar.wheelchair") }
/// Wheelchairs
public static var wheelchairs: String { return L10n.tr("Mainstrings", "avatar.wheelchairs") }
}

public enum ChallengeCategory {
Expand Down
46 changes: 23 additions & 23 deletions HabitRPG/Storyboards/Base.lproj/Main.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@
<objects>
<navigationController storyboardIdentifier="AdventureGuideNavigationViewController" id="WTd-tE-eOd" sceneMemberID="viewController">
<navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="GDi-dP-m8t">
<rect key="frame" x="0.0" y="47" width="428" height="44"/>
<rect key="frame" x="0.0" y="0.0" width="107" height="56"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
<connections>
Expand All @@ -482,33 +482,33 @@
<viewControllerLayoutGuide type="bottom" id="grl-y6-BoW"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="PSh-Sr-xnO">
<rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
<rect key="frame" x="0.0" y="0.0" width="107" height="791"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8fK-nl-DsM">
<rect key="frame" x="0.0" y="91" width="428" height="801"/>
<rect key="frame" x="0.0" y="56" width="107" height="735"/>
<subviews>
<view contentMode="scaleToFill" verticalHuggingPriority="1000" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="foh-Y5-euZ">
<rect key="frame" x="0.0" y="0.0" width="428" height="209.33333333333334"/>
<rect key="frame" x="0.0" y="0.0" width="107" height="209.33333333333334"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="1000" verticalCompressionResistancePriority="1000" axis="vertical" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="wYP-zx-dbe">
<rect key="frame" x="26" y="0.0" width="376" height="249.33333333333334"/>
<rect key="frame" x="26" y="0.0" width="55" height="249.33333333333334"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="adventureGuideArt" translatesAutoresizingMaskIntoConstraints="NO" id="Eax-S2-1ke">
<rect key="frame" x="0.0" y="0.0" width="376" height="46"/>
<rect key="frame" x="0.0" y="0.0" width="55" height="46"/>
<constraints>
<constraint firstAttribute="height" constant="46" id="xVs-7j-18d"/>
</constraints>
</imageView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="m7O-ZS-KOh">
<rect key="frame" x="0.0" y="54" width="376" height="1"/>
<rect key="frame" x="0.0" y="54" width="55" height="1"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="ifP-cD-1sC"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="1000" verticalCompressionResistancePriority="1000" text="Beginner Objectives" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OaN-pI-O3a">
<rect key="frame" x="0.0" y="63.000000000000007" width="376" height="20.333333333333336"/>
<rect key="frame" x="0.0" y="63.000000000000007" width="55" height="20.333333333333336"/>
<constraints>
<constraint firstAttribute="height" priority="500" constant="22" id="fQn-E8-VM0"/>
</constraints>
Expand All @@ -517,10 +517,10 @@
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" verticalHuggingPriority="1000" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="WUa-Qe-rtA">
<rect key="frame" x="0.0" y="91.333333333333343" width="376" height="50"/>
<rect key="frame" x="0.0" y="91.333333333333343" width="55" height="50"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="1000" verticalCompressionResistancePriority="1000" text="Complete these onboarding tasks and you’ll earn 5 Achievements and 100 Gold once you’re done!" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KXt-8h-VNr">
<rect key="frame" x="12" y="0.0" width="352" height="50"/>
<rect key="frame" x="12" y="0.0" width="31" height="50"/>
<constraints>
<constraint firstAttribute="height" priority="500" constant="22" id="bej-Uf-maR"/>
</constraints>
Expand All @@ -538,23 +538,23 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YPg-7O-j94">
<rect key="frame" x="0.0" y="149.33333333333334" width="376" height="1"/>
<rect key="frame" x="0.0" y="149.33333333333334" width="55" height="1"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="V3u-UV-9kz"/>
</constraints>
</view>
<stackView opaque="NO" contentMode="scaleToFill" distribution="equalSpacing" translatesAutoresizingMaskIntoConstraints="NO" id="ul9-Fj-GrY">
<rect key="frame" x="0.0" y="158.33333333333334" width="376" height="20"/>
<rect key="frame" x="0.0" y="158.33333333333334" width="55" height="20"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Your Progress" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gGm-VS-bMz">
<rect key="frame" x="0.0" y="0.0" width="85" height="20"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Your Progress" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gGm-VS-bMz">
<rect key="frame" x="0.0" y="0.0" width="55" height="20"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="12"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ANP-hf-wbL">
<rect key="frame" x="345" y="0.0" width="31" height="20"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ANP-hf-wbL">
<rect key="frame" x="55" y="0.0" width="0.0" height="20"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
Expand All @@ -565,14 +565,14 @@
</constraints>
</stackView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Hqi-5C-p2F" customClass="ProgressBar" customModule="Habitica" customModuleProvider="target">
<rect key="frame" x="0.0" y="186.33333333333331" width="376" height="5"/>
<rect key="frame" x="0.0" y="186.33333333333334" width="55" height="5"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="5" id="sHS-eo-snW"/>
</constraints>
</view>
<stackView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="1000" verticalCompressionResistancePriority="1000" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="eGa-gL-7SD">
<rect key="frame" x="0.0" y="199.33333333333331" width="376" height="50"/>
<rect key="frame" x="0.0" y="199.33333333333334" width="55" height="50"/>
<constraints>
<constraint firstAttribute="height" priority="500" constant="20" id="pmU-Np-CQZ"/>
</constraints>
Expand Down Expand Up @@ -887,7 +887,7 @@
<constraints>
<constraint firstAttribute="height" priority="500" constant="26" id="AXg-RX-7v0"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
Expand Down Expand Up @@ -969,7 +969,7 @@
</collectionViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Q5s-Wo-MJQ" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="6399.5327102803731" y="125.05399568034558"/>
<point key="canvasLocation" x="6363" y="124"/>
</scene>
<!--Settings-->
<scene sceneID="5Gi-ds-f28">
Expand Down Expand Up @@ -3831,7 +3831,7 @@ a matching subscription automatically after sending your gift.</string>
</scene>
</scenes>
<inferredMetricsTieBreakers>
<segue reference="FI8-Gh-C6n"/>
<segue reference="yNZ-LP-06T"/>
<segue reference="2vn-wQ-bqg"/>
<segue reference="FPm-Dv-Zos"/>
<segue reference="x0h-sG-Le1"/>
Expand All @@ -3841,10 +3841,10 @@ a matching subscription automatically after sending your gift.</string>
<segue reference="ETz-qE-xC2"/>
<segue reference="jU9-l6-uQc"/>
<segue reference="nf5-O5-ykS"/>
<segue reference="gXQ-dZ-OGd"/>
<segue reference="u8W-Xm-nze"/>
<segue reference="j9F-en-5nH"/>
<segue reference="dho-1x-ad8"/>
<segue reference="6tw-63-M3K"/>
<segue reference="PHp-cT-md6"/>
<segue reference="zf0-3c-Xzo"/>
<segue reference="Nkz-Sr-H0i"/>
</inferredMetricsTieBreakers>
Expand Down
2 changes: 1 addition & 1 deletion HabitRPG/Storyboards/Base.lproj/Shop.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JB4-vT-m2S">
<rect key="frame" x="8" y="25" width="307" height="0.0"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="12"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
Expand Down
Loading

0 comments on commit 73739c0

Please sign in to comment.