From bc300c53c8bda16b2ea946902752c4383f9e8a4f Mon Sep 17 00:00:00 2001 From: johannesloor Date: Thu, 1 Jul 2021 14:09:12 +0200 Subject: [PATCH 1/9] Initial setup --- .gitignore | 135 +++++++ DareFilm/DareFilm.xcodeproj/project.pbxproj | 333 ++++++++++++++++++ .../contents.xcworkspacedata | 7 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../AccentColor.colorset/Contents.json | 11 + .../AppIcon.appiconset/Contents.json | 98 ++++++ .../DareFilm/Assets.xcassets/Contents.json | 6 + DareFilm/DareFilm/ContentView.swift | 21 ++ DareFilm/DareFilm/DareFilmApp.swift | 17 + DareFilm/DareFilm/Info.plist | 50 +++ .../Preview Assets.xcassets/Contents.json | 6 + 11 files changed, 692 insertions(+) create mode 100644 .gitignore create mode 100644 DareFilm/DareFilm.xcodeproj/project.pbxproj create mode 100644 DareFilm/DareFilm.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 DareFilm/DareFilm.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 DareFilm/DareFilm/Assets.xcassets/AccentColor.colorset/Contents.json create mode 100644 DareFilm/DareFilm/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 DareFilm/DareFilm/Assets.xcassets/Contents.json create mode 100644 DareFilm/DareFilm/ContentView.swift create mode 100644 DareFilm/DareFilm/DareFilmApp.swift create mode 100644 DareFilm/DareFilm/Info.plist create mode 100644 DareFilm/DareFilm/Preview Content/Preview Assets.xcassets/Contents.json diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..b2ab9503 --- /dev/null +++ b/.gitignore @@ -0,0 +1,135 @@ + +# Created by https://www.toptal.com/developers/gitignore/api/xcode,swift,macos +# Edit at https://www.toptal.com/developers/gitignore?templates=xcode,swift,macos + +### macOS ### +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +### Swift ### +# Xcode +# +# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore + +## User settings +xcuserdata/ + +## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9) +*.xcscmblueprint +*.xccheckout + +## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4) +build/ +DerivedData/ +*.moved-aside +*.pbxuser +!default.pbxuser +*.mode1v3 +!default.mode1v3 +*.mode2v3 +!default.mode2v3 +*.perspectivev3 +!default.perspectivev3 + +## Obj-C/Swift specific +*.hmap + +## App packaging +*.ipa +*.dSYM.zip +*.dSYM + +## Playgrounds +timeline.xctimeline +playground.xcworkspace + +# Swift Package Manager +# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies. +# Packages/ +# Package.pins +# Package.resolved +# *.xcodeproj +# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata +# hence it is not needed unless you have added a package configuration file to your project +# .swiftpm + +.build/ + +# CocoaPods +# We recommend against adding the Pods directory to your .gitignore. However +# you should judge for yourself, the pros and cons are mentioned at: +# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control +# Pods/ +# Add this line if you want to avoid checking in source code from the Xcode workspace +# *.xcworkspace + +# Carthage +# Add this line if you want to avoid checking in source code from Carthage dependencies. +# Carthage/Checkouts + +Carthage/Build/ + +# Accio dependency management +Dependencies/ +.accio/ + +# fastlane +# It is recommended to not store the screenshots in the git repo. +# Instead, use fastlane to re-generate the screenshots whenever they are needed. +# For more information about the recommended setup visit: +# https://docs.fastlane.tools/best-practices/source-control/#source-control + +fastlane/report.xml +fastlane/Preview.html +fastlane/screenshots/**/*.png +fastlane/test_output + +# Code Injection +# After new code Injection tools there's a generated folder /iOSInjectionProject +# https://github.com/johnno1962/injectionforxcode + +iOSInjectionProject/ + +### Xcode ### +# Xcode +# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore + + + + +## Gcc Patch +/*.gcno + +### Xcode Patch ### +*.xcodeproj/* +!*.xcodeproj/project.pbxproj +!*.xcodeproj/xcshareddata/ +!*.xcworkspace/contents.xcworkspacedata +**/xcshareddata/WorkspaceSettings.xcsettings + +# End of https://www.toptal.com/developers/gitignore/api/xcode,swift,macos diff --git a/DareFilm/DareFilm.xcodeproj/project.pbxproj b/DareFilm/DareFilm.xcodeproj/project.pbxproj new file mode 100644 index 00000000..95e33b2f --- /dev/null +++ b/DareFilm/DareFilm.xcodeproj/project.pbxproj @@ -0,0 +1,333 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 50; + objects = { + +/* Begin PBXBuildFile section */ + F5D3BB9E268DE775006D1C26 /* DareFilmApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5D3BB9D268DE775006D1C26 /* DareFilmApp.swift */; }; + F5D3BBA0268DE775006D1C26 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5D3BB9F268DE775006D1C26 /* ContentView.swift */; }; + F5D3BBA2268DE775006D1C26 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F5D3BBA1268DE775006D1C26 /* Assets.xcassets */; }; + F5D3BBA5268DE775006D1C26 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F5D3BBA4268DE775006D1C26 /* Preview Assets.xcassets */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + F5D3BB9A268DE775006D1C26 /* DareFilm.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DareFilm.app; sourceTree = BUILT_PRODUCTS_DIR; }; + F5D3BB9D268DE775006D1C26 /* DareFilmApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DareFilmApp.swift; sourceTree = ""; }; + F5D3BB9F268DE775006D1C26 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; + F5D3BBA1268DE775006D1C26 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + F5D3BBA4268DE775006D1C26 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; + F5D3BBA6268DE775006D1C26 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + F5D3BB97268DE775006D1C26 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + F5D3BB91268DE775006D1C26 = { + isa = PBXGroup; + children = ( + F5D3BB9C268DE775006D1C26 /* DareFilm */, + F5D3BB9B268DE775006D1C26 /* Products */, + ); + sourceTree = ""; + }; + F5D3BB9B268DE775006D1C26 /* Products */ = { + isa = PBXGroup; + children = ( + F5D3BB9A268DE775006D1C26 /* DareFilm.app */, + ); + name = Products; + sourceTree = ""; + }; + F5D3BB9C268DE775006D1C26 /* DareFilm */ = { + isa = PBXGroup; + children = ( + F5D3BB9D268DE775006D1C26 /* DareFilmApp.swift */, + F5D3BB9F268DE775006D1C26 /* ContentView.swift */, + F5D3BBA1268DE775006D1C26 /* Assets.xcassets */, + F5D3BBA6268DE775006D1C26 /* Info.plist */, + F5D3BBA3268DE775006D1C26 /* Preview Content */, + ); + path = DareFilm; + sourceTree = ""; + }; + F5D3BBA3268DE775006D1C26 /* Preview Content */ = { + isa = PBXGroup; + children = ( + F5D3BBA4268DE775006D1C26 /* Preview Assets.xcassets */, + ); + path = "Preview Content"; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + F5D3BB99268DE775006D1C26 /* DareFilm */ = { + isa = PBXNativeTarget; + buildConfigurationList = F5D3BBA9268DE775006D1C26 /* Build configuration list for PBXNativeTarget "DareFilm" */; + buildPhases = ( + F5D3BB96268DE775006D1C26 /* Sources */, + F5D3BB97268DE775006D1C26 /* Frameworks */, + F5D3BB98268DE775006D1C26 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = DareFilm; + productName = DareFilm; + productReference = F5D3BB9A268DE775006D1C26 /* DareFilm.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + F5D3BB92268DE775006D1C26 /* Project object */ = { + isa = PBXProject; + attributes = { + LastSwiftUpdateCheck = 1250; + LastUpgradeCheck = 1250; + TargetAttributes = { + F5D3BB99268DE775006D1C26 = { + CreatedOnToolsVersion = 12.5.1; + }; + }; + }; + buildConfigurationList = F5D3BB95268DE775006D1C26 /* Build configuration list for PBXProject "DareFilm" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = F5D3BB91268DE775006D1C26; + productRefGroup = F5D3BB9B268DE775006D1C26 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + F5D3BB99268DE775006D1C26 /* DareFilm */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + F5D3BB98268DE775006D1C26 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + F5D3BBA5268DE775006D1C26 /* Preview Assets.xcassets in Resources */, + F5D3BBA2268DE775006D1C26 /* Assets.xcassets in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + F5D3BB96268DE775006D1C26 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + F5D3BBA0268DE775006D1C26 /* ContentView.swift in Sources */, + F5D3BB9E268DE775006D1C26 /* DareFilmApp.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + F5D3BBA7268DE775006D1C26 /* 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_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + 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 = 14.5; + 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; + }; + F5D3BBA8268DE775006D1C26 /* 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_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + 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 = 14.5; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + SDKROOT = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + F5D3BBAA268DE775006D1C26 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_ASSET_PATHS = "\"DareFilm/Preview Content\""; + DEVELOPMENT_TEAM = 762W6V8USZ; + ENABLE_PREVIEWS = YES; + INFOPLIST_FILE = DareFilm/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = loor.DareFilm; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + F5D3BBAB268DE775006D1C26 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_ASSET_PATHS = "\"DareFilm/Preview Content\""; + DEVELOPMENT_TEAM = 762W6V8USZ; + ENABLE_PREVIEWS = YES; + INFOPLIST_FILE = DareFilm/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = loor.DareFilm; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + F5D3BB95268DE775006D1C26 /* Build configuration list for PBXProject "DareFilm" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + F5D3BBA7268DE775006D1C26 /* Debug */, + F5D3BBA8268DE775006D1C26 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + F5D3BBA9268DE775006D1C26 /* Build configuration list for PBXNativeTarget "DareFilm" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + F5D3BBAA268DE775006D1C26 /* Debug */, + F5D3BBAB268DE775006D1C26 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = F5D3BB92268DE775006D1C26 /* Project object */; +} diff --git a/DareFilm/DareFilm.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/DareFilm/DareFilm.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..919434a6 --- /dev/null +++ b/DareFilm/DareFilm.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/DareFilm/DareFilm.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/DareFilm/DareFilm.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/DareFilm/DareFilm.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/DareFilm/DareFilm/Assets.xcassets/AccentColor.colorset/Contents.json b/DareFilm/DareFilm/Assets.xcassets/AccentColor.colorset/Contents.json new file mode 100644 index 00000000..eb878970 --- /dev/null +++ b/DareFilm/DareFilm/Assets.xcassets/AccentColor.colorset/Contents.json @@ -0,0 +1,11 @@ +{ + "colors" : [ + { + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/DareFilm/DareFilm/Assets.xcassets/AppIcon.appiconset/Contents.json b/DareFilm/DareFilm/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 00000000..9221b9bb --- /dev/null +++ b/DareFilm/DareFilm/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,98 @@ +{ + "images" : [ + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" + }, + { + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" + }, + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" + }, + { + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" + }, + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" + }, + { + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" + }, + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" + }, + { + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" + }, + { + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" + }, + { + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" + }, + { + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" + }, + { + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" + }, + { + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" + }, + { + "idiom" : "ipad", + "scale" : "2x", + "size" : "76x76" + }, + { + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" + }, + { + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/DareFilm/DareFilm/Assets.xcassets/Contents.json b/DareFilm/DareFilm/Assets.xcassets/Contents.json new file mode 100644 index 00000000..73c00596 --- /dev/null +++ b/DareFilm/DareFilm/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/DareFilm/DareFilm/ContentView.swift b/DareFilm/DareFilm/ContentView.swift new file mode 100644 index 00000000..4cb66f5b --- /dev/null +++ b/DareFilm/DareFilm/ContentView.swift @@ -0,0 +1,21 @@ +// +// ContentView.swift +// DareFilm +// +// Created by Johannes Loor on 2021-07-01. +// + +import SwiftUI + +struct ContentView: View { + var body: some View { + Text("Hello, world!") + .padding() + } +} + +struct ContentView_Previews: PreviewProvider { + static var previews: some View { + ContentView() + } +} diff --git a/DareFilm/DareFilm/DareFilmApp.swift b/DareFilm/DareFilm/DareFilmApp.swift new file mode 100644 index 00000000..6d2e3a97 --- /dev/null +++ b/DareFilm/DareFilm/DareFilmApp.swift @@ -0,0 +1,17 @@ +// +// DareFilmApp.swift +// DareFilm +// +// Created by Johannes Loor on 2021-07-01. +// + +import SwiftUI + +@main +struct DareFilmApp: App { + var body: some Scene { + WindowGroup { + ContentView() + } + } +} diff --git a/DareFilm/DareFilm/Info.plist b/DareFilm/DareFilm/Info.plist new file mode 100644 index 00000000..efc211a0 --- /dev/null +++ b/DareFilm/DareFilm/Info.plist @@ -0,0 +1,50 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + $(PRODUCT_BUNDLE_PACKAGE_TYPE) + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + LSRequiresIPhoneOS + + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + + UIApplicationSupportsIndirectInputEvents + + UILaunchScreen + + UIRequiredDeviceCapabilities + + armv7 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + + diff --git a/DareFilm/DareFilm/Preview Content/Preview Assets.xcassets/Contents.json b/DareFilm/DareFilm/Preview Content/Preview Assets.xcassets/Contents.json new file mode 100644 index 00000000..73c00596 --- /dev/null +++ b/DareFilm/DareFilm/Preview Content/Preview Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} From fbd30238c2e6694f277dddcac3f9c16ad67db7f8 Mon Sep 17 00:00:00 2001 From: johannesloor Date: Fri, 2 Jul 2021 14:29:04 +0200 Subject: [PATCH 2/9] Built views for listing and displaying movies along with the movie model --- DareFilm/DareFilm.xcodeproj/project.pbxproj | 48 ++++++++++++++-- .../BackgroundColor.colorset/Contents.json | 38 +++++++++++++ DareFilm/DareFilm/ContentView.swift | 21 ------- DareFilm/DareFilm/DareFilmApp.swift | 8 ++- DareFilm/DareFilm/Models/Movie.swift | 15 +++++ DareFilm/DareFilm/Views/HomeView.swift | 55 +++++++++++++++++++ DareFilm/DareFilm/Views/MovieDetailView.swift | 25 +++++++++ DareFilm/DareFilm/Views/MovieListView.swift | 28 ++++++++++ DareFilm/DareFilm/Views/MovieView.swift | 42 ++++++++++++++ 9 files changed, 254 insertions(+), 26 deletions(-) create mode 100644 DareFilm/DareFilm/Assets.xcassets/BackgroundColor.colorset/Contents.json delete mode 100644 DareFilm/DareFilm/ContentView.swift create mode 100644 DareFilm/DareFilm/Models/Movie.swift create mode 100644 DareFilm/DareFilm/Views/HomeView.swift create mode 100644 DareFilm/DareFilm/Views/MovieDetailView.swift create mode 100644 DareFilm/DareFilm/Views/MovieListView.swift create mode 100644 DareFilm/DareFilm/Views/MovieView.swift diff --git a/DareFilm/DareFilm.xcodeproj/project.pbxproj b/DareFilm/DareFilm.xcodeproj/project.pbxproj index 95e33b2f..1ab14602 100644 --- a/DareFilm/DareFilm.xcodeproj/project.pbxproj +++ b/DareFilm/DareFilm.xcodeproj/project.pbxproj @@ -7,16 +7,24 @@ objects = { /* Begin PBXBuildFile section */ + F581A4B5268F2E4200CCD578 /* HomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F581A4B4268F2E4200CCD578 /* HomeView.swift */; }; + F581A4B7268F2F8000CCD578 /* MovieListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F581A4B6268F2F8000CCD578 /* MovieListView.swift */; }; + F581A4B9268F301400CCD578 /* MovieView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F581A4B8268F301400CCD578 /* MovieView.swift */; }; + F581A4BF268F35D100CCD578 /* Movie.swift in Sources */ = {isa = PBXBuildFile; fileRef = F581A4BE268F35D100CCD578 /* Movie.swift */; }; + F581A4C1268F3A6D00CCD578 /* MovieDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F581A4C0268F3A6D00CCD578 /* MovieDetailView.swift */; }; F5D3BB9E268DE775006D1C26 /* DareFilmApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5D3BB9D268DE775006D1C26 /* DareFilmApp.swift */; }; - F5D3BBA0268DE775006D1C26 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5D3BB9F268DE775006D1C26 /* ContentView.swift */; }; F5D3BBA2268DE775006D1C26 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F5D3BBA1268DE775006D1C26 /* Assets.xcassets */; }; F5D3BBA5268DE775006D1C26 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F5D3BBA4268DE775006D1C26 /* Preview Assets.xcassets */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + F581A4B4268F2E4200CCD578 /* HomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeView.swift; sourceTree = ""; }; + F581A4B6268F2F8000CCD578 /* MovieListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MovieListView.swift; sourceTree = ""; }; + F581A4B8268F301400CCD578 /* MovieView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MovieView.swift; sourceTree = ""; }; + F581A4BE268F35D100CCD578 /* Movie.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Movie.swift; sourceTree = ""; }; + F581A4C0268F3A6D00CCD578 /* MovieDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MovieDetailView.swift; sourceTree = ""; }; F5D3BB9A268DE775006D1C26 /* DareFilm.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DareFilm.app; sourceTree = BUILT_PRODUCTS_DIR; }; F5D3BB9D268DE775006D1C26 /* DareFilmApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DareFilmApp.swift; sourceTree = ""; }; - F5D3BB9F268DE775006D1C26 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; F5D3BBA1268DE775006D1C26 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; F5D3BBA4268DE775006D1C26 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; F5D3BBA6268DE775006D1C26 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -52,8 +60,10 @@ F5D3BB9C268DE775006D1C26 /* DareFilm */ = { isa = PBXGroup; children = ( + F5D3BBAE268DE8EF006D1C26 /* Views */, + F5D3BBAD268DE8E5006D1C26 /* ViewModels */, + F5D3BBAC268DE8D9006D1C26 /* Models */, F5D3BB9D268DE775006D1C26 /* DareFilmApp.swift */, - F5D3BB9F268DE775006D1C26 /* ContentView.swift */, F5D3BBA1268DE775006D1C26 /* Assets.xcassets */, F5D3BBA6268DE775006D1C26 /* Info.plist */, F5D3BBA3268DE775006D1C26 /* Preview Content */, @@ -69,6 +79,32 @@ path = "Preview Content"; sourceTree = ""; }; + F5D3BBAC268DE8D9006D1C26 /* Models */ = { + isa = PBXGroup; + children = ( + F581A4BE268F35D100CCD578 /* Movie.swift */, + ); + path = Models; + sourceTree = ""; + }; + F5D3BBAD268DE8E5006D1C26 /* ViewModels */ = { + isa = PBXGroup; + children = ( + ); + path = ViewModels; + sourceTree = ""; + }; + F5D3BBAE268DE8EF006D1C26 /* Views */ = { + isa = PBXGroup; + children = ( + F581A4B4268F2E4200CCD578 /* HomeView.swift */, + F581A4B6268F2F8000CCD578 /* MovieListView.swift */, + F581A4B8268F301400CCD578 /* MovieView.swift */, + F581A4C0268F3A6D00CCD578 /* MovieDetailView.swift */, + ); + path = Views; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -138,7 +174,11 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - F5D3BBA0268DE775006D1C26 /* ContentView.swift in Sources */, + F581A4C1268F3A6D00CCD578 /* MovieDetailView.swift in Sources */, + F581A4B9268F301400CCD578 /* MovieView.swift in Sources */, + F581A4B5268F2E4200CCD578 /* HomeView.swift in Sources */, + F581A4BF268F35D100CCD578 /* Movie.swift in Sources */, + F581A4B7268F2F8000CCD578 /* MovieListView.swift in Sources */, F5D3BB9E268DE775006D1C26 /* DareFilmApp.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/DareFilm/DareFilm/Assets.xcassets/BackgroundColor.colorset/Contents.json b/DareFilm/DareFilm/Assets.xcassets/BackgroundColor.colorset/Contents.json new file mode 100644 index 00000000..2b3d9a22 --- /dev/null +++ b/DareFilm/DareFilm/Assets.xcassets/BackgroundColor.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "196", + "green" : "228", + "red" : "255" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "20", + "green" : "20", + "red" : "20" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/DareFilm/DareFilm/ContentView.swift b/DareFilm/DareFilm/ContentView.swift deleted file mode 100644 index 4cb66f5b..00000000 --- a/DareFilm/DareFilm/ContentView.swift +++ /dev/null @@ -1,21 +0,0 @@ -// -// ContentView.swift -// DareFilm -// -// Created by Johannes Loor on 2021-07-01. -// - -import SwiftUI - -struct ContentView: View { - var body: some View { - Text("Hello, world!") - .padding() - } -} - -struct ContentView_Previews: PreviewProvider { - static var previews: some View { - ContentView() - } -} diff --git a/DareFilm/DareFilm/DareFilmApp.swift b/DareFilm/DareFilm/DareFilmApp.swift index 6d2e3a97..7b231c40 100644 --- a/DareFilm/DareFilm/DareFilmApp.swift +++ b/DareFilm/DareFilm/DareFilmApp.swift @@ -11,7 +11,13 @@ import SwiftUI struct DareFilmApp: App { var body: some Scene { WindowGroup { - ContentView() + ZStack{ + Color("BackgroundColor") + .ignoresSafeArea() + HomeView() + .edgesIgnoringSafeArea(.bottom) + } + } } } diff --git a/DareFilm/DareFilm/Models/Movie.swift b/DareFilm/DareFilm/Models/Movie.swift new file mode 100644 index 00000000..e7c32dff --- /dev/null +++ b/DareFilm/DareFilm/Models/Movie.swift @@ -0,0 +1,15 @@ +// +// Movie.swift +// DareFilm +// +// Created by Johannes Loor on 2021-07-02. +// + +import Foundation + +struct Movie: Identifiable { + var id = UUID() + var title: String + var description: String + var rating: String +} diff --git a/DareFilm/DareFilm/Views/HomeView.swift b/DareFilm/DareFilm/Views/HomeView.swift new file mode 100644 index 00000000..cd3b3504 --- /dev/null +++ b/DareFilm/DareFilm/Views/HomeView.swift @@ -0,0 +1,55 @@ +// +// HomeView.swift +// DareFilm +// +// Created by Johannes Loor on 2021-07-02. +// + +import SwiftUI + +struct HomeView: View { + @State private var tabSelection = "Popular" + let popularSectionTitle = "Popular" + let ratedSectionTitile = "Top rated" + let movies = [Movie(title: "The best movie ever", description: "Johannes searches for greatness when he tries to build the best app ever seen", rating: "5/5"), Movie(title: "The worst movie ever", description: "Johannes searches for failure when he tries to build the best app ever seen", rating: "1/5")] + var body: some View { + VStack(spacing: 0){ + Text("DareFilm") + .font(.title) + .padding() + HStack{ + Spacer() + Button(tabSelection == popularSectionTitle ? "\(popularSectionTitle)🍿" : popularSectionTitle){ + tabSelection = popularSectionTitle + } + .foregroundColor(tabSelection == popularSectionTitle ? .primary : .gray) + + Spacer() + + Button(tabSelection == ratedSectionTitile ? "🍿\(ratedSectionTitile)" : ratedSectionTitile){ + tabSelection = ratedSectionTitile + } + .foregroundColor(tabSelection == ratedSectionTitile ? .primary : .gray) + Spacer() + } + .font(.headline) + .padding(.bottom) + Divider() + + TabView(selection: $tabSelection){ + MovieListView(movies: movies.reversed()) + .tag(popularSectionTitle) + + MovieListView(movies: movies) + .tag(ratedSectionTitile) + } + .tabViewStyle(PageTabViewStyle(indexDisplayMode: .never)) + } + } +} + +struct HomeView_Previews: PreviewProvider { + static var previews: some View { + HomeView() + } +} diff --git a/DareFilm/DareFilm/Views/MovieDetailView.swift b/DareFilm/DareFilm/Views/MovieDetailView.swift new file mode 100644 index 00000000..f05cd567 --- /dev/null +++ b/DareFilm/DareFilm/Views/MovieDetailView.swift @@ -0,0 +1,25 @@ +// +// MovieDetailView.swift +// DareFilm +// +// Created by Johannes Loor on 2021-07-02. +// + +import SwiftUI + +struct MovieDetailView: View { + var movie: Movie + var body: some View { + VStack{ + Text(movie.title) + Text(movie.description) + Text(movie.rating) + } + } +} + +//struct MovieDetailView_Previews: PreviewProvider { +// static var previews: some View { +// MovieDetailView() +// } +//} diff --git a/DareFilm/DareFilm/Views/MovieListView.swift b/DareFilm/DareFilm/Views/MovieListView.swift new file mode 100644 index 00000000..7465b218 --- /dev/null +++ b/DareFilm/DareFilm/Views/MovieListView.swift @@ -0,0 +1,28 @@ +// +// MovieListView.swift +// DareFilm +// +// Created by Johannes Loor on 2021-07-02. +// + +import SwiftUI + +struct MovieListView: View { + var movies: [Movie] + var body: some View { + VStack(alignment: .leading, spacing: 0){ + ScrollView{ + ForEach(movies){movie in + MovieView(movie: movie) + } + } + + } + } +} + +//struct MovieListView_Previews: PreviewProvider { +// static var previews: some View { +// MovieListView() +// } +//} diff --git a/DareFilm/DareFilm/Views/MovieView.swift b/DareFilm/DareFilm/Views/MovieView.swift new file mode 100644 index 00000000..60160405 --- /dev/null +++ b/DareFilm/DareFilm/Views/MovieView.swift @@ -0,0 +1,42 @@ +// +// MovieView.swift +// DareFilm +// +// Created by Johannes Loor on 2021-07-02. +// + +import SwiftUI + +struct MovieView: View { + @State private var showingDetails = false + var movie: Movie + var body: some View { + HStack{ + RoundedRectangle(cornerRadius: 25, style: .continuous) + .fill(Color.yellow) + .frame(width: 150, height: 230) + VStack(alignment: .leading, spacing: 10){ + Text(movie.title) + .font(.title2) + Text(movie.description) + .italic() + .lineLimit(3) + Text(movie.rating) + } + Spacer() + } + .padding() + .onTapGesture { + showingDetails.toggle() + } + .sheet(isPresented: $showingDetails) { + MovieDetailView(movie: movie) + } + } +} + +struct MovieView_Previews: PreviewProvider { + static var previews: some View { + MovieView(movie: Movie(title: "The best movie ever", description: "Johannes searches for greatness when he tries to build the best app ever seen", rating: "5/5")) + } +} From c76127d6400ec44e2bc28bba474672fa0310ae0c Mon Sep 17 00:00:00 2001 From: johannesloor Date: Sat, 3 Jul 2021 12:23:07 +0200 Subject: [PATCH 3/9] Created ViewModel for fetching movie data --- DareFilm/DareFilm.xcodeproj/project.pbxproj | 4 ++ DareFilm/DareFilm/Models/Movie.swift | 13 ++++-- .../DareFilm/ViewModels/MovieViewModel.swift | 41 +++++++++++++++++++ DareFilm/DareFilm/Views/HomeView.swift | 6 +-- DareFilm/DareFilm/Views/MovieDetailView.swift | 4 +- DareFilm/DareFilm/Views/MovieView.swift | 14 +++---- 6 files changed, 66 insertions(+), 16 deletions(-) create mode 100644 DareFilm/DareFilm/ViewModels/MovieViewModel.swift diff --git a/DareFilm/DareFilm.xcodeproj/project.pbxproj b/DareFilm/DareFilm.xcodeproj/project.pbxproj index 1ab14602..2d9f2941 100644 --- a/DareFilm/DareFilm.xcodeproj/project.pbxproj +++ b/DareFilm/DareFilm.xcodeproj/project.pbxproj @@ -12,6 +12,7 @@ F581A4B9268F301400CCD578 /* MovieView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F581A4B8268F301400CCD578 /* MovieView.swift */; }; F581A4BF268F35D100CCD578 /* Movie.swift in Sources */ = {isa = PBXBuildFile; fileRef = F581A4BE268F35D100CCD578 /* Movie.swift */; }; F581A4C1268F3A6D00CCD578 /* MovieDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F581A4C0268F3A6D00CCD578 /* MovieDetailView.swift */; }; + F581A4C3268F44D800CCD578 /* MovieViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F581A4C2268F44D800CCD578 /* MovieViewModel.swift */; }; F5D3BB9E268DE775006D1C26 /* DareFilmApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5D3BB9D268DE775006D1C26 /* DareFilmApp.swift */; }; F5D3BBA2268DE775006D1C26 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F5D3BBA1268DE775006D1C26 /* Assets.xcassets */; }; F5D3BBA5268DE775006D1C26 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F5D3BBA4268DE775006D1C26 /* Preview Assets.xcassets */; }; @@ -23,6 +24,7 @@ F581A4B8268F301400CCD578 /* MovieView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MovieView.swift; sourceTree = ""; }; F581A4BE268F35D100CCD578 /* Movie.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Movie.swift; sourceTree = ""; }; F581A4C0268F3A6D00CCD578 /* MovieDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MovieDetailView.swift; sourceTree = ""; }; + F581A4C2268F44D800CCD578 /* MovieViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MovieViewModel.swift; sourceTree = ""; }; F5D3BB9A268DE775006D1C26 /* DareFilm.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DareFilm.app; sourceTree = BUILT_PRODUCTS_DIR; }; F5D3BB9D268DE775006D1C26 /* DareFilmApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DareFilmApp.swift; sourceTree = ""; }; F5D3BBA1268DE775006D1C26 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; @@ -90,6 +92,7 @@ F5D3BBAD268DE8E5006D1C26 /* ViewModels */ = { isa = PBXGroup; children = ( + F581A4C2268F44D800CCD578 /* MovieViewModel.swift */, ); path = ViewModels; sourceTree = ""; @@ -179,6 +182,7 @@ F581A4B5268F2E4200CCD578 /* HomeView.swift in Sources */, F581A4BF268F35D100CCD578 /* Movie.swift in Sources */, F581A4B7268F2F8000CCD578 /* MovieListView.swift in Sources */, + F581A4C3268F44D800CCD578 /* MovieViewModel.swift in Sources */, F5D3BB9E268DE775006D1C26 /* DareFilmApp.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/DareFilm/DareFilm/Models/Movie.swift b/DareFilm/DareFilm/Models/Movie.swift index e7c32dff..04d6d3af 100644 --- a/DareFilm/DareFilm/Models/Movie.swift +++ b/DareFilm/DareFilm/Models/Movie.swift @@ -7,9 +7,14 @@ import Foundation -struct Movie: Identifiable { - var id = UUID() +struct MovieDataResponse: Codable { + var results: [Movie] +} + +struct Movie: Identifiable, Codable { + var id: Int var title: String - var description: String - var rating: String + var overview: String + var voteAverage: Double + var posterPath: String } diff --git a/DareFilm/DareFilm/ViewModels/MovieViewModel.swift b/DareFilm/DareFilm/ViewModels/MovieViewModel.swift new file mode 100644 index 00000000..a468ca49 --- /dev/null +++ b/DareFilm/DareFilm/ViewModels/MovieViewModel.swift @@ -0,0 +1,41 @@ +// +// MovieViewModel.swift +// DareFilm +// +// Created by Johannes Loor on 2021-07-02. +// + +import Foundation + +class MovieHandler: ObservableObject { + @Published var movies: [Movie] = [] + + init() { + fetchMovieData() + } + + func fetchMovieData() { + let apiKey = "" //TODO: Add your TMDB key here + guard let url = URL(string: "https://api.themoviedb.org/3/movie/popular?api_key=\(apiKey)&language=en-US&page=1") else{ + print("Url broken") + return + } + + URLSession.shared.dataTask(with: url){ data, _, error in + if let data = data { + let decoder = JSONDecoder() + decoder.keyDecodingStrategy = .convertFromSnakeCase + if let decodedResponse = try? decoder.decode(MovieDataResponse.self, from: data) { + DispatchQueue.main.async { + print(decodedResponse.results) + self.movies = decodedResponse.results + } + + return + } + } + print("\(error?.localizedDescription ?? "Unknown error")") + + }.resume() + } +} diff --git a/DareFilm/DareFilm/Views/HomeView.swift b/DareFilm/DareFilm/Views/HomeView.swift index cd3b3504..cee7f167 100644 --- a/DareFilm/DareFilm/Views/HomeView.swift +++ b/DareFilm/DareFilm/Views/HomeView.swift @@ -9,9 +9,9 @@ import SwiftUI struct HomeView: View { @State private var tabSelection = "Popular" + @ObservedObject var movieHandler = MovieHandler() let popularSectionTitle = "Popular" let ratedSectionTitile = "Top rated" - let movies = [Movie(title: "The best movie ever", description: "Johannes searches for greatness when he tries to build the best app ever seen", rating: "5/5"), Movie(title: "The worst movie ever", description: "Johannes searches for failure when he tries to build the best app ever seen", rating: "1/5")] var body: some View { VStack(spacing: 0){ Text("DareFilm") @@ -37,10 +37,10 @@ struct HomeView: View { Divider() TabView(selection: $tabSelection){ - MovieListView(movies: movies.reversed()) + MovieListView(movies: movieHandler.movies) .tag(popularSectionTitle) - MovieListView(movies: movies) + MovieListView(movies: movieHandler.movies.reversed()) .tag(ratedSectionTitile) } .tabViewStyle(PageTabViewStyle(indexDisplayMode: .never)) diff --git a/DareFilm/DareFilm/Views/MovieDetailView.swift b/DareFilm/DareFilm/Views/MovieDetailView.swift index f05cd567..bc23e242 100644 --- a/DareFilm/DareFilm/Views/MovieDetailView.swift +++ b/DareFilm/DareFilm/Views/MovieDetailView.swift @@ -12,8 +12,8 @@ struct MovieDetailView: View { var body: some View { VStack{ Text(movie.title) - Text(movie.description) - Text(movie.rating) + Text(movie.overview) + Text(String(movie.voteAverage)) } } } diff --git a/DareFilm/DareFilm/Views/MovieView.swift b/DareFilm/DareFilm/Views/MovieView.swift index 60160405..afa84250 100644 --- a/DareFilm/DareFilm/Views/MovieView.swift +++ b/DareFilm/DareFilm/Views/MovieView.swift @@ -18,10 +18,10 @@ struct MovieView: View { VStack(alignment: .leading, spacing: 10){ Text(movie.title) .font(.title2) - Text(movie.description) + Text(movie.overview) .italic() .lineLimit(3) - Text(movie.rating) + Text(String(movie.voteAverage)) } Spacer() } @@ -35,8 +35,8 @@ struct MovieView: View { } } -struct MovieView_Previews: PreviewProvider { - static var previews: some View { - MovieView(movie: Movie(title: "The best movie ever", description: "Johannes searches for greatness when he tries to build the best app ever seen", rating: "5/5")) - } -} +//struct MovieView_Previews: PreviewProvider { +// static var previews: some View { +// MovieView(movie: Movie(title: "The best movie ever", description: "Johannes searches for greatness when he tries to build the best app ever seen", rating: "5/5")) +// } +//} From bca796637e59614cb5a9b3ddbf589ffabd0af979 Mon Sep 17 00:00:00 2001 From: johannesloor Date: Sat, 3 Jul 2021 12:29:59 +0200 Subject: [PATCH 4/9] Added keys to gitignore --- .gitignore | 3 +++ DareFilm/DareFilm.xcodeproj/project.pbxproj | 4 ++++ DareFilm/DareFilm/ViewModels/MovieViewModel.swift | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index b2ab9503..2ece5737 100644 --- a/.gitignore +++ b/.gitignore @@ -133,3 +133,6 @@ iOSInjectionProject/ **/xcshareddata/WorkspaceSettings.xcsettings # End of https://www.toptal.com/developers/gitignore/api/xcode,swift,macos + +### Project specific files ### +Keys.swift diff --git a/DareFilm/DareFilm.xcodeproj/project.pbxproj b/DareFilm/DareFilm.xcodeproj/project.pbxproj index 2d9f2941..4523d2d4 100644 --- a/DareFilm/DareFilm.xcodeproj/project.pbxproj +++ b/DareFilm/DareFilm.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + F5301BD5269072A800CC3AEF /* Keys.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5301BD4269072A800CC3AEF /* Keys.swift */; }; F581A4B5268F2E4200CCD578 /* HomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F581A4B4268F2E4200CCD578 /* HomeView.swift */; }; F581A4B7268F2F8000CCD578 /* MovieListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F581A4B6268F2F8000CCD578 /* MovieListView.swift */; }; F581A4B9268F301400CCD578 /* MovieView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F581A4B8268F301400CCD578 /* MovieView.swift */; }; @@ -19,6 +20,7 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + F5301BD4269072A800CC3AEF /* Keys.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Keys.swift; sourceTree = ""; }; F581A4B4268F2E4200CCD578 /* HomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeView.swift; sourceTree = ""; }; F581A4B6268F2F8000CCD578 /* MovieListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MovieListView.swift; sourceTree = ""; }; F581A4B8268F301400CCD578 /* MovieView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MovieView.swift; sourceTree = ""; }; @@ -69,6 +71,7 @@ F5D3BBA1268DE775006D1C26 /* Assets.xcassets */, F5D3BBA6268DE775006D1C26 /* Info.plist */, F5D3BBA3268DE775006D1C26 /* Preview Content */, + F5301BD4269072A800CC3AEF /* Keys.swift */, ); path = DareFilm; sourceTree = ""; @@ -178,6 +181,7 @@ buildActionMask = 2147483647; files = ( F581A4C1268F3A6D00CCD578 /* MovieDetailView.swift in Sources */, + F5301BD5269072A800CC3AEF /* Keys.swift in Sources */, F581A4B9268F301400CCD578 /* MovieView.swift in Sources */, F581A4B5268F2E4200CCD578 /* HomeView.swift in Sources */, F581A4BF268F35D100CCD578 /* Movie.swift in Sources */, diff --git a/DareFilm/DareFilm/ViewModels/MovieViewModel.swift b/DareFilm/DareFilm/ViewModels/MovieViewModel.swift index a468ca49..4296c561 100644 --- a/DareFilm/DareFilm/ViewModels/MovieViewModel.swift +++ b/DareFilm/DareFilm/ViewModels/MovieViewModel.swift @@ -15,7 +15,7 @@ class MovieHandler: ObservableObject { } func fetchMovieData() { - let apiKey = "" //TODO: Add your TMDB key here + let apiKey = TMDBapiKey //TODO: Add your TMDB key here guard let url = URL(string: "https://api.themoviedb.org/3/movie/popular?api_key=\(apiKey)&language=en-US&page=1") else{ print("Url broken") return From 9b92ac992410d6fbd09cfdee582f8ff54fec0ec2 Mon Sep 17 00:00:00 2001 From: johannesloor Date: Sat, 3 Jul 2021 13:01:20 +0200 Subject: [PATCH 5/9] Added filtering for popular and top rated --- .../DareFilm/ViewModels/MovieViewModel.swift | 37 ++++++++++++++----- DareFilm/DareFilm/Views/HomeView.swift | 14 ++++++- DareFilm/DareFilm/Views/MovieListView.swift | 12 ++++-- 3 files changed, 47 insertions(+), 16 deletions(-) diff --git a/DareFilm/DareFilm/ViewModels/MovieViewModel.swift b/DareFilm/DareFilm/ViewModels/MovieViewModel.swift index 4296c561..5b11b8b1 100644 --- a/DareFilm/DareFilm/ViewModels/MovieViewModel.swift +++ b/DareFilm/DareFilm/ViewModels/MovieViewModel.swift @@ -7,18 +7,28 @@ import Foundation +enum movieFilter { + case popular, topRated +} + class MovieHandler: ObservableObject { - @Published var movies: [Movie] = [] - - init() { - fetchMovieData() - } + @Published var popularMovies: [Movie] = [] + @Published var topRatedMovies: [Movie] = [] - func fetchMovieData() { + func fetchMovieData(withFilter filter: movieFilter) { let apiKey = TMDBapiKey //TODO: Add your TMDB key here - guard let url = URL(string: "https://api.themoviedb.org/3/movie/popular?api_key=\(apiKey)&language=en-US&page=1") else{ - print("Url broken") - return + var filterType: String { + switch filter { + case .popular: + return "popular" + case .topRated: + return "top_rated" + } + } + + guard let url = URL(string: "https://api.themoviedb.org/3/movie/\(filterType)?api_key=\(apiKey)&language=en-US&page=1") else{ + print("Url broken") + return } URLSession.shared.dataTask(with: url){ data, _, error in @@ -28,7 +38,14 @@ class MovieHandler: ObservableObject { if let decodedResponse = try? decoder.decode(MovieDataResponse.self, from: data) { DispatchQueue.main.async { print(decodedResponse.results) - self.movies = decodedResponse.results + switch filter{ + case .popular: + self.popularMovies = decodedResponse.results + + case .topRated: + self.topRatedMovies = decodedResponse.results + } + } return diff --git a/DareFilm/DareFilm/Views/HomeView.swift b/DareFilm/DareFilm/Views/HomeView.swift index cee7f167..648d26f8 100644 --- a/DareFilm/DareFilm/Views/HomeView.swift +++ b/DareFilm/DareFilm/Views/HomeView.swift @@ -37,11 +37,21 @@ struct HomeView: View { Divider() TabView(selection: $tabSelection){ - MovieListView(movies: movieHandler.movies) + MovieListView(movies: movieHandler.popularMovies) .tag(popularSectionTitle) + .onAppear(){ + if movieHandler.popularMovies.isEmpty{ + movieHandler.fetchMovieData(withFilter: .popular) + } + } - MovieListView(movies: movieHandler.movies.reversed()) + MovieListView(movies: movieHandler.topRatedMovies) .tag(ratedSectionTitile) + .onAppear(){ + if movieHandler.topRatedMovies.isEmpty{ + movieHandler.fetchMovieData(withFilter: .topRated) + } + } } .tabViewStyle(PageTabViewStyle(indexDisplayMode: .never)) } diff --git a/DareFilm/DareFilm/Views/MovieListView.swift b/DareFilm/DareFilm/Views/MovieListView.swift index 7465b218..f734e975 100644 --- a/DareFilm/DareFilm/Views/MovieListView.swift +++ b/DareFilm/DareFilm/Views/MovieListView.swift @@ -11,12 +11,16 @@ struct MovieListView: View { var movies: [Movie] var body: some View { VStack(alignment: .leading, spacing: 0){ - ScrollView{ - ForEach(movies){movie in - MovieView(movie: movie) + if movies.isEmpty{ + ProgressView() + } + else{ + ScrollView{ + ForEach(movies){movie in + MovieView(movie: movie) + } } } - } } } From 47a175393775aba30d18aaf8b1afbff03c934699 Mon Sep 17 00:00:00 2001 From: johannesloor Date: Sat, 3 Jul 2021 14:19:11 +0200 Subject: [PATCH 6/9] Added handler for fetching images --- DareFilm/DareFilm.xcodeproj/project.pbxproj | 4 +++ .../DareFilm/ViewModels/ImageHandler.swift | 34 +++++++++++++++++++ .../DareFilm/ViewModels/MovieViewModel.swift | 9 +++-- DareFilm/DareFilm/Views/MovieView.swift | 17 ++++++++-- 4 files changed, 56 insertions(+), 8 deletions(-) create mode 100644 DareFilm/DareFilm/ViewModels/ImageHandler.swift diff --git a/DareFilm/DareFilm.xcodeproj/project.pbxproj b/DareFilm/DareFilm.xcodeproj/project.pbxproj index 4523d2d4..87399eb7 100644 --- a/DareFilm/DareFilm.xcodeproj/project.pbxproj +++ b/DareFilm/DareFilm.xcodeproj/project.pbxproj @@ -8,6 +8,7 @@ /* Begin PBXBuildFile section */ F5301BD5269072A800CC3AEF /* Keys.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5301BD4269072A800CC3AEF /* Keys.swift */; }; + F5301BD726907F5900CC3AEF /* ImageHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5301BD626907F5900CC3AEF /* ImageHandler.swift */; }; F581A4B5268F2E4200CCD578 /* HomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F581A4B4268F2E4200CCD578 /* HomeView.swift */; }; F581A4B7268F2F8000CCD578 /* MovieListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F581A4B6268F2F8000CCD578 /* MovieListView.swift */; }; F581A4B9268F301400CCD578 /* MovieView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F581A4B8268F301400CCD578 /* MovieView.swift */; }; @@ -21,6 +22,7 @@ /* Begin PBXFileReference section */ F5301BD4269072A800CC3AEF /* Keys.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Keys.swift; sourceTree = ""; }; + F5301BD626907F5900CC3AEF /* ImageHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageHandler.swift; sourceTree = ""; }; F581A4B4268F2E4200CCD578 /* HomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeView.swift; sourceTree = ""; }; F581A4B6268F2F8000CCD578 /* MovieListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MovieListView.swift; sourceTree = ""; }; F581A4B8268F301400CCD578 /* MovieView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MovieView.swift; sourceTree = ""; }; @@ -96,6 +98,7 @@ isa = PBXGroup; children = ( F581A4C2268F44D800CCD578 /* MovieViewModel.swift */, + F5301BD626907F5900CC3AEF /* ImageHandler.swift */, ); path = ViewModels; sourceTree = ""; @@ -187,6 +190,7 @@ F581A4BF268F35D100CCD578 /* Movie.swift in Sources */, F581A4B7268F2F8000CCD578 /* MovieListView.swift in Sources */, F581A4C3268F44D800CCD578 /* MovieViewModel.swift in Sources */, + F5301BD726907F5900CC3AEF /* ImageHandler.swift in Sources */, F5D3BB9E268DE775006D1C26 /* DareFilmApp.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/DareFilm/DareFilm/ViewModels/ImageHandler.swift b/DareFilm/DareFilm/ViewModels/ImageHandler.swift new file mode 100644 index 00000000..6ccfa49d --- /dev/null +++ b/DareFilm/DareFilm/ViewModels/ImageHandler.swift @@ -0,0 +1,34 @@ +// +// ImageHandler.swift +// DareFilm +// +// Created by Johannes Loor on 2021-07-03. +// + +import Foundation +import SwiftUI + +enum imageSize: String { + case w92, w154, w185, w342, w500, w780, original +} + +class ImageHandler: ObservableObject { + @Published private(set) var image: UIImage? + + func loadImage(withPath posterPath: String, size: imageSize? = .w342){ + guard let url = URL(string: "https://image.tmdb.org/t/p/\(size!.rawValue)\(posterPath)") else{ + print("Image url broken") + return + } + + URLSession.shared.dataTask(with: url) { data, _, error in + if let data = data { + DispatchQueue.main.sync { + self.image = UIImage(data: data) ?? UIImage() + } + return + } + print("Error while downloading image. Error: \(String(describing: error))") + }.resume() + } +} diff --git a/DareFilm/DareFilm/ViewModels/MovieViewModel.swift b/DareFilm/DareFilm/ViewModels/MovieViewModel.swift index 5b11b8b1..d4c424e3 100644 --- a/DareFilm/DareFilm/ViewModels/MovieViewModel.swift +++ b/DareFilm/DareFilm/ViewModels/MovieViewModel.swift @@ -14,9 +14,9 @@ enum movieFilter { class MovieHandler: ObservableObject { @Published var popularMovies: [Movie] = [] @Published var topRatedMovies: [Movie] = [] - + let apiKey = TMDBapiKey //TODO: Add your TMDB key here + func fetchMovieData(withFilter filter: movieFilter) { - let apiKey = TMDBapiKey //TODO: Add your TMDB key here var filterType: String { switch filter { case .popular: @@ -27,7 +27,7 @@ class MovieHandler: ObservableObject { } guard let url = URL(string: "https://api.themoviedb.org/3/movie/\(filterType)?api_key=\(apiKey)&language=en-US&page=1") else{ - print("Url broken") + print("Data url broken") return } @@ -37,7 +37,6 @@ class MovieHandler: ObservableObject { decoder.keyDecodingStrategy = .convertFromSnakeCase if let decodedResponse = try? decoder.decode(MovieDataResponse.self, from: data) { DispatchQueue.main.async { - print(decodedResponse.results) switch filter{ case .popular: self.popularMovies = decodedResponse.results @@ -51,7 +50,7 @@ class MovieHandler: ObservableObject { return } } - print("\(error?.localizedDescription ?? "Unknown error")") + print("Error while downloading data. Error: \(String(describing: error))") }.resume() } diff --git a/DareFilm/DareFilm/Views/MovieView.swift b/DareFilm/DareFilm/Views/MovieView.swift index afa84250..5bc01a6f 100644 --- a/DareFilm/DareFilm/Views/MovieView.swift +++ b/DareFilm/DareFilm/Views/MovieView.swift @@ -8,13 +8,24 @@ import SwiftUI struct MovieView: View { + @ObservedObject var imageHandler = ImageHandler() @State private var showingDetails = false var movie: Movie var body: some View { HStack{ - RoundedRectangle(cornerRadius: 25, style: .continuous) - .fill(Color.yellow) - .frame(width: 150, height: 230) + ZStack{ + RoundedRectangle(cornerRadius: 25, style: .continuous) + .fill(Color.yellow) + + Image(uiImage: imageHandler.image ?? UIImage()) + .resizable() + .cornerRadius(25) + .onAppear(){ + imageHandler.loadImage(withPath: movie.posterPath) + } + } + .frame(width: 150, height: 230) + VStack(alignment: .leading, spacing: 10){ Text(movie.title) .font(.title2) From 763070fb47a9e2114c1b4eafdf2906e8b0fd8ee2 Mon Sep 17 00:00:00 2001 From: johannesloor Date: Sat, 3 Jul 2021 17:47:28 +0200 Subject: [PATCH 7/9] Built detail view and added support for horizontal images --- DareFilm/DareFilm/Models/Movie.swift | 2 ++ .../DareFilm/ViewModels/ImageHandler.swift | 11 +++++-- .../DareFilm/ViewModels/MovieViewModel.swift | 1 + DareFilm/DareFilm/Views/MovieDetailView.swift | 32 +++++++++++++++++-- DareFilm/DareFilm/Views/MovieListView.swift | 2 ++ DareFilm/DareFilm/Views/MovieView.swift | 11 +++++-- 6 files changed, 51 insertions(+), 8 deletions(-) diff --git a/DareFilm/DareFilm/Models/Movie.swift b/DareFilm/DareFilm/Models/Movie.swift index 04d6d3af..7446aa7c 100644 --- a/DareFilm/DareFilm/Models/Movie.swift +++ b/DareFilm/DareFilm/Models/Movie.swift @@ -17,4 +17,6 @@ struct Movie: Identifiable, Codable { var overview: String var voteAverage: Double var posterPath: String + var backdropPath: String? + var releaseDate: String? } diff --git a/DareFilm/DareFilm/ViewModels/ImageHandler.swift b/DareFilm/DareFilm/ViewModels/ImageHandler.swift index 6ccfa49d..7c797e07 100644 --- a/DareFilm/DareFilm/ViewModels/ImageHandler.swift +++ b/DareFilm/DareFilm/ViewModels/ImageHandler.swift @@ -9,14 +9,19 @@ import Foundation import SwiftUI enum imageSize: String { - case w92, w154, w185, w342, w500, w780, original + case w92, w154, w185, w342, w500, w780, original //Poster sizes + case w300, w1280 //Extra Backdrop sizes along with w780 and original } class ImageHandler: ObservableObject { @Published private(set) var image: UIImage? - func loadImage(withPath posterPath: String, size: imageSize? = .w342){ - guard let url = URL(string: "https://image.tmdb.org/t/p/\(size!.rawValue)\(posterPath)") else{ + func loadImage(withPath imagePath: String?, size: imageSize? = .w500){ + if imagePath == nil{ + print("Error: no image path") + return + } + guard let url = URL(string: "https://image.tmdb.org/t/p/\(size!.rawValue)\(imagePath!)") else{ print("Image url broken") return } diff --git a/DareFilm/DareFilm/ViewModels/MovieViewModel.swift b/DareFilm/DareFilm/ViewModels/MovieViewModel.swift index d4c424e3..9056608d 100644 --- a/DareFilm/DareFilm/ViewModels/MovieViewModel.swift +++ b/DareFilm/DareFilm/ViewModels/MovieViewModel.swift @@ -37,6 +37,7 @@ class MovieHandler: ObservableObject { decoder.keyDecodingStrategy = .convertFromSnakeCase if let decodedResponse = try? decoder.decode(MovieDataResponse.self, from: data) { DispatchQueue.main.async { + print(decodedResponse.results) switch filter{ case .popular: self.popularMovies = decodedResponse.results diff --git a/DareFilm/DareFilm/Views/MovieDetailView.swift b/DareFilm/DareFilm/Views/MovieDetailView.swift index bc23e242..2ac06182 100644 --- a/DareFilm/DareFilm/Views/MovieDetailView.swift +++ b/DareFilm/DareFilm/Views/MovieDetailView.swift @@ -8,13 +8,41 @@ import SwiftUI struct MovieDetailView: View { + @ObservedObject var imageHandler = ImageHandler() var movie: Movie var body: some View { VStack{ + ZStack{ + Rectangle() + .fill(Color.yellow) + .frame(minHeight: 100) + Text("\(movie.title)") + .italic() + .padding() + Image(uiImage: imageHandler.image ?? UIImage()) + .resizable() + .onAppear(){ + imageHandler.loadImage(withPath: movie.backdropPath) + } + } + .scaledToFit() Text(movie.title) - Text(movie.overview) - Text(String(movie.voteAverage)) + .font(.title) + VStack(alignment: .leading){ + Text("Released: \(movie.releaseDate ?? "")") + Text("⭐️: \(String(movie.voteAverage))") + + Text("Description:") + .italic() + .padding(.top) + Text(movie.overview) + + } + .padding() + Spacer() } + .background(Color("BackgroundColor")) + .ignoresSafeArea() } } diff --git a/DareFilm/DareFilm/Views/MovieListView.swift b/DareFilm/DareFilm/Views/MovieListView.swift index f734e975..01116be0 100644 --- a/DareFilm/DareFilm/Views/MovieListView.swift +++ b/DareFilm/DareFilm/Views/MovieListView.swift @@ -22,6 +22,8 @@ struct MovieListView: View { } } } + .padding() + } } diff --git a/DareFilm/DareFilm/Views/MovieView.swift b/DareFilm/DareFilm/Views/MovieView.swift index 5bc01a6f..0bb5d3f4 100644 --- a/DareFilm/DareFilm/Views/MovieView.swift +++ b/DareFilm/DareFilm/Views/MovieView.swift @@ -16,10 +16,13 @@ struct MovieView: View { ZStack{ RoundedRectangle(cornerRadius: 25, style: .continuous) .fill(Color.yellow) + Text("\(movie.title)") + .italic() + .padding() Image(uiImage: imageHandler.image ?? UIImage()) .resizable() - .cornerRadius(25) + .cornerRadius(20) .onAppear(){ imageHandler.loadImage(withPath: movie.posterPath) } @@ -32,12 +35,14 @@ struct MovieView: View { Text(movie.overview) .italic() .lineLimit(3) - Text(String(movie.voteAverage)) + Text("⭐️\(String(movie.voteAverage))") } Spacer() } - .padding() + .padding(.bottom) .onTapGesture { + let hapticGenerator = UIImpactFeedbackGenerator(style: .light) + hapticGenerator.impactOccurred() showingDetails.toggle() } .sheet(isPresented: $showingDetails) { From 382ea7d833417b7c5bfe7a97d803c839d8c3f7e2 Mon Sep 17 00:00:00 2001 From: johannesloor Date: Sat, 3 Jul 2021 18:41:48 +0200 Subject: [PATCH 8/9] Added close button, vote count and yellow frame --- DareFilm/DareFilm/Models/Movie.swift | 1 + DareFilm/DareFilm/Views/MovieDetailView.swift | 38 ++++++++++++------- DareFilm/DareFilm/Views/MovieView.swift | 13 +++++-- 3 files changed, 36 insertions(+), 16 deletions(-) diff --git a/DareFilm/DareFilm/Models/Movie.swift b/DareFilm/DareFilm/Models/Movie.swift index 7446aa7c..5888e158 100644 --- a/DareFilm/DareFilm/Models/Movie.swift +++ b/DareFilm/DareFilm/Models/Movie.swift @@ -19,4 +19,5 @@ struct Movie: Identifiable, Codable { var posterPath: String var backdropPath: String? var releaseDate: String? + var voteCount: Int } diff --git a/DareFilm/DareFilm/Views/MovieDetailView.swift b/DareFilm/DareFilm/Views/MovieDetailView.swift index 2ac06182..d4d289c3 100644 --- a/DareFilm/DareFilm/Views/MovieDetailView.swift +++ b/DareFilm/DareFilm/Views/MovieDetailView.swift @@ -9,6 +9,7 @@ import SwiftUI struct MovieDetailView: View { @ObservedObject var imageHandler = ImageHandler() + @Binding var isShowing: Bool var movie: Movie var body: some View { VStack{ @@ -26,20 +27,31 @@ struct MovieDetailView: View { } } .scaledToFit() - Text(movie.title) - .font(.title) - VStack(alignment: .leading){ - Text("Released: \(movie.releaseDate ?? "")") - Text("⭐️: \(String(movie.voteAverage))") - - Text("Description:") - .italic() - .padding(.top) - Text(movie.overview) - + + ScrollView{ + Text(movie.title) + .font(.title) + VStack(alignment: .leading){ + + Text("⭐️: \(String(movie.voteAverage))") + .font(.title2) + Text("Number of votes: \(movie.voteCount)") + Text("Released: \(movie.releaseDate ?? "")") + .padding(.top) + Text("Description:") + .italic() + .padding(.top) + Text(movie.overview) + + } + .padding() + Spacer() + } + + Button("Close"){ + isShowing = false } - .padding() - Spacer() + .padding(.bottom, 50) } .background(Color("BackgroundColor")) .ignoresSafeArea() diff --git a/DareFilm/DareFilm/Views/MovieView.swift b/DareFilm/DareFilm/Views/MovieView.swift index 0bb5d3f4..7c15fc2e 100644 --- a/DareFilm/DareFilm/Views/MovieView.swift +++ b/DareFilm/DareFilm/Views/MovieView.swift @@ -14,20 +14,27 @@ struct MovieView: View { var body: some View { HStack{ ZStack{ - RoundedRectangle(cornerRadius: 25, style: .continuous) + Rectangle() .fill(Color.yellow) + .frame(width: 155, height: 235) + + .cornerRadius(20) + Text("\(movie.title)") .italic() .padding() Image(uiImage: imageHandler.image ?? UIImage()) .resizable() + .frame(width: 150, height: 230) .cornerRadius(20) .onAppear(){ imageHandler.loadImage(withPath: movie.posterPath) } + + } - .frame(width: 150, height: 230) + .frame(width: 155, height: 235) VStack(alignment: .leading, spacing: 10){ Text(movie.title) @@ -46,7 +53,7 @@ struct MovieView: View { showingDetails.toggle() } .sheet(isPresented: $showingDetails) { - MovieDetailView(movie: movie) + MovieDetailView(isShowing: $showingDetails, movie: movie) } } } From 784811183990c367972e0dcdb265ee789f03ca55 Mon Sep 17 00:00:00 2001 From: johannesloor Date: Sat, 3 Jul 2021 19:18:57 +0200 Subject: [PATCH 9/9] Comment and cleanup --- .../DareFilm/ViewModels/ImageHandler.swift | 12 +++++++++++ .../DareFilm/ViewModels/MovieViewModel.swift | 16 ++++++++++----- DareFilm/DareFilm/Views/HomeView.swift | 14 +++++++------ DareFilm/DareFilm/Views/MovieDetailView.swift | 15 +++++++------- DareFilm/DareFilm/Views/MovieListView.swift | 11 +++------- DareFilm/DareFilm/Views/MovieView.swift | 20 +++++++++---------- 6 files changed, 51 insertions(+), 37 deletions(-) diff --git a/DareFilm/DareFilm/ViewModels/ImageHandler.swift b/DareFilm/DareFilm/ViewModels/ImageHandler.swift index 7c797e07..345d9a76 100644 --- a/DareFilm/DareFilm/ViewModels/ImageHandler.swift +++ b/DareFilm/DareFilm/ViewModels/ImageHandler.swift @@ -13,9 +13,21 @@ enum imageSize: String { case w300, w1280 //Extra Backdrop sizes along with w780 and original } +/* + Handles and fecthes the images from TMDB + */ class ImageHandler: ObservableObject { @Published private(set) var image: UIImage? + /** + Fetches images from TMDB + + -Parameters: + - imagePath: The specific image path of the url + - size: The optional size of the image + + -Returns: Puts the returning image in the image property wrapper + */ func loadImage(withPath imagePath: String?, size: imageSize? = .w500){ if imagePath == nil{ print("Error: no image path") diff --git a/DareFilm/DareFilm/ViewModels/MovieViewModel.swift b/DareFilm/DareFilm/ViewModels/MovieViewModel.swift index 9056608d..52690791 100644 --- a/DareFilm/DareFilm/ViewModels/MovieViewModel.swift +++ b/DareFilm/DareFilm/ViewModels/MovieViewModel.swift @@ -11,11 +11,20 @@ enum movieFilter { case popular, topRated } +/* + Handles and fecthes the data from TMDB + */ class MovieHandler: ObservableObject { @Published var popularMovies: [Movie] = [] @Published var topRatedMovies: [Movie] = [] - let apiKey = TMDBapiKey //TODO: Add your TMDB key here - + let apiKey = TMDBapiKey //TODO: Add your TMDB key here (string) + + /** + Fetches movie data from TMDB + + -Parameter filter: The order type to filter the data on (popular or top rated) + -Returns: Adds movies to the corresponing property wrapper + */ func fetchMovieData(withFilter filter: movieFilter) { var filterType: String { switch filter { @@ -37,7 +46,6 @@ class MovieHandler: ObservableObject { decoder.keyDecodingStrategy = .convertFromSnakeCase if let decodedResponse = try? decoder.decode(MovieDataResponse.self, from: data) { DispatchQueue.main.async { - print(decodedResponse.results) switch filter{ case .popular: self.popularMovies = decodedResponse.results @@ -45,9 +53,7 @@ class MovieHandler: ObservableObject { case .topRated: self.topRatedMovies = decodedResponse.results } - } - return } } diff --git a/DareFilm/DareFilm/Views/HomeView.swift b/DareFilm/DareFilm/Views/HomeView.swift index 648d26f8..fc5ac6e4 100644 --- a/DareFilm/DareFilm/Views/HomeView.swift +++ b/DareFilm/DareFilm/Views/HomeView.swift @@ -7,16 +7,23 @@ import SwiftUI +/* + First landing page of the app, building the overall structure + */ struct HomeView: View { @State private var tabSelection = "Popular" @ObservedObject var movieHandler = MovieHandler() let popularSectionTitle = "Popular" let ratedSectionTitile = "Top rated" + var body: some View { VStack(spacing: 0){ + // MARK: Title Text("DareFilm") .font(.title) .padding() + + //MARK: Top selection bar HStack{ Spacer() Button(tabSelection == popularSectionTitle ? "\(popularSectionTitle)🍿" : popularSectionTitle){ @@ -36,6 +43,7 @@ struct HomeView: View { .padding(.bottom) Divider() + //MARK: Tabview content TabView(selection: $tabSelection){ MovieListView(movies: movieHandler.popularMovies) .tag(popularSectionTitle) @@ -57,9 +65,3 @@ struct HomeView: View { } } } - -struct HomeView_Previews: PreviewProvider { - static var previews: some View { - HomeView() - } -} diff --git a/DareFilm/DareFilm/Views/MovieDetailView.swift b/DareFilm/DareFilm/Views/MovieDetailView.swift index d4d289c3..2b76647d 100644 --- a/DareFilm/DareFilm/Views/MovieDetailView.swift +++ b/DareFilm/DareFilm/Views/MovieDetailView.swift @@ -6,7 +6,9 @@ // import SwiftUI - +/* + The detailed movie description + */ struct MovieDetailView: View { @ObservedObject var imageHandler = ImageHandler() @Binding var isShowing: Bool @@ -14,12 +16,15 @@ struct MovieDetailView: View { var body: some View { VStack{ ZStack{ + //MARK: Background and placeholder Rectangle() .fill(Color.yellow) .frame(minHeight: 100) Text("\(movie.title)") .italic() .padding() + + //MARK: Fetched horizontal image Image(uiImage: imageHandler.image ?? UIImage()) .resizable() .onAppear(){ @@ -28,6 +33,7 @@ struct MovieDetailView: View { } .scaledToFit() + //MARK: Detailed information ScrollView{ Text(movie.title) .font(.title) @@ -48,6 +54,7 @@ struct MovieDetailView: View { Spacer() } + //MARK: Button for closing details sheet Button("Close"){ isShowing = false } @@ -57,9 +64,3 @@ struct MovieDetailView: View { .ignoresSafeArea() } } - -//struct MovieDetailView_Previews: PreviewProvider { -// static var previews: some View { -// MovieDetailView() -// } -//} diff --git a/DareFilm/DareFilm/Views/MovieListView.swift b/DareFilm/DareFilm/Views/MovieListView.swift index 01116be0..d89b98be 100644 --- a/DareFilm/DareFilm/Views/MovieListView.swift +++ b/DareFilm/DareFilm/Views/MovieListView.swift @@ -6,7 +6,9 @@ // import SwiftUI - +/* + Lists each movie in a scrollable list + */ struct MovieListView: View { var movies: [Movie] var body: some View { @@ -23,12 +25,5 @@ struct MovieListView: View { } } .padding() - } } - -//struct MovieListView_Previews: PreviewProvider { -// static var previews: some View { -// MovieListView() -// } -//} diff --git a/DareFilm/DareFilm/Views/MovieView.swift b/DareFilm/DareFilm/Views/MovieView.swift index 7c15fc2e..c35fc3a7 100644 --- a/DareFilm/DareFilm/Views/MovieView.swift +++ b/DareFilm/DareFilm/Views/MovieView.swift @@ -6,7 +6,9 @@ // import SwiftUI - +/* + The view represtning each movie object + */ struct MovieView: View { @ObservedObject var imageHandler = ImageHandler() @State private var showingDetails = false @@ -14,6 +16,7 @@ struct MovieView: View { var body: some View { HStack{ ZStack{ + //MARK: Background and placeholder Rectangle() .fill(Color.yellow) .frame(width: 155, height: 235) @@ -23,7 +26,8 @@ struct MovieView: View { Text("\(movie.title)") .italic() .padding() - + + //MARK: Fetched poster Image(uiImage: imageHandler.image ?? UIImage()) .resizable() .frame(width: 150, height: 230) @@ -31,11 +35,10 @@ struct MovieView: View { .onAppear(){ imageHandler.loadImage(withPath: movie.posterPath) } - - } .frame(width: 155, height: 235) - + + //MARK: General movie information VStack(alignment: .leading, spacing: 10){ Text(movie.title) .font(.title2) @@ -52,14 +55,9 @@ struct MovieView: View { hapticGenerator.impactOccurred() showingDetails.toggle() } + //MARK: Detailed movie sheet shown on tap .sheet(isPresented: $showingDetails) { MovieDetailView(isShowing: $showingDetails, movie: movie) } } } - -//struct MovieView_Previews: PreviewProvider { -// static var previews: some View { -// MovieView(movie: Movie(title: "The best movie ever", description: "Johannes searches for greatness when he tries to build the best app ever seen", rating: "5/5")) -// } -//}