Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Rename all refs from Polaris to Adevinta in CatalogApp #624

Merged
merged 2 commits into from
Aug 17, 2023
Merged

fix: Rename all refs from Polaris to Adevinta in CatalogApp #624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
443e207
fix: Rename all refs to Polaris into Adevinta in CatalogApp
MarinaRomanova Aug 17, 2023
8ac1a47
run spotlessApply
MarinaRomanova Aug 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions catalog/src/main/kotlin/com/adevinta/spark/catalog/CatalogApp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ import com.adevinta.spark.catalog.themes.ThemeMode
import com.adevinta.spark.catalog.themes.ThemePicker
import com.adevinta.spark.catalog.themes.UserMode
import com.adevinta.spark.catalog.themes.themeprovider.ThemeProvider
import com.adevinta.spark.catalog.themes.themeprovider.adevinta.AdevintaTheme
import com.adevinta.spark.catalog.themes.themeprovider.leboncoin.LeboncoinTheme
import com.adevinta.spark.catalog.themes.themeprovider.polaris.PolarisTheme
import com.airbnb.android.showkase.models.ShowkaseBrowserComponent
import com.google.accompanist.testharness.TestHarness
import kotlinx.coroutines.launch
Expand All @@ -96,7 +96,7 @@ internal fun CatalogApp(
showkaseBrowserScreenMetadata: MutableState<ShowkaseBrowserScreenMetadata>,
) {
val themeProvider: ThemeProvider = when (theme.brandMode) {
BrandMode.Polaris -> PolarisTheme
BrandMode.Adevinta -> AdevintaTheme
BrandMode.Leboncoin -> LeboncoinTheme
BrandMode.LeboncoinLegacy -> LeboncoinTheme
}
Expand Down
4 changes: 2 additions & 2 deletions catalog/src/main/kotlin/com/adevinta/spark/catalog/themes/Theme.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import androidx.compose.runtime.saveable.Saver
public data class Theme(
val themeMode: ThemeMode = ThemeMode.System,
val colorMode: ColorMode = ColorMode.Baseline,
val brandMode: BrandMode = BrandMode.Polaris,
val brandMode: BrandMode = BrandMode.Adevinta,
val userMode: UserMode = UserMode.Part,
val fontScale: Float = 1.0f,
val fontScaleMode: FontScaleMode = FontScaleMode.System,
Expand Down Expand Up @@ -90,7 +90,7 @@ public enum class ThemeMode {
public enum class BrandMode(public val label: String) {
LeboncoinLegacy("Leboncoin (Legacy)"),
Leboncoin("Leboncoin (New Ui)"),
Polaris("Polaris"),
Adevinta("Adevinta"),
}

public enum class UserMode {
Expand Down
4 changes: 2 additions & 2 deletions ...mes/themeprovider/polaris/PolarisTheme.kt → ...s/themeprovider/adevinta/AdevintaTheme.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.adevinta.spark.catalog.themes.themeprovider.polaris
package com.adevinta.spark.catalog.themes.themeprovider.adevinta

import androidx.compose.runtime.Composable
import com.adevinta.spark.catalog.themes.themeprovider.ThemeProvider
Expand All @@ -31,7 +31,7 @@ import com.adevinta.spark.tokens.lightSparkColors
import com.adevinta.spark.tokens.sparkShapes
import com.adevinta.spark.tokens.sparkTypography

public object PolarisTheme : ThemeProvider {
public object AdevintaTheme : ThemeProvider {
@Composable
override fun colors(useDarkColors: Boolean, isPro: Boolean, isLegacy: Boolean): SparkColors {
return when {
Expand Down
Loading