Merge branch 'develop' into feature/metrics

Author: SubvertDev

.github/workflows/main.yaml

@@ -0,0 +1,24 @@
+name: Github Telegram Notifier
+
+on:
+  push:
+  pull_request:
+  create:
+  delete:
+  issues:
+  issue_comment:
+  pull_request_review:
+  pull_request_review_comment:
+  fork:
+  watch:
+  release:
+
+jobs:
+  notify:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Send Telegram Notification
+        uses: EverythingSuckz/[email protected]
+        with:
+          bot_token: ${{ secrets.TG_BOT_TOKEN }}
+          chat_id: ${{ secrets.TG_CHAT_ID }}

Configs/App.xcconfig

@@ -1,3 +1,3 @@
 #include "Secrets.xcconfig"
 MARKETING_VERSION = 0.8.0
-CURRENT_PROJECT_VERSION = 629
+CURRENT_PROJECT_VERSION = 644

ForPDA.xcodeproj/project.pbxproj

@@ -50,7 +50,7 @@ public struct APIClient: Sendable {
     public var getHistory: @Sendable (_ offset: Int, _ perPage: Int) async throws -> History
 
     // Favorites
-    public var getFavorites: @Sendable (_ request: FavoritesRequest, _ policy: CachePolicy) async throws -> AsyncThrowingStream<[FavoriteInfo], any Error>
+    public var getFavorites: @Sendable (_ request: FavoritesRequest, _ policy: CachePolicy) async throws -> AsyncThrowingStream<Favorite, any Error>
     public var setFavorite: @Sendable (_ request: SetFavoriteRequest) async throws -> Bool
     public var notifyFavorite: @Sendable (_ request: NotifyFavoriteRequest) async throws -> Bool
     public var readAllFavorites: @Sendable () async throws -> Bool
@@ -244,8 +244,8 @@ extension APIClient: DependencyKey {
                         )
                         let response = try await api.get(command)
                         let favorites = try await parser.parseFavorites(response)
-                        await cache.setFavorites(favorites.favorites)
-                        return favorites.favorites
+                        await cache.setFavorites(favorites)
+                        return favorites
                     },
                     policy: policy
                 )

Modules/Sources/APIClient/APIClient.swift

@@ -29,8 +29,8 @@ public struct CacheClient: Sendable {
     public var getUser: @Sendable (_ id: Int) async -> User?
 
     // Favorites
-    public var setFavorites: @Sendable ([FavoriteInfo]) async -> Void
-    public var getFavorites: @Sendable () async -> [FavoriteInfo]?
+    public var setFavorites: @Sendable (Favorite) async -> Void
+    public var getFavorites: @Sendable () async -> Favorite?
 
     // Forums List
     public var setForumsList: @Sendable ([ForumInfo]) async -> Void
@@ -200,12 +200,12 @@ private extension CacheClient {
     }
 
     private static var favoritesKey: String { "favoritesKey" }
-    private static var favoritesStorage: Storage<String, [FavoriteInfo]> {
+    private static var favoritesStorage: Storage<String, Favorite> {
         return try! Storage(
             diskConfig: DiskConfig(name: "Favorites", expiry: .date(.days(30)), maxSize: .kilobytes(100)),
             memoryConfig: MemoryConfig(),
             fileManager: .default,
-            transformer: TransformerFactory.forCodable(ofType: [FavoriteInfo].self)
+            transformer: TransformerFactory.forCodable(ofType: Favorite.self)
         )
     }
 

Modules/Sources/CacheClient/CacheClient.swift

@@ -73,7 +73,7 @@ public struct FavoritesFeature: Reducer, Sendable {
 
         case sort(PresentationAction<SortFeature.Action>)
 
-        case _favoritesResponse(Result<[FavoriteInfo], any Error>)
+        case _favoritesResponse(Result<Favorite, any Error>)
         case _loadFavorites(offset: Int)
         case _startUnreadLoadingIndicator(id: Int)
         case _jumpRequestFailed
@@ -105,6 +105,7 @@ public struct FavoritesFeature: Reducer, Sendable {
             case .onAppear:
                 guard state.favorites.isEmpty && state.favoritesImportant.isEmpty else { return .none }
                 return .merge([
+                    updatePageNavigation(&state, offset: 0),
                     .send(._loadFavorites(offset: 0)),
                     .run { send in
                         for await _ in notificationCenter.observe(.favoritesUpdated) {
@@ -245,7 +246,7 @@ public struct FavoritesFeature: Reducer, Sendable {
                 var favsImportant: [FavoriteInfo] = []
                 var favorites: [FavoriteInfo] = []
 
-                for favorite in response {
+                for favorite in response.favorites {
                     if favorite.isImportant {
                         favsImportant.append(favorite)
                     } else {
@@ -257,14 +258,14 @@ public struct FavoritesFeature: Reducer, Sendable {
                 state.favorites = favorites
 
                 // TODO: Is it ok?
-                state.pageNavigation.count = response.count
+//                state.pageNavigation.count = response.count
 
                 state.isLoading = false
                 state.isRefreshing = false
 
                 reportFullyDisplayed(&state)
 
-                return .none
+                return updatePageNavigation(&state, count: response.favoritesCount)
 
             case let ._favoritesResponse(.failure(error)):
                 print("FAVORITES RESPONSE FAILURE: \(error)")
@@ -286,12 +287,26 @@ public struct FavoritesFeature: Reducer, Sendable {
         }
     }
 
+    // MARK: - Shared logic
+    
     private func reportFullyDisplayed(_ state: inout State) {
         guard !state.didLoadOnce else { return }
         analyticsClient.reportFullyDisplayed()
         state.didLoadOnce = true
     }
 
+    private func updatePageNavigation(_ state: inout State, count: Int = 0, offset: Int? = nil) -> Effect<Action> {
+        return PageNavigationFeature()
+            .reduce(
+                into: &state.pageNavigation,
+                action: .update(
+                    count: count,
+                    offset: offset
+                )
+            )
+            .map(Action.pageNavigation)
+    }
+    
     private func goToEnd(id: Int) -> Effect<Action> {
         return .merge(
             .run { send in

Modules/Sources/FavoritesFeature/FavoritesFeature.swift

@@ -187,9 +187,7 @@ public struct FavoritesScreen: View {
     @ViewBuilder
     private func FavoritesSection(favorites: [FavoriteInfo], important: Bool) -> some View {
         Section {
-            if !important, store.pageNavigation.shouldShow {
-                PageNavigation(store: store.scope(state: \.pageNavigation, action: \.pageNavigation))
-            }
+            Navigation(isShown: !important)
 
             ForEach(favorites, id: \.hashValue) { favorite in
                 Row(
@@ -226,9 +224,7 @@ public struct FavoritesScreen: View {
             }
             .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
 
-            if !important, store.pageNavigation.shouldShow {
-                PageNavigation(store: store.scope(state: \.pageNavigation, action: \.pageNavigation))
-            }
+            Navigation(isShown: !important)
         } header: {
             if !favorites.isEmpty {
                 Header(title: important
@@ -239,6 +235,17 @@ public struct FavoritesScreen: View {
         .listRowBackground(Color(.Background.teritary))
     }
 
+    // MARK: - Navigation
+    
+    @ViewBuilder
+    private func Navigation(isShown: Bool) -> some View {
+        if isShown, store.pageNavigation.shouldShow {
+            PageNavigation(store: store.scope(state: \.pageNavigation, action: \.pageNavigation))
+                .listRowBackground(Color.clear)
+                .padding(.bottom, 4)
+        }
+    }
+    
     // MARK: - Row
 
     @ViewBuilder

Modules/Sources/FavoritesFeature/FavoritesScreen.swift

@@ -158,7 +158,7 @@ platform :ios do
         )
 
         version = get_xcconfig_value(path: 'Configs/App.xcconfig', name: 'MARKETING_VERSION')
-        build = sh("git rev-list --all --count").chomp.strip
+        build = get_xcconfig_value(path: 'Configs/App.xcconfig', name: 'CURRENT_PROJECT_VERSION')
 
         telegram(
             token: ENV['TG_BOT_TOKEN'],