Making InlineIconText Single Line (#518)

Progress toward #280.
AdamMc331 · Jul 12, 2024 · dada545 · dada545
1 parent c0a0ce7
commit dada545
Show file tree

Hide file tree

Showing 99 changed files with 22 additions and 0 deletions.
diff --git a/...e.eventdetail_EventStageCardPaparazziTest_renderDefault[useDarkTheme=false].png b/...e.eventdetail_EventStageCardPaparazziTest_renderDefault[useDarkTheme=false].png
diff --git a/...re.eventdetail_EventStageCardPaparazziTest_renderDefault[useDarkTheme=true].png b/...re.eventdetail_EventStageCardPaparazziTest_renderDefault[useDarkTheme=true].png
diff --git a/...entdetail_EventStageCardPaparazziTest_renderPlaceholder[useDarkTheme=false].png b/...entdetail_EventStageCardPaparazziTest_renderPlaceholder[useDarkTheme=false].png
diff --git a/...ventdetail_EventStageCardPaparazziTest_renderPlaceholder[useDarkTheme=true].png b/...ventdetail_EventStageCardPaparazziTest_renderPlaceholder[useDarkTheme=true].png
diff --git a/....eventdetail_StageMatchListItemPaparazziTest_blueWinner[useDarkTheme=false].png b/....eventdetail_StageMatchListItemPaparazziTest_blueWinner[useDarkTheme=false].png
diff --git a/...e.eventdetail_StageMatchListItemPaparazziTest_blueWinner[useDarkTheme=true].png b/...e.eventdetail_StageMatchListItemPaparazziTest_blueWinner[useDarkTheme=true].png
diff --git a/...ventdetail_StageMatchListItemPaparazziTest_orangewinner[useDarkTheme=false].png b/...ventdetail_StageMatchListItemPaparazziTest_orangewinner[useDarkTheme=false].png
diff --git a/...eventdetail_StageMatchListItemPaparazziTest_orangewinner[useDarkTheme=true].png b/...eventdetail_StageMatchListItemPaparazziTest_orangewinner[useDarkTheme=true].png
diff --git a/...eventdetail_StageMatchListItemPaparazziTest_placeholder[useDarkTheme=false].png b/...eventdetail_StageMatchListItemPaparazziTest_placeholder[useDarkTheme=false].png
diff --git a/....eventdetail_StageMatchListItemPaparazziTest_placeholder[useDarkTheme=true].png b/....eventdetail_StageMatchListItemPaparazziTest_placeholder[useDarkTheme=true].png
diff --git a/...feature.teamdetail_RosterCardPaparazziTest_placeholders[useDarkTheme=false].png b/...feature.teamdetail_RosterCardPaparazziTest_placeholders[useDarkTheme=false].png
diff --git a/....feature.teamdetail_RosterCardPaparazziTest_placeholders[useDarkTheme=true].png b/....feature.teamdetail_RosterCardPaparazziTest_placeholders[useDarkTheme=true].png
diff --git a/...ture.teamdetail_RosterCardPaparazziTest_withCoachAndSub[useDarkTheme=false].png b/...ture.teamdetail_RosterCardPaparazziTest_withCoachAndSub[useDarkTheme=false].png
diff --git a/...ature.teamdetail_RosterCardPaparazziTest_withCoachAndSub[useDarkTheme=true].png b/...ature.teamdetail_RosterCardPaparazziTest_withCoachAndSub[useDarkTheme=true].png
diff --git a/...rc/commonMain/kotlin/com/adammcneilly/pocketleague/shared/ui/components/InlineIconText.kt b/...rc/commonMain/kotlin/com/adammcneilly/pocketleague/shared/ui/components/InlineIconText.kt
@@ -17,6 +17,7 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
 
 private const val INLINE_CONTENT_ID = "inlineContent"
 
@@ -35,6 +36,7 @@ private const val INLINE_CONTENT_ID = "inlineContent"
  * @param[textAlign] @see [Text]
  * @param[style] @see [Text]
  * @param[fontWeight] @see [Text]
+ * @param[maxLines] @see [Text]
  */
 @Composable
 fun InlineIconText(
@@ -48,6 +50,7 @@ fun InlineIconText(
     textAlign: TextAlign? = null,
     style: TextStyle = LocalTextStyle.current,
     fontWeight: FontWeight? = null,
+    maxLines: Int = Int.MAX_VALUE,
 ) {
     Text(
         text = text.getAnnotatedString(
@@ -64,6 +67,8 @@ fun InlineIconText(
         style = style,
         color = textColor,
         fontWeight = fontWeight,
+        maxLines = maxLines,
+        overflow = TextOverflow.Ellipsis,
     )
 }
 

diff --git a/shared/ui/src/commonMain/kotlin/com/adammcneilly/pocketleague/shared/ui/match/MatchCard.kt b/shared/ui/src/commonMain/kotlin/com/adammcneilly/pocketleague/shared/ui/match/MatchCard.kt
@@ -125,6 +125,7 @@ private fun MatchTeamResultRow(
             icon = Icons.Default.EmojiEvents,
             showIcon = teamResult.winner,
             fontWeight = fontWeight,
+            maxLines = 1,
             modifier = Modifier
                 .weight(1F),
         )

diff --git a/...i/src/test/kotlin/com/adammcneilly/pocketleague/shared/ui/match/MatchCardPaparazziTest.kt b/...i/src/test/kotlin/com/adammcneilly/pocketleague/shared/ui/match/MatchCardPaparazziTest.kt
@@ -47,4 +47,20 @@ class MatchCardPaparazziTest {
             )
         }
     }
+
+    @Test
+    fun renderLongTeamName() {
+        paparazzi.snapshotScreen(useDarkTheme) {
+            MatchCard(
+                match = TestDisplayModel.matchDetailOrangeWinner.copy(
+                    orangeTeamResult = TestDisplayModel.matchTeamResultWinner.copy(
+                        team = TestDisplayModel.g2.copy(
+                            name = "SUPER DUPER LONG TEAM NAME THAT SHOULD OVERFLOW",
+                        ),
+                    ),
+                ),
+                onClick = {},
+            )
+        }
+    }
 }
diff --git a/...omponents_InlineIconTextPaparazziTest_renderLeadingIcon[useDarkTheme=false].png b/...omponents_InlineIconTextPaparazziTest_renderLeadingIcon[useDarkTheme=false].png
diff --git a/...components_InlineIconTextPaparazziTest_renderLeadingIcon[useDarkTheme=true].png b/...components_InlineIconTextPaparazziTest_renderLeadingIcon[useDarkTheme=true].png
diff --git a/...mponents_InlineIconTextPaparazziTest_renderTrailingIcon[useDarkTheme=false].png b/...mponents_InlineIconTextPaparazziTest_renderTrailingIcon[useDarkTheme=false].png
diff --git a/...omponents_InlineIconTextPaparazziTest_renderTrailingIcon[useDarkTheme=true].png b/...omponents_InlineIconTextPaparazziTest_renderTrailingIcon[useDarkTheme=true].png
diff --git a/...omponents_InlineIconTextPaparazziTest_renderWithoutIcon[useDarkTheme=false].png b/...omponents_InlineIconTextPaparazziTest_renderWithoutIcon[useDarkTheme=false].png
diff --git a/...components_InlineIconTextPaparazziTest_renderWithoutIcon[useDarkTheme=true].png b/...components_InlineIconTextPaparazziTest_renderWithoutIcon[useDarkTheme=true].png
diff --git a/...CardPaparazziTest_renderEventSummaryListCardWithWinners[useDarkTheme=false].png b/...CardPaparazziTest_renderEventSummaryListCardWithWinners[useDarkTheme=false].png
diff --git a/...tCardPaparazziTest_renderEventSummaryListCardWithWinners[useDarkTheme=true].png b/...tCardPaparazziTest_renderEventSummaryListCardWithWinners[useDarkTheme=true].png
diff --git a/...SummaryListCardPaparazziTest_renderEventSummaryListCard[useDarkTheme=false].png b/...SummaryListCardPaparazziTest_renderEventSummaryListCard[useDarkTheme=false].png
diff --git a/...tSummaryListCardPaparazziTest_renderEventSummaryListCard[useDarkTheme=true].png b/...tSummaryListCardPaparazziTest_renderEventSummaryListCard[useDarkTheme=true].png
diff --git a/...ent_EventSummaryListCardPaparazziTest_renderPlaceholder[useDarkTheme=false].png b/...ent_EventSummaryListCardPaparazziTest_renderPlaceholder[useDarkTheme=false].png
diff --git a/...vent_EventSummaryListCardPaparazziTest_renderPlaceholder[useDarkTheme=true].png b/...vent_EventSummaryListCardPaparazziTest_renderPlaceholder[useDarkTheme=true].png
diff --git a/...SummaryListItemPaparazziTest_renderEventSummaryListItem[useDarkTheme=false].png b/...SummaryListItemPaparazziTest_renderEventSummaryListItem[useDarkTheme=false].png
diff --git a/...tSummaryListItemPaparazziTest_renderEventSummaryListItem[useDarkTheme=true].png b/...tSummaryListItemPaparazziTest_renderEventSummaryListItem[useDarkTheme=true].png
diff --git a/...ent_EventSummaryListItemPaparazziTest_renderPlaceholder[useDarkTheme=false].png b/...ent_EventSummaryListItemPaparazziTest_renderPlaceholder[useDarkTheme=false].png
diff --git a/...vent_EventSummaryListItemPaparazziTest_renderPlaceholder[useDarkTheme=true].png b/...vent_EventSummaryListItemPaparazziTest_renderPlaceholder[useDarkTheme=true].png
diff --git a/...vent_EventSummaryListItemPaparazziTest_renderWithWinner[useDarkTheme=false].png b/...vent_EventSummaryListItemPaparazziTest_renderWithWinner[useDarkTheme=false].png
diff --git a/...event_EventSummaryListItemPaparazziTest_renderWithWinner[useDarkTheme=true].png b/...event_EventSummaryListItemPaparazziTest_renderWithWinner[useDarkTheme=true].png
diff --git a/...ent_LanEventSummaryCardPaparazziTest_renderLanEventCard[useDarkTheme=false].png b/...ent_LanEventSummaryCardPaparazziTest_renderLanEventCard[useDarkTheme=false].png
diff --git a/...vent_LanEventSummaryCardPaparazziTest_renderLanEventCard[useDarkTheme=true].png b/...vent_LanEventSummaryCardPaparazziTest_renderLanEventCard[useDarkTheme=true].png
diff --git a/...event_LanEventSummaryCardPaparazziTest_renderWithWinner[useDarkTheme=false].png b/...event_LanEventSummaryCardPaparazziTest_renderWithWinner[useDarkTheme=false].png
diff --git a/....event_LanEventSummaryCardPaparazziTest_renderWithWinner[useDarkTheme=true].png b/....event_LanEventSummaryCardPaparazziTest_renderWithWinner[useDarkTheme=true].png
diff --git a/...ared.ui.feed_FeedContentPaparazziTest_renderFeedContent[useDarkTheme=false].png b/...ared.ui.feed_FeedContentPaparazziTest_renderFeedContent[useDarkTheme=false].png
diff --git a/...hared.ui.feed_FeedContentPaparazziTest_renderFeedContent[useDarkTheme=true].png b/...hared.ui.feed_FeedContentPaparazziTest_renderFeedContent[useDarkTheme=true].png
diff --git a/...etleague.shared.ui.game_GameListCardPaparazziTest_games[useDarkTheme=false].png b/...etleague.shared.ui.game_GameListCardPaparazziTest_games[useDarkTheme=false].png
diff --git a/...ketleague.shared.ui.game_GameListCardPaparazziTest_games[useDarkTheme=true].png b/...ketleague.shared.ui.game_GameListCardPaparazziTest_games[useDarkTheme=true].png
diff --git a/...e.shared.ui.game_GameListCardPaparazziTest_placeholders[useDarkTheme=false].png b/...e.shared.ui.game_GameListCardPaparazziTest_placeholders[useDarkTheme=false].png
diff --git a/...ue.shared.ui.game_GameListCardPaparazziTest_placeholders[useDarkTheme=true].png b/...ue.shared.ui.game_GameListCardPaparazziTest_placeholders[useDarkTheme=true].png
diff --git a/....ui.game_GameListItemPaparazziTest_renderBlueTeamWinner[useDarkTheme=false].png b/....ui.game_GameListItemPaparazziTest_renderBlueTeamWinner[useDarkTheme=false].png
diff --git a/...d.ui.game_GameListItemPaparazziTest_renderBlueTeamWinner[useDarkTheme=true].png b/...d.ui.game_GameListItemPaparazziTest_renderBlueTeamWinner[useDarkTheme=true].png
diff --git a/...i.game_GameListItemPaparazziTest_renderOrangeTeamWinner[useDarkTheme=false].png b/...i.game_GameListItemPaparazziTest_renderOrangeTeamWinner[useDarkTheme=false].png
diff --git a/...ui.game_GameListItemPaparazziTest_renderOrangeTeamWinner[useDarkTheme=true].png b/...ui.game_GameListItemPaparazziTest_renderOrangeTeamWinner[useDarkTheme=true].png
diff --git a/...red.ui.game_GameListItemPaparazziTest_renderPlaceholder[useDarkTheme=false].png b/...red.ui.game_GameListItemPaparazziTest_renderPlaceholder[useDarkTheme=false].png
diff --git a/...ared.ui.game_GameListItemPaparazziTest_renderPlaceholder[useDarkTheme=true].png b/...ared.ui.game_GameListItemPaparazziTest_renderPlaceholder[useDarkTheme=true].png
diff --git a/...ui.game_GameListItemPaparazziTest_renderWithLongMapName[useDarkTheme=false].png b/...ui.game_GameListItemPaparazziTest_renderWithLongMapName[useDarkTheme=false].png
diff --git a/....ui.game_GameListItemPaparazziTest_renderWithLongMapName[useDarkTheme=true].png b/....ui.game_GameListItemPaparazziTest_renderWithLongMapName[useDarkTheme=true].png
diff --git a/...e.shared.ui.game_GameListItemPaparazziTest_renderWithOT[useDarkTheme=false].png b/...e.shared.ui.game_GameListItemPaparazziTest_renderWithOT[useDarkTheme=false].png
diff --git a/...ue.shared.ui.game_GameListItemPaparazziTest_renderWithOT[useDarkTheme=true].png b/...ue.shared.ui.game_GameListItemPaparazziTest_renderWithOT[useDarkTheme=true].png
diff --git a/...ed.ui.match_MatchCardPaparazziTest_renderBlueTeamWinner[useDarkTheme=false].png b/...ed.ui.match_MatchCardPaparazziTest_renderBlueTeamWinner[useDarkTheme=false].png
diff --git a/...red.ui.match_MatchCardPaparazziTest_renderBlueTeamWinner[useDarkTheme=true].png b/...red.ui.match_MatchCardPaparazziTest_renderBlueTeamWinner[useDarkTheme=true].png
diff --git a/...ared.ui.match_MatchCardPaparazziTest_renderLongTeamName[useDarkTheme=false].png b/...ared.ui.match_MatchCardPaparazziTest_renderLongTeamName[useDarkTheme=false].png
diff --git a/...hared.ui.match_MatchCardPaparazziTest_renderLongTeamName[useDarkTheme=true].png b/...hared.ui.match_MatchCardPaparazziTest_renderLongTeamName[useDarkTheme=true].png
diff --git a/....ui.match_MatchCardPaparazziTest_renderOrangeTeamWinner[useDarkTheme=false].png b/....ui.match_MatchCardPaparazziTest_renderOrangeTeamWinner[useDarkTheme=false].png
diff --git a/...d.ui.match_MatchCardPaparazziTest_renderOrangeTeamWinner[useDarkTheme=true].png b/...d.ui.match_MatchCardPaparazziTest_renderOrangeTeamWinner[useDarkTheme=true].png
diff --git a/...hared.ui.match_MatchCardPaparazziTest_renderPlaceholder[useDarkTheme=false].png b/...hared.ui.match_MatchCardPaparazziTest_renderPlaceholder[useDarkTheme=false].png
diff --git a/...shared.ui.match_MatchCardPaparazziTest_renderPlaceholder[useDarkTheme=true].png b/...shared.ui.match_MatchCardPaparazziTest_renderPlaceholder[useDarkTheme=true].png
diff --git a/...atch_MatchCarouselPaparazziTest_renderMultiItemCarousel[useDarkTheme=false].png b/...atch_MatchCarouselPaparazziTest_renderMultiItemCarousel[useDarkTheme=false].png
diff --git a/...match_MatchCarouselPaparazziTest_renderMultiItemCarousel[useDarkTheme=true].png b/...match_MatchCarouselPaparazziTest_renderMultiItemCarousel[useDarkTheme=true].png
diff --git a/...tch_MatchCarouselPaparazziTest_renderSingleItemCarousel[useDarkTheme=false].png b/...tch_MatchCarouselPaparazziTest_renderSingleItemCarousel[useDarkTheme=false].png
diff --git a/...atch_MatchCarouselPaparazziTest_renderSingleItemCarousel[useDarkTheme=true].png b/...atch_MatchCarouselPaparazziTest_renderSingleItemCarousel[useDarkTheme=true].png
diff --git a/...atchDetailContentPaparazziTest_renderMatchDetailContent[useDarkTheme=false].png b/...atchDetailContentPaparazziTest_renderMatchDetailContent[useDarkTheme=false].png
diff --git a/...MatchDetailContentPaparazziTest_renderMatchDetailContent[useDarkTheme=true].png b/...MatchDetailContentPaparazziTest_renderMatchDetailContent[useDarkTheme=true].png
diff --git a/...match_MatchDetailContentPaparazziTest_renderPlaceholder[useDarkTheme=false].png b/...match_MatchDetailContentPaparazziTest_renderPlaceholder[useDarkTheme=false].png
diff --git a/....match_MatchDetailContentPaparazziTest_renderPlaceholder[useDarkTheme=true].png b/....match_MatchDetailContentPaparazziTest_renderPlaceholder[useDarkTheme=true].png
diff --git a/..._MatchDetailHeaderPaparazziTest_renderMatchDetailHeader[useDarkTheme=false].png b/..._MatchDetailHeaderPaparazziTest_renderMatchDetailHeader[useDarkTheme=false].png
diff --git a/...h_MatchDetailHeaderPaparazziTest_renderMatchDetailHeader[useDarkTheme=true].png b/...h_MatchDetailHeaderPaparazziTest_renderMatchDetailHeader[useDarkTheme=true].png
diff --git a/....match_MatchDetailHeaderPaparazziTest_renderPlaceholder[useDarkTheme=false].png b/....match_MatchDetailHeaderPaparazziTest_renderPlaceholder[useDarkTheme=false].png
diff --git a/...i.match_MatchDetailHeaderPaparazziTest_renderPlaceholder[useDarkTheme=true].png b/...i.match_MatchDetailHeaderPaparazziTest_renderPlaceholder[useDarkTheme=true].png
diff --git a/..._CoreStatsComparisonCardPaparazziTest_renderDefaultCard[useDarkTheme=false].png b/..._CoreStatsComparisonCardPaparazziTest_renderDefaultCard[useDarkTheme=false].png
diff --git a/...s_CoreStatsComparisonCardPaparazziTest_renderDefaultCard[useDarkTheme=true].png b/...s_CoreStatsComparisonCardPaparazziTest_renderDefaultCard[useDarkTheme=true].png
diff --git a/...tatsComparisonCardPaparazziTest_renderFullyAnimatedCard[useDarkTheme=false].png b/...tatsComparisonCardPaparazziTest_renderFullyAnimatedCard[useDarkTheme=false].png
diff --git a/...StatsComparisonCardPaparazziTest_renderFullyAnimatedCard[useDarkTheme=true].png b/...StatsComparisonCardPaparazziTest_renderFullyAnimatedCard[useDarkTheme=true].png
diff --git a/...StatsComparisonCardPaparazziTest_renderHalfAnimatedCard[useDarkTheme=false].png b/...StatsComparisonCardPaparazziTest_renderHalfAnimatedCard[useDarkTheme=false].png
diff --git a/...eStatsComparisonCardPaparazziTest_renderHalfAnimatedCard[useDarkTheme=true].png b/...eStatsComparisonCardPaparazziTest_renderHalfAnimatedCard[useDarkTheme=true].png
diff --git a/...i.stats_StatComparisonPaparazziTest_blueTeamLeadingStat[useDarkTheme=false].png b/...i.stats_StatComparisonPaparazziTest_blueTeamLeadingStat[useDarkTheme=false].png
diff --git a/...ui.stats_StatComparisonPaparazziTest_blueTeamLeadingStat[useDarkTheme=true].png b/...ui.stats_StatComparisonPaparazziTest_blueTeamLeadingStat[useDarkTheme=true].png
diff --git a/...stats_StatComparisonPaparazziTest_orangeTeamLeadingStat[useDarkTheme=false].png b/...stats_StatComparisonPaparazziTest_orangeTeamLeadingStat[useDarkTheme=false].png
diff --git a/....stats_StatComparisonPaparazziTest_orangeTeamLeadingStat[useDarkTheme=true].png b/....stats_StatComparisonPaparazziTest_orangeTeamLeadingStat[useDarkTheme=true].png
diff --git a/...tatComparisonPaparazziTest_renderCompleteStatComparison[useDarkTheme=false].png b/...tatComparisonPaparazziTest_renderCompleteStatComparison[useDarkTheme=false].png
diff --git a/...StatComparisonPaparazziTest_renderCompleteStatComparison[useDarkTheme=true].png b/...StatComparisonPaparazziTest_renderCompleteStatComparison[useDarkTheme=true].png
diff --git a/...StatComparisonPaparazziTest_renderHalfwayStatComparison[useDarkTheme=false].png b/...StatComparisonPaparazziTest_renderHalfwayStatComparison[useDarkTheme=false].png
diff --git a/..._StatComparisonPaparazziTest_renderHalfwayStatComparison[useDarkTheme=true].png b/..._StatComparisonPaparazziTest_renderHalfwayStatComparison[useDarkTheme=true].png
diff --git a/...StatComparisonPaparazziTest_renderQuarterStatComparison[useDarkTheme=false].png b/...StatComparisonPaparazziTest_renderQuarterStatComparison[useDarkTheme=false].png
diff --git a/..._StatComparisonPaparazziTest_renderQuarterStatComparison[useDarkTheme=true].png b/..._StatComparisonPaparazziTest_renderQuarterStatComparison[useDarkTheme=true].png
diff --git a/...ed.ui.swiss_SwissTeamResultListCardPaparazziTest_render[useDarkTheme=false].png b/...ed.ui.swiss_SwissTeamResultListCardPaparazziTest_render[useDarkTheme=false].png
diff --git a/...red.ui.swiss_SwissTeamResultListCardPaparazziTest_render[useDarkTheme=true].png b/...red.ui.swiss_SwissTeamResultListCardPaparazziTest_render[useDarkTheme=true].png
diff --git a/...s_SwissTeamResultListItemPaparazziTest_renderEliminated[useDarkTheme=false].png b/...s_SwissTeamResultListItemPaparazziTest_renderEliminated[useDarkTheme=false].png
diff --git a/...ss_SwissTeamResultListItemPaparazziTest_renderEliminated[useDarkTheme=true].png b/...ss_SwissTeamResultListItemPaparazziTest_renderEliminated[useDarkTheme=true].png
diff --git a/...s_SwissTeamResultListItemPaparazziTest_renderInProgress[useDarkTheme=false].png b/...s_SwissTeamResultListItemPaparazziTest_renderInProgress[useDarkTheme=false].png
diff --git a/...ss_SwissTeamResultListItemPaparazziTest_renderInProgress[useDarkTheme=true].png b/...ss_SwissTeamResultListItemPaparazziTest_renderInProgress[useDarkTheme=true].png
diff --git a/...ss_SwissTeamResultListItemPaparazziTest_renderQualified[useDarkTheme=false].png b/...ss_SwissTeamResultListItemPaparazziTest_renderQualified[useDarkTheme=false].png
diff --git a/...iss_SwissTeamResultListItemPaparazziTest_renderQualified[useDarkTheme=true].png b/...iss_SwissTeamResultListItemPaparazziTest_renderQualified[useDarkTheme=true].png