UI polish (#309)

Author: trevor-e

.github/workflows/ios_emerge_upload_main.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   build:
-    runs-on: macos-14
+    runs-on: macos-15
 
     defaults:
       run:
@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Select Xcode version
-        run: sudo xcode-select -s '/Applications/Xcode_15.4.app/Contents/Developer'
+        run: sudo xcode-select -s '/Applications/Xcode_16.2.app/Contents/Developer'
 
       - name: Set up Ruby env
         uses: ruby/setup-ruby@v1

.github/workflows/ios_emerge_upload_pr.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   build:
-    runs-on: macos-14
+    runs-on: macos-15
 
     defaults:
       run:
@@ -18,7 +18,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Select Xcode version
-        run: sudo xcode-select -s '/Applications/Xcode_15.4.app/Contents/Developer'
+        run: sudo xcode-select -s '/Applications/Xcode_16.2.app/Contents/Developer'
 
       - name: Set up Ruby env
         uses: ruby/setup-ruby@v1

.github/workflows/ios_emerge_upload_snapshots.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   upload_emerge_snapshots:
-    runs-on: macos-14
+    runs-on: macos-15
 
     defaults:
       run:
@@ -20,7 +20,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Select Xcode version
-        run: sudo xcode-select -s '/Applications/Xcode_15.4.app/Contents/Developer'
+        run: sudo xcode-select -s '/Applications/Xcode_16.2.app/Contents/Developer'
 
       - name: Set up Ruby env
         uses: ruby/setup-ruby@v1
@@ -37,15 +37,15 @@ jobs:
           EMERGE_API_TOKEN: ${{ secrets.EMERGE_API_KEY }}
 
   upload_swift_snapshot_testing_snapshots:
-    runs-on: macos-14
+    runs-on: macos-15
     defaults:
       run:
         working-directory: ./ios
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Select Xcode version
-        run: sudo xcode-select -s '/Applications/Xcode_15.4.app/Contents/Developer'
+        run: sudo xcode-select -s '/Applications/Xcode_16.2.app/Contents/Developer'
       - name: Set up App Store Connect API Key
         run: |
           ABSOLUTE_KEY_PATH="$(pwd)/app_store_key.p8"
@@ -59,7 +59,7 @@ jobs:
           xcodebuild test \
             -scheme HackerNews \
             -sdk iphonesimulator \
-            -destination 'platform=iOS Simulator,name=iPhone 15 Pro,OS=18.1' \
+            -destination 'platform=iOS Simulator,name=iPhone 16 Pro,OS=18.1' \
             -only-testing:HackerNewsTests/SwiftSnapshotTest \
             -allowProvisioningUpdates \
             -authenticationKeyPath "$AUTH_KEY_PATH" \

ios/HackerNews.xcodeproj/project.pbxproj

@@ -109,8 +109,8 @@
 		A42705AA2A4296BA0057E439 /* FeedScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedScreen.swift; sourceTree = "<group>"; };
 		A42705AC2A429D2E0057E439 /* HNApi.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HNApi.swift; sourceTree = "<group>"; };
 		A434C2DF2A8E75960002F488 /* WebView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebView.swift; sourceTree = "<group>"; };
-		A435EF3D2C08F2A9005BF473 /* HackerNews.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = HackerNews.entitlements; path = ../HackerNews.entitlements; sourceTree = "<group>"; };
 		A439A8EB2D4194B100452940 /* Font.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Font.swift; sourceTree = "<group>"; };
+		A439A8ED2D429E2500452940 /* HackerNews.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = HackerNews.entitlements; sourceTree = "<group>"; };
 		A45C2C7D2A5DDE25009BC030 /* README.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.txt; sourceTree = "<group>"; };
 		A45C2C7E2A5DDE25009BC030 /* Pluginfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Pluginfile; sourceTree = "<group>"; };
 		A45C2C7F2A5DDE25009BC030 /* Appfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Appfile; sourceTree = "<group>"; };
@@ -216,8 +216,8 @@
 			isa = PBXGroup;
 			children = (
 				A42705AC2A429D2E0057E439 /* HNApi.swift */,
-				A423B0672BAE05FB00267DDB /* NetworkDebugger.swift */,
 				EC70E1602D1DD82B00582023 /* HNWebClient.swift */,
+				A423B0672BAE05FB00267DDB /* NetworkDebugger.swift */,
 			);
 			path = Network;
 			sourceTree = "<group>";
@@ -257,14 +257,15 @@
 				1DF162042A436E8D001A3F76 /* Network */,
 				A439A8E72D418D1100452940 /* Settings */,
 				A439A8E42D418CC900452940 /* Stories */,
-				A439A8E22D418C9A00452940 /* Supporting Files */,
 				1DF162012A436E6E001A3F76 /* Utils */,
 				A439A8E62D418D0300452940 /* Web */,
 				A42705A62A42949D0057E439 /* AppViewModel.swift */,
 				A427057E2A4293B10057E439 /* ContentView.swift */,
 				A427057C2A4293B10057E439 /* HNApp.swift */,
 				A42705802A4293B20057E439 /* Assets.xcassets */,
 				A42705832A4293B20057E439 /* Preview Assets.xcassets */,
+				A45C2CBB2A5F0A41009BC030 /* Hacker-News-Info.plist */,
+				A439A8ED2D429E2500452940 /* HackerNews.entitlements */,
 			);
 			path = HackerNews;
 			sourceTree = "<group>";
@@ -289,23 +290,14 @@
 			path = HackerNewsUITests;
 			sourceTree = "<group>";
 		};
-		A439A8E22D418C9A00452940 /* Supporting Files */ = {
-			isa = PBXGroup;
-			children = (
-				A435EF3D2C08F2A9005BF473 /* HackerNews.entitlements */,
-				A45C2CBB2A5F0A41009BC030 /* Hacker-News-Info.plist */,
-			);
-			path = "Supporting Files";
-			sourceTree = "<group>";
-		};
 		A439A8E32D418CB500452940 /* Comments */ = {
 			isa = PBXGroup;
 			children = (
-				A48C0DE92A9819E00034CC0A /* CommentsViewModel.swift */,
-				A48C0DE62A9818A50034CC0A /* CommentsScreen.swift */,
+				ECC0BC8B2D39CDCB00ABB263 /* CommentComposer.swift */,
 				A47309B52AA7D1F600201376 /* CommentRow.swift */,
 				EC0B1C742D1A34110000C3AC /* CommentsHeader.swift */,
-				ECC0BC8B2D39CDCB00ABB263 /* CommentComposer.swift */,
+				A48C0DE62A9818A50034CC0A /* CommentsScreen.swift */,
+				A48C0DE92A9819E00034CC0A /* CommentsViewModel.swift */,
 			);
 			path = Comments;
 			sourceTree = "<group>";
@@ -465,7 +457,6 @@
 				A42705762A4293B10057E439 /* Frameworks */,
 				A42705772A4293B10057E439 /* Resources */,
 				A42705AE2A44C35D0057E439 /* Strip Symbols */,
-				F52059CED4FD476981550295 /* Upload Debug Symbols to Sentry */,
 				A4D28AE92C237BAE007F20D0 /* Embed Frameworks */,
 			);
 			buildRules = (
@@ -623,22 +614,6 @@
 			shellPath = /bin/sh;
 			shellScript = "#!/bin/bash\nset -e\n\nif [ \"Release\" = \"${CONFIGURATION}\" ]; then\n  # Path to the app directory\n  APP_DIR_PATH=\"${BUILT_PRODUCTS_DIR}/${EXECUTABLE_FOLDER_PATH}\"\n  # Strip main binary\n  strip -rSTx \"${APP_DIR_PATH}/${EXECUTABLE_NAME}\"\n  # Path to the Frameworks directory\n  APP_FRAMEWORKS_DIR=\"${APP_DIR_PATH}/Frameworks\"\n\n  # Strip symbols from frameworks, if Frameworks/ exists at all\n  # ... as long as the framework is NOT signed by Apple\n  if [ -d \"${APP_FRAMEWORKS_DIR}\" ]\n  then\n    find \"${APP_FRAMEWORKS_DIR}\" -type f -perm +111 -maxdepth 2 -mindepth 2 -exec bash -c '\n    codesign -v -R=\"anchor apple\" \"{}\" &> /dev/null ||\n    (\n        echo \"Stripping {}\" &&\n        if [ -w \"{}\" ]; then\n            strip -rSTx \"{}\"\n        else\n            echo \"Warning: No write permission for {}\"\n        fi\n    )\n    ' \\;\n  fi\nfi\n";
 		};
-		F52059CED4FD476981550295 /* Upload Debug Symbols to Sentry */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Resources/DWARF/${TARGET_NAME}",
-			);
-			name = "Upload Debug Symbols to Sentry";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "# This script is responsable to upload debug symbols and source context for Sentry.\nif which sentry-cli >/dev/null; then\nexport SENTRY_ORG=emerge-tools\nexport SENTRY_PROJECT=hackernews-ios\nERROR=$(sentry-cli debug-files upload --include-sources \"$DWARF_DSYM_FOLDER_PATH\" 2>&1 >/dev/null)\nif [ ! $? -eq 0 ]; then\necho \"warning: sentry-cli - $ERROR\"\nfi\nelse\necho \"warning: sentry-cli not installed, download from https://github.com/getsentry/sentry-cli/releases\"\nfi\n";
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */

ios/HackerNews/AppViewModel.swift

@@ -6,8 +6,8 @@
 //
 
 import Foundation
-import SwiftUI
 import SwiftData
+import SwiftUI
 
 enum FeedType: CaseIterable {
   case top
@@ -119,9 +119,9 @@ enum StoryState: Identifiable {
 
   var id: Int64 {
     switch self {
-    case .loading(id: let id):
+    case .loading(let id):
       return id
-    case .loaded(content: let content):
+    case .loaded(let content):
       return content.id
     case .nextPage:
       return Int64.max
@@ -134,27 +134,27 @@ enum AuthState {
   case loggedOut
 }
 
-@MainActor
-class AppViewModel: ObservableObject {
+@Observable @MainActor
+final class AppViewModel {
 
   enum AppNavigation: Codable, Hashable {
     case webLink(url: URL, title: String)
     case storyComments(story: Story)
   }
 
-  @Published var authState: AuthState
-  @Published var showLoginSheet: Bool = false
-  @Published var feedState = FeedState()
-  @Published var navigationPath = NavigationPath()
-  @Published var bookmarks: [Bookmark]
+  var authState: AuthState
+  var showLoginSheet: Bool = false
+  var feedState = FeedState()
+  var navigationPath = NavigationPath()
+  var bookmarks: [Bookmark]
 
   private let bookmarkStore: BookmarksDataStore
   private let api = HNApi()
   private let webClient = HNWebClient()
 
   private var pager = Pager()
   private let cookieStorage = HTTPCookieStorage.shared
-  private var loadingTask: Task<Void, Never>?
+  @ObservationIgnored private var loadingTask: Task<Void, Never>?
 
   init(bookmarkStore: BookmarksDataStore) {
     self.bookmarkStore = bookmarkStore
@@ -195,7 +195,7 @@ class AppViewModel: ObservableObject {
     }
     let nextPage = pager.nextPage()
     let items = await api.fetchPage(page: nextPage)
-    feedState.stories.removeLast() // remove the loading view
+    feedState.stories.removeLast()  // remove the loading view
     feedState.stories += items.map { story in
       let bookmarked = bookmarkStore.containsBookmark(with: story.id)
       return .loaded(content: story.toStoryContent(bookmarked: bookmarked))
@@ -207,7 +207,6 @@ class AppViewModel: ObservableObject {
     bookmarks = bookmarkStore.fetchBookmarks()
   }
 
-
   private func isLoggedIn() -> Bool {
     return cookieStorage.cookies?.isEmpty == false
   }
@@ -217,7 +216,7 @@ class AppViewModel: ObservableObject {
   }
 
   func gotoLogin() {
-    if (authState == .loggedOut) {
+    if authState == .loggedOut {
       showLoginSheet = true
     } else {
       cookieStorage.removeCookies()
@@ -252,7 +251,7 @@ class AppViewModel: ObservableObject {
   }
 
   func loginSubmit(username: String, password: String) async {
-    let status = await webClient.login(acct: username, pw: password   )
+    let status = await webClient.login(acct: username, pw: password)
     print("Login Status: \(status)")
     switch status {
     case .success:

ios/HackerNews/Auth/LoginScreen.swift

@@ -19,7 +19,7 @@ enum LoginStatus {
 }
 
 struct LoginScreen: View {
-  @ObservedObject var model: AppViewModel
+  @Binding var model: AppViewModel
   @State var loginState = LoginState()
 
   var body: some View {
@@ -67,5 +67,8 @@ struct LoginScreen: View {
 }
 
 #Preview {
-  LoginScreen(model: AppViewModel(bookmarkStore: FakeBookmarkDataStore()))
+  @Previewable @State var model = AppViewModel(
+    bookmarkStore: FakeBookmarkDataStore()
+  )
+  LoginScreen(model: $model)
 }

ios/HackerNews/Bookmarks/BookmarksScreen.swift

@@ -9,13 +9,13 @@ import Foundation
 import SwiftUI
 
 struct BookmarksScreen: View {
-  @ObservedObject var model: AppViewModel
+  @Binding var model: AppViewModel
 
   var body: some View {
     Group {
       if model.bookmarks.isEmpty {
         ZStack {
-          Text("Long press a story to bookmark it.")
+          Text("Swipe a story to bookmark it.")
             .font(.ibmPlexSans(.medium, size: 18))
         }
       } else {
@@ -25,7 +25,7 @@ struct BookmarksScreen: View {
               .frame(height: 60)
             ForEach(model.bookmarks, id: \.id) { bookmark in
               StoryRow(
-                model: model,
+                model: $model,
                 state: .loaded(content: bookmark.toStoryContent())
               )
 
@@ -59,7 +59,9 @@ struct BookmarksScreen: View {
 }
 
 #Preview {
+  @Previewable @State var model = AppViewModel(
+    bookmarkStore: FakeBookmarkDataStore())
   BookmarksScreen(
-    model: AppViewModel(bookmarkStore: FakeBookmarkDataStore())
+    model: $model
   )
 }

ios/HackerNews/Comments/CommentsScreen.swift

@@ -50,6 +50,7 @@ struct CommentsScreen: View {
           ProgressView()
             .progressViewStyle(CircularProgressViewStyle())
             .scaleEffect(2)
+            .padding(24)
         case .loaded(let comments):
           ForEach(comments, id: \.id) { commentState in
             CommentRow(
@@ -81,11 +82,11 @@ struct CommentsScreen: View {
       .padding(8)
     }
     .overlay(alignment: .bottom) {
-      if (model.state.postCommentState != nil) {
+      if model.state.postCommentState != nil {
         CommentComposer(
           state: Binding(
             get: { model.state.postCommentState! },
-            set: { model.state.postCommentState = $0}
+            set: { model.state.postCommentState = $0 }
           ),
           goToLogin: {
             model.goToLogin()
@@ -111,7 +112,7 @@ struct CommentsScreen: View {
       let viewModel = CommentsViewModel(
         story: PreviewHelpers.makeFakeStory(kids: comments.map { $0.id }),
         auth: .loggedIn,
-        navigation: {_ in}
+        navigation: { _ in }
       )
       viewModel.state.comments = .loaded(comments: comments)
       return PreviewVariants {