#3 bugfix after rebase

RSS_Reader.xcodeproj/project.pbxproj

@@ -7,10 +7,10 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		1BA01EDF2554449C00EAFB79 /* ArticleList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1BA01EDE2554449C00EAFB79 /* ArticleList.swift */; };
 		1BBFF7F425531F980091541B /* c9f82579-efeb-4ed5-bf07-e10edafc3a4d.jpeg in Resources */ = {isa = PBXBuildFile; fileRef = 1BBFF7F225531F980091541B /* c9f82579-efeb-4ed5-bf07-e10edafc3a4d.jpeg */; };
 		1BBFF7F525531F980091541B /* 824cf0bb-20a4-4655-a50e-0e6ff7520d0f.jpeg in Resources */ = {isa = PBXBuildFile; fileRef = 1BBFF7F325531F980091541B /* 824cf0bb-20a4-4655-a50e-0e6ff7520d0f.jpeg */; };
 		1BBFF80D25532AD30091541B /* ArticleListRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1BBFF80C25532AD20091541B /* ArticleListRow.swift */; };
+		1BC46CA42556CD1A0029D436 /* ArticleList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1BC46CA32556CD1A0029D436 /* ArticleList.swift */; };
 		1BD2A3C7254B036E00FCA510 /* RSS_ReaderApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1BD2A3C6254B036E00FCA510 /* RSS_ReaderApp.swift */; };
 		1BD2A3C9254B036E00FCA510 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1BD2A3C8254B036E00FCA510 /* ContentView.swift */; };
 		1BD2A3CB254B036F00FCA510 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1BD2A3CA254B036F00FCA510 /* Assets.xcassets */; };
@@ -51,10 +51,10 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		1BA01EDE2554449C00EAFB79 /* ArticleList.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ArticleList.swift; sourceTree = "<group>"; };
 		1BBFF7F225531F980091541B /* c9f82579-efeb-4ed5-bf07-e10edafc3a4d.jpeg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "c9f82579-efeb-4ed5-bf07-e10edafc3a4d.jpeg"; sourceTree = "<group>"; };
 		1BBFF7F325531F980091541B /* 824cf0bb-20a4-4655-a50e-0e6ff7520d0f.jpeg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "824cf0bb-20a4-4655-a50e-0e6ff7520d0f.jpeg"; sourceTree = "<group>"; };
 		1BBFF80C25532AD20091541B /* ArticleListRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArticleListRow.swift; sourceTree = "<group>"; };
+		1BC46CA32556CD1A0029D436 /* ArticleList.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ArticleList.swift; sourceTree = "<group>"; };
 		1BD2A3C3254B036E00FCA510 /* RSS_Reader.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RSS_Reader.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		1BD2A3C6254B036E00FCA510 /* RSS_ReaderApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RSS_ReaderApp.swift; sourceTree = "<group>"; };
 		1BD2A3C8254B036E00FCA510 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
@@ -158,9 +158,8 @@
 				EB6702DE254D983A006BD9C1 /* ArticleDataStructures.swift */,
 				EB6702E6254DA694006BD9C1 /* FeedDataStructures.swift */,
 				EB6702EB254DABE6006BD9C1 /* FilterDataStructures.swift */,
-				1BA01EDE2554449C00EAFB79 /* ArticleList.swift */,
 				1BBFF80C25532AD20091541B /* ArticleListRow.swift */,
-				1BBFF81125532BB00091541B /* ArticleList.swift */,
+				1BC46CA32556CD1A0029D436 /* ArticleList.swift */,
 				EB3F6AAA2552F7F0003FA72F /* SettingsView.swift */,
 				EB3F6AAF2552F9F2003FA72F /* FeedSettingsView.swift */,
 				EB3F6AB425530CAA003FA72F /* FeedParser.swift */,
@@ -343,9 +342,9 @@
 				EB6702DF254D983A006BD9C1 /* ArticleDataStructures.swift in Sources */,
 				EB3F6AB02552F9F2003FA72F /* FeedSettingsView.swift in Sources */,
 				EB08E11F254D7BAD00006B70 /* ArticleView.swift in Sources */,
-				1BA01EDF2554449C00EAFB79 /* ArticleList.swift in Sources */,
 				EB3F6AB525530CAA003FA72F /* FeedParser.swift in Sources */,
 				EB08E139254D7EBD00006B70 /* Model.swift in Sources */,
+				1BC46CA42556CD1A0029D436 /* ArticleList.swift in Sources */,
 				EB08E129254D7BF000006B70 /* ListEntryView.swift in Sources */,
 				1BD2A3C7254B036E00FCA510 /* RSS_ReaderApp.swift in Sources */,
 			);

RSS_Reader/ArticleList.swift

@@ -13,14 +13,11 @@ import SwiftUI
 struct ArticleList: View {
     
     var body: some View {
-        NavigationView {
             List {
                 ForEach(model.article_data){ article in
                     ArticleListRow(article: article, image: Image("824cf0bb-20a4-4655-a50e-0e6ff7520d0f"))
                 }
             }
-            .navigationBarTitle(Text("Articles"))
-        }
     }
 }
 

RSS_Reader/ArticleListRow.swift

@@ -19,6 +19,10 @@ struct ArticleListRow: View {
     var body: some View {
         
         HStack {
+            image
+                .resizable()
+                .frame(width: 130, height: 115)
+            
             VStack{
                 Text(article.title)
                     .font(.custom("article_titel", size: 19))
@@ -29,11 +33,8 @@ struct ArticleListRow: View {
                 Text(article.description)
                     .font(.subheadline)
             }
-            Spacer()
             //article.image
-            image
-                .resizable()
-                .frame(width: 130, height: 115)
+            Spacer()
         }
 
         .frame(width: 370, height: 120, alignment: .center)
@@ -44,7 +45,6 @@ struct ArticleListRow_Previews: PreviewProvider {
     static var previews: some View {
         
         let img0 = Image("824cf0bb-20a4-4655-a50e-0e6ff7520d0f")
-
         let img1 = Image("c9f82579-efeb-4ed5-bf07-e10edafc3a4d")
 
         Group{

RSS_Reader/ContentView.swift

@@ -28,7 +28,7 @@ struct ContentView: View {
         ZStack {
             NavigationView {
                 
-                ArticleListView()
+                ArticleList()
                 .navigationBarTitle("Feed", displayMode: .inline)
                 .navigationBarItems(
                     leading: