Merge pull request #4145 from element-hq/feature/fga/design_button_te…

…xt_style change(design) : use ElementTheme.typography.fontBodyLgMedium
element-hq · Jan 14, 2025 · f31e648 · f31e648
2 parents c7dbc7a + 20a4ea1
commit f31e648
Show file tree

Hide file tree

Showing 326 changed files with 651 additions and 660 deletions.
diff --git a/...stem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Button.kt b/...stem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Button.kt
@@ -27,7 +27,6 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.ButtonColors
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.LocalContentColor
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.remember
@@ -202,14 +201,6 @@ private fun ButtonInternal(
         ButtonStyle.Text -> null
     }
 
-    val textStyle = when (size) {
-        ButtonSize.Small,
-        ButtonSize.Medium,
-        ButtonSize.MediumLowPadding -> MaterialTheme.typography.labelLarge
-        ButtonSize.Large,
-        ButtonSize.LargeLowPadding -> ElementTheme.typography.fontBodyLgMedium
-    }
-
     androidx.compose.material3.Button(
         onClick = {
             if (!showProgress) {
@@ -248,7 +239,7 @@ private fun ButtonInternal(
         }
         Text(
             text = text,
-            style = textStyle,
+            style = ElementTheme.typography.fontBodyLgMedium,
             maxLines = 1,
             overflow = TextOverflow.Ellipsis,
         )

diff --git a/tests/uitests/src/test/snapshots/images/appnav.loggedin_LoggedInView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/appnav.loggedin_LoggedInView_Day_2_en.png
diff --git a/tests/uitests/src/test/snapshots/images/appnav.loggedin_LoggedInView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/appnav.loggedin_LoggedInView_Day_3_en.png
diff --git a/...s/uitests/src/test/snapshots/images/appnav.loggedin_LoggedInView_Night_2_en.png b/...s/uitests/src/test/snapshots/images/appnav.loggedin_LoggedInView_Night_2_en.png
diff --git a/...s/uitests/src/test/snapshots/images/appnav.loggedin_LoggedInView_Night_3_en.png b/...s/uitests/src/test/snapshots/images/appnav.loggedin_LoggedInView_Night_3_en.png
diff --git a/tests/uitests/src/test/snapshots/images/appnav.root_RootView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/appnav.root_RootView_Day_0_en.png
diff --git a/tests/uitests/src/test/snapshots/images/appnav.root_RootView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/appnav.root_RootView_Day_1_en.png
diff --git a/tests/uitests/src/test/snapshots/images/appnav.root_RootView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/appnav.root_RootView_Day_2_en.png
diff --git a/tests/uitests/src/test/snapshots/images/appnav.root_RootView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/appnav.root_RootView_Night_0_en.png
diff --git a/tests/uitests/src/test/snapshots/images/appnav.root_RootView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/appnav.root_RootView_Night_1_en.png
diff --git a/tests/uitests/src/test/snapshots/images/appnav.root_RootView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/appnav.root_RootView_Night_2_en.png
diff --git a/...c/test/snapshots/images/features.analytics.impl_AnalyticsOptInView_Day_0_en.png b/...c/test/snapshots/images/features.analytics.impl_AnalyticsOptInView_Day_0_en.png
diff --git a/...test/snapshots/images/features.analytics.impl_AnalyticsOptInView_Night_0_en.png b/...test/snapshots/images/features.analytics.impl_AnalyticsOptInView_Night_0_en.png
diff --git a/...sts/src/test/snapshots/images/features.call.impl.ui_CallScreenView_Day_2_en.png b/...sts/src/test/snapshots/images/features.call.impl.ui_CallScreenView_Day_2_en.png
diff --git a/...sts/src/test/snapshots/images/features.call.impl.ui_CallScreenView_Day_3_en.png b/...sts/src/test/snapshots/images/features.call.impl.ui_CallScreenView_Day_3_en.png
diff --git a/...s/src/test/snapshots/images/features.call.impl.ui_CallScreenView_Night_2_en.png b/...s/src/test/snapshots/images/features.call.impl.ui_CallScreenView_Night_2_en.png
diff --git a/...s/src/test/snapshots/images/features.call.impl.ui_CallScreenView_Night_3_en.png b/...s/src/test/snapshots/images/features.call.impl.ui_CallScreenView_Night_3_en.png
diff --git a/.../snapshots/images/features.createroom.impl.root_CreateRoomRootView_Day_2_en.png b/.../snapshots/images/features.createroom.impl.root_CreateRoomRootView_Day_2_en.png
diff --git a/...napshots/images/features.createroom.impl.root_CreateRoomRootView_Night_2_en.png b/...napshots/images/features.createroom.impl.root_CreateRoomRootView_Night_2_en.png
diff --git a/...shots/images/features.invite.impl.response_AcceptDeclineInviteView_Day_1_en.png b/...shots/images/features.invite.impl.response_AcceptDeclineInviteView_Day_1_en.png
diff --git a/...shots/images/features.invite.impl.response_AcceptDeclineInviteView_Day_2_en.png b/...shots/images/features.invite.impl.response_AcceptDeclineInviteView_Day_2_en.png
diff --git a/...shots/images/features.invite.impl.response_AcceptDeclineInviteView_Day_3_en.png b/...shots/images/features.invite.impl.response_AcceptDeclineInviteView_Day_3_en.png
diff --git a/...shots/images/features.invite.impl.response_AcceptDeclineInviteView_Day_4_en.png b/...shots/images/features.invite.impl.response_AcceptDeclineInviteView_Day_4_en.png
diff --git a/...ots/images/features.invite.impl.response_AcceptDeclineInviteView_Night_1_en.png b/...ots/images/features.invite.impl.response_AcceptDeclineInviteView_Night_1_en.png
diff --git a/...ots/images/features.invite.impl.response_AcceptDeclineInviteView_Night_2_en.png b/...ots/images/features.invite.impl.response_AcceptDeclineInviteView_Night_2_en.png
diff --git a/...ots/images/features.invite.impl.response_AcceptDeclineInviteView_Night_3_en.png b/...ots/images/features.invite.impl.response_AcceptDeclineInviteView_Night_3_en.png
diff --git a/...ots/images/features.invite.impl.response_AcceptDeclineInviteView_Night_4_en.png b/...ots/images/features.invite.impl.response_AcceptDeclineInviteView_Night_4_en.png
diff --git a/.../images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_0_en.png b/.../images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_0_en.png
diff --git a/.../images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_1_en.png b/.../images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_1_en.png
diff --git a/.../images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_2_en.png b/.../images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_2_en.png
diff --git a/.../images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_3_en.png b/.../images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_3_en.png
diff --git a/.../images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_4_en.png b/.../images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_4_en.png
diff --git a/.../images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_5_en.png b/.../images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_5_en.png
diff --git a/.../images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_6_en.png b/.../images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_6_en.png
diff --git a/...mages/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_0_en.png b/...mages/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_0_en.png
diff --git a/...mages/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_1_en.png b/...mages/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_1_en.png
diff --git a/...mages/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_2_en.png b/...mages/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_2_en.png
diff --git a/...mages/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_3_en.png b/...mages/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_3_en.png
diff --git a/...mages/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_4_en.png b/...mages/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_4_en.png
diff --git a/...mages/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_5_en.png b/...mages/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_5_en.png
diff --git a/...mages/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_6_en.png b/...mages/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_6_en.png
diff --git a/...ots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_10_en.png b/...ots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_10_en.png
diff --git a/...hots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_2_en.png b/...hots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_2_en.png
diff --git a/...hots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_3_en.png b/...hots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_3_en.png
diff --git a/...hots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_4_en.png b/...hots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_4_en.png
diff --git a/...hots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_5_en.png b/...hots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_5_en.png
diff --git a/...hots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_6_en.png b/...hots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_6_en.png
diff --git a/...hots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_7_en.png b/...hots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_7_en.png
diff --git a/...hots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_8_en.png b/...hots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_8_en.png
diff --git a/...hots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_9_en.png b/...hots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_9_en.png
diff --git a/...s/images/features.knockrequests.impl.list_KnockRequestsListView_Night_10_en.png b/...s/images/features.knockrequests.impl.list_KnockRequestsListView_Night_10_en.png
diff --git a/...ts/images/features.knockrequests.impl.list_KnockRequestsListView_Night_2_en.png b/...ts/images/features.knockrequests.impl.list_KnockRequestsListView_Night_2_en.png
diff --git a/...ts/images/features.knockrequests.impl.list_KnockRequestsListView_Night_3_en.png b/...ts/images/features.knockrequests.impl.list_KnockRequestsListView_Night_3_en.png
diff --git a/...ts/images/features.knockrequests.impl.list_KnockRequestsListView_Night_4_en.png b/...ts/images/features.knockrequests.impl.list_KnockRequestsListView_Night_4_en.png
diff --git a/...ts/images/features.knockrequests.impl.list_KnockRequestsListView_Night_5_en.png b/...ts/images/features.knockrequests.impl.list_KnockRequestsListView_Night_5_en.png
diff --git a/...ts/images/features.knockrequests.impl.list_KnockRequestsListView_Night_6_en.png b/...ts/images/features.knockrequests.impl.list_KnockRequestsListView_Night_6_en.png
diff --git a/...ts/images/features.knockrequests.impl.list_KnockRequestsListView_Night_7_en.png b/...ts/images/features.knockrequests.impl.list_KnockRequestsListView_Night_7_en.png
diff --git a/...ts/images/features.knockrequests.impl.list_KnockRequestsListView_Night_8_en.png b/...ts/images/features.knockrequests.impl.list_KnockRequestsListView_Night_8_en.png
diff --git a/...ts/images/features.knockrequests.impl.list_KnockRequestsListView_Night_9_en.png b/...ts/images/features.knockrequests.impl.list_KnockRequestsListView_Night_9_en.png
diff --git a/...sts/src/test/snapshots/images/features.leaveroom.api_LeaveRoomView_Day_1_en.png b/...sts/src/test/snapshots/images/features.leaveroom.api_LeaveRoomView_Day_1_en.png
diff --git a/...sts/src/test/snapshots/images/features.leaveroom.api_LeaveRoomView_Day_2_en.png b/...sts/src/test/snapshots/images/features.leaveroom.api_LeaveRoomView_Day_2_en.png
diff --git a/...sts/src/test/snapshots/images/features.leaveroom.api_LeaveRoomView_Day_3_en.png b/...sts/src/test/snapshots/images/features.leaveroom.api_LeaveRoomView_Day_3_en.png