Improve iOS design on feed list

prof18 · Oct 24, 2023 · 39cfba7 · 39cfba7
1 parent 41cc6f5
commit 39cfba7
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 46 deletions.
diff --git a/iosApp/Source/App/CompactView.swift b/iosApp/Source/App/CompactView.swift
@@ -3,7 +3,7 @@
 //  FeedFlow
 //
 //  Created by Marco Gomiero on 21/10/23.
-//  Copyright © 2023 orgName. All rights reserved.
+//  Copyright © 2023 FeedFlow. All rights reserved.
 //
 
 import Foundation

diff --git a/iosApp/Source/App/Drawer/SidebarDrawer.swift b/iosApp/Source/App/Drawer/SidebarDrawer.swift
@@ -3,7 +3,7 @@
 //  FeedFlow
 //
 //  Created by Marco Gomiero on 21/10/23.
-//  Copyright © 2023 orgName. All rights reserved.
+//  Copyright © 2023 FeedFlow. All rights reserved.
 //
 
 import SwiftUI

diff --git a/iosApp/Source/App/RegularView.swift b/iosApp/Source/App/RegularView.swift
@@ -3,7 +3,7 @@
 //  FeedFlow
 //
 //  Created by Marco Gomiero on 21/10/23.
-//  Copyright © 2023 orgName. All rights reserved.
+//  Copyright © 2023 FeedFlow. All rights reserved.
 //
 
 import Foundation

diff --git a/iosApp/Source/Settings/About/AboutScreen.swift b/iosApp/Source/Settings/About/AboutScreen.swift
@@ -3,7 +3,7 @@
 //  FeedFlow
 //
 //  Created by Marco Gomiero on 22/07/23.
-//  Copyright © 2023 orgName. All rights reserved.
+//  Copyright © 2023 FeedFlow. All rights reserved.
 //
 
 import Foundation

diff --git a/iosApp/Source/Settings/About/LicensesScreen.swift b/iosApp/Source/Settings/About/LicensesScreen.swift
@@ -3,7 +3,7 @@
 //  FeedFlow
 //
 //  Created by Marco Gomiero on 22/07/23.
-//  Copyright © 2023 orgName. All rights reserved.
+//  Copyright © 2023 FeedFlow. All rights reserved.
 //
 
 import SwiftUI

diff --git a/iosApp/Source/Settings/Feeds/FeedSourceListScreen.swift b/iosApp/Source/Settings/Feeds/FeedSourceListScreen.swift
@@ -51,54 +51,57 @@ private struct FeedSourceListContent: View {
             VStack {
                 if feedState.isEmpty {
                     VStack {
+                        Spacer()
+
                         Text(localizer.no_feeds_found_message.localized)
                             .font(.body)
 
                         NavigationLink(value: SheetPage.addFeed) {
                             Text(localizer.add_feed.localized)
                         }
+
+                        Spacer()
                     }
                 } else {
                     List {
                         ForEach(feedState, id: \.self.categoryId) { feedSourceState in
+                            DisclosureGroup(
+                                content: {
+                                    ForEach(feedSourceState.feedSources, id: \.self.id) { feedSource in
+                                        VStack(alignment: .leading) {
+                                            Text(feedSource.title)
+                                                .font(.system(size: 16))
+                                                .padding(.top, Spacing.regular)
+                                                .padding(.bottom, 2)
+
+                                            Text(feedSource.url)
+                                                .font(.system(size: 12))
+                                                .padding(.top, 0)
+                                                .padding(.bottom, Spacing.regular)
 
-                            Section {
-                                ForEach(feedSourceState.feedSources, id: \.self.id) { feedSource in
-                                    VStack(alignment: .leading) {
-                                        Text(feedSource.title)
-                                            .font(.system(size: 16))
-                                            .padding(.top, Spacing.regular)
-                                            .padding(.bottom, 2)
-
-                                        Text(feedSource.url)
-                                            .font(.system(size: 12))
-                                            .padding(.top, 0)
-                                            .padding(.bottom, Spacing.regular)
-
-                                    }
-                                    .padding(.horizontal, Spacing.small)
-                                    .id(feedSource.id)
-                                    .contextMenu {
-                                        Button {
-                                            deleteFeedSource(feedSource)
-                                        } label: {
-                                            Label(
-                                                localizer.delete_feed.localized,
-                                                systemImage: "trash"
-                                            )
+                                        }
+                                        .padding(.horizontal, Spacing.small)
+                                        .id(feedSource.id)
+                                        .contextMenu {
+                                            Button {
+                                                deleteFeedSource(feedSource)
+                                            } label: {
+                                                Label(
+                                                    localizer.delete_feed.localized,
+                                                    systemImage: "trash"
+                                                )
+                                            }
                                         }
                                     }
+                                },
+                                label: {
+                                    Text(feedSourceState.categoryName ?? localizer.no_category.localized)
+                                        .font(.system(size: 16))
+                                        .foregroundStyle(Color(UIColor.label))
+                                        .bold()
+                                        .padding(Spacing.regular)
                                 }
-
-                            } header: {
-                                Text(feedSourceState.categoryName ?? localizer.no_category.localized)
-                                    .font(.system(size: 16))
-                                    .foregroundStyle(Color(UIColor.label))
-                                    .bold()
-                                    .padding(.horizontal, Spacing.small)
-
-                            }
-                            .textCase(nil)
+                            )
                             .listRowInsets(
                                 EdgeInsets(
                                     top: .zero,
@@ -108,15 +111,15 @@ private struct FeedSourceListContent: View {
                             )
                         }
                     }
-
-                    .listStyle(.sidebar)
-                    .scrollContentBackground(.hidden)
-
+                    .padding(.top, -Spacing.medium)
                     .sheet(isPresented: $showAddFeed) {
                         AddFeedScreen()
                     }
                 }
+
+                Spacer()
             }
+            .scrollContentBackground(.hidden)
             .toolbar {
                 ToolbarItem(placement: .navigationBarLeading) {
                     Button(

diff --git a/iosApp/Source/Settings/ImportExport/ImportExportScreen.swift b/iosApp/Source/Settings/ImportExport/ImportExportScreen.swift
@@ -3,7 +3,7 @@
 //  FeedFlow
 //
 //  Created by Marco Gomiero on 01/09/23.
-//  Copyright © 2023 orgName. All rights reserved.
+//  Copyright © 2023 FeedFlow. All rights reserved.
 //
 
 import SwiftUI

diff --git a/iosApp/Source/Settings/ImportExport/ImportExportSheetToShow.swift b/iosApp/Source/Settings/ImportExport/ImportExportSheetToShow.swift
@@ -3,7 +3,7 @@
 //  FeedFlow
 //
 //  Created by Marco Gomiero on 01/09/23.
-//  Copyright © 2023 orgName. All rights reserved.
+//  Copyright © 2023 FeedFlow. All rights reserved.
 //
 
 import Foundation

diff --git a/iosApp/Source/UI/Components/HtmlView.swift b/iosApp/Source/UI/Components/HtmlView.swift
@@ -3,7 +3,7 @@
 //  FeedFlow
 //
 //  Created by Marco Gomiero on 22/07/23.
-//  Copyright © 2023 orgName. All rights reserved.
+//  Copyright © 2023 FeedFlow. All rights reserved.
 //
 
 import WebKit