update designsystem name to design

StanfordSpezi · May 9, 2024 · afa243a · afa243a
1 parent 6891eac
commit afa243a
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 33 deletions.
diff --git a/README.md b/README.md
@@ -10,4 +10,5 @@ SpeziKt is a collection of modules that can be used to build Android application
 
 ### Modules
 
-- **Design System**: Provides a cohesive user interface and user experience components. [Read More](./core/designsystem/README.md)
+- **Design System**: Provides a cohesive user interface and user experience
+  components. [Read More](./core/design/README.md)
diff --git a/app/src/main/java/edu/stanford/spezikt/MainActivity.kt b/app/src/main/java/edu/stanford/spezikt/MainActivity.kt
@@ -10,7 +10,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
-import edu.stanford.spezikt.core.designsystem.theme.SpeziKtTheme
+import edu.stanford.spezikt.core.design.theme.SpeziKtTheme
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {

diff --git a/core/design/README.md b/core/design/README.md
@@ -1,4 +1,4 @@
-# Module designsystem
+# Module design
 
 ## Overview
 
@@ -23,7 +23,7 @@ your `build.gradle` file:
 
 ```gradle
 dependencies {
-    implementation(project(":core:designsystem"))
+    implementation(project(":core:design"))
 }
 ```
 
@@ -58,7 +58,7 @@ Text(text = "Text", style = MaterialTheme.typography.bodyLarge)
 ImageVector.vectorResource(R.drawable.ic_medications)
 ```
 
-# Package edu.stanford.spezikt.core.designsystem.theme
+# Package edu.stanford.spezikt.core.design.theme
 
 The `theme` package contains the theme configuration for the Design System Module. It includes:
 Color, Theme and Typography.
diff --git a/core/design/src/main/java/edu/stanford/spezikt/core/design/component/Button.kt b/core/design/src/main/java/edu/stanford/spezikt/core/design/component/Button.kt
@@ -15,7 +15,7 @@ import edu.stanford.spezikt.core.design.theme.SpeziKtTheme
 /**
  * A button of the SpeziKt design system with customizable content.
  *
- * @sample edu.stanford.spezikt.core.designsystem.component.SpeziButtonDarkPreview
+ * @sample edu.stanford.spezikt.core.design.component.SpeziButtonDarkPreview
  *
  * @param onClick The callback to be invoked when the button is clicked.
  * @param modifier The modifier to be applied to the button.

diff --git a/core/design/src/main/java/edu/stanford/spezikt/core/design/theme/Color.kt b/core/design/src/main/java/edu/stanford/spezikt/core/design/theme/Color.kt
@@ -1,4 +1,4 @@
-package edu.stanford.spezikt.core.designsystem.theme
+package edu.stanford.spezikt.core.design.theme
 
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable

diff --git a/core/design/src/main/java/edu/stanford/spezikt/core/design/theme/Theme.kt b/core/design/src/main/java/edu/stanford/spezikt/core/design/theme/Theme.kt
@@ -17,15 +17,6 @@ import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
 import androidx.core.view.WindowCompat
-import edu.stanford.spezikt.core.designsystem.theme.Black
-import edu.stanford.spezikt.core.designsystem.theme.Black60
-import edu.stanford.spezikt.core.designsystem.theme.Black80
-import edu.stanford.spezikt.core.designsystem.theme.CardinalRed
-import edu.stanford.spezikt.core.designsystem.theme.CardinalRedDark
-import edu.stanford.spezikt.core.designsystem.theme.CoolGrey
-import edu.stanford.spezikt.core.designsystem.theme.RectangleBlue
-import edu.stanford.spezikt.core.designsystem.theme.White
-import edu.stanford.spezikt.core.designsystem.theme.typography
 
 typealias ComposableBlock = @Composable () -> Unit
 

diff --git a/core/design/src/main/java/edu/stanford/spezikt/core/design/theme/Type.kt b/core/design/src/main/java/edu/stanford/spezikt/core/design/theme/Type.kt
@@ -1,4 +1,4 @@
-package edu.stanford.spezikt.core.designsystem.theme
+package edu.stanford.spezikt.core.design.theme
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.material3.MaterialTheme
@@ -11,11 +11,10 @@ import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.sp
-import edu.stanford.spezikt.core.design.theme.SpeziKtTheme
-import edu.stanford.spezikt.core.designsystem.theme.SpeziTypography.bodyLarge
-import edu.stanford.spezikt.core.designsystem.theme.SpeziTypography.labelSmall
-import edu.stanford.spezikt.core.designsystem.theme.SpeziTypography.titleLarge
-import edu.stanford.spezikt.core.designsystem.theme.SpeziTypography.titleSmall
+import edu.stanford.spezikt.core.design.theme.SpeziTypography.bodyLarge
+import edu.stanford.spezikt.core.design.theme.SpeziTypography.labelSmall
+import edu.stanford.spezikt.core.design.theme.SpeziTypography.titleLarge
+import edu.stanford.spezikt.core.design.theme.SpeziTypography.titleSmall
 
 object SpeziTypography {
     val bodyLarge: TextStyle

diff --git a/...i-module/contact/src/main/java/edu/stanford/spezikt/spezi_module/contact/ContactScreen.kt b/...i-module/contact/src/main/java/edu/stanford/spezikt/spezi_module/contact/ContactScreen.kt
@@ -28,12 +28,12 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
-import edu.stanford.spezikt.core.designsystem.theme.IconSize
-import edu.stanford.spezikt.core.designsystem.theme.LargeSpacing
-import edu.stanford.spezikt.core.designsystem.theme.MediumSpacing
-import edu.stanford.spezikt.core.designsystem.theme.SmallSpacing
-import edu.stanford.spezikt.core.designsystem.theme.SpeziKtTheme
-import edu.stanford.spezikt.core.designsystem.theme.SpeziTypography
+import edu.stanford.spezikt.core.design.theme.IconSize
+import edu.stanford.spezikt.core.design.theme.LargeSpacing
+import edu.stanford.spezikt.core.design.theme.MediumSpacing
+import edu.stanford.spezikt.core.design.theme.SmallSpacing
+import edu.stanford.spezikt.core.design.theme.SpeziKtTheme
+import edu.stanford.spezikt.core.design.theme.SpeziTypography
 import edu.stanford.spezikt.spezi_module.contact.component.ContactOptionCard
 import edu.stanford.spezikt.spezi_module.contact.component.NavigationCard
 import edu.stanford.spezikt.spezi_module.contact.model.Contact

diff --git a/...ct/src/main/java/edu/stanford/spezikt/spezi_module/contact/component/ContactOptionCard.kt b/...ct/src/main/java/edu/stanford/spezikt/spezi_module/contact/component/ContactOptionCard.kt
@@ -16,8 +16,8 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import edu.stanford.spezikt.core.designsystem.theme.SmallSpacing
-import edu.stanford.spezikt.core.designsystem.theme.SpeziKtTheme
+import edu.stanford.spezikt.core.design.theme.SmallSpacing
+import edu.stanford.spezikt.core.design.theme.SpeziKtTheme
 import edu.stanford.spezikt.spezi_module.contact.OnAction
 import edu.stanford.spezikt.spezi_module.contact.model.ContactOption
 import edu.stanford.spezikt.spezi_module.contact.model.ContactOptionType

diff --git a/...ntact/src/main/java/edu/stanford/spezikt/spezi_module/contact/component/NavigationCard.kt b/...ntact/src/main/java/edu/stanford/spezikt/spezi_module/contact/component/NavigationCard.kt
@@ -17,8 +17,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
-import edu.stanford.spezikt.core.designsystem.theme.MediumSpacing
-import edu.stanford.spezikt.core.designsystem.theme.SpeziKtTheme
+import edu.stanford.spezikt.core.design.theme.MediumSpacing
+import edu.stanford.spezikt.core.design.theme.SpeziKtTheme
 import edu.stanford.spezikt.spezi_module.contact.OnAction
 
 /**

diff --git a/...onboarding/src/main/java/edu/stanford/spezikt/spezi_module/onboarding/OnboardingScreen.kt b/...onboarding/src/main/java/edu/stanford/spezikt/spezi_module/onboarding/OnboardingScreen.kt
@@ -3,7 +3,7 @@ package edu.stanford.spezikt.spezi_module.onboarding
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.tooling.preview.Preview
-import edu.stanford.spezikt.core.designsystem.theme.SpeziKtTheme
+import edu.stanford.spezikt.core.design.theme.SpeziKtTheme
 
 @Composable
 fun OnboardingScreen() {