Merge pull request element-hq#3705 from element-hq/feature/bma/sheetC…

…ontentPreview Rename some function to avoid name clash
daedric7 · Oct 18, 2024 · 714f74a · 714f74a
2 parents b0df319 + ab59a73
commit 714f74a
Show file tree

Hide file tree

Showing 31 changed files with 39 additions and 8 deletions.
diff --git a/...pl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListView.kt b/...pl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListView.kt
@@ -146,7 +146,7 @@ fun ActionListView(
             onDismissRequest = ::onDismiss,
             modifier = modifier,
         ) {
-            SheetContent(
+            ActionListViewContent(
                 state = state,
                 onActionClick = ::onItemActionClick,
                 onEmojiReactionClick = ::onEmojiReactionClick,
@@ -161,7 +161,7 @@ fun ActionListView(
 }
 
 @Composable
-private fun SheetContent(
+private fun ActionListViewContent(
     state: ActionListState,
     onActionClick: (TimelineItemAction) -> Unit,
     onEmojiReactionClick: (String) -> Unit,
@@ -442,10 +442,10 @@ private fun EmojiButton(
 
 @PreviewsDayNight
 @Composable
-internal fun SheetContentPreview(
+internal fun ActionListViewContentPreview(
     @PreviewParameter(ActionListStateProvider::class) state: ActionListState
 ) = ElementPreview {
-    SheetContent(
+    ActionListViewContent(
         state = state,
         onActionClick = {},
         onEmojiReactionClick = {},

diff --git a/...android/features/messages/impl/timeline/components/reactionsummary/ReactionSummaryView.kt b/...android/features/messages/impl/timeline/components/reactionsummary/ReactionSummaryView.kt
@@ -89,14 +89,14 @@ fun ReactionSummaryView(
             sheetState = sheetState,
             modifier = modifier
         ) {
-            SheetContent(summary = state.target)
+            ReactionSummaryViewContent(summary = state.target)
         }
     }
 }
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
-private fun SheetContent(
+private fun ReactionSummaryViewContent(
     summary: ReactionSummaryState.Summary,
 ) {
     val animationScope = rememberCoroutineScope()
@@ -274,8 +274,8 @@ private fun SenderRow(
 
 @PreviewsDayNight
 @Composable
-internal fun SheetContentPreview(
+internal fun ReactionSummaryViewContentPreview(
     @PreviewParameter(ReactionSummaryStateProvider::class) state: ReactionSummaryState
 ) = ElementPreview {
-    SheetContent(summary = state.target as ReactionSummaryState.Summary)
+    ReactionSummaryViewContent(summary = state.target as ReactionSummaryState.Summary)
 }
diff --git a/...impl.actionlist_SheetContent_Day_0_en.png → ...onlist_ActionListViewContent_Day_0_en.png b/...impl.actionlist_SheetContent_Day_0_en.png → ...onlist_ActionListViewContent_Day_0_en.png
diff --git a/...mpl.actionlist_SheetContent_Day_10_en.png → ...nlist_ActionListViewContent_Day_10_en.png b/...mpl.actionlist_SheetContent_Day_10_en.png → ...nlist_ActionListViewContent_Day_10_en.png
diff --git a/...mpl.actionlist_SheetContent_Day_11_en.png → ...nlist_ActionListViewContent_Day_11_en.png b/...mpl.actionlist_SheetContent_Day_11_en.png → ...nlist_ActionListViewContent_Day_11_en.png
diff --git a/...mpl.actionlist_SheetContent_Day_12_en.png → ...nlist_ActionListViewContent_Day_12_en.png b/...mpl.actionlist_SheetContent_Day_12_en.png → ...nlist_ActionListViewContent_Day_12_en.png
diff --git a/...impl.actionlist_SheetContent_Day_1_en.png → ...onlist_ActionListViewContent_Day_1_en.png b/...impl.actionlist_SheetContent_Day_1_en.png → ...onlist_ActionListViewContent_Day_1_en.png
diff --git a/...impl.actionlist_SheetContent_Day_2_en.png → ...onlist_ActionListViewContent_Day_2_en.png b/...impl.actionlist_SheetContent_Day_2_en.png → ...onlist_ActionListViewContent_Day_2_en.png
diff --git a/...impl.actionlist_SheetContent_Day_3_en.png → ...onlist_ActionListViewContent_Day_3_en.png b/...impl.actionlist_SheetContent_Day_3_en.png → ...onlist_ActionListViewContent_Day_3_en.png
diff --git a/...impl.actionlist_SheetContent_Day_4_en.png → ...onlist_ActionListViewContent_Day_4_en.png b/...impl.actionlist_SheetContent_Day_4_en.png → ...onlist_ActionListViewContent_Day_4_en.png
diff --git a/...impl.actionlist_SheetContent_Day_5_en.png → ...onlist_ActionListViewContent_Day_5_en.png b/...impl.actionlist_SheetContent_Day_5_en.png → ...onlist_ActionListViewContent_Day_5_en.png
diff --git a/...impl.actionlist_SheetContent_Day_6_en.png → ...onlist_ActionListViewContent_Day_6_en.png b/...impl.actionlist_SheetContent_Day_6_en.png → ...onlist_ActionListViewContent_Day_6_en.png
diff --git a/...impl.actionlist_SheetContent_Day_7_en.png → ...onlist_ActionListViewContent_Day_7_en.png b/...impl.actionlist_SheetContent_Day_7_en.png → ...onlist_ActionListViewContent_Day_7_en.png
diff --git a/...impl.actionlist_SheetContent_Day_8_en.png → ...onlist_ActionListViewContent_Day_8_en.png b/...impl.actionlist_SheetContent_Day_8_en.png → ...onlist_ActionListViewContent_Day_8_en.png
diff --git a/...impl.actionlist_SheetContent_Day_9_en.png → ...onlist_ActionListViewContent_Day_9_en.png b/...impl.actionlist_SheetContent_Day_9_en.png → ...onlist_ActionListViewContent_Day_9_en.png
diff --git a/...pl.actionlist_SheetContent_Night_0_en.png → ...list_ActionListViewContent_Night_0_en.png b/...pl.actionlist_SheetContent_Night_0_en.png → ...list_ActionListViewContent_Night_0_en.png
diff --git a/...l.actionlist_SheetContent_Night_10_en.png → ...ist_ActionListViewContent_Night_10_en.png b/...l.actionlist_SheetContent_Night_10_en.png → ...ist_ActionListViewContent_Night_10_en.png
diff --git a/...l.actionlist_SheetContent_Night_11_en.png → ...ist_ActionListViewContent_Night_11_en.png b/...l.actionlist_SheetContent_Night_11_en.png → ...ist_ActionListViewContent_Night_11_en.png
diff --git a/...l.actionlist_SheetContent_Night_12_en.png → ...ist_ActionListViewContent_Night_12_en.png b/...l.actionlist_SheetContent_Night_12_en.png → ...ist_ActionListViewContent_Night_12_en.png
diff --git a/...pl.actionlist_SheetContent_Night_1_en.png → ...list_ActionListViewContent_Night_1_en.png b/...pl.actionlist_SheetContent_Night_1_en.png → ...list_ActionListViewContent_Night_1_en.png
diff --git a/...pl.actionlist_SheetContent_Night_2_en.png → ...list_ActionListViewContent_Night_2_en.png b/...pl.actionlist_SheetContent_Night_2_en.png → ...list_ActionListViewContent_Night_2_en.png
diff --git a/...pl.actionlist_SheetContent_Night_3_en.png → ...list_ActionListViewContent_Night_3_en.png b/...pl.actionlist_SheetContent_Night_3_en.png → ...list_ActionListViewContent_Night_3_en.png
diff --git a/...pl.actionlist_SheetContent_Night_4_en.png → ...list_ActionListViewContent_Night_4_en.png b/...pl.actionlist_SheetContent_Night_4_en.png → ...list_ActionListViewContent_Night_4_en.png
diff --git a/...pl.actionlist_SheetContent_Night_5_en.png → ...list_ActionListViewContent_Night_5_en.png b/...pl.actionlist_SheetContent_Night_5_en.png → ...list_ActionListViewContent_Night_5_en.png
diff --git a/...pl.actionlist_SheetContent_Night_6_en.png → ...list_ActionListViewContent_Night_6_en.png b/...pl.actionlist_SheetContent_Night_6_en.png → ...list_ActionListViewContent_Night_6_en.png
diff --git a/...pl.actionlist_SheetContent_Night_7_en.png → ...list_ActionListViewContent_Night_7_en.png b/...pl.actionlist_SheetContent_Night_7_en.png → ...list_ActionListViewContent_Night_7_en.png
diff --git a/...pl.actionlist_SheetContent_Night_8_en.png → ...list_ActionListViewContent_Night_8_en.png b/...pl.actionlist_SheetContent_Night_8_en.png → ...list_ActionListViewContent_Night_8_en.png
diff --git a/...pl.actionlist_SheetContent_Night_9_en.png → ...list_ActionListViewContent_Night_9_en.png b/...pl.actionlist_SheetContent_Night_9_en.png → ...list_ActionListViewContent_Night_9_en.png
diff --git a/...reactionsummary_SheetContent_Day_0_en.png → ...y_ReactionSummaryViewContent_Day_0_en.png b/...reactionsummary_SheetContent_Day_0_en.png → ...y_ReactionSummaryViewContent_Day_0_en.png
diff --git a/...actionsummary_SheetContent_Night_0_en.png → ...ReactionSummaryViewContent_Night_0_en.png b/...actionsummary_SheetContent_Night_0_en.png → ...ReactionSummaryViewContent_Night_0_en.png
diff --git a/tools/test/generateAllScreenshots.py b/tools/test/generateAllScreenshots.py
@@ -10,6 +10,7 @@
 import re
 import sys
 import time
+
 from util import compare
 
 
@@ -100,6 +101,34 @@ def computeDarkFileName(lightFileName):
         return match.group(1) + "_Night_" + match.group(2) + "_" + match.group(3)
     return ""
 
+
+def checkForScreenshotNameDuplication():
+    __doc__ = "Check for screenshots name duplication"
+    print("Check for screenshots name duplication...")
+    files = os.listdir("tests/uitests/src/test/snapshots/images/")
+    dict = {}
+    for file in files:
+        start = file.find("_") + 1
+        end = file.find("_", start)
+        screenshotName = file[start:end]
+        if screenshotName in dict:
+            dict[screenshotName].append(file[:end])
+        else:
+            dict[screenshotName] = [file[:end]]
+    error = 0
+    for key in dict:
+        if key in ["Icon", "RoundIcon"]:
+            continue
+        values = set(dict[key])
+        if len(values) > 1:
+            print("Duplicated screenshot name: %s" % key)
+            for value in values:
+                print("    - %s" % value)
+            error += 1
+    if error:
+        print("Warning: %d duplicated screenshot name(s) found" % error)
+
+
 def generateJavascriptFile():
     __doc__ = "Generate a javascript file to load the screenshots"
     print("Generating javascript file...")
@@ -151,11 +180,13 @@ def generateJavascriptFile():
 
 
 def main():
+    checkForScreenshotNameDuplication()
     generateAllScreenshots(readArguments())
     lang = detectLanguages()
     for l in lang:
         deleteDuplicatedScreenshots(l)
         moveScreenshots(l)
     generateJavascriptFile()
 
+
 main()