Merge pull request #92 from Q42/main

Main

app/src/main/kotlin/nl/q42/template/MainActivity.kt

@@ -5,13 +5,12 @@ import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
 import androidx.compose.ui.Modifier
 import androidx.navigation.compose.rememberNavController
 import dagger.hilt.android.AndroidEntryPoint
 import nl.q42.template.navigation.AppNavigation
 import nl.q42.template.navigation.NavGraphs
+import nl.q42.template.ui.compose.composables.widgets.AppSurface
 import nl.q42.template.ui.theme.AppTheme
 
 @AndroidEntryPoint
@@ -26,7 +25,9 @@ class MainActivity : ComponentActivity() {
 
                 val navController = rememberNavController()
 
-                Surface(modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background) {
+                AppSurface (
+                    modifier = Modifier.fillMaxSize(),
+                ) {
                     AppNavigation(navController = navController, navGraph = NavGraphs.root)
                 }
             }

core/ui/src/main/kotlin/nl/q42/template/ui/compose/composables/text/BodyText.kt

@@ -0,0 +1,24 @@
+package nl.q42.template.ui.compose.composables.text
+
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
+import nl.q42.template.ui.theme.AppTheme
+import nl.q42.template.ui.theme.PreviewLightDark
+
+@Composable
+fun BodyText(text: String, color: Color = AppTheme.colors.textPrimary) {
+    Text(
+        text = text,
+        color = color,
+        style = AppTheme.typography.body
+    )
+}
+
+@Composable
+@PreviewLightDark
+private fun BodyTextPreview() {
+    AppTheme {
+        BodyText("Body text")
+    }
+}

core/ui/src/main/kotlin/nl/q42/template/ui/compose/composables/text/H1Text.kt

@@ -0,0 +1,24 @@
+package nl.q42.template.ui.compose.composables.text
+
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
+import nl.q42.template.ui.theme.AppTheme
+import nl.q42.template.ui.theme.PreviewLightDark
+
+@Composable
+fun H1Text(text: String, color: Color = AppTheme.colors.textPrimary) {
+    Text(
+        text = text,
+        color = color,
+        style = AppTheme.typography.h1
+    )
+}
+
+@Composable
+@PreviewLightDark
+private fun H1TextPreview() {
+    AppTheme {
+        H1Text("H1 text")
+    }
+}

core/ui/src/main/kotlin/nl/q42/template/ui/compose/composables/widgets/AppSurface.kt

@@ -0,0 +1,26 @@
+package nl.q42.template.ui.compose.composables.widgets
+
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.Surface
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import nl.q42.template.ui.theme.AppTheme
+import nl.q42.template.ui.theme.PreviewLightDark
+
+@Composable
+fun AppSurface(modifier: Modifier = Modifier, content: @Composable () -> Unit) {
+    Surface(
+        modifier = modifier,
+        color = AppTheme.colors.surface,
+        contentColor = AppTheme.colors.textPrimary,
+        content = content
+    )
+}
+
+@Composable
+@PreviewLightDark
+private fun AppSurfacePreview() {
+    AppTheme {
+        AppSurface(Modifier.fillMaxSize()) {}
+    }
+}

core/ui/src/main/kotlin/nl/q42/template/ui/compose/composables/widgets/TemplateButton.kt

@@ -0,0 +1,36 @@
+package nl.q42.template.ui.compose.composables.widgets
+
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import nl.q42.template.ui.theme.AppTheme
+import nl.q42.template.ui.theme.PreviewLightDark
+
+@Composable
+fun TemplateButton(text: String, enabled: Boolean = true, onClick: () -> Unit) {
+    Button(
+        onClick = onClick,
+        enabled = enabled,
+        colors = ButtonDefaults.buttonColors(
+            containerColor = AppTheme.colors.accent,
+            contentColor = AppTheme.colors.buttonText,
+            disabledContentColor = AppTheme.colors.buttonText.copy(alpha = 0.5f),
+            disabledContainerColor = AppTheme.colors.accent.copy(alpha = 0.5f)
+        )
+    ) {
+        Text(
+            text = text,
+            style = AppTheme.typography.body,
+            color = AppTheme.colors.buttonText
+        )
+    }
+}
+
+@Composable
+@PreviewLightDark
+private fun TemplateButtonPreview() {
+    AppTheme {
+        TemplateButton("Button",) {}
+    }
+}

core/ui/src/main/kotlin/nl/q42/template/ui/theme/AppColorScheme.kt

@@ -0,0 +1,12 @@
+package nl.q42.template.ui.theme
+
+import androidx.compose.ui.graphics.Color
+
+interface AppColorScheme {
+    val buttonText: Color
+    val accent: Color
+    val textPrimary: Color
+    val surface: Color
+    val surfaceSelected: Color
+    val error: Color
+}

core/ui/src/main/kotlin/nl/q42/template/ui/theme/AppColorSchemeDark.kt

@@ -0,0 +1,12 @@
+package nl.q42.template.ui.theme
+
+import androidx.compose.ui.graphics.Color
+
+object AppColorSchemeDark: AppColorScheme {
+    override val buttonText: Color = White
+    override val accent: Color =  PurpleGrey80
+    override val textPrimary = White
+    override val surface = Black
+    override val surfaceSelected = White
+    override val error = Pink80
+}

core/ui/src/main/kotlin/nl/q42/template/ui/theme/AppColorSchemeLight.kt

@@ -0,0 +1,12 @@
+package nl.q42.template.ui.theme
+
+import androidx.compose.ui.graphics.Color
+
+object AppColorSchemeLight : AppColorScheme {
+    override val buttonText: Color = White
+    override val accent: Color = Purple40
+    override val textPrimary = Black
+    override val surface = White
+    override val surfaceSelected = Gray10
+    override val error: Color = Red80
+}

core/ui/src/main/kotlin/nl/q42/template/ui/theme/AppRipples.kt

@@ -0,0 +1,31 @@
+package nl.q42.template.ui.theme
+
+import androidx.compose.foundation.Indication
+import androidx.compose.material.ripple.RippleAlpha
+import androidx.compose.material3.RippleConfiguration
+import androidx.compose.material3.ripple
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.ReadOnlyComposable
+import androidx.compose.ui.graphics.Color
+
+val AppRippleConfiguration: RippleConfiguration
+    @Composable
+    @ReadOnlyComposable
+    get() = RippleConfiguration(
+        color = AppTheme.colors.surfaceSelected
+    )
+
+val NoRippleConfiguration: RippleConfiguration
+    @Composable
+    @ReadOnlyComposable
+    get() = RippleConfiguration(
+        color = Color.Transparent,
+        rippleAlpha = RippleAlpha(0.0f, 0.0f, 0.0f, 0.0f)
+    )
+
+val AppRipple: Indication
+    @Composable
+    @ReadOnlyComposable
+    get() = ripple(
+        color = AppTheme.colors.surfaceSelected
+    )

core/ui/src/main/kotlin/nl/q42/template/ui/theme/AppShapes.kt

@@ -0,0 +1,13 @@
+package nl.q42.template.ui.theme
+
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.runtime.Immutable
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.unit.dp
+
+@Immutable
+data class AppShapes(
+    val small: Shape = RoundedCornerShape(8.dp),
+    val medium: Shape = RoundedCornerShape(16.dp),
+    val large: Shape = RoundedCornerShape(20.dp)
+)

core/ui/src/main/kotlin/nl/q42/template/ui/theme/AppTheme.kt

@@ -0,0 +1,94 @@
+package nl.q42.template.ui.theme
+
+import android.annotation.SuppressLint
+import android.app.Activity
+import androidx.compose.foundation.LocalIndication
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material3.LocalContentColor
+import androidx.compose.material3.LocalRippleConfiguration
+import androidx.compose.material3.LocalTextStyle
+import androidx.compose.material3.ProvideTextStyle
+import androidx.compose.material3.Scaffold
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.ReadOnlyComposable
+import androidx.compose.runtime.SideEffect
+import androidx.compose.runtime.staticCompositionLocalOf
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.toArgb
+import androidx.compose.ui.platform.LocalView
+import androidx.core.view.WindowCompat
+import nl.q42.template.ui.compose.composables.widgets.AppSurface
+
+/**
+ * Generate this using: https://m2.material.io/material-theme-builder/. For more info and resources: see the
+ * README file of our project.
+ */
+
+private val LocalAppTypography = staticCompositionLocalOf { AppTypography() }
+private val LocalAppColorScheme = staticCompositionLocalOf<AppColorScheme> {
+    // Dummy default, will be replaced for the actual tokens by the Provider
+    AppColorSchemeLight
+}
+private val LocalAppShapes = staticCompositionLocalOf { AppShapes() }
+
+@Composable
+fun AppTheme(
+    darkTheme: Boolean = isSystemInDarkTheme(),
+    typography: AppTypography = AppTheme.typography,
+    colors: AppColorScheme = AppTheme.colors,
+    shapes: AppShapes = AppTheme.shapes,
+    content: @Composable () -> Unit
+) {
+    // status bar color
+    val view = LocalView.current
+    if (!view.isInEditMode) {
+        SideEffect {
+            val window = (view.context as Activity).window
+            window.statusBarColor = colors.accent.toArgb()
+            WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme
+        }
+    }
+
+    CompositionLocalProvider(
+        LocalAppTypography provides typography,
+        LocalAppColorScheme provides if (darkTheme) AppColorSchemeDark else AppColorSchemeLight,
+        LocalAppShapes provides shapes,
+        /** configures the ripple for material components */
+        LocalRippleConfiguration provides AppRippleConfiguration,
+        /** needed for non-material components to have a material ripple. eg [Modifier.clickable] */
+        LocalIndication provides AppRipple,
+        /** merges the platform style with our type, @see [ProvideTextStyle] for more context */
+        LocalTextStyle provides LocalTextStyle.current.merge(typography.body),
+        LocalContentColor provides colors.textPrimary,
+        content = content
+    )
+}
+
+object AppTheme {
+    val typography: AppTypography
+        @Composable
+        @ReadOnlyComposable
+        get() = LocalAppTypography.current
+    val colors: AppColorScheme
+        @Composable
+        @ReadOnlyComposable
+        get() = LocalAppColorScheme.current
+    val shapes: AppShapes
+        @Composable
+        @ReadOnlyComposable
+        get() = LocalAppShapes.current
+}
+
+@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
+@Composable
+fun PreviewAppTheme(content: @Composable () -> Unit) {
+    AppTheme {
+        Scaffold {
+            AppSurface {
+                content()
+            }
+        }
+    }
+}