Merge c6b44b23ce into 7d47834903

IceCubesApp/Resources/Localization/Localizable.xcstrings

@@ -15,6 +15,12 @@
             "value" : ""
           }
         },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : ""
+          }
+        },
         "eu" : {
           "stringUnit" : {
             "state" : "translated",
@@ -8593,8 +8599,8 @@
             "plural" : {
               "one" : {
                 "stringUnit" : {
-                  "state" : "needs_review",
+                  "state" : "translated",
-                  "value" : "%lld publicaciones nuevas"
+                  "value" : "%lld publicación nueva"
                 }
               },
               "other" : {
@@ -11797,8 +11803,8 @@
             "plural" : {
               "one" : {
                 "stringUnit" : {
-                  "state" : "needs_review",
+                  "state" : "translated",
-                  "value" : "%lld publicaciones"
+                  "value" : "%lld publicación"
                 }
               },
               "other" : {
@@ -12150,8 +12156,8 @@
             "plural" : {
               "one" : {
                 "stringUnit" : {
-                  "state" : "needs_review",
+                  "state" : "translated",
-                  "value" : "%lld campos"
+                  "value" : "%lld campo"
                 }
               },
               "other" : {
@@ -17102,8 +17108,8 @@
         },
         "es" : {
           "stringUnit" : {
-            "state" : "needs_review",
+            "state" : "translated",
-            "value" : "Moved To %@"
+            "value" : "Movido A %@"
           }
         },
         "eu" : {
@@ -17150,8 +17156,8 @@
         },
         "pl" : {
           "stringUnit" : {
-            "state" : "needs_review",
+            "state" : "translated",
-            "value" : "Moved To %@"
+            "value" : "Przeniesione do %@"
           }
         },
         "pt-BR" : {
@@ -34632,8 +34638,8 @@
         },
         "es" : {
           "stringUnit" : {
-            "state" : "needs_review",
+            "state" : "translated",
-            "value" : "New accounts"
+            "value" : "Cuentas nuevas"
           }
         },
         "eu" : {
@@ -34680,8 +34686,8 @@
         },
         "pl" : {
           "stringUnit" : {
-            "state" : "needs_review",
+            "state" : "translated",
-            "value" : "New accounts"
+            "value" : "Nowe konta"
           }
         },
         "pt-BR" : {
@@ -34751,8 +34757,8 @@
         },
         "es" : {
           "stringUnit" : {
-            "state" : "needs_review",
+            "state" : "translated",
-            "value" : "People not following you"
+            "value" : "Personas que no te siguen"
           }
         },
         "eu" : {
@@ -34799,8 +34805,8 @@
         },
         "pl" : {
           "stringUnit" : {
-            "state" : "needs_review",
+            "state" : "translated",
-            "value" : "People not following you"
+            "value" : "Osoby, które Cię nie obserwują"
           }
         },
         "pt-BR" : {
@@ -34870,8 +34876,8 @@
         },
         "es" : {
           "stringUnit" : {
-            "state" : "needs_review",
+            "state" : "translated",
-            "value" : "People you don't follow"
+            "value" : "Personas que no sigues"
           }
         },
         "eu" : {
@@ -34918,8 +34924,8 @@
         },
         "pl" : {
           "stringUnit" : {
-            "state" : "needs_review",
+            "state" : "translated",
-            "value" : "People you don't follow"
+            "value" : "Osoby, których nie obserwujesz"
           }
         },
         "pt-BR" : {
@@ -34989,8 +34995,8 @@
         },
         "es" : {
           "stringUnit" : {
-            "state" : "needs_review",
+            "state" : "translated",
-            "value" : "Unsolicited private mentions"
+            "value" : "Menciones privadas no solicitadas"
           }
         },
         "eu" : {
@@ -35037,8 +35043,8 @@
         },
         "pl" : {
           "stringUnit" : {
-            "state" : "needs_review",
+            "state" : "translated",
-            "value" : "Unsolicited private mentions"
+            "value" : "Niechciane prywatne wzmianki"
           }
         },
         "pt-BR" : {
@@ -35108,8 +35114,8 @@
         },
         "es" : {
           "stringUnit" : {
-            "state" : "needs_review",
+            "state" : "translated",
-            "value" : "Filtered notifications"
+            "value" : "Notificaciones filtradas"
           }
         },
         "eu" : {
@@ -35156,8 +35162,8 @@
         },
         "pl" : {
           "stringUnit" : {
-            "state" : "needs_review",
+            "state" : "translated",
-            "value" : "Filtered notifications"
+            "value" : "Powiadomienia filtrowane"
           }
         },
         "pt-BR" : {
@@ -35227,8 +35233,8 @@
         },
         "es" : {
           "stringUnit" : {
-            "state" : "needs_review",
+            "state" : "translated",
-            "value" : "Notifications Filter"
+            "value" : "Filtro de notificaciones"
           }
         },
         "eu" : {
@@ -35275,8 +35281,8 @@
         },
         "pl" : {
           "stringUnit" : {
-            "state" : "needs_review",
+            "state" : "translated",
-            "value" : "Notifications Filter"
+            "value" : "Filtr powiadomień"
           }
         },
         "pt-BR" : {
@@ -35346,8 +35352,8 @@
         },
         "es" : {
           "stringUnit" : {
-            "state" : "needs_review",
+            "state" : "translated",
-            "value" : "Filter out notifications from…"
+            "value" : "Ocultar notificaciones de..."
           }
         },
         "eu" : {
@@ -35394,8 +35400,8 @@
         },
         "pl" : {
           "stringUnit" : {
-            "state" : "needs_review",
+            "state" : "translated",
-            "value" : "Filter out notifications from…"
+            "value" : "Odfiltruj powiadomienia od …"
           }
         },
         "pt-BR" : {
@@ -39064,7 +39070,7 @@
         "pl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Wszystkie komunikaty"
+            "value" : "Wszystkie powiadomienia"
           }
         },
         "pt-BR" : {
@@ -69851,8 +69857,8 @@
             "plural" : {
               "one" : {
                 "stringUnit" : {
-                  "state" : "needs_review",
+                  "state" : "translated",
-                  "value" : "%lld votos"
+                  "value" : "%lld voto"
                 }
               },
               "other" : {
@@ -72791,8 +72797,8 @@
             "plural" : {
               "one" : {
                 "stringUnit" : {
-                  "state" : "needs_review",
+                  "state" : "translated",
-                  "value" : "%lld boosts"
+                  "value" : "%lld boost"
                 }
               },
               "other" : {
@@ -73144,8 +73150,8 @@
             "plural" : {
               "one" : {
                 "stringUnit" : {
-                  "state" : "needs_review",
+                  "state" : "translated",
-                  "value" : "%lld favoritos"
+                  "value" : "%lld favorito"
                 }
               },
               "other" : {
@@ -73497,8 +73503,8 @@
             "plural" : {
               "one" : {
                 "stringUnit" : {
-                  "state" : "needs_review",
+                  "state" : "translated",
-                  "value" : "%lld respuestas"
+                  "value" : "%lld respuesta"
                 }
               },
               "other" : {
@@ -75620,8 +75626,8 @@
             "plural" : {
               "one" : {
                 "stringUnit" : {
-                  "state" : "needs_review",
+                  "state" : "translated",
-                  "value" : "%lld menciones"
+                  "value" : "%lld mención"
                 }
               },
               "other" : {
@@ -78384,7 +78390,7 @@
         },
         "es" : {
           "stringUnit" : {
-            "state" : "needs_review",
+            "state" : "translated",
             "value" : "Saltar al más reciente"
           }
         },
@@ -78854,7 +78860,7 @@
         },
         "es" : {
           "stringUnit" : {
-            "state" : "needs_review",
+            "state" : "translated",
             "value" : "%#@arg1@ publicaciones recientes de %#@arg2@ participantes"
           },
           "substitutions" : {
@@ -78865,14 +78871,14 @@
                 "plural" : {
                   "one" : {
                     "stringUnit" : {
-                      "state" : "needs_review",
+                      "state" : "translated",
-                      "value" : "%arg"
+                      "value" : "%arg publicación reciente"
                     }
                   },
                   "other" : {
                     "stringUnit" : {
-                      "state" : "needs_review",
+                      "state" : "translated",
-                      "value" : "%arg"
+                      "value" : "%arg publicaciones recientes"
                     }
                   }
                 }
@@ -78885,14 +78891,14 @@
                 "plural" : {
                   "one" : {
                     "stringUnit" : {
-                      "state" : "needs_review",
+                      "state" : "translated",
-                      "value" : "%arg"
+                      "value" : "%arg participante"
                     }
                   },
                   "other" : {
                     "stringUnit" : {
-                      "state" : "needs_review",
+                      "state" : "translated",
-                      "value" : "%arg"
+                      "value" : "%arg participantes"
                     }
                   }
                 }
@@ -79842,14 +79848,14 @@
             "plural" : {
               "one" : {
                 "stringUnit" : {
-                  "state" : "needs_review",
+                  "state" : "translated",
-                  "value" : ""
+                  "value" : "%lld persona hablando"
                 }
               },
               "other" : {
                 "stringUnit" : {
-                  "state" : "needs_review",
+                  "state" : "translated",
-                  "value" : ""
+                  "value" : "%lld personas hablando"
                 }
               }
             }
@@ -80105,4 +80111,4 @@
     }
   },
   "version" : "1.0"
-}
+}

Packages/StatusKit/Sources/StatusKit/Row/StatusRowView.swift

@@ -83,33 +83,33 @@ public struct StatusRowView: View {
                   viewModel.navigateToAccountDetail(account: viewModel.finalStatus.account)
                 }
             }
-            VStack(alignment: .leading, spacing: .statusComponentSpacing) {
+            if !isCompact {
-              if !isCompact {
+              StatusRowHeaderView(viewModel: viewModel)
-                StatusRowHeaderView(viewModel: viewModel)
+            }
+          }
+          VStack(alignment: .leading, spacing: .statusComponentSpacing) {
+            StatusRowContentView(viewModel: viewModel)
+              .contentShape(Rectangle())
+              .onTapGesture {
+                guard !isFocused else { return }
+                viewModel.navigateToDetail()
               }
-              StatusRowContentView(viewModel: viewModel)
+              .accessibilityActions {
-                .contentShape(Rectangle())
+                if isFocused, viewModel.showActions {
-                .onTapGesture {
+                  accessibilityActions
-                  guard !isFocused else { return }
-                  viewModel.navigateToDetail()
                 }
-                .accessibilityActions {
-                  if isFocused, viewModel.showActions {
-                    accessibilityActions
-                  }
-                }
-              if !reasons.contains(.placeholder),
-                 viewModel.showActions, isFocused || theme.statusActionsDisplay != .none,
-                 !isInCaptureMode
-              {
-                StatusRowActionsView(isBlockConfirmationPresented: $isBlockConfirmationPresented,
-                                     viewModel: viewModel)
-                  .tint(isFocused ? theme.tintColor : .gray)
               }
+            if !reasons.contains(.placeholder),
+               viewModel.showActions, isFocused || theme.statusActionsDisplay != .none,
+               !isInCaptureMode
+            {
+              StatusRowActionsView(isBlockConfirmationPresented: $isBlockConfirmationPresented,
+                                   viewModel: viewModel)
+                .tint(isFocused ? theme.tintColor : .gray)
+            }
 
-              if isFocused, !isCompact {
+            if isFocused, !isCompact {
-                StatusRowDetailView(viewModel: viewModel)
+              StatusRowDetailView(viewModel: viewModel)
-              }
             }
           }
         }

Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowMediaPreviewView.swift

@@ -67,7 +67,6 @@ public struct StatusRowMediaPreviewView: View {
           }
           .padding(.bottom, scrollBottomPadding)
         }
-        .scrollClipDisabled()
       }
     }
   }