Skip to content

Commit

Permalink
Move body variable inside ArtistView. Bump version number.
Browse files Browse the repository at this point in the history
  • Loading branch information
melgu committed Jul 4, 2020
1 parent f4f4f39 commit 1cf67c1
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions TidalSwift.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1024,7 +1024,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 26;
CURRENT_PROJECT_VERSION = 27;
DEVELOPMENT_ASSET_PATHS = "TidalSwift/Preview\\ Content";
DEVELOPMENT_TEAM = V7E5P7292M;
ENABLE_HARDENED_RUNTIME = YES;
Expand Down Expand Up @@ -1054,7 +1054,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 26;
CURRENT_PROJECT_VERSION = 27;
DEVELOPMENT_ASSET_PATHS = "TidalSwift/Preview\\ Content";
DEVELOPMENT_TEAM = V7E5P7292M;
ENABLE_HARDENED_RUNTIME = YES;
Expand Down
36 changes: 18 additions & 18 deletions TidalSwift/ArtistView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,24 @@ struct ArtistView: View {
}
}

var body: some View {
ZStack {
// TODO: Bring ScroolView back in?
if let artist = artist {
VStack(alignment: .leading) {
headerSection(artist, viewState: viewState)
topTrackSection()
Divider()
bottomSection(artist)
}
.padding(.top, 50) // Has to be 50 instead of 40 like the others to look the same
} else {
Text("Couldn't load Artist")
}
BackButton()
}
}

func headerSection(_ artist: Artist, viewState: ViewState) -> some View {
HStack {
if let pictureUrlSmall = artist.getPictureUrl(session: session, resolution: 320),
Expand Down Expand Up @@ -169,22 +187,4 @@ struct ArtistView: View {
}
.padding(.horizontal)
}

var body: some View {
ZStack {
// TODO: Bring ScroolView back in?
if let artist = artist {
VStack(alignment: .leading) {
headerSection(artist, viewState: viewState)
topTrackSection()
Divider()
bottomSection(artist)
}
.padding(.top, 50) // Has to be 50 instead of 40 like the others to look the same
} else {
Text("Couldn't load Artist")
}
BackButton()
}
}
}

0 comments on commit 1cf67c1

Please sign in to comment.