Feature/calculation sources (#6)

* Storyboard refactoring * Separate storyboards into module specific ones * Refactor slider and buttons into separate views * Fix the wrong folder linking * Add Web view that displays relevant information for the app review * Build version bump
kayoslab · Aug 20, 2020 · a4ad97a · a4ad97a
1 parent 5d74d1e
commit a4ad97a
Show file tree

Hide file tree

Showing 30 changed files with 4,459 additions and 4,253 deletions.
diff --git a/caffeine.xcodeproj/project.pbxproj b/caffeine.xcodeproj/project.pbxproj
diff --git a/caffeine/Generated/Strings.swift b/caffeine/Generated/Strings.swift
@@ -66,6 +66,20 @@ internal enum L10n {
   internal static let sensibilityAlertTitle = L10n.tr("Localizable", "SensibilityAlertTitle")
   /// SEPT
   internal static let september = L10n.tr("Localizable", "September")
+  /// Female
+  internal static let settingsFemale = L10n.tr("Localizable", "SettingsFemale")
+  /// Male
+  internal static let settingsMale = L10n.tr("Localizable", "SettingsMale")
+  /// Medical Information!
+  internal static let settingsMedicalInformation = L10n.tr("Localizable", "SettingsMedicalInformation")
+  /// Height in cm:
+  internal static let settingsTitleHeight = L10n.tr("Localizable", "SettingsTitleHeight")
+  /// Sensibility in %%:
+  internal static let settingsTitleSensibility = L10n.tr("Localizable", "SettingsTitleSensibility")
+  /// Sex:
+  internal static let settingsTitleSex = L10n.tr("Localizable", "SettingsTitleSex")
+  /// Weight in kg:
+  internal static let settingsTitleWeight = L10n.tr("Localizable", "SettingsTitleWeight")
   /// Coffee Saved!
   internal static let shortcutHeading = L10n.tr("Localizable", "ShortcutHeading")
   /// OK

diff --git a/caffeine/Localization/Base.lproj/Localizable.strings b/caffeine/Localization/Base.lproj/Localizable.strings
@@ -57,3 +57,12 @@
 "singlepiece" = "1 Sugar";
 "twopiece" = "2 Sugar";
 "threepiece" = "3 Sugar";
+
+"SettingsTitleWeight" = "Weight in kg:";
+"SettingsTitleHeight" = "Height in cm:";
+"SettingsTitleSensibility" = "Sensibility in %%:";
+"SettingsTitleSex" = "Sex:";
+"SettingsMedicalInformation" = "Medical Information!";
+
+"SettingsMale" = "Male";
+"SettingsFemale" = "Female";
diff --git a/caffeine/Localization/de.lproj/Localizable.strings b/caffeine/Localization/de.lproj/Localizable.strings
@@ -57,3 +57,12 @@
 "singlepiece" = "1 Zucker";
 "twopiece" = "2 Zucker";
 "threepiece" = "3 Zucker";
+
+"SettingsTitleWeight" = "Gewicht in kg:";
+"SettingsTitleHeight" = "Größe in cm:";
+"SettingsTitleSensibility" = "Sensibilität in %%:";
+"SettingsTitleSex" = "Geschlecht:";
+"SettingsMedicalInformation" = "Medizinische Informationen!";
+
+"SettingsMale" = "Männlich";
+"SettingsFemale" = "Weiblich";
diff --git a/caffeine/Localization/en.lproj/Localizable.strings b/caffeine/Localization/en.lproj/Localizable.strings
@@ -57,3 +57,12 @@
 "singlepiece" = "1 Sugar";
 "twopiece" = "2 Sugar";
 "threepiece" = "3 Sugar";
+
+"SettingsTitleWeight" = "Weight in kg:";
+"SettingsTitleHeight" = "Height in cm:";
+"SettingsTitleSensibility" = "Sensibility in %%:";
+"SettingsTitleSex" = "Sex:";
+"SettingsMedicalInformation" = "Medical Information!";
+
+"SettingsMale" = "Male";
+"SettingsFemale" = "Female";
diff --git a/caffeine/Scenes/LaunchScreen.storyboard b/caffeine/Scenes/LaunchScreen.storyboard
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9060" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9051"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -14,27 +15,24 @@
                         <viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="caffe:ne" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BIb-U1-D6u">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="caffe:ne" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BIb-U1-D6u">
                                 <rect key="frame" x="228.5" y="275" width="142" height="50.5"/>
-                                <animations/>
                                 <fontDescription key="fontDescription" type="system" weight="thin" pointSize="42"/>
-                                <color key="textColor" red="0.2196078431372549" green="0.22352941176470589" blue="0.24313725490196078" alpha="1" colorSpace="calibratedRGB"/>
+                                <color key="textColor" red="0.2196078431372549" green="0.22352941176470589" blue="0.24313725490196078" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launchIcon" translatesAutoresizingMaskIntoConstraints="NO" id="Rsz-k6-rOb">
-                                <rect key="frame" x="270" y="195" width="60" height="60"/>
-                                <animations/>
+                                <rect key="frame" x="177" y="343" width="60" height="60"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="60" id="ezL-Sa-qIJ"/>
                                     <constraint firstAttribute="height" constant="60" id="oKb-ks-5hz"/>
                                 </constraints>
                             </imageView>
                         </subviews>
-                        <animations/>
-                        <color key="backgroundColor" red="0.1137254902" green="0.1137254902" blue="0.12941176469999999" alpha="1" colorSpace="calibratedRGB"/>
+                        <color key="backgroundColor" red="0.1137254902" green="0.1137254902" blue="0.12941176469999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="Rsz-k6-rOb" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="94V-rz-4S2"/>
                             <constraint firstItem="BIb-U1-D6u" firstAttribute="top" secondItem="Rsz-k6-rOb" secondAttribute="bottom" constant="20" id="qxw-XM-bya"/>