Fix comment button

Author: SubvertDev

Packages/Sources/ArticleFeature/ArticleScreen.swift

@@ -291,42 +291,49 @@ public struct ArticleScreen: View {
             }
 
             HStack(alignment: .bottom, spacing: 8) {
-                TextField("Message", text: $store.commentText.removeDuplicates(), axis: .vertical)
-                    .font(.subheadline)
-                    .foregroundStyle(Color.Labels.primary)
-                    .lineLimit(1...10)
-                    .focused($focus, equals: ArticleFeature.State.Field.comment)
-                    .padding(.horizontal, 8)
-                    .padding(.vertical, 7)
-                    .background(Color.Background.teritary)
-                    .clipShape(RoundedRectangle(cornerRadius: 18))
-                    .overlay {
-                        RoundedRectangle(cornerRadius: 18)
-                            .stroke(Color.Separator.secondary, lineWidth: 0.33)
+                TextField(text: $store.commentText.removeDuplicates()) {
+                    Text("Comment...", bundle: .module)
+                        .font(.subheadline)
+                        .foregroundStyle(Color.Labels.quintuple)
+                }
+                .font(.subheadline)
+                .foregroundStyle(Color.Labels.primary)
+                .lineLimit(1...10)
+                .focused($focus, equals: ArticleFeature.State.Field.comment)
+                .padding(.horizontal, 8)
+                .padding(.vertical, 7)
+                .background(Color.Background.teritary)
+                .clipShape(RoundedRectangle(cornerRadius: 18))
+                .overlay {
+                    RoundedRectangle(cornerRadius: 18)
+                        .stroke(Color.Separator.secondary, lineWidth: 0.33)
                     }
 
-                Button {
-                    store.send(.sendCommentButtonTapped)
-                } label: {
-                    ZStack {
-                        Circle()
-                            .fill(tintColor)
-                        
-                        if store.isUploadingComment {
-                            ProgressView()
-                                .progressViewStyle(.circular)
-                                .tint(Color.Labels.primaryInvariably)
-                        } else {
-                            Image(systemSymbol: .arrowUp)
-                                .font(.body)
-                                .fontWeight(.medium)
-                                .foregroundStyle(Color.Labels.primaryInvariably)
+                if !store.commentText.isEmpty {
+                    Button {
+                        store.send(.sendCommentButtonTapped)
+                    } label: {
+                        ZStack {
+                            Circle()
+                                .fill(tintColor)
+                            
+                            if store.isUploadingComment {
+                                ProgressView()
+                                    .progressViewStyle(.circular)
+                                    .tint(Color.Labels.primaryInvariably)
+                            } else {
+                                Image(systemSymbol: .arrowUp)
+                                    .font(.body)
+                                    .fontWeight(.medium)
+                                    .foregroundStyle(Color.Labels.primaryInvariably)
+                            }
                         }
+                        .frame(width: 34, height: 34)
                     }
-                    .frame(width: 34, height: 34)
+                    .disabled(store.isUploadingComment)
                 }
-                .disabled(store.isUploadingComment)
             }
+            .animation(.default, value: store.commentText.isEmpty)
         }
         .padding(.horizontal, 12)
         .padding(.top, 8)
@@ -491,7 +498,9 @@ extension UIApplication {
 }
 
 #Preview("Test comments") {
-    NavigationStack {
+    @Shared(.userSession) var userSession
+    userSession = UserSession(userId: 1, token: "1", isHidden: false)
+    return NavigationStack {
         ArticleScreen(
             store: Store(
                 initialState: ArticleFeature.State(

Packages/Sources/ArticleFeature/Resources/Localizable.xcstrings

@@ -51,6 +51,16 @@
         }
       }
     },
+    "Comment..." : {
+      "localizations" : {
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Комментарий..."
+          }
+        }
+      }
+    },
     "Comments (%@):" : {
       "localizations" : {
         "ru" : {
@@ -121,16 +131,6 @@
         }
       }
     },
-    "Message" : {
-      "localizations" : {
-        "ru" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Сообщение"
-          }
-        }
-      }
-    },
     "OK" : {
       "localizations" : {
         "ru" : {

Packages/Sources/Models/Articles/ArticlePreview.swift

@@ -59,7 +59,7 @@ public struct ArticlePreview: Sendable, Hashable, Identifiable {
 public extension ArticlePreview {
     static let mock = ArticlePreview(
         id: 123456,
-        date: Date(timeIntervalSince1970: 1234567890),
+        date: Date.now,
         authorId: 123456,
         authorName: "Lorem Ipsum",
         commentsAmount: 69,