From a317daa68f160a4a4614d8fcf35cd902c116da4b Mon Sep 17 00:00:00 2001 From: Tayeb Sedraia Date: Mon, 25 Nov 2024 15:00:17 +0100 Subject: [PATCH] review: pass token directly to ShowcaseTokenCode --- Showcase/Showcase/Pages/Tokens/Border/BorderTokenPage.swift | 3 +-- Showcase/Showcase/Pages/Tokens/Color/ColorTokenPage.swift | 3 +-- .../Showcase/Pages/Tokens/Dimension/Size/SizeTokenPage.swift | 3 +-- .../Showcase/Pages/Tokens/Dimension/Space/SpaceTokenPage.swift | 3 +-- .../Showcase/Pages/Tokens/Elevation/ElevationTokenPage.swift | 3 +-- Showcase/Showcase/Pages/Tokens/Grid/GrisTokenPage.swift | 3 +-- Showcase/Showcase/Pages/Tokens/Opacity/OpacityTokenPage.swift | 3 +-- .../Showcase/Pages/Tokens/Typography/TypographyTokenPage.swift | 3 +-- 8 files changed, 8 insertions(+), 16 deletions(-) diff --git a/Showcase/Showcase/Pages/Tokens/Border/BorderTokenPage.swift b/Showcase/Showcase/Pages/Tokens/Border/BorderTokenPage.swift index 3ab7d22d3..1bf5818c6 100644 --- a/Showcase/Showcase/Pages/Tokens/Border/BorderTokenPage.swift +++ b/Showcase/Showcase/Pages/Tokens/Border/BorderTokenPage.swift @@ -50,8 +50,7 @@ struct BorderTokenPage: View { VStack(alignment: .leading, spacing: activeTheme.spaceFixedMedium) { Section { VStack(alignment: .leading, spacing: activeTheme.spaceFixedNone) { - let tokenCode = "theme.borderWidthDefault" - ShowcaseTokenCode(code: tokenCode) + ShowcaseTokenCode(code: "theme.borderWidthDefault") } } Section { diff --git a/Showcase/Showcase/Pages/Tokens/Color/ColorTokenPage.swift b/Showcase/Showcase/Pages/Tokens/Color/ColorTokenPage.swift index 3963d231b..88575c94d 100644 --- a/Showcase/Showcase/Pages/Tokens/Color/ColorTokenPage.swift +++ b/Showcase/Showcase/Pages/Tokens/Color/ColorTokenPage.swift @@ -50,8 +50,7 @@ struct ColorTokenPage: View { var body: some View { Group { Section { - let tokenCode = "theme.colorBgPrimary.color(for: colorScheme)" - ShowcaseTokenCode(code: tokenCode) + ShowcaseTokenCode(code: "theme.colorBgPrimary.color(for: colorScheme)") } Section { illustrationForBackground() } header: { header("Background") } Section { illustrationForAction() } header: { header("Action") } diff --git a/Showcase/Showcase/Pages/Tokens/Dimension/Size/SizeTokenPage.swift b/Showcase/Showcase/Pages/Tokens/Dimension/Size/SizeTokenPage.swift index ce9f9c7ca..f6ea61ead 100644 --- a/Showcase/Showcase/Pages/Tokens/Dimension/Size/SizeTokenPage.swift +++ b/Showcase/Showcase/Pages/Tokens/Dimension/Size/SizeTokenPage.swift @@ -60,8 +60,7 @@ struct SizeTokenPage: View { var body: some View { Group { Section { - let tokenCode = "theme.sizeIconWithHeadingXLargeShort.dimension(for: horizontalSizeClass ?? .regular)" - ShowcaseTokenCode(code: tokenCode) + ShowcaseTokenCode(code: "theme.sizeIconWithHeadingXLargeShort.dimension(for: horizontalSizeClass ?? .regular)") } Section { illustrationForIconDecorative() } header: { header("app_tokens_dimension_size_iconDecorative_label") diff --git a/Showcase/Showcase/Pages/Tokens/Dimension/Space/SpaceTokenPage.swift b/Showcase/Showcase/Pages/Tokens/Dimension/Space/SpaceTokenPage.swift index 9ec53462e..8bd788c3e 100644 --- a/Showcase/Showcase/Pages/Tokens/Dimension/Space/SpaceTokenPage.swift +++ b/Showcase/Showcase/Pages/Tokens/Dimension/Space/SpaceTokenPage.swift @@ -82,8 +82,7 @@ struct SpaceTokenPage: View { var body: some View { Group { Section { - let tokenCode = "theme.spaceScaledMedium.dimension(for: horizontalSizeClass ?? .regular)" - ShowcaseTokenCode(code: tokenCode) + ShowcaseTokenCode(code: "theme.spaceScaledMedium.dimension(for: horizontalSizeClass ?? .regular)") } // Basic Space Tokens Section { illustrationForScaledSpaces() } header: { diff --git a/Showcase/Showcase/Pages/Tokens/Elevation/ElevationTokenPage.swift b/Showcase/Showcase/Pages/Tokens/Elevation/ElevationTokenPage.swift index 82c689600..001e1a511 100644 --- a/Showcase/Showcase/Pages/Tokens/Elevation/ElevationTokenPage.swift +++ b/Showcase/Showcase/Pages/Tokens/Elevation/ElevationTokenPage.swift @@ -52,8 +52,7 @@ struct ElevationTokenPage: View { var body: some View { VStack(alignment: .leading, spacing: activeTheme.spaceFixedNone) { Section { - let tokenCode = "theme.elevationNone.elevation(for: colorScheme)" - ShowcaseTokenCode(code: tokenCode) + ShowcaseTokenCode(code: "theme.elevationNone.elevation(for: colorScheme)") } Spacer() .frame(height: activeTheme.spaceFixedMedium) diff --git a/Showcase/Showcase/Pages/Tokens/Grid/GrisTokenPage.swift b/Showcase/Showcase/Pages/Tokens/Grid/GrisTokenPage.swift index 1b1101ced..a11a99eae 100644 --- a/Showcase/Showcase/Pages/Tokens/Grid/GrisTokenPage.swift +++ b/Showcase/Showcase/Pages/Tokens/Grid/GrisTokenPage.swift @@ -42,8 +42,7 @@ struct GridTokenPage: View { } Section { - let tokenCode = "theme.gridColumnCount(for: horizontalSizeClass)" - ShowcaseTokenCode(code: tokenCode) + ShowcaseTokenCode(code: "theme.gridColumnCount(for: horizontalSizeClass)") } Section { illustrationForGridTokens() } header: { diff --git a/Showcase/Showcase/Pages/Tokens/Opacity/OpacityTokenPage.swift b/Showcase/Showcase/Pages/Tokens/Opacity/OpacityTokenPage.swift index f0ef48288..f9ab67093 100644 --- a/Showcase/Showcase/Pages/Tokens/Opacity/OpacityTokenPage.swift +++ b/Showcase/Showcase/Pages/Tokens/Opacity/OpacityTokenPage.swift @@ -52,8 +52,7 @@ struct OpacityTokenPage: View { var body: some View { VStack(alignment: .leading, spacing: activeTheme.spaceFixedNone) { Section { - let tokenCode = "theme.opacityTransparent" - ShowcaseTokenCode(code: tokenCode) + ShowcaseTokenCode(code: "theme.opacityTransparent") } Spacer() .frame(height: activeTheme.spaceFixedMedium) diff --git a/Showcase/Showcase/Pages/Tokens/Typography/TypographyTokenPage.swift b/Showcase/Showcase/Pages/Tokens/Typography/TypographyTokenPage.swift index 9b8a97674..07e6b4e3b 100644 --- a/Showcase/Showcase/Pages/Tokens/Typography/TypographyTokenPage.swift +++ b/Showcase/Showcase/Pages/Tokens/Typography/TypographyTokenPage.swift @@ -62,8 +62,7 @@ struct TypographyTokenPage: View { var body: some View { VStack(alignment: .leading, spacing: activeTheme.spaceFixedNone) { Section { - let tokenCode = "theme.typeBodyStrongLarge(theme)" - ShowcaseTokenCode(code: tokenCode) + ShowcaseTokenCode(code: "theme.typeBodyStrongLarge(theme)") } Spacer() ForEach(NamedTypography.allCases, id: \.rawValue) { typographyName in