diff --git a/bank-sdk/example-app/src/main/res/values/colors.xml b/bank-sdk/example-app/src/main/res/values/colors.xml index d28d9f100f..596d694c3e 100644 --- a/bank-sdk/example-app/src/main/res/values/colors.xml +++ b/bank-sdk/example-app/src/main/res/values/colors.xml @@ -1,5 +1,9 @@ + + #006ECF + #006ECF + @color/gc_light_01 @color/gc_light_02 @color/gc_light_03 diff --git a/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/colors/section/SkontoSectionColors.kt b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/colors/section/SkontoSectionColors.kt index 9462fae50d..5a9b53c71d 100644 --- a/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/colors/section/SkontoSectionColors.kt +++ b/bank-sdk/sdk/src/main/java/net/gini/android/bank/sdk/capture/skonto/colors/section/SkontoSectionColors.kt @@ -24,7 +24,7 @@ data class SkontoSectionColors( @Composable fun colors( - titleTextColor: Color = GiniTheme.colorScheme.text.primary, + titleTextColor: Color = GiniTheme.colorScheme.skontoSection.skontoSectionTitleTextColor, switchColors: GiniSwitchColors = GiniSwitchColors.colors(), cardBackgroundColor: Color = GiniTheme.colorScheme.card.container, enabledHintTextColor: Color = GiniTheme.colorScheme.text.success, diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/theme/GiniTheme.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/theme/GiniTheme.kt index 65f75fb360..67c6c8054a 100644 --- a/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/theme/GiniTheme.kt +++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/theme/GiniTheme.kt @@ -9,6 +9,7 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.staticCompositionLocalOf import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.unit.dp +import net.gini.android.capture.ui.theme.colors.GiniColorElementsPrimitives import net.gini.android.capture.ui.theme.colors.GiniColorPrimitives import net.gini.android.capture.ui.theme.colors.GiniColorScheme import net.gini.android.capture.ui.theme.colors.giniDarkColorScheme @@ -31,11 +32,13 @@ fun GiniTheme( val context = LocalContext.current val giniPrimitives = remember { GiniColorPrimitives.buildColorPrimitivesBasedOnResources(context) } + val giniElementPrimitives = + remember { GiniColorElementsPrimitives.buildColorPrimitivesBasedOnResources(context) } val colors = if (darkMode) { - giniDarkColorScheme(giniPrimitives) + giniDarkColorScheme(giniPrimitives, giniElementPrimitives) } else { - giniLightColorScheme(giniPrimitives) + giniLightColorScheme(giniPrimitives, giniElementPrimitives) } val typography = extractGiniTypography() diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/theme/colors/GiniColorElementsPrimitives.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/theme/colors/GiniColorElementsPrimitives.kt new file mode 100644 index 0000000000..b83883b6f8 --- /dev/null +++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/theme/colors/GiniColorElementsPrimitives.kt @@ -0,0 +1,21 @@ +package net.gini.android.capture.ui.theme.colors + +import android.content.Context +import androidx.compose.ui.graphics.Color +import net.gini.android.capture.R + +data class GiniColorElementsPrimitives( + val skontoSectionTitleTextColor: Color = Color(0xFF161616), + +) { + companion object { + /** + * Bridge between old way of defining colors by overridden resources and Compose + * + * This function will define color primitives based on resources value at res/colors.xml + */ + internal fun buildColorPrimitivesBasedOnResources(context: Context) = GiniColorElementsPrimitives( + skontoSectionTitleTextColor = Color(context.getColor(R.color.skonto_section_title_text_color)), + ) + } +} \ No newline at end of file diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/theme/colors/GiniColorPalette.kt b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/theme/colors/GiniColorPalette.kt index e71fa63d1d..e34fa53655 100644 --- a/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/theme/colors/GiniColorPalette.kt +++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/ui/theme/colors/GiniColorPalette.kt @@ -30,6 +30,8 @@ data class GiniColorScheme( val checkbox: Checkbox = Checkbox(), val contextMenu: ContextMenu = ContextMenu(), val logo: Logo = Logo(), + val skontoSection: SkontoSection = SkontoSection() + ) { @Immutable @@ -234,6 +236,10 @@ data class GiniColorScheme( val contentOutlined: Color = Color.Unspecified, ) } + @Immutable + data class SkontoSection( + val skontoSectionTitleTextColor: Color = Color.Unspecified, + ) @Immutable data class Logo( @@ -245,7 +251,8 @@ data class GiniColorScheme( * Created a light color scheme based on primitives. */ internal fun giniLightColorScheme( - giniColorPrimitives: GiniColorPrimitives = GiniColorPrimitives() + giniColorPrimitives: GiniColorPrimitives = GiniColorPrimitives(), + giniColorElementsPrimitives: GiniColorElementsPrimitives = GiniColorElementsPrimitives() ) = with(giniColorPrimitives) { GiniColorScheme( background = GiniColorScheme.Background(primary = light02), @@ -373,6 +380,9 @@ internal fun giniLightColorScheme( ), logo = GiniColorScheme.Logo( tint = accent01 + ), + skontoSection = GiniColorScheme.SkontoSection( + skontoSectionTitleTextColor = giniColorElementsPrimitives.skontoSectionTitleTextColor ) ) } @@ -381,7 +391,8 @@ internal fun giniLightColorScheme( * Created a dark color scheme based on primitives. */ internal fun giniDarkColorScheme( - giniColorPrimitives: GiniColorPrimitives = GiniColorPrimitives() + giniColorPrimitives: GiniColorPrimitives = GiniColorPrimitives(), + giniColorElementsPrimitives: GiniColorElementsPrimitives = GiniColorElementsPrimitives() ) = with(giniColorPrimitives) { GiniColorScheme( background = GiniColorScheme.Background(primary = dark01), @@ -513,6 +524,9 @@ internal fun giniDarkColorScheme( ), logo = GiniColorScheme.Logo( tint = accent01 + ), + skontoSection = GiniColorScheme.SkontoSection( + skontoSectionTitleTextColor = giniColorElementsPrimitives.skontoSectionTitleTextColor ) ) } diff --git a/capture-sdk/sdk/src/main/res/layout/gc_fragment_camera.xml b/capture-sdk/sdk/src/main/res/layout/gc_fragment_camera.xml index 3e9d8648a7..dcb458caad 100644 --- a/capture-sdk/sdk/src/main/res/layout/gc_fragment_camera.xml +++ b/capture-sdk/sdk/src/main/res/layout/gc_fragment_camera.xml @@ -76,7 +76,7 @@ android:layout_marginBottom="@dimen/gc_large" android:paddingTop="@dimen/gc_large" android:text="@string/gc_camera_info_label_invoice_and_qr" - android:textColor="@color/gc_light_01" + android:textColor="@color/gc_camera_title_color" app:layout_constraintBottom_toTopOf="@id/gc_button_camera_trigger" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> diff --git a/capture-sdk/sdk/src/main/res/values/element_colors.xml b/capture-sdk/sdk/src/main/res/values/element_colors.xml new file mode 100644 index 0000000000..9b312ed341 --- /dev/null +++ b/capture-sdk/sdk/src/main/res/values/element_colors.xml @@ -0,0 +1,7 @@ + + + + @color/gc_light_01 + @color/gc_dark_02 + +