🔀 :: (#1) 컬러 시스템 구현

team-xquare · Jul 21, 2023 · 22bc4d8 · 22bc4d8
2 parents 6e75374 + d5b4651
commit 22bc4d8
Show file tree

Hide file tree

Showing 7 changed files with 204 additions and 18 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -10,13 +10,13 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.XQUAREDesignSystemAndroid"
+        android:theme="@style/Theme.XQUARE.DayNight.NoActionBar"
         tools:targetApi="31">
         <activity
             android:name="com.xquare.xquare_design_system_android.MainActivity"
             android:exported="true"
             android:label="@string/app_name"
-            android:theme="@style/Theme.XQUAREDesignSystemAndroid">
+            android:theme="@style/Theme.XQUARE.DayNight.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
@@ -1,7 +1,5 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Base.Theme.XQUAREDesignSystemAndroid" parent="Theme.Material3.DayNight.NoActionBar">
-        <!-- Customize your dark theme here. -->
-        <!-- <item name="colorPrimary">@color/my_dark_primary</item> -->
-    </style>
-</resources>
+<resources>
+
+    <style name="Theme.XQUARE.DayNight.NoActionBar" parent="Theme.Material3.DayNight.NoActionBar" />
+
+</resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -1,9 +1,5 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Base.Theme.XQUAREDesignSystemAndroid" parent="Theme.Material3.DayNight.NoActionBar">
-        <!-- Customize your light theme here. -->
-        <!-- <item name="colorPrimary">@color/my_light_primary</item> -->
-    </style>
+<resources>
 
-    <style name="Theme.XQUAREDesignSystemAndroid" parent="Base.Theme.XQUAREDesignSystemAndroid" />
-</resources>
+    <style name="Theme.XquarePlayground.DayNight.NoActionBar" parent="Theme.XQUARE.DayNight.NoActionBar" />
+
+</resources>
diff --git a/xds-android/build.gradle b/xds-android/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'com.android.library'
     id 'org.jetbrains.kotlin.android'
+    id 'maven-publish'
 }
 
 android {
@@ -31,7 +32,29 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.8.0'
+    implementation 'androidx.core:core-ktx:1.9.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.google.android.material:material:1.9.0'
 }
+
+afterEvaluate {
+    publishing {
+        publications {
+            release(MavenPublication) {
+                from components.release
+
+                // You can then customize attributes of the publication as shown below.
+                groupId = 'com.xquare.android'
+                artifactId = 'xds-android'
+                version = 'v0.1.0'
+            }
+            debug(MavenPublication) {
+                from components.debug
+
+                groupId = 'com.xquare.android'
+                artifactId = 'xds-android-debug'
+                version = 'v0.1.0'
+            }
+        }
+    }
+}
diff --git a/xds-android/src/main/res/values-night/themes.xml b/xds-android/src/main/res/values-night/themes.xml
@@ -0,0 +1,35 @@
+<resources>
+
+    <style name="Theme.XQUARE.DayNight.NoActionBar" parent="Theme.Material3.DayNight.NoActionBar" />
+
+    <color name="primary">@color/primary_40</color>
+    <color name="onPrimary">@color/primary_100</color>
+    <color name="primaryContainer">@color/primary_30</color>
+    <color name="onPrimaryContainer">@color/primary_90</color>
+
+    <color name="secondary">@color/secondary_40</color>
+    <color name="onSecondary">@color/secondary_100</color>
+    <color name="secondaryContainer">@color/secondary_30</color>
+    <color name="onSecondaryContainer">@color/secondary_90</color>
+
+    <color name="tertiary">@color/tertiary_40</color>
+    <color name="onTertiary">@color/tertiary_100</color>
+    <color name="tertiaryContainer">@color/tertiary_30</color>
+    <color name="onTertiaryContainer">@color/tertiary_90</color>
+
+    <color name="error">@color/error_40</color>
+    <color name="onError">@color/error_100</color>
+    <color name="errorContainer">@color/error_30</color>
+    <color name="onErrorContainer">@color/error_90</color>
+
+    <color name="background">@color/neutral_10</color>
+    <color name="onBackground">@color/neutral_90</color>
+    <color name="surface">@color/neutral_10</color>
+    <color name="onSurface">@color/neutral_90</color>
+
+    <color name="surfaceVariant">@color/neutral_variant_30</color>
+    <color name="onSurfaceVariant">@color/neutral_variant_80</color>
+    <color name="outline">@color/neutral_variant_60</color>
+    <color name="outline_variant">@color/neutral_variant_30</color>
+
+</resources>
diff --git a/xds-android/src/main/res/values/colors.xml b/xds-android/src/main/res/values/colors.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!--Primary-->
+    <color name="primary_0">#FF000000</color>
+    <color name="primary_10">#FF1D0D33</color>
+    <color name="primary_20">#FF35185C</color>
+    <color name="primary_30">#FF4D2485</color>
+    <color name="primary_40">#FF6532AD</color>
+    <color name="primary_50">#FF7E40D5</color>
+    <color name="primary_60">#FF9650FA</color>
+    <color name="primary_70">#FFAA71FB</color>
+    <color name="primary_80">#FFBE93FC</color>
+    <color name="primary_90">#FFD2B4FD</color>
+    <color name="primary_95">#FFE6D5FE</color>
+    <color name="primary_99">#FFFAF6FF</color>
+    <color name="primary_100">#FFFFFFFF</color>
+
+    <!--Secondary-->
+    <color name="secondary_0">#FF000000</color>
+    <color name="secondary_10">#FF130C33</color>
+    <color name="secondary_20">#FF22175B</color>
+    <color name="secondary_30">#FF332382</color>
+    <color name="secondary_40">#FF4430A8</color>
+    <color name="secondary_50">#FF563ECC</color>
+    <color name="secondary_60">#FF684DF0</color>
+    <color name="secondary_70">#FF856FF3</color>
+    <color name="secondary_80">#FFA191F6</color>
+    <color name="secondary_90">#FFBEB3F9</color>
+    <color name="secondary_95">#FFDBD4FB</color>
+    <color name="secondary_99">#FFF8F6FE</color>
+    <color name="secondary_100">#FFFFFFFF</color>
+
+    <!--Tertiary-->
+    <color name="tertiary_0">#FF000000</color>
+    <color name="tertiary_10">#FF121531</color>
+    <color name="tertiary_20">#FF212658</color>
+    <color name="tertiary_30">#FF30387D</color>
+    <color name="tertiary_40">#FF414BA2</color>
+    <color name="tertiary_50">#FF535EC6</color>
+    <color name="tertiary_60">#FF6572E9</color>
+    <color name="tertiary_70">#FF828DED</color>
+    <color name="tertiary_80">#FFAOA8F1</color>
+    <color name="tertiary_90">#FFBDC2F6</color>
+    <color name="tertiary_95">#FFDADDFA</color>
+    <color name="tertiary_99">#FFF7F8FE</color>
+    <color name="tertiary_100">#FFFFFFFF</color>
+
+    <!--Error-->
+    <color name="error_0">#FF000000</color>
+    <color name="error_10">#FF410E0B</color>
+    <color name="error_20">#FF601410</color>
+    <color name="error_30">#FF8C1D18</color>
+    <color name="error_40">#FFB3261E</color>
+    <color name="error_50">#FFDC362E</color>
+    <color name="error_60">#FFE46962</color>
+    <color name="error_70">#FFEC928E</color>
+    <color name="error_80">#FFF2B8B5</color>
+    <color name="error_90">#FFF9DEDC</color>
+    <color name="error_95">#FFFCEEEE</color>
+    <color name="error_99">#FFFFFBF9</color>
+    <color name="error_100">#FFFFFFFF</color>
+
+    <!--Neutral-->
+    <color name="neutral_0">#FF000000</color>
+    <color name="neutral_10">#FF1C1B1F</color>
+    <color name="neutral_20">#FF313033</color>
+    <color name="neutral_30">#FF484649</color>
+    <color name="neutral_40">#FF605D62</color>
+    <color name="neutral_50">#FF787579</color>
+    <color name="neutral_60">#FF939094</color>
+    <color name="neutral_70">#FFAEAAAE</color>
+    <color name="neutral_80">#FFC9C5CA</color>
+    <color name="neutral_90">#FFE6E1E5</color>
+    <color name="neutral_95">#FFF4EFF4</color>
+    <color name="neutral_99">#FFFFFBFE</color>
+    <color name="neutral_100">#FFFFFFFF</color>
+
+    <!--Neutral Variant-->
+    <color name="neutral_variant_0">#FF000000</color>
+    <color name="neutral_variant_10">#FF1D1A22</color>
+    <color name="neutral_variant_20">#FF322F37</color>
+    <color name="neutral_variant_30">#FF49454F</color>
+    <color name="neutral_variant_40">#FF605D66</color>
+    <color name="neutral_variant_50">#FF79747E</color>
+    <color name="neutral_variant_60">#FF938F99</color>
+    <color name="neutral_variant_70">#FFAEA9B4</color>
+    <color name="neutral_variant_80">#FFCAC4D0</color>
+    <color name="neutral_variant_90">#FFE7E0EC</color>
+    <color name="neutral_variant_95">#FFF5FEFA</color>
+    <color name="neutral_variant_99">#FFFFFBFE</color>
+    <color name="neutral_variant_100">#FFFFFFFF</color>
+
+    <!--Common-->
+    <color name="black">#FF000000</color>
+    <color name="white">#FFFFFFFF</color>
+    <color name="test">#FF3D8AFF</color>
+
+</resources>
diff --git a/xds-android/src/main/res/values/themes.xml b/xds-android/src/main/res/values/themes.xml
@@ -0,0 +1,35 @@
+<resources>
+
+    <style name="Theme.XQUARE.DayNight.NoActionBar" parent="Theme.Material3.DayNight.NoActionBar" />
+
+    <color name="primary">@color/primary_60</color>
+    <color name="onPrimary">@color/primary_100</color>
+    <color name="primaryContainer">@color/primary_90</color>
+    <color name="onPrimaryContainer">@color/primary_10</color>
+
+    <color name="secondary">@color/secondary_60</color>
+    <color name="onSecondary">@color/secondary_100</color>
+    <color name="secondaryContainer">@color/secondary_90</color>
+    <color name="onSecondaryContainer">@color/secondary_10</color>
+
+    <color name="tertiary">@color/tertiary_60</color>
+    <color name="onTertiary">@color/tertiary_100</color>
+    <color name="tertiaryContainer">@color/tertiary_90</color>
+    <color name="onTertiaryContainer">@color/tertiary_10</color>
+
+    <color name="error">@color/error_60</color>
+    <color name="onError">@color/error_100</color>
+    <color name="errorContainer">@color/error_90</color>
+    <color name="onErrorContainer">@color/error_10</color>
+
+    <color name="background">@color/neutral_99</color>
+    <color name="onBackground">@color/neutral_10</color>
+    <color name="surface">@color/neutral_99</color>
+    <color name="onSurface">@color/neutral_10</color>
+
+    <color name="surfaceVariant">@color/neutral_variant_90</color>
+    <color name="onSurfaceVariant">@color/neutral_variant_30</color>
+    <color name="outline">@color/neutral_variant_50</color>
+    <color name="outline_variant">@color/neutral_variant_80</color>
+
+</resources>