diff --git a/ARCHBLOX.xcodeproj/project.pbxproj b/ARCHBLOX.xcodeproj/project.pbxproj index e1e78b1..bea228d 100644 --- a/ARCHBLOX.xcodeproj/project.pbxproj +++ b/ARCHBLOX.xcodeproj/project.pbxproj @@ -7,13 +7,13 @@ objects = { /* Begin PBXBuildFile section */ - E95B7B4C28E549FA00929213 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E95B7B4B28E549FA00929213 /* AppDelegate.swift */; }; - E95B7B4E28E549FA00929213 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E95B7B4D28E549FA00929213 /* ViewController.swift */; }; E95B7B5028E549FB00929213 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E95B7B4F28E549FB00929213 /* Assets.xcassets */; }; - E95B7B5328E549FB00929213 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E95B7B5128E549FB00929213 /* Main.storyboard */; }; E95B7B5E28E549FB00929213 /* ARCHBLOXTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E95B7B5D28E549FB00929213 /* ARCHBLOXTests.swift */; }; E95B7B6828E549FB00929213 /* ARCHBLOXUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E95B7B6728E549FB00929213 /* ARCHBLOXUITests.swift */; }; E95B7B6A28E549FB00929213 /* ARCHBLOXUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E95B7B6928E549FB00929213 /* ARCHBLOXUITestsLaunchTests.swift */; }; + E9D10F1229BF215800172363 /* MainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9D10F1129BF215800172363 /* MainView.swift */; }; + E9D10F1629BF229900172363 /* ARCHBLOX.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9D10F1529BF229900172363 /* ARCHBLOX.swift */; }; + E9D10F1829BF281000172363 /* HomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9D10F1729BF281000172363 /* HomeView.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -35,16 +35,18 @@ /* Begin PBXFileReference section */ E95B7B4828E549FA00929213 /* ARCHBLOX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ARCHBLOX.app; sourceTree = BUILT_PRODUCTS_DIR; }; - E95B7B4B28E549FA00929213 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - E95B7B4D28E549FA00929213 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; E95B7B4F28E549FB00929213 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - E95B7B5228E549FB00929213 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; E95B7B5428E549FB00929213 /* ARCHBLOX.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = ARCHBLOX.entitlements; sourceTree = ""; }; E95B7B5928E549FB00929213 /* ARCHBLOXTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ARCHBLOXTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; E95B7B5D28E549FB00929213 /* ARCHBLOXTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ARCHBLOXTests.swift; sourceTree = ""; }; E95B7B6328E549FB00929213 /* ARCHBLOXUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ARCHBLOXUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; E95B7B6728E549FB00929213 /* ARCHBLOXUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ARCHBLOXUITests.swift; sourceTree = ""; }; E95B7B6928E549FB00929213 /* ARCHBLOXUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ARCHBLOXUITestsLaunchTests.swift; sourceTree = ""; }; + E9D10F1129BF215800172363 /* MainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainView.swift; sourceTree = ""; }; + E9D10F1329BF225A00172363 /* LucidaGrande.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = LucidaGrande.ttf; sourceTree = ""; }; + E9D10F1429BF225A00172363 /* LucidaGrandeBold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = LucidaGrandeBold.ttf; sourceTree = ""; }; + E9D10F1529BF229900172363 /* ARCHBLOX.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ARCHBLOX.swift; sourceTree = ""; }; + E9D10F1729BF281000172363 /* HomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeView.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -95,11 +97,13 @@ E95B7B4A28E549FA00929213 /* ARCHBLOX */ = { isa = PBXGroup; children = ( - E95B7B4B28E549FA00929213 /* AppDelegate.swift */, - E95B7B4D28E549FA00929213 /* ViewController.swift */, E95B7B4F28E549FB00929213 /* Assets.xcassets */, - E95B7B5128E549FB00929213 /* Main.storyboard */, E95B7B5428E549FB00929213 /* ARCHBLOX.entitlements */, + E9D10F1129BF215800172363 /* MainView.swift */, + E9D10F1329BF225A00172363 /* LucidaGrande.ttf */, + E9D10F1429BF225A00172363 /* LucidaGrandeBold.ttf */, + E9D10F1529BF229900172363 /* ARCHBLOX.swift */, + E9D10F1729BF281000172363 /* HomeView.swift */, ); path = ARCHBLOX; sourceTree = ""; @@ -185,7 +189,7 @@ attributes = { BuildIndependentTargetsInParallel = 1; LastSwiftUpdateCheck = 1400; - LastUpgradeCheck = 1400; + LastUpgradeCheck = 1420; TargetAttributes = { E95B7B4728E549FA00929213 = { CreatedOnToolsVersion = 14.0.1; @@ -226,7 +230,6 @@ buildActionMask = 2147483647; files = ( E95B7B5028E549FB00929213 /* Assets.xcassets in Resources */, - E95B7B5328E549FB00929213 /* Main.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -251,8 +254,9 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - E95B7B4E28E549FA00929213 /* ViewController.swift in Sources */, - E95B7B4C28E549FA00929213 /* AppDelegate.swift in Sources */, + E9D10F1829BF281000172363 /* HomeView.swift in Sources */, + E9D10F1229BF215800172363 /* MainView.swift in Sources */, + E9D10F1629BF229900172363 /* ARCHBLOX.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -288,17 +292,6 @@ }; /* End PBXTargetDependency section */ -/* Begin PBXVariantGroup section */ - E95B7B5128E549FB00929213 /* Main.storyboard */ = { - isa = PBXVariantGroup; - children = ( - E95B7B5228E549FB00929213 /* Base */, - ); - name = Main.storyboard; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - /* Begin XCBuildConfiguration section */ E95B7B6B28E549FB00929213 /* Debug */ = { isa = XCBuildConfiguration; @@ -333,6 +326,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -350,7 +344,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -393,6 +387,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -404,7 +399,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = macosx; @@ -420,9 +415,11 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; CODE_SIGN_ENTITLEMENTS = ARCHBLOX/ARCHBLOX.entitlements; + CODE_SIGN_IDENTITY = "-"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; + DEAD_CODE_STRIPPING = YES; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_KEY_CFBundleDisplayName = ARCHBLOX; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.games"; @@ -434,7 +431,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 11.0; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.ARCHBLOX.ARCHBLOX; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -450,9 +447,11 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; CODE_SIGN_ENTITLEMENTS = ARCHBLOX/ARCHBLOX.entitlements; + CODE_SIGN_IDENTITY = "-"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; + DEAD_CODE_STRIPPING = YES; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_KEY_CFBundleDisplayName = ARCHBLOX; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.games"; @@ -464,7 +463,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 11.0; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.ARCHBLOX.ARCHBLOX; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -480,8 +479,9 @@ BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; + DEAD_CODE_STRIPPING = YES; GENERATE_INFOPLIST_FILE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.ARCHBLOX.ARCHBLOXTests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -498,8 +498,9 @@ BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; + DEAD_CODE_STRIPPING = YES; GENERATE_INFOPLIST_FILE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.ARCHBLOX.ARCHBLOXTests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -515,8 +516,9 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; + DEAD_CODE_STRIPPING = YES; GENERATE_INFOPLIST_FILE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.ARCHBLOX.ARCHBLOXUITests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -532,8 +534,9 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; + DEAD_CODE_STRIPPING = YES; GENERATE_INFOPLIST_FILE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.ARCHBLOX.ARCHBLOXUITests; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/ARCHBLOX/ARCHBLOX.entitlements b/ARCHBLOX/ARCHBLOX.entitlements index f2ef3ae..852fa1a 100644 --- a/ARCHBLOX/ARCHBLOX.entitlements +++ b/ARCHBLOX/ARCHBLOX.entitlements @@ -2,9 +2,7 @@ - com.apple.security.app-sandbox - - com.apple.security.files.user-selected.read-only - + com.apple.security.app-sandbox + diff --git a/ARCHBLOX/ARCHBLOX.swift b/ARCHBLOX/ARCHBLOX.swift new file mode 100644 index 0000000..ad16206 --- /dev/null +++ b/ARCHBLOX/ARCHBLOX.swift @@ -0,0 +1,17 @@ +// +// ARCHBLOX.swift +// ARCHBLOX +// +// Created by Thomas G on 13/3/2023. +// + +import SwiftUI + +@main +struct ARCHBLOX: App { + var body: some Scene { + WindowGroup { + MainView().edgesIgnoringSafeArea(.top).frame(minWidth: 400, maxWidth: .infinity, minHeight: 300, maxHeight: .infinity) + }.windowStyle(HiddenTitleBarWindowStyle()) + } +} diff --git a/ARCHBLOX/AppDelegate.swift b/ARCHBLOX/AppDelegate.swift deleted file mode 100644 index c63de28..0000000 --- a/ARCHBLOX/AppDelegate.swift +++ /dev/null @@ -1,30 +0,0 @@ -// -// AppDelegate.swift -// ARCHBLOX -// -// Created by Thomas G on 29/9/2022. -// - -import Cocoa - -@main -class AppDelegate: NSObject, NSApplicationDelegate { - - - - - func applicationDidFinishLaunching(_ aNotification: Notification) { - // Insert code here to initialize your application - } - - func applicationWillTerminate(_ aNotification: Notification) { - // Insert code here to tear down your application - } - - func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool { - return true - } - - -} - diff --git a/ARCHBLOX/Assets.xcassets/ARCHBLOX.imageset/Contents.json b/ARCHBLOX/Assets.xcassets/ARCHBLOX.imageset/Contents.json new file mode 100644 index 0000000..626a049 --- /dev/null +++ b/ARCHBLOX/Assets.xcassets/ARCHBLOX.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "archblox_glossy128.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "archblox_glossy256.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "archblox_glossy512.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ARCHBLOX/Assets.xcassets/ARCHBLOX.imageset/archblox_glossy128.png b/ARCHBLOX/Assets.xcassets/ARCHBLOX.imageset/archblox_glossy128.png new file mode 100644 index 0000000..e4d13a6 Binary files /dev/null and b/ARCHBLOX/Assets.xcassets/ARCHBLOX.imageset/archblox_glossy128.png differ diff --git a/ARCHBLOX/Assets.xcassets/ARCHBLOX.imageset/archblox_glossy256.png b/ARCHBLOX/Assets.xcassets/ARCHBLOX.imageset/archblox_glossy256.png new file mode 100644 index 0000000..cbcd646 Binary files /dev/null and b/ARCHBLOX/Assets.xcassets/ARCHBLOX.imageset/archblox_glossy256.png differ diff --git a/ARCHBLOX/Assets.xcassets/ARCHBLOX.imageset/archblox_glossy512.png b/ARCHBLOX/Assets.xcassets/ARCHBLOX.imageset/archblox_glossy512.png new file mode 100644 index 0000000..7ce570d Binary files /dev/null and b/ARCHBLOX/Assets.xcassets/ARCHBLOX.imageset/archblox_glossy512.png differ diff --git a/ARCHBLOX/Assets.xcassets/ARCHBLOXarched.imageset/ARCHBLOXarched.png b/ARCHBLOX/Assets.xcassets/ARCHBLOXarched.imageset/ARCHBLOXarched.png new file mode 100644 index 0000000..a46d614 Binary files /dev/null and b/ARCHBLOX/Assets.xcassets/ARCHBLOXarched.imageset/ARCHBLOXarched.png differ diff --git a/ARCHBLOX/Assets.xcassets/ARCHBLOXarched.imageset/Contents.json b/ARCHBLOX/Assets.xcassets/ARCHBLOXarched.imageset/Contents.json new file mode 100644 index 0000000..93fad0a --- /dev/null +++ b/ARCHBLOX/Assets.xcassets/ARCHBLOXarched.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "ARCHBLOXarched.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 1.png b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 1.png deleted file mode 100644 index ad68e6e..0000000 Binary files a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 1.png and /dev/null differ diff --git a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 2.png b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 2.png deleted file mode 100644 index fb31327..0000000 Binary files a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 2.png and /dev/null differ diff --git a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 3.png b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 3.png deleted file mode 100644 index fb31327..0000000 Binary files a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 3.png and /dev/null differ diff --git a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 4.png b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 4.png deleted file mode 100644 index ad68e6e..0000000 Binary files a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 4.png and /dev/null differ diff --git a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 5.png b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 5.png deleted file mode 100644 index 2279679..0000000 Binary files a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 5.png and /dev/null differ diff --git a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 6.png b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 6.png deleted file mode 100644 index 2279679..0000000 Binary files a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 6.png and /dev/null differ diff --git a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 7.png b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 7.png deleted file mode 100644 index 44be55a..0000000 Binary files a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 7.png and /dev/null differ diff --git a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 8.png b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 8.png deleted file mode 100644 index a4d1eb6..0000000 Binary files a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 8.png and /dev/null differ diff --git a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 9.png b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 9.png deleted file mode 100644 index 759acc3..0000000 Binary files a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX 9.png and /dev/null differ diff --git a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX.png b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX.png deleted file mode 100644 index 45a5056..0000000 Binary files a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/ARCHBLOX.png and /dev/null differ diff --git a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/Contents.json b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/Contents.json index f09c422..87050df 100644 --- a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,61 +1,61 @@ { "images" : [ { - "filename" : "ARCHBLOX.png", + "filename" : "archblox_glossy16.png", "idiom" : "mac", "scale" : "1x", "size" : "16x16" }, { - "filename" : "ARCHBLOX 2.png", + "filename" : "archblox_glossy32 1.png", "idiom" : "mac", "scale" : "2x", "size" : "16x16" }, { - "filename" : "ARCHBLOX 3.png", + "filename" : "archblox_glossy32.png", "idiom" : "mac", "scale" : "1x", "size" : "32x32" }, { - "filename" : "ARCHBLOX 8.png", + "filename" : "archblox_glossy64.png", "idiom" : "mac", "scale" : "2x", "size" : "32x32" }, { - "filename" : "ARCHBLOX 7.png", + "filename" : "archblox_glossy128.png", "idiom" : "mac", "scale" : "1x", "size" : "128x128" }, { - "filename" : "ARCHBLOX 5.png", + "filename" : "archblox_glossy256 1.png", "idiom" : "mac", "scale" : "2x", "size" : "128x128" }, { - "filename" : "ARCHBLOX 6.png", + "filename" : "archblox_glossy256.png", "idiom" : "mac", "scale" : "1x", "size" : "256x256" }, { - "filename" : "ARCHBLOX 4.png", + "filename" : "archblox_glossy512.png", "idiom" : "mac", "scale" : "2x", "size" : "256x256" }, { - "filename" : "ARCHBLOX 1.png", + "filename" : "archblox_glossy512 1.png", "idiom" : "mac", "scale" : "1x", "size" : "512x512" }, { - "filename" : "ARCHBLOX 9.png", + "filename" : "archblox_glossy1024.png", "idiom" : "mac", "scale" : "2x", "size" : "512x512" diff --git a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/archblox_glossy1024.png b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/archblox_glossy1024.png new file mode 100644 index 0000000..ce0ff94 Binary files /dev/null and b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/archblox_glossy1024.png differ diff --git a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/archblox_glossy128.png b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/archblox_glossy128.png new file mode 100644 index 0000000..e4d13a6 Binary files /dev/null and b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/archblox_glossy128.png differ diff --git a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/archblox_glossy16.png b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/archblox_glossy16.png new file mode 100644 index 0000000..27436e9 Binary files /dev/null and b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/archblox_glossy16.png differ diff --git a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/archblox_glossy256 1.png b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/archblox_glossy256 1.png new file mode 100644 index 0000000..cbcd646 Binary files /dev/null and b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/archblox_glossy256 1.png differ diff --git a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/archblox_glossy256.png b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/archblox_glossy256.png new file mode 100644 index 0000000..cbcd646 Binary files /dev/null and b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/archblox_glossy256.png differ diff --git a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/archblox_glossy32 1.png b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/archblox_glossy32 1.png new file mode 100644 index 0000000..79bbe63 Binary files /dev/null and b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/archblox_glossy32 1.png differ diff --git a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/archblox_glossy32.png b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/archblox_glossy32.png new file mode 100644 index 0000000..79bbe63 Binary files /dev/null and b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/archblox_glossy32.png differ diff --git a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/archblox_glossy512 1.png b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/archblox_glossy512 1.png new file mode 100644 index 0000000..7ce570d Binary files /dev/null and b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/archblox_glossy512 1.png differ diff --git a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/archblox_glossy512.png b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/archblox_glossy512.png new file mode 100644 index 0000000..7ce570d Binary files /dev/null and b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/archblox_glossy512.png differ diff --git a/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/archblox_glossy64.png b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/archblox_glossy64.png new file mode 100644 index 0000000..bcfc5ed Binary files /dev/null and b/ARCHBLOX/Assets.xcassets/AppIcon.appiconset/archblox_glossy64.png differ diff --git a/ARCHBLOX/Assets.xcassets/arkot.imageset/Contents.json b/ARCHBLOX/Assets.xcassets/arkot.imageset/Contents.json new file mode 100644 index 0000000..fc6af34 --- /dev/null +++ b/ARCHBLOX/Assets.xcassets/arkot.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "arkot.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ARCHBLOX/Assets.xcassets/arkot.imageset/arkot.png b/ARCHBLOX/Assets.xcassets/arkot.imageset/arkot.png new file mode 100644 index 0000000..91ba495 Binary files /dev/null and b/ARCHBLOX/Assets.xcassets/arkot.imageset/arkot.png differ diff --git a/ARCHBLOX/Assets.xcassets/background.imageset/Contents.json b/ARCHBLOX/Assets.xcassets/background.imageset/Contents.json new file mode 100644 index 0000000..470c0bb --- /dev/null +++ b/ARCHBLOX/Assets.xcassets/background.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "background.jpg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ARCHBLOX/Assets.xcassets/background.imageset/background.jpg b/ARCHBLOX/Assets.xcassets/background.imageset/background.jpg new file mode 100644 index 0000000..3966c30 Binary files /dev/null and b/ARCHBLOX/Assets.xcassets/background.imageset/background.jpg differ diff --git a/ARCHBLOX/Assets.xcassets/backgrounddark.imageset/Contents.json b/ARCHBLOX/Assets.xcassets/backgrounddark.imageset/Contents.json new file mode 100644 index 0000000..dbf99ac --- /dev/null +++ b/ARCHBLOX/Assets.xcassets/backgrounddark.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "backgrounddark.jpg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ARCHBLOX/Assets.xcassets/backgrounddark.imageset/backgrounddark.jpg b/ARCHBLOX/Assets.xcassets/backgrounddark.imageset/backgrounddark.jpg new file mode 100644 index 0000000..d56acb5 Binary files /dev/null and b/ARCHBLOX/Assets.xcassets/backgrounddark.imageset/backgrounddark.jpg differ diff --git a/ARCHBLOX/Assets.xcassets/defaultrender.imageset/Contents.json b/ARCHBLOX/Assets.xcassets/defaultrender.imageset/Contents.json new file mode 100644 index 0000000..bc5f199 --- /dev/null +++ b/ARCHBLOX/Assets.xcassets/defaultrender.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "defaultrender.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ARCHBLOX/Assets.xcassets/defaultrender.imageset/defaultrender.png b/ARCHBLOX/Assets.xcassets/defaultrender.imageset/defaultrender.png new file mode 100644 index 0000000..8cc8368 Binary files /dev/null and b/ARCHBLOX/Assets.xcassets/defaultrender.imageset/defaultrender.png differ diff --git a/ARCHBLOX/Assets.xcassets/navbar.imageset/Contents.json b/ARCHBLOX/Assets.xcassets/navbar.imageset/Contents.json new file mode 100644 index 0000000..cb32384 --- /dev/null +++ b/ARCHBLOX/Assets.xcassets/navbar.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "bg-rbx_header.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ARCHBLOX/Assets.xcassets/navbar.imageset/bg-rbx_header.png b/ARCHBLOX/Assets.xcassets/navbar.imageset/bg-rbx_header.png new file mode 100644 index 0000000..bdd1348 Binary files /dev/null and b/ARCHBLOX/Assets.xcassets/navbar.imageset/bg-rbx_header.png differ diff --git a/ARCHBLOX/Base.lproj/Main.storyboard b/ARCHBLOX/Base.lproj/Main.storyboard deleted file mode 100644 index ade8d30..0000000 --- a/ARCHBLOX/Base.lproj/Main.storyboard +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ARCHBLOX/HomeView.swift b/ARCHBLOX/HomeView.swift new file mode 100644 index 0000000..e75b6dd --- /dev/null +++ b/ARCHBLOX/HomeView.swift @@ -0,0 +1,40 @@ +// +// MainView.swift +// ARCHBLOX +// +// Created by Thomas G on 13/3/2023. +// + +import SwiftUI + +struct HomeView: View { + var body: some View { + VStack{ + HStack{ + Image("ARCHBLOX").resizable().aspectRatio(contentMode: ContentMode.fit).accessibilityLabel("ARCHBLOX").padding().frame(minHeight: 80,maxHeight: 80); + Spacer(); + Text("Thomas").font(.custom("Lucida Grande", size: 20)).padding(); + Image("arkot").resizable().aspectRatio(contentMode: ContentMode.fit).accessibilityLabel("ARCHBLOX").padding().frame(minHeight: 51,maxHeight: 51); + Text("100.000M").font(.custom("Lucida Grande", size: 20)).padding(); + Text("Log Out").font(.custom("Lucida Grande", size: 20)).padding(); + }.fixedSize(horizontal: false, vertical: true).frame(minHeight: 51,maxHeight: 51).background( + Image("navbar") + .resizable() + .edgesIgnoringSafeArea(.all)) + Spacer(); + VStack{ + Text("home content goes here").font(.custom("Lucida Grande", size: 30)).padding(); + } + }.background( + Image("background") + .resizable() + .edgesIgnoringSafeArea(.all) + ) + } +} + +struct HomeView_Previews: PreviewProvider { + static var previews: some View { + HomeView() + } +} diff --git a/ARCHBLOX/LucidaGrande.ttf b/ARCHBLOX/LucidaGrande.ttf new file mode 100644 index 0000000..63c3d97 Binary files /dev/null and b/ARCHBLOX/LucidaGrande.ttf differ diff --git a/ARCHBLOX/LucidaGrandeBold.ttf b/ARCHBLOX/LucidaGrandeBold.ttf new file mode 100644 index 0000000..6f67c86 Binary files /dev/null and b/ARCHBLOX/LucidaGrandeBold.ttf differ diff --git a/ARCHBLOX/MainView.swift b/ARCHBLOX/MainView.swift new file mode 100644 index 0000000..5589f09 --- /dev/null +++ b/ARCHBLOX/MainView.swift @@ -0,0 +1,31 @@ +// +// MainView.swift +// ARCHBLOX +// +// Created by Thomas G on 13/3/2023. +// + +import SwiftUI + +struct MainView: View { + var body: some View { + VStack{ + Image("ARCHBLOXarched").resizable().aspectRatio(contentMode: ContentMode.fit).accessibilityLabel("ARCHBLOX").padding(); + Spacer(); + HStack{ + Text("Sign Up").font(.custom("Lucida Grande", size: 30)).padding(); + Text("Log In").font(.custom("Lucida Grande", size: 30)).padding(); + } + }.background( + Image("background") + .resizable() + .edgesIgnoringSafeArea(.all) + ) + } +} + +struct MainView_Previews: PreviewProvider { + static var previews: some View { + MainView() + } +} diff --git a/ARCHBLOX/ViewController.swift b/ARCHBLOX/ViewController.swift deleted file mode 100644 index 260d92a..0000000 --- a/ARCHBLOX/ViewController.swift +++ /dev/null @@ -1,26 +0,0 @@ -// -// ViewController.swift -// ARCHBLOX -// -// Created by Thomas G on 29/9/2022. -// - -import Cocoa - -class ViewController: NSViewController { - - override func viewDidLoad() { - super.viewDidLoad() - - // Do any additional setup after loading the view. - } - - override var representedObject: Any? { - didSet { - // Update the view, if already loaded. - } - } - - -} -