From 9edc7fdf8dfcd6e925f9f0f72c23c840fe1b5d1b Mon Sep 17 00:00:00 2001
From: Tmdhoon2 <hks026naver@gmail.com>
Date: Mon, 24 Jul 2023 10:55:13 +0900
Subject: [PATCH 01/13] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20::=20corners.xml=20?=
 =?UTF-8?q?=EC=A0=95=EC=9D=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/values/corners.xml                       | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 xquare-design-system-android/src/main/res/values/corners.xml

diff --git a/xquare-design-system-android/src/main/res/values/corners.xml b/xquare-design-system-android/src/main/res/values/corners.xml
new file mode 100644
index 00000000..36daa7fd
--- /dev/null
+++ 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="xSmall">4dp</dimen>
+    <dimen name="small">8dp</dimen>
+    <dimen name="medium">12dp</dimen>
+    <dimen name="large">16dp</dimen>
+    <dimen name="xLarge">20dp</dimen>
+</resources>
\ No newline at end of file

From 7622d30fa4351213e8f1913007ee9851f99117f1 Mon Sep 17 00:00:00 2001
From: haeun <haeun3882@gmail.com>
Date: Mon, 24 Jul 2023 12:54:23 +0900
Subject: [PATCH 02/13] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20::=20elevation=20?=
 =?UTF-8?q?=EC=A0=95=EC=9D=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/values/elevation.xml                       | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 xquare-design-system-android/src/main/res/values/elevation.xml

diff --git a/xquare-design-system-android/src/main/res/values/elevation.xml b/xquare-design-system-android/src/main/res/values/elevation.xml
new file mode 100644
index 00000000..166027d1
--- /dev/null
+++ 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="row_elevation">8dp</dimen>
+    <dimen name="medium_elevation">16dp</dimen>
+    <dimen name="high_elevation">24dp</dimen>
+</resources>

From f672a9af337fc3df40abd619fd2dd0a473c61dac Mon Sep 17 00:00:00 2001
From: haeun <haeun3882@gmail.com>
Date: Mon, 24 Jul 2023 17:19:22 +0900
Subject: [PATCH 03/13] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20::=20resource=20?=
 =?UTF-8?q?=EB=84=A4=EC=9D=B4=EB=B0=8D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/values/elevation.xml                       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xquare-design-system-android/src/main/res/values/elevation.xml b/xquare-design-system-android/src/main/res/values/elevation.xml
index 166027d1..c59d379f 100644
--- a/xquare-design-system-android/src/main/res/values/elevation.xml
+++ b/xquare-design-system-android/src/main/res/values/elevation.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="row_elevation">8dp</dimen>
-    <dimen name="medium_elevation">16dp</dimen>
-    <dimen name="high_elevation">24dp</dimen>
+    <dimen name="elevation_row">8dp</dimen>
+    <dimen name="elevation_medium">16dp</dimen>
+    <dimen name="elevation_high">24dp</dimen>
 </resources>

From 70b59e596ded524740306ef620c0ae2eeb3c3466 Mon Sep 17 00:00:00 2001
From: haeun <haeun3882@gmail.com>
Date: Mon, 24 Jul 2023 17:23:21 +0900
Subject: [PATCH 04/13] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20::=20resource=20?=
 =?UTF-8?q?=EB=84=A4=EC=9D=B4=EB=B0=8D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xquare-design-system-android/src/main/res/values/elevation.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xquare-design-system-android/src/main/res/values/elevation.xml b/xquare-design-system-android/src/main/res/values/elevation.xml
index c59d379f..1ebd6bd4 100644
--- a/xquare-design-system-android/src/main/res/values/elevation.xml
+++ b/xquare-design-system-android/src/main/res/values/elevation.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="elevation_row">8dp</dimen>
+    <dimen name="elevation_low">8dp</dimen>
     <dimen name="elevation_medium">16dp</dimen>
     <dimen name="elevation_high">24dp</dimen>
 </resources>

From 048b6ad1485886ca9c3799f6372ae1ee1e023725 Mon Sep 17 00:00:00 2001
From: Tmdhoon2 <hks026naver@gmail.com>
Date: Mon, 24 Jul 2023 19:28:29 +0900
Subject: [PATCH 05/13] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20::=20=EB=9D=BC?=
 =?UTF-8?q?=EC=9D=B4=EB=B8=8C=EB=9F=AC=EB=A6=AC=20artifactId=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xquare-design-system-android/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xquare-design-system-android/build.gradle b/xquare-design-system-android/build.gradle
index f744da22..9c689646 100644
--- a/xquare-design-system-android/build.gradle
+++ b/xquare-design-system-android/build.gradle
@@ -43,14 +43,14 @@ afterEvaluate {
 
                 // You can then customize attributes of the publication as shown below.
                 groupId = 'com.xquare.android'
-                artifactId = 'xds-design-system-android'
+                artifactId = 'xdsandroid'
                 version = '0.2.0'
             }
             debug(MavenPublication) {
                 from components.debug
 
                 groupId = 'com.xquare.android'
-                artifactId = 'xds-design-system-android'
+                artifactId = 'xdsandroid'
                 version = '0.2.0'
             }
         }

From 1425c6a4b2932b60457e311a51b36c915c229ffb Mon Sep 17 00:00:00 2001
From: Tmdhoon2 <hks026naver@gmail.com>
Date: Mon, 24 Jul 2023 19:28:39 +0900
Subject: [PATCH 06/13] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20::=20corners.xml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/values/corners.xml                    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/xquare-design-system-android/src/main/res/values/corners.xml b/xquare-design-system-android/src/main/res/values/corners.xml
index 36daa7fd..562213f6 100644
--- a/xquare-design-system-android/src/main/res/values/corners.xml
+++ b/xquare-design-system-android/src/main/res/values/corners.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="xSmall">4dp</dimen>
-    <dimen name="small">8dp</dimen>
-    <dimen name="medium">12dp</dimen>
-    <dimen name="large">16dp</dimen>
-    <dimen name="xLarge">20dp</dimen>
+    <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>
\ No newline at end of file

From e8d256f7336ce9c84259732a51ad2ca80e4883e5 Mon Sep 17 00:00:00 2001
From: haeun <haeun3882@gmail.com>
Date: Mon, 24 Jul 2023 19:48:45 +0900
Subject: [PATCH 07/13] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20::=20frame=20margin?=
 =?UTF-8?q?=20=EC=A0=95=EC=9D=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/values/frame_margin.xml                   | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 xquare-design-system-android/src/main/res/values/frame_margin.xml

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
new file mode 100644
index 00000000..6dea3795
--- /dev/null
+++ b/xquare-design-system-android/src/main/res/values/frame_margin.xml
@@ -0,0 +1,7 @@
+<?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>
+</resources>
\ No newline at end of file

From acfa9b5c76219aca9bfc5055f3c0a0ba6219401c Mon Sep 17 00:00:00 2001
From: haeun <haeun3882@gmail.com>
Date: Tue, 25 Jul 2023 08:28:15 +0900
Subject: [PATCH 08/13] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20::=20margin=20horizo?=
 =?UTF-8?q?ntal,=20vertical?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/values/frame_margin.xml                        | 2 ++
 1 file changed, 2 insertions(+)

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
index 6dea3795..759ba394 100644
--- a/xquare-design-system-android/src/main/res/values/frame_margin.xml
+++ b/xquare-design-system-android/src/main/res/values/frame_margin.xml
@@ -4,4 +4,6 @@
     <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">16dp</dimen>
+    <dimen name="margin_frame_vertical">12dp</dimen>
 </resources>
\ No newline at end of file

From 56bd50de3f97fa0f81d25af6ae37b39d243d374f Mon Sep 17 00:00:00 2001
From: haeun <haeun3882@gmail.com>
Date: Tue, 25 Jul 2023 08:53:24 +0900
Subject: [PATCH 09/13] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20::=20margin=20style?=
 =?UTF-8?q?=20=EC=A0=95=EC=9D=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/values/frame_margin.xml              | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

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
index 759ba394..dd870860 100644
--- a/xquare-design-system-android/src/main/res/values/frame_margin.xml
+++ b/xquare-design-system-android/src/main/res/values/frame_margin.xml
@@ -4,6 +4,13 @@
     <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">16dp</dimen>
-    <dimen name="margin_frame_vertical">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>
 </resources>
\ No newline at end of file

From f266cb0f2ed272cca94bfa25b9c3ba0438384992 Mon Sep 17 00:00:00 2001
From: haeun <haeun3882@gmail.com>
Date: Tue, 25 Jul 2023 09:09:10 +0900
Subject: [PATCH 10/13] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20::=20background=20st?=
 =?UTF-8?q?yle=20=EC=A0=95=EC=9D=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/values/frame_margin.xml                   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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
index dd870860..d2e9ecb1 100644
--- a/xquare-design-system-android/src/main/res/values/frame_margin.xml
+++ b/xquare-design-system-android/src/main/res/values/frame_margin.xml
@@ -13,4 +13,9 @@
         <item name="android:layout_marginTop">12dp</item>
         <item name="android:layout_marginBottom">12dp</item>
     </style>
-</resources>
\ No newline at end of file
+
+    <style name="MarginFrameDefaultBackground" parent="@style/MarginFrameDefault">
+        <item name="android:colorBackground">@color/background</item>
+    </style>
+
+</resources>

From 4b78c0215b92c9a3da68901f0ac062db48a3908e Mon Sep 17 00:00:00 2001
From: Tmdhoon2 <hks026naver@gmail.com>
Date: Sun, 30 Jul 2023 14:28:31 +0900
Subject: [PATCH 11/13] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20::=20dynamic=20color?=
 =?UTF-8?q?s=20=EC=A0=95=EC=9D=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/values-night/themes.xml      | 37 +++++++++++++++++++
 .../src/main/res/values/themes.xml            | 37 +++++++++++++++++++
 2 files changed, 74 insertions(+)

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
index e57da9b1..82ab39eb 100644
--- 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/themes.xml b/xquare-design-system-android/src/main/res/values/themes.xml
index ba8c262f..8fc299c1 100644
--- 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>

From dd73dac00df02561bdbaba3673ad15f9d7f14375 Mon Sep 17 00:00:00 2001
From: Tmdhoon2 <hks026naver@gmail.com>
Date: Sun, 30 Jul 2023 14:33:29 +0900
Subject: [PATCH 12/13] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20::=20XdsApplication?=
 =?UTF-8?q?=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                      |  4 ++--
 .../com/xquare/xds/application/XdsApplication.kt      | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 xquare-design-system-android/src/main/kotlin/com/xquare/xds/application/XdsApplication.kt

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f129da2a..47460d4c 100644
--- 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>
\ No newline at end of file
+</manifest>
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
new file mode 100644
index 00000000..23ff4275
--- /dev/null
+++ 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)
+    }
+}

From 54692abad6c9372b71d7719338b506f56a4a75cd Mon Sep 17 00:00:00 2001
From: Tmdhoon2 <hks026naver@gmail.com>
Date: Sun, 30 Jul 2023 15:04:01 +0900
Subject: [PATCH 13/13] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20::=20=EB=B2=84?=
 =?UTF-8?q?=EC=A0=84=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xquare-design-system-android/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xquare-design-system-android/build.gradle b/xquare-design-system-android/build.gradle
index 9c689646..7f358cc8 100644
--- a/xquare-design-system-android/build.gradle
+++ b/xquare-design-system-android/build.gradle
@@ -44,14 +44,14 @@ afterEvaluate {
                 // You can then customize attributes of the publication as shown below.
                 groupId = 'com.xquare.android'
                 artifactId = 'xdsandroid'
-                version = '0.2.0'
+                version = '0.3.0'
             }
             debug(MavenPublication) {
                 from components.debug
 
                 groupId = 'com.xquare.android'
                 artifactId = 'xdsandroid'
-                version = '0.2.0'
+                version = '0.3.0'
             }
         }
     }