Skip to content

Commit 25cb658

Browse files
author
Martin Barreto
authored
Merge pull request #30 from xmartlabs/exampleChanges
remove navbaritem from model
2 parents 20eeaba + 63b2bf6 commit 25cb658

File tree

9 files changed

+7
-14
lines changed

9 files changed

+7
-14
lines changed

Example/Shared/Additional Example Source Code/Views/Instagram/Models/GalleryModel.swift

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import Foundation
99

1010
class GalleryModel: ObservableObject {
11-
var navBarItem = InstagramNavBarItem(imageName: "gallery")
1211

1312
var posts: [Post] {
1413
PostsFactory.shared.posts

Example/Shared/Additional Example Source Code/Views/Instagram/Models/LikedModel.swift

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import Foundation
99

1010
class LikedModel: ObservableObject {
11-
var navBarItem = InstagramNavBarItem(imageName: "liked")
1211

1312
var posts: [Post] {
1413
PostsFactory.shared.posts

Example/Shared/Additional Example Source Code/Views/Instagram/Models/ListModel.swift

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import Foundation
99

1010
class ListModel: ObservableObject {
11-
var navBarItem = InstagramNavBarItem(imageName: "list")
1211

1312
var posts: [Post] {
1413
PostsFactory.shared.posts

Example/Shared/Additional Example Source Code/Views/Instagram/Models/SavedModel.swift

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import Foundation
99

1010
class SavedModel: ObservableObject {
11-
var navBarItem = InstagramNavBarItem(imageName: "saved")
1211

1312
var posts: [Post] {
1413
PostsFactory.shared.posts

Example/Shared/Additional Example Source Code/Views/Twitter/LikesModel.swift

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import Foundation
99

1010
class LikesModel: ObservableObject {
11-
var navBarItem = TwitterNavBarItem(title: "Likes")
1211

1312
var posts: [Post] {
1413
PostsFactory.shared.posts

Example/Shared/Additional Example Source Code/Views/Twitter/MediaModel.swift

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import Foundation
99

1010
class MediaModel: ObservableObject {
11-
var navBarItem = TwitterNavBarItem(title: "Media")
1211

1312
var posts: [Post] {
1413
PostsFactory.shared.posts

Example/Shared/Additional Example Source Code/Views/Twitter/TweetsModel.swift

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import Foundation
99

1010
class TweetsModel: ObservableObject {
11-
var navBarItem = TwitterNavBarItem(title: "Tweets")
1211

1312
var posts: [Post] {
1413
PostsFactory.shared.posts

Example/Shared/InstagramView.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ struct InstagramView: View {
2020
var body: some View {
2121
PagerTabStripView(selection: $selection) {
2222
PostsList(isLoading: $galleryModel.isLoading, items: galleryModel.posts).pagerTabItem {
23-
galleryModel.navBarItem
23+
InstagramNavBarItem(imageName: "gallery")
2424
}.onPageAppear {
2525
galleryModel.isLoading = true
2626
DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
@@ -29,7 +29,7 @@ struct InstagramView: View {
2929
}
3030

3131
PostsList(isLoading: $listModel.isLoading, items: listModel.posts, withDescription: false).pagerTabItem {
32-
listModel.navBarItem
32+
InstagramNavBarItem(imageName: "list")
3333
}.onPageAppear {
3434
listModel.isLoading = true
3535
DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
@@ -38,7 +38,7 @@ struct InstagramView: View {
3838
}
3939

4040
PostsList(isLoading: $likedModel.isLoading, items: likedModel.posts).pagerTabItem {
41-
likedModel.navBarItem
41+
InstagramNavBarItem(imageName: "liked")
4242
}.onPageAppear {
4343
likedModel.isLoading = true
4444
DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
@@ -47,7 +47,7 @@ struct InstagramView: View {
4747
}
4848

4949
PostsList(isLoading: $savedModel.isLoading, items: savedModel.posts, withDescription: false).pagerTabItem {
50-
savedModel.navBarItem
50+
InstagramNavBarItem(imageName: "saved")
5151
}.onPageAppear {
5252
savedModel.isLoading = true
5353
DispatchQueue.main.asyncAfter(deadline: .now() + 2) {

Example/Shared/TwitterView.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ struct TwitterView: View {
1818
var body: some View {
1919
PagerTabStripView(selection: $selection) {
2020
PostsList(isLoading: $tweetsModel.isLoading, items: tweetsModel.posts).pagerTabItem {
21-
tweetsModel.navBarItem
21+
TwitterNavBarItem(title: "Tweets")
2222
}.onPageAppear {
2323
tweetsModel.isLoading = true
2424
DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
@@ -27,7 +27,7 @@ struct TwitterView: View {
2727
}
2828

2929
PostsList(isLoading: $mediaModel.isLoading, items: mediaModel.posts).pagerTabItem {
30-
mediaModel.navBarItem
30+
TwitterNavBarItem(title: "Media")
3131
}.onPageAppear {
3232
mediaModel.isLoading = true
3333
DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
@@ -36,7 +36,7 @@ struct TwitterView: View {
3636
}
3737

3838
PostsList(isLoading: $likesModel.isLoading, items: likesModel.posts, withDescription: false).pagerTabItem {
39-
likesModel.navBarItem
39+
TwitterNavBarItem(title: "Likes")
4040
}.onPageAppear {
4141
likesModel.isLoading = true
4242
DispatchQueue.main.asyncAfter(deadline: .now() + 2) {

0 commit comments

Comments
 (0)