Feature : Typography

chai/build.gradle.kts

@@ -1,3 +1,18 @@
+/**
+ * Copyright 2024 droidcoke
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.jetbrains.kotlin.android)

chai/src/main/AndroidManifest.xml

@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright 2024 droidconke
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>

chai/src/main/java/com/droidconke/chai/Theme.kt

@@ -31,10 +31,35 @@ import com.droidconke.chai.colors.ChaiColors
 import com.droidconke.chai.colors.ChaiDarkColorPalette
 import com.droidconke.chai.colors.ChaiLightColorPalette
 import com.droidconke.chai.colors.LocalChaiColorsPalette
+import com.droidconke.chai.typography.ChaiTypography
+import com.droidconke.chai.typography.LocalChaiTypography
+import com.droidconke.chai.typography.chaiTypography
+
+
+object ChaiTheme {
+
+    /**
+     * Accessing the current typography style
+     */
+    val typography: ChaiTypography
+        @Composable
+        @ReadOnlyComposable
+        get() = LocalChaiTypography.current
+
+    /**
+     * Accessing the current colors style
+     */
+    val colors: ChaiColors
+        @Composable
+        @ReadOnlyComposable
+        get() = LocalChaiColorsPalette.current
+
+}
 
 @Composable
 fun ChaiTheme(
     darkTheme: Boolean = isSystemInDarkTheme(),
+    typography: ChaiTypography = chaiTypography(),
     content: @Composable () -> Unit
 ) {
     val view = LocalView.current
@@ -50,7 +75,8 @@ fun ChaiTheme(
     }
 
     CompositionLocalProvider(
-        LocalChaiColorsPalette provides customColorsPalette
+        LocalChaiTypography provides typography,
+        LocalChaiColorsPalette provides customColorsPalette,
     ) {
         MaterialTheme(
             content = content

chai/src/main/java/com/droidconke/chai/atoms/Font.kt

@@ -0,0 +1,57 @@
+/*
+ * Copyright 2022 DroidconKE
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.droidconke.chai.atoms
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import com.droidconke.chai.R
+
+/**
+ * Chai typography:
+ * Consists of 2 files that work together:
+ *  - Typography(located in the main package) and
+ *  - Font located in the atoms directory
+ *
+ * Font:
+ * Defines the font family types only here
+ * We use val for the purpose of making it available in the entire application
+ * You first add the fonts to the res folder under fonts
+ * Then just reference them here.
+ *
+ * Font - List all fonts that will be used in the application
+ *
+ */
+internal val MontserratSans: FontFamily
+    @Composable
+    get() = FontFamily(
+        MontserratBold,
+        MontserratSemiBold,
+        MontserratMedium,
+        MontserratRegular,
+        MontserratLight,
+        MontserratExtraLight,
+        MontserratThin
+    )
+
+private val MontserratBold = Font(R.font.montserrat_bold, weight = FontWeight.Bold)
+private val MontserratSemiBold = Font(R.font.montserrat_semi_bold, weight = FontWeight.SemiBold)
+private val MontserratMedium = Font(R.font.montserrat_medium, weight = FontWeight.Medium)
+private val MontserratRegular = Font(R.font.montserrat_regular, weight = FontWeight.Normal)
+private val MontserratLight = Font(R.font.montserrat_light, weight = FontWeight.Light)
+private val MontserratExtraLight = Font(R.font.montserrat_extra_light, weight = FontWeight.ExtraLight)
+private val MontserratThin = Font(R.font.montserrat_thin, weight = FontWeight.Thin)

chai/src/main/java/com/droidconke/chai/components/CButtons.kt

@@ -91,7 +91,7 @@ fun CPrimaryButton(
         ),
         shape = CShapes.extraLarge,
         content = {
-            CPrimaryButtonText(text = title, textAllCaps = true)
+            ChaiTextButton(text = title)
         }
     )
 }
@@ -111,7 +111,7 @@ fun COutlinedPrimaryButton(
     ) {
         Icon(imageVector = icon, contentDescription = "", modifier = Modifier.padding(5.dp))
         Space5
-        CPrimaryButtonText(text = title, textAllCaps = false)
+        ChaiTextButton(text = title)
     }
 }