🚀 :: 0.3.0

team-xquare · Jul 30, 2023 · 4623fb3 · 4623fb3
2 parents 086b9f1 + 54692ab
commit 4623fb3
Show file tree

Hide file tree

Showing 8 changed files with 126 additions and 6 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <application
+        android:name="com.xquare.xds.application.XdsApplication"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
@@ -24,5 +25,4 @@
             </intent-filter>
         </activity>
     </application>
-
-</manifest>
+</manifest>
diff --git a/xquare-design-system-android/build.gradle b/xquare-design-system-android/build.gradle
@@ -43,15 +43,15 @@ afterEvaluate {
 
                 // You can then customize attributes of the publication as shown below.
                 groupId = 'com.xquare.android'
-                artifactId = 'xds-design-system-android'
-                version = '0.2.0'
+                artifactId = 'xdsandroid'
+                version = '0.3.0'
             }
             debug(MavenPublication) {
                 from components.debug
 
                 groupId = 'com.xquare.android'
-                artifactId = 'xds-design-system-android'
-                version = '0.2.0'
+                artifactId = 'xdsandroid'
+                version = '0.3.0'
             }
         }
     }

diff --git a/xquare-design-system-android/src/main/kotlin/com/xquare/xds/application/XdsApplication.kt b/xquare-design-system-android/src/main/kotlin/com/xquare/xds/application/XdsApplication.kt
@@ -0,0 +1,11 @@
+package com.xquare.xds.application
+
+import android.app.Application
+import com.google.android.material.color.DynamicColors
+
+class XdsApplication : Application() {
+    override fun onCreate() {
+        super.onCreate()
+        DynamicColors.applyToActivitiesIfAvailable(this)
+    }
+}
diff --git a/xquare-design-system-android/src/main/res/values-night/themes.xml b/xquare-design-system-android/src/main/res/values-night/themes.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--color 참조 시 @color 가 아닌 ?attr/ 로 참조하여 사용-->
 <resources>
 
     <style name="Theme.XQUARE.DayNight.NoActionBar" parent="Theme.Material3.DayNight.NoActionBar" />
@@ -39,4 +40,40 @@
     <color name="outline">@color/neutral_variant_60</color>
     <color name="outline_variant">@color/neutral_variant_30</color>
 
+    <!--primary-->
+    <color name="colorPrimary">@color/primary_40</color>
+    <color name="colorOnPrimary">@color/primary_100</color>
+    <color name="colorPrimaryContainer">@color/primary_30</color>
+    <color name="colorOnPrimaryContainer">@color/primary_90</color>
+
+    <!--secondary-->
+    <color name="colorSecondary">@color/secondary_40</color>
+    <color name="colorOnSecondary">@color/secondary_100</color>
+    <color name="colorSecondaryContainer">@color/secondary_30</color>
+    <color name="colorOnSecondaryContainer">@color/secondary_90</color>
+
+    <!--tertiary-->
+    <color name="colorTertiary">@color/tertiary_40</color>
+    <color name="colorOnTertiary">@color/tertiary_100</color>
+    <color name="colorTertiaryContainer">@color/tertiary_30</color>
+    <color name="colorOnTertiaryContainer">@color/tertiary_90</color>
+
+    <!--error-->
+    <color name="colorError">@color/error_40</color>
+    <color name="colorOnError">@color/error_100</color>
+    <color name="colorErrorContainer">@color/error_30</color>
+    <color name="colorOnErrorContainer">@color/error_90</color>
+
+    <!--background-->
+    <color name="colorBackground">@color/neutral_10</color>
+    <color name="colorOnBackground">@color/neutral_90</color>
+    <color name="colorSurface">@color/neutral_10</color>
+    <color name="colorOnSurface">@color/neutral_90</color>
+
+    <!--surface-->
+    <color name="colorSurfaceVariant">@color/neutral_variant_30</color>
+    <color name="colorOnSurfaceVariant">@color/neutral_variant_80</color>
+    <color name="colorOutline">@color/neutral_variant_60</color>
+    <color name="colorOutlineVariant">@color/neutral_variant_30</color>
+
 </resources>
diff --git a/xquare-design-system-android/src/main/res/values/corners.xml b/xquare-design-system-android/src/main/res/values/corners.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="corner_xsmall">4dp</dimen>
+    <dimen name="corner_small">8dp</dimen>
+    <dimen name="corner_medium">12dp</dimen>
+    <dimen name="corner_large">16dp</dimen>
+    <dimen name="corner_xlarge">20dp</dimen>
+</resources>
diff --git a/xquare-design-system-android/src/main/res/values/elevation.xml b/xquare-design-system-android/src/main/res/values/elevation.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="elevation_low">8dp</dimen>
+    <dimen name="elevation_medium">16dp</dimen>
+    <dimen name="elevation_high">24dp</dimen>
+</resources>
diff --git a/xquare-design-system-android/src/main/res/values/frame_margin.xml b/xquare-design-system-android/src/main/res/values/frame_margin.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="margin_frame_start">16dp</dimen>
+    <dimen name="margin_frame_end">16dp</dimen>
+    <dimen name="margin_frame_top">12dp</dimen>
+    <dimen name="margin_frame_bottom">12dp</dimen>
+    <dimen name="margin_frame_horizontal">12dp</dimen>
+    <dimen name="margin_frame_vertical">16dp</dimen>
+
+    <style name="MarginFrameDefault">
+        <item name="android:layout_marginStart">16dp</item>
+        <item name="android:layout_marginEnd">16dp</item>
+        <item name="android:layout_marginTop">12dp</item>
+        <item name="android:layout_marginBottom">12dp</item>
+    </style>
+
+    <style name="MarginFrameDefaultBackground" parent="@style/MarginFrameDefault">
+        <item name="android:colorBackground">@color/background</item>
+    </style>
+
+</resources>
diff --git a/xquare-design-system-android/src/main/res/values/themes.xml b/xquare-design-system-android/src/main/res/values/themes.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--color 참조 시 @color 가 아닌 ?attr/ 로 참조하여 사용-->
 <resources>
 
     <style name="Theme.XQUARE.DayNight.NoActionBar" parent="Theme.Material3.DayNight.NoActionBar" />
@@ -39,4 +40,40 @@
     <color name="outline">@color/neutral_variant_50</color>
     <color name="outline_variant">@color/neutral_variant_80</color>
 
+    <!--primary-->
+    <color name="colorPrimary">@color/primary_60</color>
+    <color name="colorOnPrimary">@color/primary_100</color>
+    <color name="colorPrimaryContainer">@color/primary_90</color>
+    <color name="colorOnPrimaryContainer">@color/primary_10</color>
+
+    <!--secondary-->
+    <color name="colorSecondary">@color/secondary_60</color>
+    <color name="colorOnSecondary">@color/secondary_100</color>
+    <color name="colorSecondaryContainer">@color/secondary_90</color>
+    <color name="colorOnSecondaryContainer">@color/secondary_10</color>
+
+    <!--tertiary-->
+    <color name="colorTertiary">@color/tertiary_60</color>
+    <color name="colorOnTertiary">@color/tertiary_100</color>
+    <color name="colorTertiaryContainer">@color/tertiary_90</color>
+    <color name="colorOnTertiaryContainer">@color/tertiary_10</color>
+
+    <!--error-->
+    <color name="colorError">@color/error_60</color>
+    <color name="colorOnError">@color/error_100</color>
+    <color name="colorErrorContainer">@color/error_90</color>
+    <color name="colorOnErrorContainer">@color/error_10</color>
+
+    <!--background-->
+    <color name="colorBackground">@color/neutral_99</color>
+    <color name="colorOnBackground">@color/neutral_10</color>
+    <color name="colorSurface">@color/neutral_99</color>
+    <color name="colorOnSurface">@color/neutral_10</color>
+
+    <!--surface-->
+    <color name="colorSurfaceVariant">@color/neutral_variant_90</color>
+    <color name="colorOnSurfaceVariant">@color/neutral_variant_30</color>
+    <color name="colorOutline">@color/neutral_variant_50</color>
+    <color name="colorOutlineVariant">@color/neutral_variant_80</color>
+
 </resources>