From 26f1c03f91b89cb39b8b641077e331ec29a66c0d Mon Sep 17 00:00:00 2001 From: Pauline Auvray Date: Tue, 31 Jan 2023 09:54:45 +0100 Subject: [PATCH] [#415] Review: Remove useless companion object --- .../java/com/orange/ods/demo/ui/components/chips/Chip.kt | 2 +- .../com/orange/ods/demo/ui/components/chips/ChipFilter.kt | 2 +- .../java/com/orange/ods/theme/OdsComponentsConfiguration.kt | 6 ++---- .../theme/innovationcup/InnovationCupThemeConfiguration.kt | 1 - 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/demo/src/main/java/com/orange/ods/demo/ui/components/chips/Chip.kt b/demo/src/main/java/com/orange/ods/demo/ui/components/chips/Chip.kt index 32f44b43e..acf1a4658 100644 --- a/demo/src/main/java/com/orange/ods/demo/ui/components/chips/Chip.kt +++ b/demo/src/main/java/com/orange/ods/demo/ui/components/chips/Chip.kt @@ -37,7 +37,7 @@ import com.orange.ods.demo.ui.components.chips.ChipCustomizationState.LeadingEle import com.orange.ods.demo.ui.components.utilities.ComponentCustomizationBottomSheetScaffold import com.orange.ods.demo.ui.components.utilities.clickOnElement import com.orange.ods.demo.ui.utilities.composable.Subtitle -import com.orange.ods.theme.OdsComponentsConfiguration.Companion.ComponentStyle +import com.orange.ods.theme.OdsComponentsConfiguration.ComponentStyle @OptIn(ExperimentalMaterialApi::class) @Composable diff --git a/demo/src/main/java/com/orange/ods/demo/ui/components/chips/ChipFilter.kt b/demo/src/main/java/com/orange/ods/demo/ui/components/chips/ChipFilter.kt index 44043cf0e..d0fd21eff 100644 --- a/demo/src/main/java/com/orange/ods/demo/ui/components/chips/ChipFilter.kt +++ b/demo/src/main/java/com/orange/ods/demo/ui/components/chips/ChipFilter.kt @@ -34,7 +34,7 @@ import com.orange.ods.demo.domain.recipes.LocalRecipes import com.orange.ods.demo.ui.LocalMainThemeManager import com.orange.ods.demo.ui.components.utilities.ComponentCustomizationBottomSheetScaffold import com.orange.ods.demo.ui.utilities.composable.Subtitle -import com.orange.ods.theme.OdsComponentsConfiguration.Companion.ComponentStyle +import com.orange.ods.theme.OdsComponentsConfiguration.ComponentStyle @OptIn(ExperimentalMaterialApi::class) @Composable diff --git a/theme-contract/src/main/java/com/orange/ods/theme/OdsComponentsConfiguration.kt b/theme-contract/src/main/java/com/orange/ods/theme/OdsComponentsConfiguration.kt index 3f6d3927f..445064295 100644 --- a/theme-contract/src/main/java/com/orange/ods/theme/OdsComponentsConfiguration.kt +++ b/theme-contract/src/main/java/com/orange/ods/theme/OdsComponentsConfiguration.kt @@ -16,10 +16,8 @@ package com.orange.ods.theme */ open class OdsComponentsConfiguration { - companion object { - enum class ComponentStyle { - Filled, Outlined - } + enum class ComponentStyle { + Filled, Outlined } /** diff --git a/theme-innovation-cup/src/main/java/com/orange/ods/theme/innovationcup/InnovationCupThemeConfiguration.kt b/theme-innovation-cup/src/main/java/com/orange/ods/theme/innovationcup/InnovationCupThemeConfiguration.kt index 0e35acd54..0f649ee16 100644 --- a/theme-innovation-cup/src/main/java/com/orange/ods/theme/innovationcup/InnovationCupThemeConfiguration.kt +++ b/theme-innovation-cup/src/main/java/com/orange/ods/theme/innovationcup/InnovationCupThemeConfiguration.kt @@ -14,7 +14,6 @@ import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.Shapes import androidx.compose.ui.unit.dp import com.orange.ods.theme.OdsComponentsConfiguration -import com.orange.ods.theme.OdsComponentsConfiguration.Companion.ComponentStyle import com.orange.ods.theme.OdsThemeColors import com.orange.ods.theme.OdsThemeConfigurationContract import kotlinx.parcelize.Parcelize