Merge pull request #3 from payan-app/text-color

feat: add color to text component
payan-app · Oct 9, 2022 · 3cb59a2 · 3cb59a2
2 parents 2f217d5 + 7b1dd5b
commit 3cb59a2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/Purace/src/main/java/juandahurt/purace/ui/basic/scaffold/PuraceScaffold.kt b/Purace/src/main/java/juandahurt/purace/ui/basic/scaffold/PuraceScaffold.kt
@@ -13,7 +13,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.*
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
-import juandahurt.purace.ui.basic.PuraceTextView
+import juandahurt.purace.ui.basic.text.PuraceTextView
 import juandahurt.purace.ui.style.PuraceStyle
 
 @Composable

diff --git a/Purace/src/main/java/juandahurt/purace/ui/basic/text/PuraceTextView.kt b/Purace/src/main/java/juandahurt/purace/ui/basic/text/PuraceTextView.kt
@@ -1,8 +1,9 @@
-package juandahurt.purace.ui.basic
+package juandahurt.purace.ui.basic.text
 
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
@@ -22,7 +23,8 @@ fun PuraceTextView(
     text: String,
     size: Int = 12,
     weight: FontWeight = FontWeight.Normal,
-    textAlign: TextAlign = TextAlign.Justify
+    textAlign: TextAlign = TextAlign.Justify,
+    color: Color = PuraceStyle.Color.N1
 ) {
     Text(
         modifier = modifier,
@@ -31,6 +33,6 @@ fun PuraceTextView(
         fontWeight = weight,
         fontSize = size.sp,
         textAlign = textAlign,
-        color = PuraceStyle.Color.N1
+        color = color
     )
 }
diff --git a/app/src/main/java/juandahurt/puracedemo/examples/basic/TextExample.kt b/app/src/main/java/juandahurt/puracedemo/examples/basic/TextExample.kt
@@ -1,14 +1,13 @@
 package juandahurt.puracedemo.examples.basic
 
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavHostController
-import juandahurt.purace.ui.basic.PuraceTextView
+import juandahurt.purace.ui.basic.text.PuraceTextView
 import juandahurt.purace.ui.basic.scaffold.PuraceScaffold
 
 @Composable