Skip to content

Commit

Permalink
[NEUT-1872] Rename SponsoredBanner to InsetBanner (#1763)
Browse files Browse the repository at this point in the history
* [NEUT-1872] Rename SponsoredBanner to InsetBanner

* [NEUT-1872] Fix, add deleted internal file

* Updated snapshots for 'dm'

* Updated snapshots for 'default'

* Updated snapshots for 'rtl'

* Trigger CI

---------

Co-authored-by: Miquel Puig Turon <[email protected]>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
  • Loading branch information
3 people authored Oct 25, 2023
1 parent 4456e11 commit e252b09
Show file tree
Hide file tree
Showing 61 changed files with 315 additions and 315 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
/**
* Backpack for Android - Skyscanner's Design System
*
* Copyright 2018 Skyscanner Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package net.skyscanner.backpack.compose.insetbanner

import net.skyscanner.backpack.compose.BpkSnapshotTest
import net.skyscanner.backpack.demo.compose.InsetBannerStoryOnDark
import net.skyscanner.backpack.demo.compose.InsetBannerStoryOnLight
import net.skyscanner.backpack.demo.compose.InsetBannerStoryWithoutCTA
import net.skyscanner.backpack.demo.compose.InsetBannerStoryWithoutSubHeadline
import net.skyscanner.backpack.demo.compose.InsetBannerStoryWithoutTitle
import net.skyscanner.backpack.demo.compose.InsetBannerStoryWithoutTitleAndSubHeadline
import org.junit.Test

class BpkInsetBannerTest : BpkSnapshotTest() {

@Test
fun defaultOnDark() = snap {
InsetBannerStoryOnDark()
}

@Test
fun defaultOnLight() = snap {
InsetBannerStoryOnLight()
}

@Test
fun insetBannerWithoutSubheadline() = snap {
InsetBannerStoryWithoutSubHeadline()
}

@Test
fun insetBannerWithoutTitle() = snap {
InsetBannerStoryWithoutTitle()
}

@Test
fun insetBannerWithoutTitleAndSubheadline() = snap {
InsetBannerStoryWithoutTitleAndSubHeadline()
}

@Test
fun insetBannerWithoutCallToAction() = snap {
InsetBannerStoryWithoutCTA()
}
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ package net.skyscanner.backpack.demo.components

import net.skyscanner.backpack.meta.ComponentMarker

@ComponentMarker("Sponsored Banner")
annotation class SponsoredBannerComponent
@ComponentMarker("Inset Banner")
annotation class InsetBannerComponent
Original file line number Diff line number Diff line change
@@ -0,0 +1,206 @@
/**
* Backpack for Android - Skyscanner's Design System
*
* Copyright 2018 Skyscanner Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package net.skyscanner.backpack.demo.compose

import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.padding
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import net.skyscanner.backpack.compose.insetbanner.BpkInsetBanner
import net.skyscanner.backpack.compose.insetbanner.BpkInsetBannerCTA
import net.skyscanner.backpack.compose.insetbanner.BpkInsetBannerVariant
import net.skyscanner.backpack.compose.insetbanner.BpkInsetBannerVariant.OnDark
import net.skyscanner.backpack.compose.insetbanner.BpkInsetBannerVariant.OnLight
import net.skyscanner.backpack.compose.tokens.BpkSpacing
import net.skyscanner.backpack.demo.R
import net.skyscanner.backpack.demo.components.InsetBannerComponent
import net.skyscanner.backpack.demo.meta.ComposeStory

@Composable
@InsetBannerComponent
@ComposeStory("OnLight")
fun InsetBannerStoryOnLight() {
DefaultInsetBannerSample(
variant = OnLight,
title = stringResource(R.string.inset_banner_title),
subHeadline = stringResource(R.string.inset_banner_sub_headline),
callToAction = BpkInsetBannerCTA(
stringResource(R.string.inset_banner_cta_text),
stringResource(R.string.inset_banner_cta_accessibility_label),
),
body = stringResource(R.string.inset_banner_body),
logo = getPartnerLogo(variant = OnLight),
)
}

@Composable
@InsetBannerComponent
@ComposeStory("OnDark")
fun InsetBannerStoryOnDark() {
DefaultInsetBannerSample(
variant = OnDark,
title = stringResource(R.string.inset_banner_title),
subHeadline = stringResource(R.string.inset_banner_sub_headline),
callToAction = BpkInsetBannerCTA(
stringResource(R.string.inset_banner_cta_text),
stringResource(R.string.inset_banner_cta_accessibility_label),
),
body = stringResource(R.string.inset_banner_body),
logo = getPartnerLogo(variant = OnDark),
)
}

@Composable
@InsetBannerComponent
@ComposeStory("Without Title")
fun InsetBannerStoryWithoutTitle(modifier: Modifier = Modifier) {
DefaultInsetBannerSample(
variant = OnDark,
subHeadline = stringResource(R.string.inset_banner_sub_headline),
callToAction = BpkInsetBannerCTA(
stringResource(R.string.inset_banner_cta_text),
stringResource(R.string.inset_banner_cta_accessibility_label),
),
body = stringResource(R.string.inset_banner_body),
logo = getPartnerLogo(variant = OnDark),
)
}

@Composable
@InsetBannerComponent
@ComposeStory("Without subHeadline")
fun InsetBannerStoryWithoutSubHeadline(modifier: Modifier = Modifier) {
DefaultInsetBannerSample(
variant = OnDark,
title = stringResource(R.string.inset_banner_title),
callToAction = BpkInsetBannerCTA(
stringResource(R.string.inset_banner_cta_text),
stringResource(R.string.inset_banner_cta_accessibility_label),
),
body = stringResource(R.string.inset_banner_body),
logo = getPartnerLogo(variant = OnDark),
)
}

@Composable
@InsetBannerComponent
@ComposeStory("Without Title and subHeadline")
fun InsetBannerStoryWithoutTitleAndSubHeadline(modifier: Modifier = Modifier) {
DefaultInsetBannerSample(
variant = OnDark,
callToAction = BpkInsetBannerCTA(
stringResource(R.string.inset_banner_cta_text),
stringResource(R.string.inset_banner_cta_accessibility_label),
),
body = stringResource(R.string.inset_banner_body),
logo = getPartnerLogo(variant = OnDark),
)
}

@Composable
@InsetBannerComponent
@ComposeStory("Without CTA")
fun InsetBannerStoryWithoutCTA(modifier: Modifier = Modifier) {
DefaultInsetBannerSample(
variant = OnDark,
title = stringResource(R.string.inset_banner_title),
subHeadline = stringResource(R.string.inset_banner_sub_headline),
body = stringResource(R.string.inset_banner_body),
logo = getPartnerLogo(variant = OnDark),
)
}

@Composable
@InsetBannerComponent
@ComposeStory("Without Body")
fun InsetBannerStoryWithoutBody(modifier: Modifier = Modifier) {
DefaultInsetBannerSample(
variant = OnDark,
title = stringResource(R.string.inset_banner_title),
subHeadline = stringResource(R.string.inset_banner_sub_headline),
callToAction = BpkInsetBannerCTA(
stringResource(R.string.inset_banner_cta_text),
stringResource(R.string.inset_banner_cta_accessibility_label),
),
logo = getPartnerLogo(variant = OnDark),
)
}

@Composable
@InsetBannerComponent
@ComposeStory("Without Logo")
fun InsetBannerStoryWithoutLogo(modifier: Modifier = Modifier) {
DefaultInsetBannerSample(
variant = OnDark,
title = stringResource(R.string.inset_banner_title),
subHeadline = stringResource(R.string.inset_banner_sub_headline),
callToAction = BpkInsetBannerCTA(
stringResource(R.string.inset_banner_cta_text),
stringResource(R.string.inset_banner_cta_accessibility_label),
),
body = stringResource(R.string.inset_banner_body),
logo = null,
)
}

@Composable
private fun getPartnerLogo(variant: BpkInsetBannerVariant): @Composable () -> Unit = {
Image(
painter = when (variant) {
OnDark -> painterResource(R.drawable.inset_banner_skyland_white)
OnLight -> painterResource(R.drawable.inset_banner_skyland_black)
},
contentDescription = stringResource(R.string.inset_banner_cta_accessibility_label),
contentScale = ContentScale.Fit,
)
}

@Composable
internal fun DefaultInsetBannerSample(
variant: BpkInsetBannerVariant,
modifier: Modifier = Modifier,
title: String? = null,
subHeadline: String? = null,
callToAction: BpkInsetBannerCTA? = null,
body: String? = null,
logo: @Composable (() -> Unit)? = null,
) {
Box(modifier = modifier.padding(BpkSpacing.Lg)) {
BpkInsetBanner(
variant = variant,
backgroundColor = when (variant) {
OnDark -> Color(BACKGROUND_ONDARK_COLOR_HEX)
OnLight -> Color(BACKGROUND_ONLIGHT_COLOR_HEX)
},
title = title,
subHeadline = subHeadline,
callToAction = callToAction,
body = body,
logo = logo,
)
}
}

const val BACKGROUND_ONDARK_COLOR_HEX = 0xFFFF6601
const val BACKGROUND_ONLIGHT_COLOR_HEX = 0xFFFFE300
Loading

0 comments on commit e252b09

Please sign in to comment.