diff --git a/enzevalos_iphone.xcodeproj/project.pbxproj b/enzevalos_iphone.xcodeproj/project.pbxproj
index 8b257c19d3ce9f3acbe694c86e383bda07f11b4d..71519672e036fc1192b29fce88d8c90c61c0d674 100644
--- a/enzevalos_iphone.xcodeproj/project.pbxproj
+++ b/enzevalos_iphone.xcodeproj/project.pbxproj
@@ -184,6 +184,8 @@
3EC35F2B2003766F008BDF95 /* InvitationDialogViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EC35F292003766F008BDF95 /* InvitationDialogViewController.swift */; };
3EC35F2D200376A1008BDF95 /* SendViewController+Invitation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EC35F2C200376A1008BDF95 /* SendViewController+Invitation.swift */; };
3EC35F2E200376A1008BDF95 /* SendViewController+Invitation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EC35F2C200376A1008BDF95 /* SendViewController+Invitation.swift */; };
+ 3EC35F302003838E008BDF95 /* InvitationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EC35F2F2003838E008BDF95 /* InvitationTests.swift */; };
+ 45262931B4C72A96C686C533 /* Pods_enzevalos_iphoneTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9B9CE43043CF806E1C02FCA /* Pods_enzevalos_iphoneTests.framework */; };
4707096D1F8F9F4900657F41 /* ExportViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4707096C1F8F9F4900657F41 /* ExportViewController.swift */; };
471BC9051F960B7C00D64416 /* PGPCryptoHash.m in Sources */ = {isa = PBXBuildFile; fileRef = 471BC8961F960B7C00D64416 /* PGPCryptoHash.m */; };
471BC9061F960B7C00D64416 /* PGPCryptoUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 471BC8981F960B7C00D64416 /* PGPCryptoUtils.m */; };
@@ -252,7 +254,6 @@
472F398C1E2519C8009260FB /* CNContactExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 472F398B1E2519C8009260FB /* CNContactExtension.swift */; };
472F398E1E251B8D009260FB /* MailAddress.swift in Sources */ = {isa = PBXBuildFile; fileRef = 472F398D1E251B8D009260FB /* MailAddress.swift */; };
472F39901E252470009260FB /* CNMailAddressesExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 472F398F1E252470009260FB /* CNMailAddressesExtension.swift */; };
- 473BA6421FCD4F0C00EB0D9E /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = A111F6AC1FA77B170060AFDE /* Logger.swift */; };
475B00331F7B9565006CDD41 /* SwiftPGP.swift in Sources */ = {isa = PBXBuildFile; fileRef = 475B00301F7B9565006CDD41 /* SwiftPGP.swift */; };
475B00341F7B9565006CDD41 /* Cryptography.swift in Sources */ = {isa = PBXBuildFile; fileRef = 475B00311F7B9565006CDD41 /* Cryptography.swift */; };
475B00351F7B9565006CDD41 /* CryptoObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 475B00321F7B9565006CDD41 /* CryptoObject.swift */; };
@@ -290,20 +291,8 @@
8428A86F1F436A1E007649A5 /* InviteFriendViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8428A86B1F436A1E007649A5 /* InviteFriendViewController.swift */; };
8428A8701F436A1E007649A5 /* LinearBadgeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8428A86C1F436A1E007649A5 /* LinearBadgeViewController.swift */; };
8428A8711F436A1E007649A5 /* GamificationStatusViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8428A86D1F436A1E007649A5 /* GamificationStatusViewController.swift */; };
- 8428A8771F436A9D007649A5 /* LinearBadgeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8428A86C1F436A1E007649A5 /* LinearBadgeViewController.swift */; };
- 8428A8791F436AA4007649A5 /* BadgeCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8428A86A1F436A1E007649A5 /* BadgeCase.swift */; };
- 8428A87A1F436AA9007649A5 /* ArrowTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8428A8611F436A11007649A5 /* ArrowTableViewCell.swift */; };
- 8428A87B1F436AAC007649A5 /* UserNameGamificationTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8428A8641F436A11007649A5 /* UserNameGamificationTableViewCell.swift */; };
- 8428A87C1F436AAF007649A5 /* SubBadgeTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8428A8631F436A11007649A5 /* SubBadgeTableViewCell.swift */; };
- 8428A87D1F436AB2007649A5 /* SubBadgeHeaderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8428A8621F436A11007649A5 /* SubBadgeHeaderTableViewCell.swift */; };
- 8428A87E1F436AB5007649A5 /* BadgeCaseCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8428A8601F436A11007649A5 /* BadgeCaseCollectionViewCell.swift */; };
- 8428A87F1F436AB8007649A5 /* CircleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8428A85A1F436A05007649A5 /* CircleView.swift */; };
- 8428A8801F436ABB007649A5 /* ArrowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8428A8581F436A05007649A5 /* ArrowView.swift */; };
- 8428A8811F436AC0007649A5 /* GamificationData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8428A85B1F436A05007649A5 /* GamificationData.swift */; };
- 8428A8821F436AC3007649A5 /* Badges.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8428A8591F436A05007649A5 /* Badges.swift */; };
8428A8831F436AC9007649A5 /* GamificationDataUnitTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8428A8561F4369EA007649A5 /* GamificationDataUnitTest.swift */; };
8428A8841F436ACC007649A5 /* GamificationElements.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8428A8541F4369CF007649A5 /* GamificationElements.xcassets */; };
- 8428A8851F436AD5007649A5 /* Gamification.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8428A8521F4369C0007649A5 /* Gamification.storyboard */; };
9935BC866A86C4A4B9819F35 /* Pods_enzevalos_iphone.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4AE42F42E91A1BFBF1D5BF6A /* Pods_enzevalos_iphone.framework */; };
9C1FA3A01B089C653802A88C /* Pods_enzevalos_iphoneUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48FB10FF406523D174F4202A /* Pods_enzevalos_iphoneUITests.framework */; };
A102AA8A1EDDB4F40024B457 /* videoOnboarding2.m4v in Resources */ = {isa = PBXBuildFile; fileRef = A102AA891EDDB4E80024B457 /* videoOnboarding2.m4v */; };
@@ -382,14 +371,10 @@
F1984D741E1E92B300804E1E /* LabelStyleKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1984D731E1E92B300804E1E /* LabelStyleKit.swift */; };
F1ACF21C1E0C1C6800C1B843 /* ContactViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1ACF21B1E0C1C6800C1B843 /* ContactViewController.swift */; };
F1ADF0751FBDF7D20017AE31 /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = A111F6AC1FA77B170060AFDE /* Logger.swift */; };
- F1ADF0761FBDF8120017AE31 /* PersistentMail +CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 472F39281E1277D2009260FB /* PersistentMail +CoreDataClass.swift */; };
- F1ADF0771FBDF9B40017AE31 /* Mail.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47691A891ECB56D1004BCFC5 /* Mail.swift */; };
F1AF938F1E2D04BA00755128 /* CustomCells.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1AF938E1E2D04BA00755128 /* CustomCells.swift */; };
F1C733351FEC1CE2005A497E /* About.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F1C733341FEC1CE2005A497E /* About.storyboard */; };
F1C7AC821FED6473007629DB /* AboutViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1C7AC811FED6473007629DB /* AboutViewController.swift */; };
- F1E918D71FBDEECB00D60418 /* LoggerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1E918D61FBDEECA00D60418 /* LoggerTests.swift */; };
F1F070281FA0DF3F004A860A /* Inbox.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F1F070261FA0DF3F004A860A /* Inbox.storyboard */; };
- F678F71DFB726D912D039FFF /* Pods_enzevalos_iphoneTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9B9CE43043CF806E1C02FCA /* Pods_enzevalos_iphoneTests.framework */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -422,6 +407,7 @@
3EC35F2620037664008BDF95 /* InvitationApi.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InvitationApi.swift; sourceTree = "<group>"; };
3EC35F292003766F008BDF95 /* InvitationDialogViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InvitationDialogViewController.swift; sourceTree = "<group>"; };
3EC35F2C200376A1008BDF95 /* SendViewController+Invitation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SendViewController+Invitation.swift"; sourceTree = "<group>"; };
+ 3EC35F2F2003838E008BDF95 /* InvitationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InvitationTests.swift; sourceTree = "<group>"; };
411EB2B85F99B48FFD36F966 /* Pods-enzevalos_iphoneTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-enzevalos_iphoneTests.debug.xcconfig"; path = "../workspace/Pods/Target Support Files/Pods-enzevalos_iphoneTests/Pods-enzevalos_iphoneTests.debug.xcconfig"; sourceTree = "<group>"; };
4707096C1F8F9F4900657F41 /* ExportViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExportViewController.swift; sourceTree = "<group>"; };
471BC8951F960B7C00D64416 /* PGPCryptoHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PGPCryptoHash.h; sourceTree = "<group>"; };
@@ -718,7 +704,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- F678F71DFB726D912D039FFF /* Pods_enzevalos_iphoneTests.framework in Frameworks */,
+ 45262931B4C72A96C686C533 /* Pods_enzevalos_iphoneTests.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1148,6 +1134,7 @@
A13526901D955BE000D3BFE1 /* enzevalos_iphoneTests.swift */,
A13526921D955BE000D3BFE1 /* Info.plist */,
F1E918D61FBDEECA00D60418 /* LoggerTests.swift */,
+ 3EC35F2F2003838E008BDF95 /* InvitationTests.swift */,
);
path = enzevalos_iphoneTests;
sourceTree = "<group>";
@@ -1542,7 +1529,6 @@
buildActionMask = 2147483647;
files = (
8428A8841F436ACC007649A5 /* GamificationElements.xcassets in Resources */,
- 8428A8851F436AD5007649A5 /* Gamification.storyboard in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1624,9 +1610,20 @@
files = (
);
inputPaths = (
+ "${SRCROOT}/../enzevalos_iphone_workspace/Pods/Target Support Files/Pods-enzevalos_iphoneTests/Pods-enzevalos_iphoneTests-frameworks.sh",
+ "${BUILT_PRODUCTS_DIR}/BZipCompression/BZipCompression.framework",
+ "${BUILT_PRODUCTS_DIR}/FrameAccessor/FrameAccessor.framework",
+ "${BUILT_PRODUCTS_DIR}/KeychainAccess/KeychainAccess.framework",
+ "${BUILT_PRODUCTS_DIR}/Onboard/Onboard.framework",
+ "${BUILT_PRODUCTS_DIR}/VENTokenField/VENTokenField.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BZipCompression.framework",
+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FrameAccessor.framework",
+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/KeychainAccess.framework",
+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Onboard.framework",
+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/VENTokenField.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
@@ -1711,9 +1708,12 @@
files = (
);
inputPaths = (
+ "${SRCROOT}/../enzevalos_iphone_workspace/Pods/Target Support Files/Pods-enzevalos_iphoneTests/Pods-enzevalos_iphoneTests-resources.sh",
+ $PODS_CONFIGURATION_BUILD_DIR/HockeySDK/HockeySDKResources.bundle,
);
name = "[CP] Copy Pods Resources";
outputPaths = (
+ "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
@@ -2076,23 +2076,9 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- F1ADF0771FBDF9B40017AE31 /* Mail.swift in Sources */,
- 8428A8771F436A9D007649A5 /* LinearBadgeViewController.swift in Sources */,
- 8428A87A1F436AA9007649A5 /* ArrowTableViewCell.swift in Sources */,
A13526911D955BE000D3BFE1 /* enzevalos_iphoneTests.swift in Sources */,
- 8428A87B1F436AAC007649A5 /* UserNameGamificationTableViewCell.swift in Sources */,
8428A8831F436AC9007649A5 /* GamificationDataUnitTest.swift in Sources */,
- 8428A8811F436AC0007649A5 /* GamificationData.swift in Sources */,
- F1ADF0761FBDF8120017AE31 /* PersistentMail +CoreDataClass.swift in Sources */,
- 473BA6421FCD4F0C00EB0D9E /* Logger.swift in Sources */,
- 8428A87F1F436AB8007649A5 /* CircleView.swift in Sources */,
- 8428A87E1F436AB5007649A5 /* BadgeCaseCollectionViewCell.swift in Sources */,
- 8428A8821F436AC3007649A5 /* Badges.swift in Sources */,
- 8428A8801F436ABB007649A5 /* ArrowView.swift in Sources */,
- 8428A87D1F436AB2007649A5 /* SubBadgeHeaderTableViewCell.swift in Sources */,
- 8428A87C1F436AAF007649A5 /* SubBadgeTableViewCell.swift in Sources */,
- 8428A8791F436AA4007649A5 /* BadgeCase.swift in Sources */,
- F1E918D71FBDEECB00D60418 /* LoggerTests.swift in Sources */,
+ 3EC35F302003838E008BDF95 /* InvitationTests.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -2389,6 +2375,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = VJ9C93G68Y;
+ GCC_SYMBOLS_PRIVATE_EXTERN = NO;
INFOPLIST_FILE = "enzevalos_iphone/PLists/enzevalos-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -2440,6 +2427,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = VJ9C93G68Y;
+ GCC_SYMBOLS_PRIVATE_EXTERN = NO;
INFOPLIST_FILE = "enzevalos_iphone/PLists/enzevalos-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -2484,11 +2472,13 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 6EBCCD02AD3B95D8317810E2 /* Pods-enzevalos_iphoneTests.debug.xcconfig */;
buildSettings = {
+ BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/enzevalos_iphone.app/enzevalos_iphone";
INFOPLIST_FILE = enzevalos_iphoneTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "fu-berlin.enzevalos-iphoneTests";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
+ TEST_HOST = "$(BUNDLE_LOADER)";
};
name = Debug;
};
@@ -2496,11 +2486,13 @@
isa = XCBuildConfiguration;
baseConfigurationReference = BC7D006B3B40A23E53B4F317 /* Pods-enzevalos_iphoneTests.release.xcconfig */;
buildSettings = {
+ BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/enzevalos_iphone.app/enzevalos_iphone";
INFOPLIST_FILE = enzevalos_iphoneTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "fu-berlin.enzevalos-iphoneTests";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
+ TEST_HOST = "$(BUNDLE_LOADER)";
};
name = Release;
};
diff --git a/enzevalos_iphone/Gamification.storyboard b/enzevalos_iphone/Gamification.storyboard
index 648f07c8817914f5f3ea669b9f6d23645a48b5e6..c3b4e4f2ef2219acb756cd61ec24aad1566be48a 100755
--- a/enzevalos_iphone/Gamification.storyboard
+++ b/enzevalos_iphone/Gamification.storyboard
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="fps-Pq-pci">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="fps-Pq-pci">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13174"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
@@ -15,8 +15,8 @@
<!--RootViewController-->
<scene sceneID="8sn-Dy-KNC">
<objects>
- <viewControllerPlaceholder storyboardName="Main" referencedIdentifier="RootViewController" id="OKx-fF-mvp" sceneMemberID="viewController"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="a8K-Ee-alp" userLabel="First Responder" sceneMemberID="firstResponder"/>
+ <viewControllerPlaceholder storyboardName="Main" referencedIdentifier="RootViewController" id="OKx-fF-mvp" sceneMemberID="viewController"/>
</objects>
<point key="canvasLocation" x="933" y="-393"/>
</scene>
@@ -115,13 +115,13 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="erf-YN-fAb">
- <rect key="frame" x="8" y="8" width="359" height="20"/>
+ <rect key="frame" x="15" y="11" width="345" height="14"/>
<fontDescription key="fontDescription" type="system" pointSize="20"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="751" text=" " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UKM-mp-SIx">
- <rect key="frame" x="8" y="36" width="359" height="18"/>
+ <rect key="frame" x="15" y="33" width="345" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
@@ -150,7 +150,7 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Accountinformationen" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="od0-Q7-x0q">
- <rect key="frame" x="8" y="11" width="326" height="21"/>
+ <rect key="frame" x="15" y="11" width="319" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
@@ -206,7 +206,7 @@
<color key="trackTintColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
</progressView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="xx %" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GoG-8X-ar5">
- <rect key="frame" x="333.5" y="72" width="25.5" height="14.5"/>
+ <rect key="frame" x="333.5" y="70.5" width="25.5" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
@@ -407,21 +407,21 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xCk-JD-hl2" customClass="CircleView" customModule="enzevalos_iphone" customModuleProvider="target">
- <rect key="frame" x="16" y="0.0" width="60" height="60"/>
+ <rect key="frame" x="23" y="0.0" width="60" height="60"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="width" secondItem="xCk-JD-hl2" secondAttribute="height" multiplier="1:1" id="uEm-wS-Y0Q"/>
</constraints>
</view>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ambassadorOff" translatesAutoresizingMaskIntoConstraints="NO" id="Zo4-ND-7Ko">
- <rect key="frame" x="16" y="0.0" width="60" height="60"/>
+ <rect key="frame" x="23" y="0.0" width="60" height="60"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="width" secondItem="Zo4-ND-7Ko" secondAttribute="height" multiplier="1:1" id="U8j-ye-RAB"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="nVM-Y1-Ak3">
- <rect key="frame" x="84" y="20" width="283" height="21"/>
+ <rect key="frame" x="91" y="20" width="269" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
@@ -455,7 +455,7 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1T1-ka-Yty" customClass="ArrowView" customModule="enzevalos_iphone" customModuleProvider="target">
- <rect key="frame" x="16" y="0.0" width="60" height="20"/>
+ <rect key="frame" x="23" y="0.0" width="60" height="20"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="width" constant="60" id="AF4-KA-a0X"/>
@@ -487,14 +487,14 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ambassadorOff" translatesAutoresizingMaskIntoConstraints="NO" id="L1t-h0-83v">
- <rect key="frame" x="17" y="5" width="60" height="60"/>
+ <rect key="frame" x="24" y="5" width="60" height="60"/>
<constraints>
<constraint firstAttribute="width" secondItem="L1t-h0-83v" secondAttribute="height" multiplier="1:1" id="PLJ-Gi-SxJ"/>
<constraint firstAttribute="width" constant="60" id="h4p-uP-O8S"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="11" translatesAutoresizingMaskIntoConstraints="NO" id="naa-rP-z37">
- <rect key="frame" x="85" y="22" width="282" height="27"/>
+ <rect key="frame" x="92" y="22" width="268" height="27"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="22"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
@@ -640,20 +640,20 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view alpha="0.94999999999999996" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="igR-aU-HHZ" customClass="CircleView" customModule="enzevalos_iphone" customModuleProvider="target">
- <rect key="frame" x="16" y="0.0" width="60" height="60"/>
+ <rect key="frame" x="23" y="0.0" width="60" height="60"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="width" secondItem="igR-aU-HHZ" secondAttribute="height" multiplier="1:1" id="THw-Cy-1Au"/>
</constraints>
</view>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ambassadorOff" translatesAutoresizingMaskIntoConstraints="NO" id="8rD-C2-kRo">
- <rect key="frame" x="16" y="0.0" width="60" height="60"/>
+ <rect key="frame" x="23" y="0.0" width="60" height="60"/>
<constraints>
<constraint firstAttribute="width" secondItem="8rD-C2-kRo" secondAttribute="height" multiplier="1:1" id="nl9-A6-v7D"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="a25-OL-b16">
- <rect key="frame" x="84" y="20" width="283" height="21"/>
+ <rect key="frame" x="91" y="20" width="269" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
@@ -687,7 +687,7 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GBc-t0-F18" customClass="ArrowView" customModule="enzevalos_iphone" customModuleProvider="target">
- <rect key="frame" x="16" y="0.0" width="60" height="20"/>
+ <rect key="frame" x="23" y="0.0" width="60" height="20"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="width" constant="60" id="dQn-mh-EES"/>
@@ -719,14 +719,14 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ambassadorOff" translatesAutoresizingMaskIntoConstraints="NO" id="lbi-AF-b9L">
- <rect key="frame" x="17" y="5" width="60" height="60"/>
+ <rect key="frame" x="24" y="5" width="60" height="60"/>
<constraints>
<constraint firstAttribute="width" constant="60" id="jkj-Tu-XsA"/>
<constraint firstAttribute="width" secondItem="lbi-AF-b9L" secondAttribute="height" multiplier="1:1" id="zP0-o0-AEF"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="11" translatesAutoresizingMaskIntoConstraints="NO" id="Ag6-qX-7bg">
- <rect key="frame" x="85" y="22" width="282" height="27"/>
+ <rect key="frame" x="92" y="22" width="268" height="27"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="22"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
diff --git a/enzevalos_iphone/GamificationDataUnitTest.swift b/enzevalos_iphone/GamificationDataUnitTest.swift
index deca234711138143dedd22c9575be1da9ab2df26..44bd769b3cac4835bb47eb9f62f35b91873c04e3 100755
--- a/enzevalos_iphone/GamificationDataUnitTest.swift
+++ b/enzevalos_iphone/GamificationDataUnitTest.swift
@@ -6,6 +6,7 @@
// Copyright © 2017 fu-berlin. All rights reserved.
//
import XCTest
+
@testable import enzevalos_iphone
class GamificationDataUnitTest: XCTestCase {