mirror of
https://github.com/ivanvorobei/SwiftUI.git
synced 2026-01-17 22:46:42 +01:00
Merge pull request #6 from johnno1962/xcode-11-beta3
A few more run time fixes
This commit is contained in:
@@ -20,7 +20,8 @@ struct LandmarkList: View {
|
||||
ForEach(userData.landmarks) { landmark in
|
||||
if !self.userData.showFavoritesOnly || landmark.isFavorite {
|
||||
NavigationLink(
|
||||
destination: LandmarkDetail(landmark: landmark)) {
|
||||
destination: LandmarkDetail(landmark: landmark)
|
||||
.environmentObject(self.userData)) {
|
||||
LandmarkRow(landmark: landmark)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,13 +12,13 @@ struct CategoryRow: View {
|
||||
var items: [Landmark]
|
||||
|
||||
var body: some View {
|
||||
VStack(alignment: HorizontalAlignment.leading) {
|
||||
VStack(alignment: .leading) {
|
||||
Text(self.categoryName)
|
||||
.font(.headline)
|
||||
.padding(.leading, 15)
|
||||
.padding(.top, 5)
|
||||
|
||||
ScrollView(showsHorizontalIndicator: false) {
|
||||
ScrollView {
|
||||
HStack(alignment: .top, spacing: 0) {
|
||||
ForEach(self.items.identified(by: \.name)) { landmark in
|
||||
NavigationLink(
|
||||
|
||||
@@ -33,19 +33,18 @@ struct CategoryHome: View {
|
||||
}
|
||||
.listRowInsets(EdgeInsets())
|
||||
|
||||
NavigationButton(destination: LandmarkList()) {
|
||||
NavigationLink(destination: LandmarkList()) {
|
||||
Text("See All")
|
||||
}
|
||||
}
|
||||
.navigationBarTitle(Text("Featured"))
|
||||
.navigationBarItems(trailing:
|
||||
PresentationButton(
|
||||
PresentationLink(destination: Text("User Profile")) {
|
||||
Image(systemName: "person.crop.circle")
|
||||
.imageScale(.large)
|
||||
.accessibility(label: Text("User Profile"))
|
||||
.padding(),
|
||||
destination: Text("User Profile")
|
||||
)
|
||||
.padding()
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -20,7 +20,8 @@ struct LandmarkList: View {
|
||||
ForEach(userData.landmarks) { landmark in
|
||||
if !self.userData.showFavoritesOnly || landmark.isFavorite {
|
||||
NavigationLink(
|
||||
destination: LandmarkDetail(landmark: landmark)) {
|
||||
destination: LandmarkDetail(landmark: landmark)
|
||||
.environmentObject(self.userData)) {
|
||||
LandmarkRow(landmark: landmark)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,10 +18,12 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
|
||||
// This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead).
|
||||
|
||||
// Use a UIHostingController as window root view controller
|
||||
let window = UIWindow(frame: UIScreen.main.bounds)
|
||||
window.rootViewController = UIHostingController(rootView: CategoryHome().environmentObject(UserData()))
|
||||
self.window = window
|
||||
window.makeKeyAndVisible()
|
||||
if let windowScene = scene as? UIWindowScene {
|
||||
let window = UIWindow(windowScene: windowScene)
|
||||
window.rootViewController = UIHostingController(rootView: CategoryHome().environmentObject(UserData()))
|
||||
self.window = window
|
||||
window.makeKeyAndVisible()
|
||||
}
|
||||
}
|
||||
|
||||
func sceneDidDisconnect(_ scene: UIScene) {
|
||||
|
||||
@@ -20,7 +20,8 @@ struct LandmarkList: View {
|
||||
ForEach(userData.landmarks) { landmark in
|
||||
if !self.userData.showFavoritesOnly || landmark.isFavorite {
|
||||
NavigationLink(
|
||||
destination: LandmarkDetail(landmark: landmark)) {
|
||||
destination: LandmarkDetail(landmark: landmark)
|
||||
.environmentObject(self.userData)) {
|
||||
LandmarkRow(landmark: landmark)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -20,7 +20,8 @@ struct LandmarkList: View {
|
||||
ForEach(userData.landmarks) { landmark in
|
||||
if !self.userData.showFavoritesOnly || landmark.isFavorite {
|
||||
NavigationLink(
|
||||
destination: LandmarkDetail(landmark: landmark)) {
|
||||
destination: LandmarkDetail(landmark: landmark)
|
||||
.environmentObject(self.userData)) {
|
||||
LandmarkRow(landmark: landmark)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,10 +18,10 @@ struct CategoryRow: View {
|
||||
.padding(.leading, 15)
|
||||
.padding(.top, 5)
|
||||
|
||||
ScrollView(showsHorizontalIndicator: false) {
|
||||
ScrollView([]) {
|
||||
HStack(alignment: .top, spacing: 0) {
|
||||
ForEach(self.items.identified(by: \.name)) { landmark in
|
||||
NavigationButton(
|
||||
NavigationLink(
|
||||
destination: LandmarkDetail(
|
||||
landmark: landmark
|
||||
)
|
||||
|
||||
@@ -33,19 +33,18 @@ struct CategoryHome: View {
|
||||
}
|
||||
.listRowInsets(EdgeInsets())
|
||||
|
||||
NavigationButton(destination: LandmarkList()) {
|
||||
NavigationLink(destination: LandmarkList()) {
|
||||
Text("See All")
|
||||
}
|
||||
}
|
||||
.navigationBarTitle(Text("Featured"))
|
||||
.navigationBarItems(trailing:
|
||||
PresentationButton(
|
||||
PresentationLink(destination: ProfileHost()) {
|
||||
Image(systemName: "person.crop.circle")
|
||||
.imageScale(.large)
|
||||
.accessibility(label: Text("User Profile"))
|
||||
.padding(),
|
||||
destination: ProfileHost()
|
||||
)
|
||||
.padding()
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -20,7 +20,8 @@ struct LandmarkList: View {
|
||||
ForEach(userData.landmarks) { landmark in
|
||||
if !self.userData.showFavoritesOnly || landmark.isFavorite {
|
||||
NavigationLink(
|
||||
destination: LandmarkDetail(landmark: landmark)) {
|
||||
destination: LandmarkDetail(landmark: landmark)
|
||||
.environmentObject(self.userData)) {
|
||||
LandmarkRow(landmark: landmark)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,10 +18,12 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
|
||||
// This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead).
|
||||
|
||||
// Use a UIHostingController as window root view controller
|
||||
let window = UIWindow(frame: UIScreen.main.bounds)
|
||||
window.rootViewController = UIHostingController(rootView: CategoryHome().environmentObject(UserData()))
|
||||
self.window = window
|
||||
window.makeKeyAndVisible()
|
||||
if let windowScene = scene as? UIWindowScene {
|
||||
let window = UIWindow(windowScene: windowScene)
|
||||
window.rootViewController = UIHostingController(rootView: CategoryHome().environmentObject(UserData()))
|
||||
self.window = window
|
||||
window.makeKeyAndVisible()
|
||||
}
|
||||
}
|
||||
|
||||
func sceneDidDisconnect(_ scene: UIScene) {
|
||||
|
||||
@@ -24,7 +24,8 @@ struct UsersListView : View {
|
||||
}
|
||||
Section {
|
||||
ForEach(state.usersState.users) {user in
|
||||
NavigationLink(destination: UserDetailView(userId: user.id)) {
|
||||
NavigationLink(destination: UserDetailView(userId: user.id)
|
||||
.environmentObject(self.state)) {
|
||||
UserRow(user: user)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,7 +14,8 @@ struct NoteList : View {
|
||||
var body: some View {
|
||||
NavigationView {
|
||||
List(userData.notes) { note in
|
||||
NavigationLink(destination: NoteDetail(note: note)) {
|
||||
NavigationLink(destination: NoteDetail(note: note)
|
||||
.environmentObject(self.userData)) {
|
||||
NoteRow(note: note)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,10 +18,10 @@ struct CategoryRow: View {
|
||||
.padding(.leading, 15)
|
||||
.padding(.top, 5)
|
||||
|
||||
ScrollView(showsHorizontalIndicator: false) {
|
||||
ScrollView {
|
||||
HStack(alignment: .top, spacing: 0) {
|
||||
ForEach(self.items.identified(by: \.name)) { landmark in
|
||||
NavigationButton(
|
||||
NavigationLink(
|
||||
destination: LandmarkDetail(
|
||||
landmark: landmark
|
||||
)
|
||||
|
||||
@@ -33,20 +33,18 @@ struct CategoryHome: View {
|
||||
}
|
||||
.listRowInsets(EdgeInsets())
|
||||
|
||||
NavigationButton(destination: LandmarkList()) {
|
||||
NavigationLink(destination: LandmarkList()) {
|
||||
Text("See All")
|
||||
}
|
||||
}
|
||||
.navigationBarTitle(Text("Featured"))
|
||||
.navigationBarItems(trailing:
|
||||
PresentationButton(
|
||||
PresentationLink(destination: ProfileHost()) {
|
||||
Image(systemName: "person.crop.circle")
|
||||
.imageScale(.large)
|
||||
.accessibility(label: Text("User Profile"))
|
||||
.padding(),
|
||||
destination: ProfileHost()
|
||||
)
|
||||
)
|
||||
.padding()
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,10 +18,12 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
|
||||
// This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead).
|
||||
|
||||
// Use a UIHostingController as window root view controller
|
||||
let window = UIWindow(frame: UIScreen.main.bounds)
|
||||
window.rootViewController = UIHostingController(rootView: CategoryHome().environmentObject(UserData()))
|
||||
self.window = window
|
||||
window.makeKeyAndVisible()
|
||||
if let windowScene = scene as? UIWindowScene {
|
||||
let window = UIWindow(windowScene: windowScene)
|
||||
window.rootViewController = UIHostingController(rootView: CategoryHome().environmentObject(UserData()))
|
||||
self.window = window
|
||||
window.makeKeyAndVisible()
|
||||
}
|
||||
}
|
||||
|
||||
func sceneDidDisconnect(_ scene: UIScene) {
|
||||
|
||||
Reference in New Issue
Block a user