Merge pull request #54 from droidconKE/chaidemo-screens

Laying screen foundation
droidconKE · Aug 23, 2024 · 7b3006b · 7b3006b
2 parents 427e401 + 7ef60e1
commit 7b3006b
Show file tree

Hide file tree

Showing 13 changed files with 114 additions and 219 deletions.
diff --git a/README.md b/README.md
@@ -1,13 +1,12 @@
 
-
-[![Qodana](https://github.com/droidconKE/chai/actions/workflows/qodana.yml/badge.svg)](https://github.com/droidconKE/chai/actions/workflows/qodana.yml)
 [![Chai CI 🍵](https://github.com/droidconKE/chai/actions/workflows/main.yml/badge.svg)](https://github.com/droidconKE/chai/actions/workflows/main.yml)
 
 
 <p align="center">
   <a href="https://github.com/droidconKE/droidconKE2022Android">
     <img src="https://raw.githubusercontent.com/droidconKE/iconPack/master/images/chaicover.png" alt="Chai Design Logo" width=330 height=150>
   </a>
+</p>
 
 ## Chai Design System
 ---

diff --git a/chai/src/main/java/com/droidconke/chai/components/CButtons.kt b/chai/src/main/java/com/droidconke/chai/components/CButtons.kt
@@ -36,7 +36,7 @@ import com.droidconke.chai.ChaiTheme
 import com.droidconke.chai.utils.Alpha.AlphaDisabled
 import com.droidconke.chai.utils.CShapes
 import com.droidconke.chai.utils.ChaiPreview
-import com.droidconke.chai.utils.SeparatorSpace
+import com.droidconke.chai.utils.Space5
 
 @Composable
 fun CButton(
@@ -110,7 +110,7 @@ fun COutlinedPrimaryButton(
         colors = ButtonDefaults.outlinedButtonColors(contentColor = MaterialTheme.colorScheme.primary)
     ) {
         Icon(imageVector = icon, contentDescription = "", modifier = Modifier.padding(5.dp))
-        SeparatorSpace()
+        Space5
         CPrimaryButtonText(text = title, textAllCaps = false)
     }
 }

diff --git a/chai/src/main/java/com/droidconke/chai/utils/Spacing.kt b/chai/src/main/java/com/droidconke/chai/utils/Spacing.kt
@@ -15,22 +15,43 @@
  */
 package com.droidconke.chai.utils
 
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.height
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 
+/*
+* these are units of spacing that can be used in the app.
+* Use these in padding and margin:
+*
+* Usage:
+* .padding(horizontal = Space15, vertical = Space30)
+
+*/
+val Space5 = 5.dp
+val Space15 = 15.dp
+val Space30 = 30.dp
+
+/*
+ * These are spacers that can be used in the app.
+ * Mostly relevant in rows and columns to create space with other components.
+ * Usage:
+ * Spacer30()
+ *
+
+*/
 @Composable
-fun BreathingSpace13() {
-    Spacer(modifier = Modifier.height(15.dp))
+fun Spacer5(){
+    Spacer(Modifier.height(Space5))
 }
 
 @Composable
-fun BreathingSpace26() {
-    Spacer(modifier = Modifier.height(26.dp))
+fun Spacer15() {
+    Spacer(Modifier.height(Space15))
 }
-
 @Composable
-fun SeparatorSpace() {
-    Spacer(modifier = Modifier.height(5.dp))
-}
+fun Spacer30() {
+    Spacer(Modifier.height(Space30))
+}
+
diff --git a/chaidemo/src/main/java/com/droidconke/chaidemo/ChaiDemoActivity.kt b/chaidemo/src/main/java/com/droidconke/chaidemo/ChaiDemoActivity.kt
@@ -19,29 +19,11 @@ package com.droidconke.chaidemo
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.compose.ui.Modifier
-import com.droidconke.chai.ChaiTheme
-import com.droidconke.chai.components.CPageTitle
 
 class ChaiDemoActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContent {
-            ChaiTheme {
-                // A surface container using the 'background' color from the theme
-                Surface(
-                    modifier = Modifier.fillMaxSize(),
-                    color = MaterialTheme.colorScheme.background
-                ) {
-                    CPageTitle("chai demo")
-
-
-                }
-            }
-        }
+        setContent { ChaiDemoMainScreen() }
     }
 }
 
diff --git a/chaidemo/src/main/java/com/droidconke/chaidemo/ChaiDemoMainScreen.kt b/chaidemo/src/main/java/com/droidconke/chaidemo/ChaiDemoMainScreen.kt
@@ -0,0 +1,31 @@
+package com.droidconke.chaidemo
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.*
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import com.droidconke.chai.ChaiTheme
+import com.droidconke.chai.atoms.ChaiWhite
+import com.droidconke.chai.components.CPageTitle
+import com.droidconke.chai.components.CParagraph
+import com.droidconke.chai.utils.Space15
+import com.droidconke.chai.utils.Space30
+import com.droidconke.chai.utils.Spacer30
+
+@Preview(showBackground = true)
+@Composable
+fun ChaiDemoMainScreen() {
+    ChaiTheme {
+        Column(
+            Modifier
+                .fillMaxSize()
+                .background(color = ChaiWhite)
+                .padding(horizontal = Space15, vertical = Space30)
+        ) {
+            CPageTitle("chai demo main screen")
+            Spacer30()
+            CParagraph(dParagraph = "This is the main screen of the chai demo app.")
+        }
+    }
+}
diff --git a/chaidemo/src/main/java/com/droidconke/chaidemo/screens/ChaiButtonsDemoScreen.kt b/chaidemo/src/main/java/com/droidconke/chaidemo/screens/ChaiButtonsDemoScreen.kt
@@ -0,0 +1,32 @@
+package com.droidconke.chaidemo.screens
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import com.droidconke.chai.ChaiTheme
+import com.droidconke.chai.atoms.ChaiWhite
+import com.droidconke.chai.components.CPageTitle
+import com.droidconke.chai.utils.Space15
+import com.droidconke.chai.utils.Space30
+import com.droidconke.chai.utils.Space5
+
+@Preview(showBackground = true)
+@Composable
+fun ChaiButtonsScreen() {
+    ChaiTheme {
+        Column(
+            Modifier
+                .fillMaxSize()
+                .background(color = ChaiWhite)
+                .padding(horizontal = Space15, vertical = Space30)
+        ) {
+            Space30
+            CPageTitle("chai Buttons Demo Screens")
+
+        }
+    }
+}
diff --git a/chaidemo/src/main/java/com/droidconke/chaidemo/ui/theme/Color.kt b/chaidemo/src/main/java/com/droidconke/chaidemo/ui/theme/Color.kt
diff --git a/chaidemo/src/main/java/com/droidconke/chaidemo/ui/theme/Shape.kt b/chaidemo/src/main/java/com/droidconke/chaidemo/ui/theme/Shape.kt
diff --git a/chaidemo/src/main/java/com/droidconke/chaidemo/ui/theme/Theme.kt b/chaidemo/src/main/java/com/droidconke/chaidemo/ui/theme/Theme.kt
diff --git a/chaidemo/src/main/java/com/droidconke/chaidemo/ui/theme/Type.kt b/chaidemo/src/main/java/com/droidconke/chaidemo/ui/theme/Type.kt
diff --git a/chaidemo/src/main/res/values/themes.xml b/chaidemo/src/main/res/values/themes.xml
@@ -18,5 +18,6 @@
 
     <style name="Theme.Chaidemo" parent="android:Theme.Material.Light.NoActionBar">
         <item name="android:statusBarColor">@color/purple_700</item>
+        <item name="android:navigationBarColor">#ffffff</item>
     </style>
 </resources>