diff --git a/changelog.md b/changelog.md index 778d6adc5..d0afbe3ae 100644 --- a/changelog.md +++ b/changelog.md @@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - \[Demo\] Change buttons screens by removing style customization and adding a code implementation section ([#339](https://github.com/Orange-OpenSource/ods-android/issues/339)) +- \[Demo\] Display black and white illustrations for non Orange themes ([#386](https://github.com/Orange-OpenSource/ods-android/issues/386)) - \[Doc\] Use ODS Jekyll theme header to display favicons on documentation github pages ([#370](https://github.com/Orange-OpenSource/ods-android/issues/370)) - \[Lib\] Replace `tint` parameter of `OdsIconButton` composable methods by `displaySurface` ([#294](https://github.com/Orange-OpenSource/ods-android/issues/294)) diff --git a/demo/src/main/java/com/orange/ods/demo/ui/MainScreen.kt b/demo/src/main/java/com/orange/ods/demo/ui/MainScreen.kt index 7dc4a512a..515dab80e 100644 --- a/demo/src/main/java/com/orange/ods/demo/ui/MainScreen.kt +++ b/demo/src/main/java/com/orange/ods/demo/ui/MainScreen.kt @@ -53,8 +53,8 @@ import com.orange.ods.demo.ui.components.tabs.ScrollableTabRow import com.orange.ods.demo.ui.guidelines.addGuidelinesGraph import com.orange.ods.demo.ui.utilities.composable.RadioButtonListItem import com.orange.ods.demo.ui.utilities.extension.isDarkModeEnabled +import com.orange.ods.demo.ui.utilities.extension.isOrange import com.orange.ods.theme.OdsThemeConfigurationContract -import com.orange.ods.theme.orange.OrangeThemeConfiguration import com.orange.ods.utilities.extension.orElse @Preview(showBackground = true, uiMode = UI_MODE_NIGHT_YES) @@ -152,7 +152,7 @@ fun MainScreen(themeConfigurations: Set, mainView private fun getCurrentThemeConfiguration(storedUserThemeName: String?, themeConfigurations: Set): OdsThemeConfigurationContract { // Return the stored user theme configuration if it exists. If not, return the Orange theme configuration or the first existing theme configuration return themeConfigurations.firstOrNull { it.name == storedUserThemeName } - .orElse { themeConfigurations.firstOrNull { it.name == OrangeThemeConfiguration.OrangeThemeName } } + .orElse { themeConfigurations.firstOrNull { it.isOrange } } .orElse { themeConfigurations.first() } } diff --git a/demo/src/main/java/com/orange/ods/demo/ui/about/AboutScreen.kt b/demo/src/main/java/com/orange/ods/demo/ui/about/AboutScreen.kt index 7c99f901b..51f293b81 100644 --- a/demo/src/main/java/com/orange/ods/demo/ui/about/AboutScreen.kt +++ b/demo/src/main/java/com/orange/ods/demo/ui/about/AboutScreen.kt @@ -32,6 +32,7 @@ import com.orange.ods.compose.text.OdsTextCaption import com.orange.ods.compose.text.OdsTextH4 import com.orange.ods.demo.R import com.orange.ods.demo.ui.LocalMainTopAppBarManager +import com.orange.ods.demo.ui.utilities.DrawableManager import com.orange.ods.demo.ui.utilities.compat.PackageManagerCompat import com.orange.ods.demo.ui.utilities.extension.versionCode import com.orange.ods.utilities.extension.ifNotNull @@ -50,7 +51,7 @@ fun AboutScreen(onAboutItemClick: (Long) -> Unit) { Image( modifier = Modifier .fillMaxWidth(), - painter = painterResource(id = R.drawable.il_about), + painter = painterResource(id = DrawableManager.getDrawableResIdForCurrentTheme(resId = R.drawable.il_about)), contentScale = ContentScale.Crop, contentDescription = null ) diff --git a/demo/src/main/java/com/orange/ods/demo/ui/components/ComponentDetailScreen.kt b/demo/src/main/java/com/orange/ods/demo/ui/components/ComponentDetailScreen.kt index b04f8a898..8585d32c1 100644 --- a/demo/src/main/java/com/orange/ods/demo/ui/components/ComponentDetailScreen.kt +++ b/demo/src/main/java/com/orange/ods/demo/ui/components/ComponentDetailScreen.kt @@ -33,6 +33,7 @@ import com.orange.ods.compose.component.list.iconType import com.orange.ods.compose.text.OdsTextSubtitle2 import com.orange.ods.demo.R import com.orange.ods.demo.ui.LocalMainTopAppBarManager +import com.orange.ods.demo.ui.utilities.DrawableManager import com.orange.ods.demo.ui.utilities.composable.DetailScreenHeader @Composable @@ -53,7 +54,7 @@ fun ComponentDetailScreen( .padding(bottom = dimensionResource(id = R.dimen.screen_vertical_margin)) ) { DetailScreenHeader( - imageRes = component.imageRes, + imageRes = DrawableManager.getDrawableResIdForCurrentTheme(resId = component.imageRes), imageAlignment = component.imageAlignment, descriptionRes = component.descriptionRes ) diff --git a/demo/src/main/java/com/orange/ods/demo/ui/components/ComponentsScreen.kt b/demo/src/main/java/com/orange/ods/demo/ui/components/ComponentsScreen.kt index b5289a8e3..f22da282c 100644 --- a/demo/src/main/java/com/orange/ods/demo/ui/components/ComponentsScreen.kt +++ b/demo/src/main/java/com/orange/ods/demo/ui/components/ComponentsScreen.kt @@ -29,6 +29,7 @@ import androidx.compose.ui.res.stringResource import com.orange.ods.compose.component.card.OdsSmallCard import com.orange.ods.demo.R import com.orange.ods.demo.ui.LocalMainTopAppBarManager +import com.orange.ods.demo.ui.utilities.DrawableManager import com.orange.ods.utilities.extension.orElse @Composable @@ -59,10 +60,12 @@ fun ComponentsScreen(onComponentClick: (Long) -> Unit) { @Composable private fun RowScope.ComponentCard(component: Component, onComponentClick: (Long) -> Unit) { + val smallImageResId = component.smallImageRes?.let { DrawableManager.getDrawableResIdForCurrentTheme(resId = it) } + val imageResId = DrawableManager.getDrawableResIdForCurrentTheme(resId = component.imageRes) OdsSmallCard( modifier = Modifier.weight(0.5f), title = stringResource(id = component.titleRes), - image = painterResource(id = component.smallImageRes.orElse { component.imageRes }), + image = painterResource(id = smallImageResId.orElse { imageResId }), imageBackgroundColor = Color(Component.ImageBackgroundColor), imageContentScale = ContentScale.Fit, imageAlignment = component.imageAlignment, diff --git a/demo/src/main/java/com/orange/ods/demo/ui/guidelines/GuidelinesScreen.kt b/demo/src/main/java/com/orange/ods/demo/ui/guidelines/GuidelinesScreen.kt index 79625fa0f..bd79a964c 100644 --- a/demo/src/main/java/com/orange/ods/demo/ui/guidelines/GuidelinesScreen.kt +++ b/demo/src/main/java/com/orange/ods/demo/ui/guidelines/GuidelinesScreen.kt @@ -24,6 +24,7 @@ import androidx.compose.ui.res.stringResource import com.orange.ods.compose.component.card.OdsImageFirstCard import com.orange.ods.demo.R import com.orange.ods.demo.ui.LocalMainTopAppBarManager +import com.orange.ods.demo.ui.utilities.DrawableManager @Composable fun GuidelinesScreen(onGuidelineClick: (String) -> Unit) { @@ -40,7 +41,7 @@ fun GuidelinesScreen(onGuidelineClick: (String) -> Unit) { Guideline.values().forEach { guideline -> OdsImageFirstCard( title = stringResource(id = guideline.titleRes), - image = painterResource(id = guideline.imageRes), + image = painterResource(id = DrawableManager.getDrawableResIdForCurrentTheme(resId = guideline.imageRes)), imageContentScale = guideline.imageContentScale, imageBackgroundColor = guideline.imageBackgroundColor, imageAlignment = guideline.imageAlignment, diff --git a/demo/src/main/java/com/orange/ods/demo/ui/guidelines/spacing/GuidelineSpacingScreen.kt b/demo/src/main/java/com/orange/ods/demo/ui/guidelines/spacing/GuidelineSpacingScreen.kt index ff778a9af..9e56d5b3e 100644 --- a/demo/src/main/java/com/orange/ods/demo/ui/guidelines/spacing/GuidelineSpacingScreen.kt +++ b/demo/src/main/java/com/orange/ods/demo/ui/guidelines/spacing/GuidelineSpacingScreen.kt @@ -30,9 +30,12 @@ import com.orange.ods.compose.component.list.divider import com.orange.ods.compose.text.OdsTextCaption import com.orange.ods.compose.text.OdsTextSubtitle1 import com.orange.ods.demo.R +import com.orange.ods.demo.ui.LocalMainThemeManager import com.orange.ods.demo.ui.LocalMainTopAppBarManager import com.orange.ods.demo.ui.guidelines.Guideline +import com.orange.ods.demo.ui.utilities.DrawableManager import com.orange.ods.demo.ui.utilities.composable.DetailScreenHeader +import com.orange.ods.demo.ui.utilities.extension.isOrange import java.text.DecimalFormat import java.text.DecimalFormatSymbols import java.util.* @@ -46,7 +49,7 @@ fun GuidelineSpacingScreen() { LazyColumn(contentPadding = PaddingValues(bottom = dimensionResource(id = R.dimen.spacing_m))) { item { DetailScreenHeader( - imageRes = R.drawable.il_spacing, + imageRes = DrawableManager.getDrawableResIdForCurrentTheme(resId = R.drawable.il_spacing), imageAlignment = Guideline.Spacing.imageAlignment, descriptionRes = R.string.guideline_spacing_description ) @@ -83,6 +86,7 @@ private fun GuidelineSpacingImage(spacing: Spacing) { val spacingWidth = dimensionResource(id = spacing.dimenRes).coerceAtLeast(1.dp) val imageWidth = dimensionResource(id = R.dimen.guideline_spacing_image_width) val imageHeight = dimensionResource(id = R.dimen.guideline_spacing_image_height) + val isOrangeTheme = LocalMainThemeManager.current.currentThemeConfiguration.isOrange Canvas( modifier = Modifier @@ -99,8 +103,9 @@ private fun GuidelineSpacingImage(spacing: Spacing) { Size(imageWidth.toPx(), bannerHeight.toPx()) ) // Spacing + val spacingColor = if (isOrangeTheme) 0xff4bb4e6 else 0xff949494 drawRect( - Color(0xff4bb4e6), + Color(spacingColor), Offset(((imageWidth - spacingWidth) / 2.0f).toPx(), 0.0f), Size(spacingWidth.toPx(), imageHeight.toPx()) ) diff --git a/demo/src/main/java/com/orange/ods/demo/ui/guidelines/typography/GuidelineTypographyScreen.kt b/demo/src/main/java/com/orange/ods/demo/ui/guidelines/typography/GuidelineTypographyScreen.kt index c35e63320..2e74cdc02 100644 --- a/demo/src/main/java/com/orange/ods/demo/ui/guidelines/typography/GuidelineTypographyScreen.kt +++ b/demo/src/main/java/com/orange/ods/demo/ui/guidelines/typography/GuidelineTypographyScreen.kt @@ -34,6 +34,7 @@ import com.orange.ods.compose.theme.OdsTheme import com.orange.ods.demo.R import com.orange.ods.demo.ui.LocalMainTopAppBarManager import com.orange.ods.demo.ui.LocalOdsDemoGuideline +import com.orange.ods.demo.ui.utilities.DrawableManager import com.orange.ods.demo.ui.utilities.composable.DetailScreenHeader import com.orange.ods.demo.ui.utilities.getStringName import com.orange.ods.theme.guideline.GuidelineTextStyle @@ -49,7 +50,10 @@ fun GuidelineTypographyScreen() { verticalArrangement = Arrangement.spacedBy(dimensionResource(id = R.dimen.spacing_m)) ) { item { - DetailScreenHeader(imageRes = R.drawable.il_typography, descriptionRes = R.string.guideline_typography_description) + DetailScreenHeader( + imageRes = DrawableManager.getDrawableResIdForCurrentTheme(resId = R.drawable.il_typography), + descriptionRes = R.string.guideline_typography_description + ) } if (guidelineTypography.isEmpty()) { item { diff --git a/demo/src/main/java/com/orange/ods/demo/ui/utilities/DrawableManager.kt b/demo/src/main/java/com/orange/ods/demo/ui/utilities/DrawableManager.kt new file mode 100644 index 000000000..86f72ecaa --- /dev/null +++ b/demo/src/main/java/com/orange/ods/demo/ui/utilities/DrawableManager.kt @@ -0,0 +1,63 @@ +/* + * + * Copyright 2021 Orange + * + * Use of this source code is governed by an MIT-style + * license that can be found in the LICENSE file or at + * https://opensource.org/licenses/MIT. + * / + */ + +package com.orange.ods.demo.ui.utilities + +import androidx.annotation.DrawableRes +import androidx.compose.runtime.Composable +import com.orange.ods.demo.R +import com.orange.ods.demo.ui.LocalMainThemeManager +import com.orange.ods.demo.ui.utilities.extension.isOrange +import com.orange.ods.utilities.extension.orElse + +object DrawableManager { + + private val orangeResIdByGenericResId = mapOf( + // About + R.drawable.il_about_generic to R.drawable.il_about, + // Guidelines + R.drawable.il_color_generic to R.drawable.il_color, + R.drawable.il_spacing_generic to R.drawable.il_spacing, + R.drawable.il_typography_generic to R.drawable.il_typography, + // Components + R.drawable.il_app_bars_top_generic to R.drawable.il_app_bars_top, + R.drawable.il_app_bars_top_small_generic to R.drawable.il_app_bars_top_small, + R.drawable.il_bottom_navigation_generic to R.drawable.il_bottom_navigation, + R.drawable.il_buttons_generic to R.drawable.il_buttons, + R.drawable.il_buttons_small_generic to R.drawable.il_buttons_small, + R.drawable.il_cards_generic to R.drawable.il_cards, + R.drawable.il_checkboxes_generic to R.drawable.il_checkboxes, + R.drawable.il_chips_generic to R.drawable.il_chips, + R.drawable.il_chips_small_generic to R.drawable.il_chips_small, + R.drawable.il_dialogs_generic to R.drawable.il_dialogs, + R.drawable.il_lists_generic to R.drawable.il_lists, + R.drawable.il_progress_generic to R.drawable.il_progress, + R.drawable.il_radio_buttons_generic to R.drawable.il_radio_buttons, + R.drawable.il_sliders_generic to R.drawable.il_sliders, + R.drawable.il_snackbars_generic to R.drawable.il_snackbars, + R.drawable.il_snackbars_small_generic to R.drawable.il_snackbars_small, + R.drawable.il_switches_generic to R.drawable.il_switches, + R.drawable.il_switches_small_generic to R.drawable.il_switches_small, + R.drawable.il_tabs_generic to R.drawable.il_tabs, + R.drawable.il_tabs_small_generic to R.drawable.il_tabs_small, + R.drawable.il_text_fields_generic to R.drawable.il_text_fields, + R.drawable.il_text_fields_small_generic to R.drawable.il_text_fields_small, + ) + + private val genericResIdByOrangeResId = orangeResIdByGenericResId.entries.associate { it.value to it.key } + + @Composable + fun getDrawableResIdForCurrentTheme(@DrawableRes resId: Int): Int { + val isOrangeTheme = LocalMainThemeManager.current.currentThemeConfiguration.isOrange + val currentThemeResId = if (isOrangeTheme) orangeResIdByGenericResId[resId] else genericResIdByOrangeResId[resId] + + return currentThemeResId.orElse { resId } + } +} diff --git a/demo/src/main/java/com/orange/ods/demo/ui/utilities/extension/OdsThemeConfigurationContractExt.kt b/demo/src/main/java/com/orange/ods/demo/ui/utilities/extension/OdsThemeConfigurationContractExt.kt new file mode 100644 index 000000000..23d3a3832 --- /dev/null +++ b/demo/src/main/java/com/orange/ods/demo/ui/utilities/extension/OdsThemeConfigurationContractExt.kt @@ -0,0 +1,17 @@ +/* + * + * Copyright 2021 Orange + * + * Use of this source code is governed by an MIT-style + * license that can be found in the LICENSE file or at + * https://opensource.org/licenses/MIT. + * / + */ + +package com.orange.ods.demo.ui.utilities.extension + +import com.orange.ods.theme.OdsThemeConfigurationContract +import com.orange.ods.theme.orange.OrangeThemeConfiguration + +val OdsThemeConfigurationContract.isOrange: Boolean + get() = name == OrangeThemeConfiguration.OrangeThemeName diff --git a/demo/src/main/res/drawable-hdpi/il_about_generic.png b/demo/src/main/res/drawable-hdpi/il_about_generic.png new file mode 100644 index 000000000..7fd2f5491 Binary files /dev/null and b/demo/src/main/res/drawable-hdpi/il_about_generic.png differ diff --git a/demo/src/main/res/drawable-hdpi/il_app_bars_top_generic.png b/demo/src/main/res/drawable-hdpi/il_app_bars_top_generic.png new file mode 100644 index 000000000..914332cb6 Binary files /dev/null and b/demo/src/main/res/drawable-hdpi/il_app_bars_top_generic.png differ diff --git a/demo/src/main/res/drawable-hdpi/il_app_bars_top_small_generic.png b/demo/src/main/res/drawable-hdpi/il_app_bars_top_small_generic.png new file mode 100644 index 000000000..fb1e91a6b Binary files /dev/null and b/demo/src/main/res/drawable-hdpi/il_app_bars_top_small_generic.png differ diff --git a/demo/src/main/res/drawable-hdpi/il_buttons_generic.png b/demo/src/main/res/drawable-hdpi/il_buttons_generic.png new file mode 100644 index 000000000..8a2feb0aa Binary files /dev/null and b/demo/src/main/res/drawable-hdpi/il_buttons_generic.png differ diff --git a/demo/src/main/res/drawable-hdpi/il_buttons_small_generic.png b/demo/src/main/res/drawable-hdpi/il_buttons_small_generic.png new file mode 100644 index 000000000..489f7750c Binary files /dev/null and b/demo/src/main/res/drawable-hdpi/il_buttons_small_generic.png differ diff --git a/demo/src/main/res/drawable-hdpi/il_chips_generic.png b/demo/src/main/res/drawable-hdpi/il_chips_generic.png new file mode 100644 index 000000000..09e374c58 Binary files /dev/null and b/demo/src/main/res/drawable-hdpi/il_chips_generic.png differ diff --git a/demo/src/main/res/drawable-hdpi/il_chips_small_generic.png b/demo/src/main/res/drawable-hdpi/il_chips_small_generic.png new file mode 100644 index 000000000..51cb722c9 Binary files /dev/null and b/demo/src/main/res/drawable-hdpi/il_chips_small_generic.png differ diff --git a/demo/src/main/res/drawable-hdpi/il_color_generic.png b/demo/src/main/res/drawable-hdpi/il_color_generic.png new file mode 100644 index 000000000..c023186b1 Binary files /dev/null and b/demo/src/main/res/drawable-hdpi/il_color_generic.png differ diff --git a/demo/src/main/res/drawable-hdpi/il_snackbars_generic.png b/demo/src/main/res/drawable-hdpi/il_snackbars_generic.png new file mode 100644 index 000000000..c3ce7a332 Binary files /dev/null and b/demo/src/main/res/drawable-hdpi/il_snackbars_generic.png differ diff --git a/demo/src/main/res/drawable-hdpi/il_snackbars_small_generic.png b/demo/src/main/res/drawable-hdpi/il_snackbars_small_generic.png new file mode 100644 index 000000000..d933b1cdb Binary files /dev/null and b/demo/src/main/res/drawable-hdpi/il_snackbars_small_generic.png differ diff --git a/demo/src/main/res/drawable-hdpi/il_spacing_generic.png b/demo/src/main/res/drawable-hdpi/il_spacing_generic.png new file mode 100644 index 000000000..68d3edb1f Binary files /dev/null and b/demo/src/main/res/drawable-hdpi/il_spacing_generic.png differ diff --git a/demo/src/main/res/drawable-hdpi/il_switches_generic.png b/demo/src/main/res/drawable-hdpi/il_switches_generic.png new file mode 100644 index 000000000..fbf386760 Binary files /dev/null and b/demo/src/main/res/drawable-hdpi/il_switches_generic.png differ diff --git a/demo/src/main/res/drawable-hdpi/il_switches_small_generic.png b/demo/src/main/res/drawable-hdpi/il_switches_small_generic.png new file mode 100644 index 000000000..587a15671 Binary files /dev/null and b/demo/src/main/res/drawable-hdpi/il_switches_small_generic.png differ diff --git a/demo/src/main/res/drawable-hdpi/il_tabs_generic.png b/demo/src/main/res/drawable-hdpi/il_tabs_generic.png new file mode 100644 index 000000000..a0e2d5b0e Binary files /dev/null and b/demo/src/main/res/drawable-hdpi/il_tabs_generic.png differ diff --git a/demo/src/main/res/drawable-hdpi/il_tabs_small_genric.png b/demo/src/main/res/drawable-hdpi/il_tabs_small_genric.png new file mode 100644 index 000000000..ac7cbe854 Binary files /dev/null and b/demo/src/main/res/drawable-hdpi/il_tabs_small_genric.png differ diff --git a/demo/src/main/res/drawable-hdpi/il_text_fields_generic.png b/demo/src/main/res/drawable-hdpi/il_text_fields_generic.png new file mode 100644 index 000000000..7bc54640b Binary files /dev/null and b/demo/src/main/res/drawable-hdpi/il_text_fields_generic.png differ diff --git a/demo/src/main/res/drawable-hdpi/il_text_fields_small_generic.png b/demo/src/main/res/drawable-hdpi/il_text_fields_small_generic.png new file mode 100644 index 000000000..6a32a4f9c Binary files /dev/null and b/demo/src/main/res/drawable-hdpi/il_text_fields_small_generic.png differ diff --git a/demo/src/main/res/drawable-hdpi/il_typography_generic.png b/demo/src/main/res/drawable-hdpi/il_typography_generic.png new file mode 100644 index 000000000..9e8aa63f9 Binary files /dev/null and b/demo/src/main/res/drawable-hdpi/il_typography_generic.png differ diff --git a/demo/src/main/res/drawable-mdpi/il_about_generic.png b/demo/src/main/res/drawable-mdpi/il_about_generic.png new file mode 100644 index 000000000..82d128b6a Binary files /dev/null and b/demo/src/main/res/drawable-mdpi/il_about_generic.png differ diff --git a/demo/src/main/res/drawable-mdpi/il_app_bars_top_generic.png b/demo/src/main/res/drawable-mdpi/il_app_bars_top_generic.png new file mode 100644 index 000000000..075dc28b6 Binary files /dev/null and b/demo/src/main/res/drawable-mdpi/il_app_bars_top_generic.png differ diff --git a/demo/src/main/res/drawable-mdpi/il_app_bars_top_small_generic.png b/demo/src/main/res/drawable-mdpi/il_app_bars_top_small_generic.png new file mode 100644 index 000000000..e2657d88c Binary files /dev/null and b/demo/src/main/res/drawable-mdpi/il_app_bars_top_small_generic.png differ diff --git a/demo/src/main/res/drawable-mdpi/il_buttons_generic.png b/demo/src/main/res/drawable-mdpi/il_buttons_generic.png new file mode 100644 index 000000000..c8a1eb057 Binary files /dev/null and b/demo/src/main/res/drawable-mdpi/il_buttons_generic.png differ diff --git a/demo/src/main/res/drawable-mdpi/il_buttons_small_generic.png b/demo/src/main/res/drawable-mdpi/il_buttons_small_generic.png new file mode 100644 index 000000000..c2575b1ca Binary files /dev/null and b/demo/src/main/res/drawable-mdpi/il_buttons_small_generic.png differ diff --git a/demo/src/main/res/drawable-mdpi/il_chips_generic.png b/demo/src/main/res/drawable-mdpi/il_chips_generic.png new file mode 100644 index 000000000..4879e5e44 Binary files /dev/null and b/demo/src/main/res/drawable-mdpi/il_chips_generic.png differ diff --git a/demo/src/main/res/drawable-mdpi/il_chips_small_generic.png b/demo/src/main/res/drawable-mdpi/il_chips_small_generic.png new file mode 100644 index 000000000..dc6d059da Binary files /dev/null and b/demo/src/main/res/drawable-mdpi/il_chips_small_generic.png differ diff --git a/demo/src/main/res/drawable-mdpi/il_color_generic.png b/demo/src/main/res/drawable-mdpi/il_color_generic.png new file mode 100644 index 000000000..b388f5e98 Binary files /dev/null and b/demo/src/main/res/drawable-mdpi/il_color_generic.png differ diff --git a/demo/src/main/res/drawable-mdpi/il_snackbars_generic.png b/demo/src/main/res/drawable-mdpi/il_snackbars_generic.png new file mode 100644 index 000000000..23d5c9c0f Binary files /dev/null and b/demo/src/main/res/drawable-mdpi/il_snackbars_generic.png differ diff --git a/demo/src/main/res/drawable-mdpi/il_snackbars_small_generic.png b/demo/src/main/res/drawable-mdpi/il_snackbars_small_generic.png new file mode 100644 index 000000000..b9a1a464d Binary files /dev/null and b/demo/src/main/res/drawable-mdpi/il_snackbars_small_generic.png differ diff --git a/demo/src/main/res/drawable-mdpi/il_spacing_generic.png b/demo/src/main/res/drawable-mdpi/il_spacing_generic.png new file mode 100644 index 000000000..e994374ae Binary files /dev/null and b/demo/src/main/res/drawable-mdpi/il_spacing_generic.png differ diff --git a/demo/src/main/res/drawable-mdpi/il_switches_generic.png b/demo/src/main/res/drawable-mdpi/il_switches_generic.png new file mode 100644 index 000000000..743e63ade Binary files /dev/null and b/demo/src/main/res/drawable-mdpi/il_switches_generic.png differ diff --git a/demo/src/main/res/drawable-mdpi/il_switches_small_generic.png b/demo/src/main/res/drawable-mdpi/il_switches_small_generic.png new file mode 100644 index 000000000..877073461 Binary files /dev/null and b/demo/src/main/res/drawable-mdpi/il_switches_small_generic.png differ diff --git a/demo/src/main/res/drawable-mdpi/il_tabs_generic.png b/demo/src/main/res/drawable-mdpi/il_tabs_generic.png new file mode 100644 index 000000000..bed937cdc Binary files /dev/null and b/demo/src/main/res/drawable-mdpi/il_tabs_generic.png differ diff --git a/demo/src/main/res/drawable-mdpi/il_tabs_small_generic.png b/demo/src/main/res/drawable-mdpi/il_tabs_small_generic.png new file mode 100644 index 000000000..7e88f8911 Binary files /dev/null and b/demo/src/main/res/drawable-mdpi/il_tabs_small_generic.png differ diff --git a/demo/src/main/res/drawable-mdpi/il_text_fields_generic.png b/demo/src/main/res/drawable-mdpi/il_text_fields_generic.png new file mode 100644 index 000000000..c638aaf06 Binary files /dev/null and b/demo/src/main/res/drawable-mdpi/il_text_fields_generic.png differ diff --git a/demo/src/main/res/drawable-mdpi/il_text_fields_small_generic.png b/demo/src/main/res/drawable-mdpi/il_text_fields_small_generic.png new file mode 100644 index 000000000..bdcc3ae86 Binary files /dev/null and b/demo/src/main/res/drawable-mdpi/il_text_fields_small_generic.png differ diff --git a/demo/src/main/res/drawable-mdpi/il_typography_generic.png b/demo/src/main/res/drawable-mdpi/il_typography_generic.png new file mode 100644 index 000000000..d02b36bf3 Binary files /dev/null and b/demo/src/main/res/drawable-mdpi/il_typography_generic.png differ diff --git a/demo/src/main/res/drawable-xhdpi/il_about_generic.png b/demo/src/main/res/drawable-xhdpi/il_about_generic.png new file mode 100644 index 000000000..e14b0bcc2 Binary files /dev/null and b/demo/src/main/res/drawable-xhdpi/il_about_generic.png differ diff --git a/demo/src/main/res/drawable-xhdpi/il_app_bars_top_generic.png b/demo/src/main/res/drawable-xhdpi/il_app_bars_top_generic.png new file mode 100644 index 000000000..3dcd5086f Binary files /dev/null and b/demo/src/main/res/drawable-xhdpi/il_app_bars_top_generic.png differ diff --git a/demo/src/main/res/drawable-xhdpi/il_app_bars_top_small_generic.png b/demo/src/main/res/drawable-xhdpi/il_app_bars_top_small_generic.png new file mode 100644 index 000000000..656407fe9 Binary files /dev/null and b/demo/src/main/res/drawable-xhdpi/il_app_bars_top_small_generic.png differ diff --git a/demo/src/main/res/drawable-xhdpi/il_buttons_generic.png b/demo/src/main/res/drawable-xhdpi/il_buttons_generic.png new file mode 100644 index 000000000..190019b94 Binary files /dev/null and b/demo/src/main/res/drawable-xhdpi/il_buttons_generic.png differ diff --git a/demo/src/main/res/drawable-xhdpi/il_buttons_small_generic.png b/demo/src/main/res/drawable-xhdpi/il_buttons_small_generic.png new file mode 100644 index 000000000..9dae9a090 Binary files /dev/null and b/demo/src/main/res/drawable-xhdpi/il_buttons_small_generic.png differ diff --git a/demo/src/main/res/drawable-xhdpi/il_chips_generic.png b/demo/src/main/res/drawable-xhdpi/il_chips_generic.png new file mode 100644 index 000000000..43cdb5fbb Binary files /dev/null and b/demo/src/main/res/drawable-xhdpi/il_chips_generic.png differ diff --git a/demo/src/main/res/drawable-xhdpi/il_chips_small_generic.png b/demo/src/main/res/drawable-xhdpi/il_chips_small_generic.png new file mode 100644 index 000000000..789f0d41f Binary files /dev/null and b/demo/src/main/res/drawable-xhdpi/il_chips_small_generic.png differ diff --git a/demo/src/main/res/drawable-xhdpi/il_color_generic.png b/demo/src/main/res/drawable-xhdpi/il_color_generic.png new file mode 100644 index 000000000..a9ddda889 Binary files /dev/null and b/demo/src/main/res/drawable-xhdpi/il_color_generic.png differ diff --git a/demo/src/main/res/drawable-xhdpi/il_snackbars_generic.png b/demo/src/main/res/drawable-xhdpi/il_snackbars_generic.png new file mode 100644 index 000000000..b2d64339a Binary files /dev/null and b/demo/src/main/res/drawable-xhdpi/il_snackbars_generic.png differ diff --git a/demo/src/main/res/drawable-xhdpi/il_snackbars_small_generic.png b/demo/src/main/res/drawable-xhdpi/il_snackbars_small_generic.png new file mode 100644 index 000000000..b463295ca Binary files /dev/null and b/demo/src/main/res/drawable-xhdpi/il_snackbars_small_generic.png differ diff --git a/demo/src/main/res/drawable-xhdpi/il_spacing_generic.png b/demo/src/main/res/drawable-xhdpi/il_spacing_generic.png new file mode 100644 index 000000000..d64d470c2 Binary files /dev/null and b/demo/src/main/res/drawable-xhdpi/il_spacing_generic.png differ diff --git a/demo/src/main/res/drawable-xhdpi/il_switches_generic.png b/demo/src/main/res/drawable-xhdpi/il_switches_generic.png new file mode 100644 index 000000000..f973a5ac9 Binary files /dev/null and b/demo/src/main/res/drawable-xhdpi/il_switches_generic.png differ diff --git a/demo/src/main/res/drawable-xhdpi/il_switches_small_generic.png b/demo/src/main/res/drawable-xhdpi/il_switches_small_generic.png new file mode 100644 index 000000000..97af4d582 Binary files /dev/null and b/demo/src/main/res/drawable-xhdpi/il_switches_small_generic.png differ diff --git a/demo/src/main/res/drawable-xhdpi/il_tabs_generic.png b/demo/src/main/res/drawable-xhdpi/il_tabs_generic.png new file mode 100644 index 000000000..1b12f581c Binary files /dev/null and b/demo/src/main/res/drawable-xhdpi/il_tabs_generic.png differ diff --git a/demo/src/main/res/drawable-xhdpi/il_tabs_small_generic.png b/demo/src/main/res/drawable-xhdpi/il_tabs_small_generic.png new file mode 100644 index 000000000..68ce60ac7 Binary files /dev/null and b/demo/src/main/res/drawable-xhdpi/il_tabs_small_generic.png differ diff --git a/demo/src/main/res/drawable-xhdpi/il_text_fields_generic.png b/demo/src/main/res/drawable-xhdpi/il_text_fields_generic.png new file mode 100644 index 000000000..6fbb01b45 Binary files /dev/null and b/demo/src/main/res/drawable-xhdpi/il_text_fields_generic.png differ diff --git a/demo/src/main/res/drawable-xhdpi/il_text_fields_small_generic.png b/demo/src/main/res/drawable-xhdpi/il_text_fields_small_generic.png new file mode 100644 index 000000000..25ffb50c3 Binary files /dev/null and b/demo/src/main/res/drawable-xhdpi/il_text_fields_small_generic.png differ diff --git a/demo/src/main/res/drawable-xhdpi/il_typography_generic.png b/demo/src/main/res/drawable-xhdpi/il_typography_generic.png new file mode 100644 index 000000000..2aaac4120 Binary files /dev/null and b/demo/src/main/res/drawable-xhdpi/il_typography_generic.png differ diff --git a/demo/src/main/res/drawable-xxhdpi/il_about_generic.png b/demo/src/main/res/drawable-xxhdpi/il_about_generic.png new file mode 100644 index 000000000..d702c95b8 Binary files /dev/null and b/demo/src/main/res/drawable-xxhdpi/il_about_generic.png differ diff --git a/demo/src/main/res/drawable-xxhdpi/il_app_bars_top_generic.png b/demo/src/main/res/drawable-xxhdpi/il_app_bars_top_generic.png new file mode 100644 index 000000000..dd3bdd944 Binary files /dev/null and b/demo/src/main/res/drawable-xxhdpi/il_app_bars_top_generic.png differ diff --git a/demo/src/main/res/drawable-xxhdpi/il_app_bars_top_small_generic.png b/demo/src/main/res/drawable-xxhdpi/il_app_bars_top_small_generic.png new file mode 100644 index 000000000..f1ae5deff Binary files /dev/null and b/demo/src/main/res/drawable-xxhdpi/il_app_bars_top_small_generic.png differ diff --git a/demo/src/main/res/drawable-xxhdpi/il_buttons_generic.png b/demo/src/main/res/drawable-xxhdpi/il_buttons_generic.png new file mode 100644 index 000000000..74a5a8112 Binary files /dev/null and b/demo/src/main/res/drawable-xxhdpi/il_buttons_generic.png differ diff --git a/demo/src/main/res/drawable-xxhdpi/il_buttons_small_generic.png b/demo/src/main/res/drawable-xxhdpi/il_buttons_small_generic.png new file mode 100644 index 000000000..e2d4f5cbf Binary files /dev/null and b/demo/src/main/res/drawable-xxhdpi/il_buttons_small_generic.png differ diff --git a/demo/src/main/res/drawable-xxhdpi/il_chips_generic.png b/demo/src/main/res/drawable-xxhdpi/il_chips_generic.png new file mode 100644 index 000000000..4269c4752 Binary files /dev/null and b/demo/src/main/res/drawable-xxhdpi/il_chips_generic.png differ diff --git a/demo/src/main/res/drawable-xxhdpi/il_chips_small_generic.png b/demo/src/main/res/drawable-xxhdpi/il_chips_small_generic.png new file mode 100644 index 000000000..44a2b603f Binary files /dev/null and b/demo/src/main/res/drawable-xxhdpi/il_chips_small_generic.png differ diff --git a/demo/src/main/res/drawable-xxhdpi/il_color_generic.png b/demo/src/main/res/drawable-xxhdpi/il_color_generic.png new file mode 100644 index 000000000..6bcd6df82 Binary files /dev/null and b/demo/src/main/res/drawable-xxhdpi/il_color_generic.png differ diff --git a/demo/src/main/res/drawable-xxhdpi/il_snackbars_generic.png b/demo/src/main/res/drawable-xxhdpi/il_snackbars_generic.png new file mode 100644 index 000000000..247ecc7b7 Binary files /dev/null and b/demo/src/main/res/drawable-xxhdpi/il_snackbars_generic.png differ diff --git a/demo/src/main/res/drawable-xxhdpi/il_snackbars_small_generic.png b/demo/src/main/res/drawable-xxhdpi/il_snackbars_small_generic.png new file mode 100644 index 000000000..32460c38f Binary files /dev/null and b/demo/src/main/res/drawable-xxhdpi/il_snackbars_small_generic.png differ diff --git a/demo/src/main/res/drawable-xxhdpi/il_spacing_generic.png b/demo/src/main/res/drawable-xxhdpi/il_spacing_generic.png new file mode 100644 index 000000000..05797393b Binary files /dev/null and b/demo/src/main/res/drawable-xxhdpi/il_spacing_generic.png differ diff --git a/demo/src/main/res/drawable-xxhdpi/il_switches_generic.png b/demo/src/main/res/drawable-xxhdpi/il_switches_generic.png new file mode 100644 index 000000000..9c3aff153 Binary files /dev/null and b/demo/src/main/res/drawable-xxhdpi/il_switches_generic.png differ diff --git a/demo/src/main/res/drawable-xxhdpi/il_switches_small_generic.png b/demo/src/main/res/drawable-xxhdpi/il_switches_small_generic.png new file mode 100644 index 000000000..e650574dd Binary files /dev/null and b/demo/src/main/res/drawable-xxhdpi/il_switches_small_generic.png differ diff --git a/demo/src/main/res/drawable-xxhdpi/il_tabs_generic.png b/demo/src/main/res/drawable-xxhdpi/il_tabs_generic.png new file mode 100644 index 000000000..928b09c0a Binary files /dev/null and b/demo/src/main/res/drawable-xxhdpi/il_tabs_generic.png differ diff --git a/demo/src/main/res/drawable-xxhdpi/il_tabs_small_generic.png b/demo/src/main/res/drawable-xxhdpi/il_tabs_small_generic.png new file mode 100644 index 000000000..27f1a7639 Binary files /dev/null and b/demo/src/main/res/drawable-xxhdpi/il_tabs_small_generic.png differ diff --git a/demo/src/main/res/drawable-xxhdpi/il_text_fields_generic.png b/demo/src/main/res/drawable-xxhdpi/il_text_fields_generic.png new file mode 100644 index 000000000..f7ed0e853 Binary files /dev/null and b/demo/src/main/res/drawable-xxhdpi/il_text_fields_generic.png differ diff --git a/demo/src/main/res/drawable-xxhdpi/il_text_fields_small_generic.png b/demo/src/main/res/drawable-xxhdpi/il_text_fields_small_generic.png new file mode 100644 index 000000000..9260921dc Binary files /dev/null and b/demo/src/main/res/drawable-xxhdpi/il_text_fields_small_generic.png differ diff --git a/demo/src/main/res/drawable-xxhdpi/il_typography_generic.png b/demo/src/main/res/drawable-xxhdpi/il_typography_generic.png new file mode 100644 index 000000000..4253870cf Binary files /dev/null and b/demo/src/main/res/drawable-xxhdpi/il_typography_generic.png differ diff --git a/demo/src/main/res/drawable-xxxhdpi/il_about_generic.png b/demo/src/main/res/drawable-xxxhdpi/il_about_generic.png new file mode 100644 index 000000000..9deeda3ce Binary files /dev/null and b/demo/src/main/res/drawable-xxxhdpi/il_about_generic.png differ diff --git a/demo/src/main/res/drawable-xxxhdpi/il_app_bars_top_generic.png b/demo/src/main/res/drawable-xxxhdpi/il_app_bars_top_generic.png new file mode 100644 index 000000000..171fdf9aa Binary files /dev/null and b/demo/src/main/res/drawable-xxxhdpi/il_app_bars_top_generic.png differ diff --git a/demo/src/main/res/drawable-xxxhdpi/il_app_bars_top_small_generic.png b/demo/src/main/res/drawable-xxxhdpi/il_app_bars_top_small_generic.png new file mode 100644 index 000000000..74d5c3109 Binary files /dev/null and b/demo/src/main/res/drawable-xxxhdpi/il_app_bars_top_small_generic.png differ diff --git a/demo/src/main/res/drawable-xxxhdpi/il_buttons_generic.png b/demo/src/main/res/drawable-xxxhdpi/il_buttons_generic.png new file mode 100644 index 000000000..cc4927fc9 Binary files /dev/null and b/demo/src/main/res/drawable-xxxhdpi/il_buttons_generic.png differ diff --git a/demo/src/main/res/drawable-xxxhdpi/il_buttons_small_generic.png b/demo/src/main/res/drawable-xxxhdpi/il_buttons_small_generic.png new file mode 100644 index 000000000..9c5c4a006 Binary files /dev/null and b/demo/src/main/res/drawable-xxxhdpi/il_buttons_small_generic.png differ diff --git a/demo/src/main/res/drawable-xxxhdpi/il_chips_generic.png b/demo/src/main/res/drawable-xxxhdpi/il_chips_generic.png new file mode 100644 index 000000000..bb8c9581d Binary files /dev/null and b/demo/src/main/res/drawable-xxxhdpi/il_chips_generic.png differ diff --git a/demo/src/main/res/drawable-xxxhdpi/il_chips_small_generic.png b/demo/src/main/res/drawable-xxxhdpi/il_chips_small_generic.png new file mode 100644 index 000000000..b53c42141 Binary files /dev/null and b/demo/src/main/res/drawable-xxxhdpi/il_chips_small_generic.png differ diff --git a/demo/src/main/res/drawable-xxxhdpi/il_color_generic.png b/demo/src/main/res/drawable-xxxhdpi/il_color_generic.png new file mode 100644 index 000000000..85bcbce60 Binary files /dev/null and b/demo/src/main/res/drawable-xxxhdpi/il_color_generic.png differ diff --git a/demo/src/main/res/drawable-xxxhdpi/il_snackbars_generic.png b/demo/src/main/res/drawable-xxxhdpi/il_snackbars_generic.png new file mode 100644 index 000000000..e76970d25 Binary files /dev/null and b/demo/src/main/res/drawable-xxxhdpi/il_snackbars_generic.png differ diff --git a/demo/src/main/res/drawable-xxxhdpi/il_snackbars_small_generic.png b/demo/src/main/res/drawable-xxxhdpi/il_snackbars_small_generic.png new file mode 100644 index 000000000..f12ab3c5d Binary files /dev/null and b/demo/src/main/res/drawable-xxxhdpi/il_snackbars_small_generic.png differ diff --git a/demo/src/main/res/drawable-xxxhdpi/il_spacing_generic.png b/demo/src/main/res/drawable-xxxhdpi/il_spacing_generic.png new file mode 100644 index 000000000..533987a00 Binary files /dev/null and b/demo/src/main/res/drawable-xxxhdpi/il_spacing_generic.png differ diff --git a/demo/src/main/res/drawable-xxxhdpi/il_switches_generic.png b/demo/src/main/res/drawable-xxxhdpi/il_switches_generic.png new file mode 100644 index 000000000..e90f458b0 Binary files /dev/null and b/demo/src/main/res/drawable-xxxhdpi/il_switches_generic.png differ diff --git a/demo/src/main/res/drawable-xxxhdpi/il_switches_small_generic.png b/demo/src/main/res/drawable-xxxhdpi/il_switches_small_generic.png new file mode 100644 index 000000000..e061dea85 Binary files /dev/null and b/demo/src/main/res/drawable-xxxhdpi/il_switches_small_generic.png differ diff --git a/demo/src/main/res/drawable-xxxhdpi/il_tabs_generic.png b/demo/src/main/res/drawable-xxxhdpi/il_tabs_generic.png new file mode 100644 index 000000000..c7d55d6ca Binary files /dev/null and b/demo/src/main/res/drawable-xxxhdpi/il_tabs_generic.png differ diff --git a/demo/src/main/res/drawable-xxxhdpi/il_tabs_small_generic.png b/demo/src/main/res/drawable-xxxhdpi/il_tabs_small_generic.png new file mode 100644 index 000000000..299276065 Binary files /dev/null and b/demo/src/main/res/drawable-xxxhdpi/il_tabs_small_generic.png differ diff --git a/demo/src/main/res/drawable-xxxhdpi/il_text_fields_generic.png b/demo/src/main/res/drawable-xxxhdpi/il_text_fields_generic.png new file mode 100644 index 000000000..a0e0658fc Binary files /dev/null and b/demo/src/main/res/drawable-xxxhdpi/il_text_fields_generic.png differ diff --git a/demo/src/main/res/drawable-xxxhdpi/il_text_fields_small_generic.png b/demo/src/main/res/drawable-xxxhdpi/il_text_fields_small_generic.png new file mode 100644 index 000000000..4c8862793 Binary files /dev/null and b/demo/src/main/res/drawable-xxxhdpi/il_text_fields_small_generic.png differ diff --git a/demo/src/main/res/drawable-xxxhdpi/il_typography_generic.png b/demo/src/main/res/drawable-xxxhdpi/il_typography_generic.png new file mode 100644 index 000000000..38d936dbc Binary files /dev/null and b/demo/src/main/res/drawable-xxxhdpi/il_typography_generic.png differ diff --git a/demo/src/main/res/drawable/il_bottom_navigation_generic.xml b/demo/src/main/res/drawable/il_bottom_navigation_generic.xml new file mode 100644 index 000000000..e2cdf22fd --- /dev/null +++ b/demo/src/main/res/drawable/il_bottom_navigation_generic.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/demo/src/main/res/drawable/il_cards_generic.xml b/demo/src/main/res/drawable/il_cards_generic.xml new file mode 100644 index 000000000..9f6ebfb30 --- /dev/null +++ b/demo/src/main/res/drawable/il_cards_generic.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/demo/src/main/res/drawable/il_checkboxes_generic.xml b/demo/src/main/res/drawable/il_checkboxes_generic.xml new file mode 100644 index 000000000..352588aab --- /dev/null +++ b/demo/src/main/res/drawable/il_checkboxes_generic.xml @@ -0,0 +1,12 @@ + + + + diff --git a/demo/src/main/res/drawable/il_dialogs_generic.xml b/demo/src/main/res/drawable/il_dialogs_generic.xml new file mode 100644 index 000000000..b0500b54d --- /dev/null +++ b/demo/src/main/res/drawable/il_dialogs_generic.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + diff --git a/demo/src/main/res/drawable/il_lists_generic.xml b/demo/src/main/res/drawable/il_lists_generic.xml new file mode 100644 index 000000000..fe6e8b7f5 --- /dev/null +++ b/demo/src/main/res/drawable/il_lists_generic.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/demo/src/main/res/drawable/il_progress_generic.xml b/demo/src/main/res/drawable/il_progress_generic.xml new file mode 100644 index 000000000..89d441679 --- /dev/null +++ b/demo/src/main/res/drawable/il_progress_generic.xml @@ -0,0 +1,14 @@ + + + + diff --git a/demo/src/main/res/drawable/il_radio_buttons_generic.xml b/demo/src/main/res/drawable/il_radio_buttons_generic.xml new file mode 100644 index 000000000..99bcd0541 --- /dev/null +++ b/demo/src/main/res/drawable/il_radio_buttons_generic.xml @@ -0,0 +1,12 @@ + + + + diff --git a/demo/src/main/res/drawable/il_sliders_generic.xml b/demo/src/main/res/drawable/il_sliders_generic.xml new file mode 100644 index 000000000..c78115db9 --- /dev/null +++ b/demo/src/main/res/drawable/il_sliders_generic.xml @@ -0,0 +1,20 @@ + + + + + +