Skip to content
Snippets Groups Projects
Commit 6ae35f91 authored by jakobsbode's avatar jakobsbode
Browse files

Onboarding done except of pickerViews (Authentication and Connection)

parent 34b8fe42
Branches
Tags
No related merge requests found
Showing
with 518 additions and 622 deletions
......@@ -368,8 +368,13 @@ NSString * const kOnboardInputViewAccessibilityIdentifier = @"OnboardInputViewAc
CGFloat inputYOrigin = CGRectGetMaxY(self.bodyLabel.frame) + self.underTitlePadding;
if (self.inputView) {
self.inputView.frame = CGRectMake(xPadding, inputYOrigin, contentWidth, CGRectGetHeight(self.inputView.frame));
for (UIView *view in self.inputView.subviews){
view.frame = CGRectMake(CGRectGetMinX(view.frame), CGRectGetMinY(view.frame), contentWidth, CGRectGetHeight(view.frame));
}
self.actionButton.frame = CGRectMake((CGRectGetMaxX(self.view.frame) / 2) - (contentWidth / 2), CGRectGetMaxY(self.view.frame) - self.underPageControlPadding - kMainPageControlHeight - kActionButtonHeight - self.bottomPadding - CGRectGetMaxY(self.inputView.frame), contentWidth, kActionButtonHeight);
}
}
......
This diff is collapsed.
......@@ -52,41 +52,16 @@
<key>primary</key>
<true/>
</dict>
<key>4BBD10B16564F31F9E6CB3A46C82B375</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>738FFB5A0A7C642A6657EA5241C1FB7E</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>82BBBA182FED17649112AE9374B4898E</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>83321BF5BD0E06C7F212CF8969A25A33</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>838A2C6DA366DE138E5FDF1AF19D94C0</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>8905DB6521F8FDC34752B69DEE3FDEB7</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>8F5682E0AC126B1910FC04BA8A16F382</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>9ED6B0DBB547C5A9B34F2DDC36242048</key>
<dict>
<key>primary</key>
......@@ -97,11 +72,6 @@
<key>primary</key>
<true/>
</dict>
<key>BF1258B878BFA89993BC8FEA5ACA97E4</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>D7FF48F3092783E4E42B336F0DEF2D1A</key>
<dict>
<key>primary</key>
......@@ -117,16 +87,6 @@
<key>primary</key>
<true/>
</dict>
<key>E8B699458103CA9ABE04ABB6069ACD9D</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>FC17CCC069BF20C1FDFA841B915A467B</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#endif
#import "BZipCompression.h"
......
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#endif
#import "FrameAccessor.h"
#import "ScrollViewFrameAccessor.h"
......
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#endif
FOUNDATION_EXPORT double KeychainAccessVersionNumber;
......
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#endif
#import "OnboardingViewController.h"
#import "OnboardingContentViewController.h"
......
......@@ -206,8 +206,6 @@ third-party archives.
See the License for the specific language governing permissions and
limitations under the License.
</string>
<key>License</key>
<string>Apache2</string>
<key>Title</key>
<string>BZipCompression</string>
<key>Type</key>
......@@ -235,8 +233,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
</string>
<key>License</key>
<string>MIT</string>
<key>Title</key>
<string>FrameAccessor</string>
<key>Type</key>
......@@ -267,8 +263,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
</string>
<key>License</key>
<string>MIT</string>
<key>Title</key>
<string>KeychainAccess</string>
<key>Type</key>
......@@ -298,8 +292,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
</string>
<key>License</key>
<string>MIT</string>
<key>Title</key>
<string>Onboard</string>
<key>Type</key>
......@@ -435,8 +427,6 @@ THE SOFTWARE.
*/
</string>
<key>License</key>
<string>OpenSSL (OpenSSL/SSLeay)</string>
<key>Title</key>
<string>OpenSSL-Universal</string>
<key>Type</key>
......@@ -465,8 +455,6 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.</string>
<key>License</key>
<string>MIT</string>
<key>Title</key>
<string>VENTokenField</string>
<key>Type</key>
......@@ -475,8 +463,6 @@ SOFTWARE.</string>
<dict>
<key>FooterText</key>
<string>&lt;html&gt;&lt;body&gt;You are being &lt;a href="https://raw.githubusercontent.com/MailCore/mailcore2/master/LICENSE"&gt;redirected&lt;/a&gt;.&lt;/body&gt;&lt;/html&gt;</string>
<key>License</key>
<string>BSD</string>
<key>Title</key>
<string>mailcore2-ios</string>
<key>Type</key>
......
......@@ -23,6 +23,12 @@ case "${TARGETED_DEVICE_FAMILY}" in
;;
esac
realpath() {
DIRECTORY="$(cd "${1%/*}" && pwd)"
FILENAME="${1##*/}"
echo "$DIRECTORY/$FILENAME"
}
install_resource()
{
if [[ "$1" = /* ]] ; then
......@@ -64,7 +70,7 @@ EOM
xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm"
;;
*.xcassets)
ABSOLUTE_XCASSET_FILE="$RESOURCE_PATH"
ABSOLUTE_XCASSET_FILE=$(realpath "$RESOURCE_PATH")
XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE")
;;
*)
......@@ -87,7 +93,7 @@ then
# Find all other xcassets (this unfortunately includes those of path pods and other targets).
OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
while read line; do
if [[ $line != "${PODS_ROOT}*" ]]; then
if [[ $line != "`realpath $PODS_ROOT`*" ]]; then
XCASSET_FILES+=("$line")
fi
done <<<"$OTHER_XCASSETS"
......
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#endif
FOUNDATION_EXPORT double Pods_enzevalos_iphoneVersionNumber;
......
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES
FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/BZipCompression" "$PODS_CONFIGURATION_BUILD_DIR/FrameAccessor" "$PODS_CONFIGURATION_BUILD_DIR/KeychainAccess" "$PODS_CONFIGURATION_BUILD_DIR/Onboard" "$PODS_CONFIGURATION_BUILD_DIR/VENTokenField"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
......
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES
FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/BZipCompression" "$PODS_CONFIGURATION_BUILD_DIR/FrameAccessor" "$PODS_CONFIGURATION_BUILD_DIR/KeychainAccess" "$PODS_CONFIGURATION_BUILD_DIR/Onboard" "$PODS_CONFIGURATION_BUILD_DIR/VENTokenField"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
......
......@@ -23,6 +23,12 @@ case "${TARGETED_DEVICE_FAMILY}" in
;;
esac
realpath() {
DIRECTORY="$(cd "${1%/*}" && pwd)"
FILENAME="${1##*/}"
echo "$DIRECTORY/$FILENAME"
}
install_resource()
{
if [[ "$1" = /* ]] ; then
......@@ -64,7 +70,7 @@ EOM
xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm"
;;
*.xcassets)
ABSOLUTE_XCASSET_FILE="$RESOURCE_PATH"
ABSOLUTE_XCASSET_FILE=$(realpath "$RESOURCE_PATH")
XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE")
;;
*)
......@@ -87,7 +93,7 @@ then
# Find all other xcassets (this unfortunately includes those of path pods and other targets).
OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
while read line; do
if [[ $line != "${PODS_ROOT}*" ]]; then
if [[ $line != "`realpath $PODS_ROOT`*" ]]; then
XCASSET_FILES+=("$line")
fi
done <<<"$OTHER_XCASSETS"
......
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#endif
FOUNDATION_EXPORT double Pods_enzevalos_iphoneTestsVersionNumber;
......
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO
FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/BZipCompression" "$PODS_CONFIGURATION_BUILD_DIR/FrameAccessor" "$PODS_CONFIGURATION_BUILD_DIR/KeychainAccess" "$PODS_CONFIGURATION_BUILD_DIR/Onboard" "$PODS_CONFIGURATION_BUILD_DIR/VENTokenField"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/OpenSSL-Universal" "${PODS_ROOT}/Headers/Public/mailcore2-ios"
......
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO
FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/BZipCompression" "$PODS_CONFIGURATION_BUILD_DIR/FrameAccessor" "$PODS_CONFIGURATION_BUILD_DIR/KeychainAccess" "$PODS_CONFIGURATION_BUILD_DIR/Onboard" "$PODS_CONFIGURATION_BUILD_DIR/VENTokenField"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/OpenSSL-Universal" "${PODS_ROOT}/Headers/Public/mailcore2-ios"
......
......@@ -23,6 +23,12 @@ case "${TARGETED_DEVICE_FAMILY}" in
;;
esac
realpath() {
DIRECTORY="$(cd "${1%/*}" && pwd)"
FILENAME="${1##*/}"
echo "$DIRECTORY/$FILENAME"
}
install_resource()
{
if [[ "$1" = /* ]] ; then
......@@ -64,7 +70,7 @@ EOM
xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm"
;;
*.xcassets)
ABSOLUTE_XCASSET_FILE="$RESOURCE_PATH"
ABSOLUTE_XCASSET_FILE=$(realpath "$RESOURCE_PATH")
XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE")
;;
*)
......@@ -87,7 +93,7 @@ then
# Find all other xcassets (this unfortunately includes those of path pods and other targets).
OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
while read line; do
if [[ $line != "${PODS_ROOT}*" ]]; then
if [[ $line != "`realpath $PODS_ROOT`*" ]]; then
XCASSET_FILES+=("$line")
fi
done <<<"$OTHER_XCASSETS"
......
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#endif
FOUNDATION_EXPORT double Pods_enzevalos_iphoneUITestsVersionNumber;
......
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO
FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/BZipCompression" "$PODS_CONFIGURATION_BUILD_DIR/FrameAccessor" "$PODS_CONFIGURATION_BUILD_DIR/KeychainAccess" "$PODS_CONFIGURATION_BUILD_DIR/Onboard" "$PODS_CONFIGURATION_BUILD_DIR/VENTokenField"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/OpenSSL-Universal" "${PODS_ROOT}/Headers/Public/mailcore2-ios"
......
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO
FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/BZipCompression" "$PODS_CONFIGURATION_BUILD_DIR/FrameAccessor" "$PODS_CONFIGURATION_BUILD_DIR/KeychainAccess" "$PODS_CONFIGURATION_BUILD_DIR/Onboard" "$PODS_CONFIGURATION_BUILD_DIR/VENTokenField"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/OpenSSL-Universal" "${PODS_ROOT}/Headers/Public/mailcore2-ios"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment