Make TopicBuilder as separate module

Author: SubvertDev

ForPDA.xcodeproj/project.pbxproj

@@ -13,6 +13,7 @@ import ParsingClient
 import Models
 import PersistenceKeys
 import AnalyticsClient
+import TopicBuilder
 
 @Reducer
 public struct AnnouncementFeature: Reducer, Sendable {

Modules/Sources/AnnouncementFeature/AnnouncementFeature.swift

@@ -8,7 +8,7 @@
 import SwiftUI
 import ComposableArchitecture
 import PageNavigationFeature
-import TopicFeature
+import TopicBuilder
 import SFSafeSymbols
 import SharedUI
 import Models

Modules/Sources/AnnouncementFeature/AnnouncementScreen.swift

@@ -134,18 +134,6 @@ public struct PageNavigation: View {
     }
 }
 
-// MARK: - Model Extensions
-
-extension NoticeType {
-    public var color: Color {
-        switch self {
-        case .curator:   return Color(.Main.green)
-        case .moderator: return Color(.Theme.primary)
-        case .admin:     return Color(.Main.red)
-        }
-    }
-}
-
 // MARK: - Previews
 
 #Preview {

Modules/Sources/PageNavigationFeature/PageNavigationView.swift

@@ -0,0 +1,37 @@
+{
+  "sourceLanguage" : "en",
+  "strings" : {
+    "Code" : {
+      "localizations" : {
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Код"
+          }
+        }
+      }
+    },
+    "Code: " : {
+      "comment" : "Has space after colon",
+      "localizations" : {
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Код: "
+          }
+        }
+      }
+    },
+    "Hidden text" : {
+      "localizations" : {
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Скрытый текст"
+          }
+        }
+      }
+    }
+  },
+  "version" : "1.0"
+}

Modules/Sources/TopicBuilder/Resources/Localizable.xcstrings

@@ -12,6 +12,7 @@ import SFSafeSymbols
 import Models
 import Sharing
 import Dependencies
+import CacheClient
 
 public struct TopicView: View {
 
@@ -343,12 +344,12 @@ struct CodeView: View {
                 Group {
                     switch info {
                     case .none:
-                        Text("Код")
+                        Text("Code", bundle: .module)
                             .foregroundStyle(Color(.Labels.primary))
 
                     case let .title(title):
                         HStack {
-                            Text("Код: ")
+                            Text("Code: ", bundle: .module)
                                 .foregroundStyle(Color(.Labels.teritary))
                             Text(title)
                                 .foregroundStyle(Color(.Labels.primary))
@@ -446,7 +447,7 @@ struct HideView: View {
             if isShown {
                 VStack(spacing: 0) {
                     HStack(spacing: 0) {
-                        Text("Скрытый текст")
+                        Text("Hidden text", bundle: .module)
                             .foregroundStyle(Color(.Labels.primary))
                             .font(.callout)
                             .frame(maxWidth: .infinity, alignment: .leading)
@@ -478,6 +479,7 @@ struct HideView: View {
         }
         .animation(.default, value: isShown)
         .task {
+            // TODO: What is happening here?
             @Dependency(\.cacheClient) var cache
             if let userId = shouldLoadUser, let info {
                 if let currentUser = await cache.getUser(userId) {
@@ -537,6 +539,18 @@ struct NoticeView: View {
     }
 }
 
+// MARK: - Extensions
+
+public extension NoticeType {
+    var color: Color {
+        switch self {
+        case .curator:   return Color(.Main.green)
+        case .moderator: return Color(.Theme.primary)
+        case .admin:     return Color(.Main.red)
+        }
+    }
+}
+
 // MARK: - Previews
 
 #Preview("Code View") {

Modules/Sources/TopicFeature/TopicNodeBuilder.swift renamed to Modules/Sources/TopicBuilder/TopicNodeBuilder.swift

@@ -21,78 +21,48 @@
         }
       }
     },
-    "Open In Browser" : {
-      "localizations" : {
-        "ru" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Открыть в браузере"
-          }
-        }
-      }
-    },
-    "Remove from favorites" : {
-      "localizations" : {
-        "ru" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Удалить из избранного"
-          }
-        }
-      }
-    },
-    "Код" : {
+    "Edited: %@ • %@" : {
       "localizations" : {
-        "ru" : {
+        "en" : {
           "stringUnit" : {
-            "state" : "translated",
-            "value" : "Code"
+            "state" : "new",
+            "value" : "Edited: %1$@ • %2$@"
           }
-        }
-      }
-    },
-    "Код: " : {
-      "localizations" : {
+        },
         "ru" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Code:"
+            "value" : "Отредактировал: %1$@ • %2$@"
           }
         }
       }
     },
-    "Отредактировал: %@ • %@" : {
+    "Open In Browser" : {
       "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Отредактировал: %1$@ • %2$@"
-          }
-        },
         "ru" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Edited by: %1$@ • %2$@"
+            "value" : "Открыть в браузере"
           }
         }
       }
     },
-    "Причина: %@" : {
+    "Reason: %@" : {
       "localizations" : {
         "ru" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Reason: %@"
+            "value" : "Причина: %@"
           }
         }
       }
     },
-    "Скрытый текст" : {
+    "Remove from favorites" : {
       "localizations" : {
         "ru" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Hidden text"
+            "value" : "Удалить из избранного"
           }
         }
       }

Modules/Sources/TopicFeature/TopicView.swift renamed to Modules/Sources/TopicBuilder/TopicView.swift

@@ -16,6 +16,7 @@ import PasteboardClient
 import NotificationCenterClient
 import TCAExtensions
 import AnalyticsClient
+import TopicBuilder
 
 @Reducer
 public struct TopicFeature: Reducer, Sendable {

Modules/Sources/TopicFeature/Resources/Localizable.xcstrings

@@ -13,6 +13,7 @@ import SharedUI
 import NukeUI
 import Models
 import ParsingClient
+import TopicBuilder
 
 public struct TopicScreen: View {
 
@@ -237,9 +238,9 @@ public struct TopicScreen: View {
     @ViewBuilder
     private func PostFooter(_ lastEdit: Post.LastEdit) -> some View {
         VStack(alignment: .leading, spacing: 6) {
-            Text("Отредактировал: \(lastEdit.username) • \(lastEdit.date.formatted())")
+            Text("Edited: \(lastEdit.username) • \(lastEdit.date.formatted())", bundle: .module)
             if !lastEdit.reason.isEmpty {
-                Text("Причина: \(lastEdit.reason)")
+                Text("Reason: \(lastEdit.reason)", bundle: .module)
             }
         }
         .font(.caption2)