fix image urls starting with http or https sometimes;
fix show view, scroll trough seasons now instead of double navigation
This commit is contained in:
parent
6ceee7a50d
commit
4c5f0864bb
|
@ -29,8 +29,31 @@ struct ContentView: View {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
struct ShowView: View {
|
struct ShowView: View {
|
||||||
|
var show: Show
|
||||||
|
var body: some View {
|
||||||
|
NavigationView(){
|
||||||
|
List{
|
||||||
|
ForEach(show.getSeasons(), id: \.self){ season in
|
||||||
|
Section(header: Text(season.seasonName).font(.largeTitle)) {
|
||||||
|
ForEach(season.getEpisodes(), id:\.self){ episode in
|
||||||
|
NavigationLink(destination: VideoView(episode: episode)){
|
||||||
|
HStack{
|
||||||
|
AsyncImage(url: episode.imageURL,placeholder: {
|
||||||
|
//Image(name: "loading")
|
||||||
|
Text("Loading...")
|
||||||
|
},image:{Image(uiImage:$0).resizable()}).frame(width: 300, height: 300)
|
||||||
|
Text(episode.name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
struct VisibleShowView: View {
|
||||||
var show: Show
|
var show: Show
|
||||||
var body: some View {
|
var body: some View {
|
||||||
NavigationView(){
|
NavigationView(){
|
||||||
|
|
|
@ -168,7 +168,7 @@ struct Season: Hashable, Comparable{
|
||||||
episode = output[i].replacingOccurrences(of: "vrtnu/a-z/" + show.showName + "/" + seasonName + "/", with: "").replacingOccurrences(of: "/", with: "")
|
episode = output[i].replacingOccurrences(of: "vrtnu/a-z/" + show.showName + "/" + seasonName + "/", with: "").replacingOccurrences(of: "/", with: "")
|
||||||
print(episode)
|
print(episode)
|
||||||
print(seasonName)
|
print(seasonName)
|
||||||
let image = URL(string: imageoutput[i].replacingOccurrences(of: "data-responsive-image=\"", with: "https:"))!
|
let image = URL(string: imageoutput[i].replacingOccurrences(of: "https:", with: "").replacingOccurrences(of: "http:", with: "").replacingOccurrences(of: "data-responsive-image=\"", with: "https:"))!
|
||||||
myepisodes.append(Episode(season: self, episodeName: episode, imageURL: image))
|
myepisodes.append(Episode(season: self, episodeName: episode, imageURL: image))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -275,7 +275,7 @@ struct VRTNu {
|
||||||
myshows = []
|
myshows = []
|
||||||
for i in 0 ..< output.count{
|
for i in 0 ..< output.count{
|
||||||
show = output[i].replacingOccurrences(of: ".relevant", with: "").replacingOccurrences(of: "a href=\"/vrtnu/a-z/", with: "")
|
show = output[i].replacingOccurrences(of: ".relevant", with: "").replacingOccurrences(of: "a href=\"/vrtnu/a-z/", with: "")
|
||||||
image = imageoutput[i].replacingOccurrences(of: "data-responsive-image=\"", with: "https:")
|
image = imageoutput[i].replacingOccurrences(of: "https:", with: "").replacingOccurrences(of: "http:", with: "").replacingOccurrences(of: "data-responsive-image=\"", with: "https:")
|
||||||
myshows.append(Show(showName: show, title: show, imageURL: URL(string: image)!))
|
myshows.append(Show(showName: show, title: show, imageURL: URL(string: image)!))
|
||||||
}
|
}
|
||||||
myshows.sort()
|
myshows.sort()
|
||||||
|
|
Loading…
Reference in New Issue