Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Location preview cards with asymmetric transitions swift UI map app#5 #2

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 60 additions & 4 deletions SwiftfulMapApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,30 @@
objects = {

/* Begin PBXBuildFile section */
5D772AB92935285000B45FC8 /* LocationsListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D772AB82935285000B45FC8 /* LocationsListView.swift */; };
5D772ABB2935437300B45FC8 /* LocationPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D772ABA2935437300B45FC8 /* LocationPreviewView.swift */; };
5D9B911F2932A94600B7E257 /* SwiftfulMapAppApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D9B911E2932A94600B7E257 /* SwiftfulMapAppApp.swift */; };
5D9B91212932A94600B7E257 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D9B91202932A94600B7E257 /* ContentView.swift */; };
5D9B91232932A94700B7E257 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5D9B91222932A94700B7E257 /* Assets.xcassets */; };
5D9B91262932A94700B7E257 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5D9B91252932A94700B7E257 /* Preview Assets.xcassets */; };
5D9B912D2932AA7C00B7E257 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5D9B912C2932AA7C00B7E257 /* Assets.xcassets */; };
5D9B91322932AC0A00B7E257 /* Location.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D9B91312932AC0A00B7E257 /* Location.swift */; };
5D9B91352932AF3B00B7E257 /* LocationsDataService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D9B91342932AF3B00B7E257 /* LocationsDataService.swift */; };
5DBB8D1B2933089E00BE2466 /* LocationsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DBB8D1A2933089E00BE2466 /* LocationsView.swift */; };
5DBB8D1D29330CA400BE2466 /* LocationsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DBB8D1C29330CA400BE2466 /* LocationsViewModel.swift */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
5D772AB82935285000B45FC8 /* LocationsListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationsListView.swift; sourceTree = "<group>"; };
5D772ABA2935437300B45FC8 /* LocationPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationPreviewView.swift; sourceTree = "<group>"; };
5D9B911B2932A94600B7E257 /* SwiftfulMapApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SwiftfulMapApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
5D9B911E2932A94600B7E257 /* SwiftfulMapAppApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftfulMapAppApp.swift; sourceTree = "<group>"; };
5D9B91202932A94600B7E257 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
5D9B91222932A94700B7E257 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
5D9B91252932A94700B7E257 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
5D9B912C2932AA7C00B7E257 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
5D9B91312932AC0A00B7E257 /* Location.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Location.swift; sourceTree = "<group>"; };
5D9B91342932AF3B00B7E257 /* LocationsDataService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LocationsDataService.swift; sourceTree = "<group>"; };
5DBB8D1A2933089E00BE2466 /* LocationsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationsView.swift; sourceTree = "<group>"; };
5DBB8D1C29330CA400BE2466 /* LocationsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationsViewModel.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -51,9 +63,13 @@
5D9B911D2932A94600B7E257 /* SwiftfulMapApp */ = {
isa = PBXGroup;
children = (
5D9B91332932AD8700B7E257 /* DataServices */,
5DBB8D192933086300BE2466 /* Views */,
5D9B91302932ABBA00B7E257 /* ViewModels */,
5D9B912E2932AB9400B7E257 /* Models */,
5D9B911E2932A94600B7E257 /* SwiftfulMapAppApp.swift */,
5D9B91202932A94600B7E257 /* ContentView.swift */,
5D9B91222932A94700B7E257 /* Assets.xcassets */,
5D9B912C2932AA7C00B7E257 /* Assets.xcassets */,
5D9B91242932A94700B7E257 /* Preview Content */,
);
path = SwiftfulMapApp;
Expand All @@ -67,6 +83,40 @@
path = "Preview Content";
sourceTree = "<group>";
};
5D9B912E2932AB9400B7E257 /* Models */ = {
isa = PBXGroup;
children = (
5D9B91312932AC0A00B7E257 /* Location.swift */,
);
path = Models;
sourceTree = "<group>";
};
5D9B91302932ABBA00B7E257 /* ViewModels */ = {
isa = PBXGroup;
children = (
5DBB8D1C29330CA400BE2466 /* LocationsViewModel.swift */,
);
path = ViewModels;
sourceTree = "<group>";
};
5D9B91332932AD8700B7E257 /* DataServices */ = {
isa = PBXGroup;
children = (
5D9B91342932AF3B00B7E257 /* LocationsDataService.swift */,
);
path = DataServices;
sourceTree = "<group>";
};
5DBB8D192933086300BE2466 /* Views */ = {
isa = PBXGroup;
children = (
5DBB8D1A2933089E00BE2466 /* LocationsView.swift */,
5D772AB82935285000B45FC8 /* LocationsListView.swift */,
5D772ABA2935437300B45FC8 /* LocationPreviewView.swift */,
);
path = Views;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -125,8 +175,8 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
5D9B912D2932AA7C00B7E257 /* Assets.xcassets in Resources */,
5D9B91262932A94700B7E257 /* Preview Assets.xcassets in Resources */,
5D9B91232932A94700B7E257 /* Assets.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -137,7 +187,13 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
5D9B91352932AF3B00B7E257 /* LocationsDataService.swift in Sources */,
5D772AB92935285000B45FC8 /* LocationsListView.swift in Sources */,
5D772ABB2935437300B45FC8 /* LocationPreviewView.swift in Sources */,
5DBB8D1D29330CA400BE2466 /* LocationsViewModel.swift in Sources */,
5D9B91212932A94600B7E257 /* ContentView.swift in Sources */,
5DBB8D1B2933089E00BE2466 /* LocationsView.swift in Sources */,
5D9B91322932AC0A00B7E257 /* Location.swift in Sources */,
5D9B911F2932A94600B7E257 /* SwiftfulMapAppApp.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
12 changes: 12 additions & 0 deletions SwiftfulMapApp/Assets.xcassets/AccentColor.colorset/Contents.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,23 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0.000",
"green" : "0.149",
"red" : "1.000"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"localizable" : true
}
}
107 changes: 105 additions & 2 deletions SwiftfulMapApp/Assets.xcassets/AppIcon.appiconset/Contents.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,111 @@
{
"images" : [
{
"idiom" : "universal",
"platform" : "ios",
"filename" : "[email protected]",
"idiom" : "iphone",
"scale" : "2x",
"size" : "20x20"
},
{
"filename" : "[email protected]",
"idiom" : "iphone",
"scale" : "3x",
"size" : "20x20"
},
{
"filename" : "[email protected]",
"idiom" : "iphone",
"scale" : "2x",
"size" : "29x29"
},
{
"filename" : "[email protected]",
"idiom" : "iphone",
"scale" : "3x",
"size" : "29x29"
},
{
"filename" : "[email protected]",
"idiom" : "iphone",
"scale" : "2x",
"size" : "40x40"
},
{
"filename" : "[email protected]",
"idiom" : "iphone",
"scale" : "3x",
"size" : "40x40"
},
{
"filename" : "[email protected]",
"idiom" : "iphone",
"scale" : "2x",
"size" : "60x60"
},
{
"filename" : "[email protected]",
"idiom" : "iphone",
"scale" : "3x",
"size" : "60x60"
},
{
"filename" : "Icon-20.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "20x20"
},
{
"filename" : "[email protected]",
"idiom" : "ipad",
"scale" : "2x",
"size" : "20x20"
},
{
"filename" : "Icon-29.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "29x29"
},
{
"filename" : "[email protected]",
"idiom" : "ipad",
"scale" : "2x",
"size" : "29x29"
},
{
"filename" : "Icon-40.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "40x40"
},
{
"filename" : "[email protected]",
"idiom" : "ipad",
"scale" : "2x",
"size" : "40x40"
},
{
"filename" : "Icon-76.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "76x76"
},
{
"filename" : "[email protected]",
"idiom" : "ipad",
"scale" : "2x",
"size" : "76x76"
},
{
"filename" : "[email protected]",
"idiom" : "ipad",
"scale" : "2x",
"size" : "83.5x83.5"
},
{
"filename" : "ios-marketing.png",
"idiom" : "ios-marketing",
"scale" : "1x",
"size" : "1024x1024"
}
],
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions SwiftfulMapApp/Assets.xcassets/Locations/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
6 changes: 6 additions & 0 deletions SwiftfulMapApp/Assets.xcassets/Locations/Paris/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "paris-eiffeltower-1.jpg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "paris-eiffeltower-2.jpg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "paris-louvre-1.jpg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "paris-louvre-2.jpg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "paris-louvre-3.jpg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions SwiftfulMapApp/Assets.xcassets/Locations/Rome/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading