群组折叠查看更多按钮改为查看全部

Finb · Dec 30, 2024 · c1c7ba3 · c1c7ba3
1 parent eb77151
commit c1c7ba3
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 21 deletions.
diff --git a/Bark/Localizable.xcstrings b/Bark/Localizable.xcstrings
@@ -3151,48 +3151,48 @@
         }
       }
     },
-    "viewAllSounds" : {
+    "viewAllMessages" : {
       "extractionState" : "manual",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Click here to view all available sounds."
+            "value" : "View all %d messages"
           }
         },
         "tr" : {
           "stringUnit" : {
-            "state" : "translated",
-            "value" : "Mevcut tüm sesleri görüntülemek için buraya tıklayın."
+            "state" : "needs_review",
+            "value" : "Tüm %d mesajı görüntüle"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
-            "state" : "translated",
-            "value" : "查看所有铃声"
+            "state" : "needs_review",
+            "value" : "查看全部%d条消息"
           }
         }
       }
     },
-    "viewMoreMessages" : {
+    "viewAllSounds" : {
       "extractionState" : "manual",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "View %d More Messages"
+            "value" : "Click here to view all available sounds."
           }
         },
         "tr" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "%d Daha Mesaj Görüntüle"
+            "value" : "Mevcut tüm sesleri görüntülemek için buraya tıklayın."
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "查看更多%d条消息"
+            "value" : "查看所有铃声"
           }
         }
       }

diff --git a/Controller/MessageListViewController.swift b/Controller/MessageListViewController.swift
@@ -171,7 +171,7 @@ class MessageListViewController: BaseViewController<MessageListViewModel> {
                     guard let self else { return }
                     self.alertMessage(message: message.attributedText?.string ?? "", sourceView: sourceView)
                 }
-                cell.cellData = (title, max(0, totalCount - messages.count), messages)
+                cell.cellData = (title, totalCount, messages)
                 cell.isExpanded = self.expandedGroup.contains(title)
                 return cell
             }

diff --git a/Model/MessageSection.swift b/Model/MessageSection.swift
@@ -28,6 +28,9 @@ enum MessageListCellItem: Equatable {
             if lMessages.first?.dateText != rMessages.first?.dateText {
                 return false
             }
+            if lMessages.count != rMessages.count {
+                return false
+            }
             for (lMessage, rMessage) in zip(lMessages, rMessages) {
                 if lMessage.id != rMessage.id {
                     return false

diff --git a/View/MessageList/MessageGroupMoreView.swift b/View/MessageList/MessageGroupMoreView.swift
@@ -25,7 +25,7 @@ class MessageGroupMoreView: UIView {
 
     var count: Int = 0 {
         didSet {
-            moreLabel.text = NSLocalizedString("viewMoreMessages").format(count)
+            moreLabel.text = NSLocalizedString("viewAllMessages").format(count)
         }
     }
 

diff --git a/View/MessageList/MessageTableViewCell.swift b/View/MessageList/MessageTableViewCell.swift
@@ -95,9 +95,9 @@ class MessageGroupTableViewCell: UITableViewCell {
     }
 
     /// 剩余消息数量
-    private var moreCount: Int = 0 {
+    private var totalCount: Int = 0 {
         didSet {
-            moreView.count = moreCount
+            moreView.count = totalCount
         }
     }
 
@@ -115,10 +115,10 @@ class MessageGroupTableViewCell: UITableViewCell {
         }
     }
 
-    var cellData: (groupName: String?, moreCount: Int, messages: [MessageItemModel])? {
+    var cellData: (groupName: String?, totalCount: Int, messages: [MessageItemModel])? {
         didSet {
             groupName = cellData?.groupName ?? ""
-            moreCount = cellData?.moreCount ?? 0
+            totalCount = cellData?.totalCount ?? 0
             messages = cellData?.messages ?? []
         }
     }
@@ -236,11 +236,7 @@ class MessageGroupTableViewCell: UITableViewCell {
                         make.top.equalTo(messageViews[index - 1].snp.bottom).offset(8)
                     }
                     if index == maxCount - 1 {
-                        if moreCount > 0 {
-                            make.bottom.equalTo(moreView.snp.top).offset(-18)
-                        } else {
-                            make.bottom.equalToSuperview().offset(-18)
-                        }
+                        make.bottom.equalTo(moreView.snp.top).offset(-18)
                     }
                     item.transform = .identity
                 } else {