diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 00000000..fca83725 Binary files /dev/null and b/.DS_Store differ diff --git a/Dicee-iOS13.xcodeproj/.xcodesamplecode.plist b/Dicee-iOS13.xcodeproj/.xcodesamplecode.plist deleted file mode 100644 index 5dd5da85..00000000 --- a/Dicee-iOS13.xcodeproj/.xcodesamplecode.plist +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/Dicee-iOS13.xcodeproj/project.pbxproj b/Dicee-iOS13.xcodeproj/project.pbxproj deleted file mode 100644 index 6e1df68f..00000000 --- a/Dicee-iOS13.xcodeproj/project.pbxproj +++ /dev/null @@ -1,341 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 50; - objects = { - -/* Begin PBXBuildFile section */ - ADAD913C22B0FDAE007B460A /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = ADAD913B22B0FDAE007B460A /* README.md */; }; - ADB0DFFD22AFA6090030352D /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADB0DFFC22AFA6090030352D /* AppDelegate.swift */; }; - ADB0E00122AFA6090030352D /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADB0E00022AFA6090030352D /* ViewController.swift */; }; - ADB0E00422AFA6090030352D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = ADB0E00222AFA6090030352D /* Main.storyboard */; }; - ADB0E00622AFA60E0030352D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = ADB0E00522AFA60E0030352D /* Assets.xcassets */; }; - ADB0E00922AFA60E0030352D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = ADB0E00722AFA60E0030352D /* LaunchScreen.storyboard */; }; -/* End PBXBuildFile section */ - -/* Begin PBXFileReference section */ - ADAD913B22B0FDAE007B460A /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; - ADB0DFF922AFA6090030352D /* Dicee-iOS13.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Dicee-iOS13.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - ADB0DFFC22AFA6090030352D /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - ADB0E00022AFA6090030352D /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; - ADB0E00322AFA6090030352D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - ADB0E00522AFA60E0030352D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - ADB0E00822AFA60E0030352D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; - ADB0E00A22AFA60E0030352D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - ADB0DFF622AFA6090030352D /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - ADB0DFF022AFA6090030352D = { - isa = PBXGroup; - children = ( - ADAD913B22B0FDAE007B460A /* README.md */, - ADB0DFFB22AFA6090030352D /* Dicee-iOS13 */, - ADB0DFFA22AFA6090030352D /* Products */, - ); - sourceTree = ""; - }; - ADB0DFFA22AFA6090030352D /* Products */ = { - isa = PBXGroup; - children = ( - ADB0DFF922AFA6090030352D /* Dicee-iOS13.app */, - ); - name = Products; - sourceTree = ""; - }; - ADB0DFFB22AFA6090030352D /* Dicee-iOS13 */ = { - isa = PBXGroup; - children = ( - ADB0DFFC22AFA6090030352D /* AppDelegate.swift */, - ADB0E00022AFA6090030352D /* ViewController.swift */, - ADB0E00222AFA6090030352D /* Main.storyboard */, - ADB0E00522AFA60E0030352D /* Assets.xcassets */, - ADB0E00722AFA60E0030352D /* LaunchScreen.storyboard */, - ADB0E00A22AFA60E0030352D /* Info.plist */, - ); - path = "Dicee-iOS13"; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - ADB0DFF822AFA6090030352D /* Dicee-iOS13 */ = { - isa = PBXNativeTarget; - buildConfigurationList = ADB0E00D22AFA60E0030352D /* Build configuration list for PBXNativeTarget "Dicee-iOS13" */; - buildPhases = ( - ADB0DFF522AFA6090030352D /* Sources */, - ADB0DFF622AFA6090030352D /* Frameworks */, - ADB0DFF722AFA6090030352D /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "Dicee-iOS13"; - productName = "Dicee-iOS13"; - productReference = ADB0DFF922AFA6090030352D /* Dicee-iOS13.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - ADB0DFF122AFA6090030352D /* Project object */ = { - isa = PBXProject; - attributes = { - LastSwiftUpdateCheck = 1100; - LastUpgradeCheck = 1100; - ORGANIZATIONNAME = "London App Brewery"; - TargetAttributes = { - ADB0DFF822AFA6090030352D = { - CreatedOnToolsVersion = 11.0; - }; - }; - }; - buildConfigurationList = ADB0DFF422AFA6090030352D /* Build configuration list for PBXProject "Dicee-iOS13" */; - compatibilityVersion = "Xcode 9.3"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = ADB0DFF022AFA6090030352D; - productRefGroup = ADB0DFFA22AFA6090030352D /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - ADB0DFF822AFA6090030352D /* Dicee-iOS13 */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - ADB0DFF722AFA6090030352D /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ADB0E00922AFA60E0030352D /* LaunchScreen.storyboard in Resources */, - ADB0E00622AFA60E0030352D /* Assets.xcassets in Resources */, - ADAD913C22B0FDAE007B460A /* README.md in Resources */, - ADB0E00422AFA6090030352D /* Main.storyboard in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - ADB0DFF522AFA6090030352D /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ADB0E00122AFA6090030352D /* ViewController.swift in Sources */, - ADB0DFFD22AFA6090030352D /* AppDelegate.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXVariantGroup section */ - ADB0E00222AFA6090030352D /* Main.storyboard */ = { - isa = PBXVariantGroup; - children = ( - ADB0E00322AFA6090030352D /* Base */, - ); - name = Main.storyboard; - sourceTree = ""; - }; - ADB0E00722AFA60E0030352D /* LaunchScreen.storyboard */ = { - isa = PBXVariantGroup; - children = ( - ADB0E00822AFA60E0030352D /* Base */, - ); - name = LaunchScreen.storyboard; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - ADB0E00B22AFA60E0030352D /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - }; - name = Debug; - }; - ADB0E00C22AFA60E0030352D /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - SDKROOT = iphoneos; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; - ADB0E00E22AFA60E0030352D /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_STYLE = Automatic; - INFOPLIST_FILE = "Dicee-iOS13/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = "com.londonappbrewery.Dicee-iOS13"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = 1; - }; - name = Debug; - }; - ADB0E00F22AFA60E0030352D /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_STYLE = Automatic; - INFOPLIST_FILE = "Dicee-iOS13/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = "com.londonappbrewery.Dicee-iOS13"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = 1; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - ADB0DFF422AFA6090030352D /* Build configuration list for PBXProject "Dicee-iOS13" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - ADB0E00B22AFA60E0030352D /* Debug */, - ADB0E00C22AFA60E0030352D /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - ADB0E00D22AFA60E0030352D /* Build configuration list for PBXNativeTarget "Dicee-iOS13" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - ADB0E00E22AFA60E0030352D /* Debug */, - ADB0E00F22AFA60E0030352D /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = ADB0DFF122AFA6090030352D /* Project object */; -} diff --git a/Dicee-iOS13.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Dicee-iOS13.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 8493a08f..00000000 --- a/Dicee-iOS13.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/Dicee-iOS13.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Dicee-iOS13.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d98100..00000000 --- a/Dicee-iOS13.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/Dicee-iOS13.xcodeproj/xcuserdata/angelayu.xcuserdatad/xcschemes/xcschememanagement.plist b/Dicee-iOS13.xcodeproj/xcuserdata/angelayu.xcuserdatad/xcschemes/xcschememanagement.plist deleted file mode 100644 index 9fbf1805..00000000 --- a/Dicee-iOS13.xcodeproj/xcuserdata/angelayu.xcuserdatad/xcschemes/xcschememanagement.plist +++ /dev/null @@ -1,14 +0,0 @@ - - - - - SchemeUserState - - Dicee-iOS13.xcscheme_^#shared#^_ - - orderHint - 0 - - - - diff --git a/Dicee-iOS13/Base.lproj/Main.storyboard b/Dicee-iOS13/Base.lproj/Main.storyboard index a2019bf8..68b14c93 100644 --- a/Dicee-iOS13/Base.lproj/Main.storyboard +++ b/Dicee-iOS13/Base.lproj/Main.storyboard @@ -1,9 +1,11 @@ - + - + + + @@ -14,8 +16,34 @@ - + + + + + + + + + + + + + + + + + + + + @@ -23,4 +51,12 @@ + + + + + + + + diff --git a/Dicee-iOS13/SceneDelegate.swift b/Dicee-iOS13/SceneDelegate.swift new file mode 100644 index 00000000..695c9e47 --- /dev/null +++ b/Dicee-iOS13/SceneDelegate.swift @@ -0,0 +1,53 @@ +// +// SceneDelegate.swift +// Test +// +// Created by Angela Yu on 13/06/2019. +// Copyright © 2019 London App Brewery. All rights reserved. +// + +import UIKit + +class SceneDelegate: UIResponder, UIWindowSceneDelegate { + + var window: UIWindow? + + + func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) { + // Use this method to optionally configure and attach the UIWindow `window` to the provided UIWindowScene `scene`. + // If using a storyboard, the `window` property will automatically be initialized and attached to the scene. + // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead). + guard let _ = (scene as? UIWindowScene) else { return } + } + + func sceneDidDisconnect(_ scene: UIScene) { + // Called as the scene is being released by the system. + // This occurs shortly after the scene enters the background, or when its session is discarded. + // Release any resources associated with this scene that can be re-created the next time the scene connects. + // The scene may re-connect later, as its session was not neccessarily discarded (see `application:didDiscardSceneSessions` instead). + } + + func sceneDidBecomeActive(_ scene: UIScene) { + // Called when the scene has moved from an inactive state to an active state. + // Use this method to restart any tasks that were paused (or not yet started) when the scene was inactive. + } + + func sceneWillResignActive(_ scene: UIScene) { + // Called when the scene will move from an active state to an inactive state. + // This may occur due to temporary interruptions (ex. an incoming phone call). + } + + func sceneWillEnterForeground(_ scene: UIScene) { + // Called as the scene transitions from the background to the foreground. + // Use this method to undo the changes made on entering the background. + } + + func sceneDidEnterBackground(_ scene: UIScene) { + // Called as the scene transitions from the foreground to the background. + // Use this method to save data, release shared resources, and store enough scene-specific state information + // to restore the scene back to its current state. + } + + +} + diff --git a/Dicee-iOS13/ViewController.swift b/Dicee-iOS13/ViewController.swift index 8657151e..e4aed02a 100644 --- a/Dicee-iOS13/ViewController.swift +++ b/Dicee-iOS13/ViewController.swift @@ -10,11 +10,18 @@ import UIKit class ViewController: UIViewController { + @IBOutlet weak var diceImageView2: UIImageView! + @IBOutlet weak var diceImageView1: UIImageView! override func viewDidLoad() { super.viewDidLoad() // Do any additional setup after loading the view. + + diceImageView1.image = + diceImageView1.alpha = 0.5 + + diceImageView2.image = #imageLiteral(resourceName: "DiceTwo") } - } +