From 739048e422ed3ca8cb087c3a3e6872003559fb56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9E=84=EA=B0=80=EB=9E=8C?=
 <84944117+ImGaram@users.noreply.github.com>
Date: Wed, 20 Sep 2023 15:33:29 +0900
Subject: [PATCH 1/2] =?UTF-8?q?:sparkles:=20::=20border=EB=A5=BC=20?=
 =?UTF-8?q?=EC=9E=90=EC=9C=A0=EB=A1=AD=EA=B2=8C=20=EB=B3=80=EA=B2=BD=20?=
 =?UTF-8?q?=ED=95=A0=20=EC=88=98=20=EC=9E=88=EB=8F=84=EB=A1=9D=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

---
 .../dotori_components/components/button/DotoriButton.kt     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dotori-components/src/main/java/com/dotori/dotori_components/components/button/DotoriButton.kt b/dotori-components/src/main/java/com/dotori/dotori_components/components/button/DotoriButton.kt
index f9fb440..68b1280 100644
--- a/dotori-components/src/main/java/com/dotori/dotori_components/components/button/DotoriButton.kt
+++ b/dotori-components/src/main/java/com/dotori/dotori_components/components/button/DotoriButton.kt
@@ -32,6 +32,7 @@ fun DotoriButton(
     text: String,
     colors: Color = DotoriTheme.colors.primary10,
     shape: Shape = RoundedCornerShape(8.dp),
+    border: BorderStroke = BorderStroke(1.dp, DotoriTheme.colors.neutral30),
     paddingValues: PaddingValues = PaddingValues(0.dp),
     textStyle: TextStyle = DotoriTheme.typography.smallTitle,
     onClick: () -> Unit
@@ -39,7 +40,7 @@ fun DotoriButton(
     if (colors == Transparent) {
         OutlinedButton(
             modifier = modifier,
-            border = BorderStroke(1.dp, DotoriTheme.colors.neutral30),
+            border = border,
             colors = ButtonDefaults.buttonColors(
                 backgroundColor = Transparent,
                 contentColor = DotoriTheme.colors.neutral20
@@ -98,7 +99,8 @@ fun DotoriButtonPreview() {
             text = "button",
             colors = Transparent,
             paddingValues = PaddingValues(vertical = 8.dp, horizontal = 16.dp),
-            shape = CircleShape
+            shape = CircleShape,
+            border = BorderStroke(1.dp, DotoriTheme.colors.subRed)
         ) {}
         Spacer(modifier = Modifier.height(10.dp))
 

From 8068c0443f4b408357072a56a32334dc4edef764 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9E=84=EA=B0=80=EB=9E=8C?=
 <84944117+ImGaram@users.noreply.github.com>
Date: Wed, 20 Sep 2023 15:37:38 +0900
Subject: [PATCH 2/2] =?UTF-8?q?:sparkles:=20::=20text=20color=EB=A5=BC=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD=ED=95=A0=20=EC=88=98=20=EC=9E=88=EA=B2=8C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dotori_components/components/button/DotoriButton.kt    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dotori-components/src/main/java/com/dotori/dotori_components/components/button/DotoriButton.kt b/dotori-components/src/main/java/com/dotori/dotori_components/components/button/DotoriButton.kt
index 68b1280..a9d247e 100644
--- a/dotori-components/src/main/java/com/dotori/dotori_components/components/button/DotoriButton.kt
+++ b/dotori-components/src/main/java/com/dotori/dotori_components/components/button/DotoriButton.kt
@@ -8,7 +8,6 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Button
@@ -31,6 +30,7 @@ fun DotoriButton(
     modifier: Modifier = Modifier,
     text: String,
     colors: Color = DotoriTheme.colors.primary10,
+    textColor: Color = DotoriTheme.colors.neutral30,
     shape: Shape = RoundedCornerShape(8.dp),
     border: BorderStroke = BorderStroke(1.dp, DotoriTheme.colors.neutral30),
     paddingValues: PaddingValues = PaddingValues(0.dp),
@@ -51,6 +51,7 @@ fun DotoriButton(
         ) {
             Text(
                 text = text,
+                color = textColor,
                 style = textStyle
             )
         }
@@ -67,6 +68,7 @@ fun DotoriButton(
         ) {
             Text(
                 text = text,
+                color = textColor,
                 style = textStyle
             )
         }
@@ -100,7 +102,8 @@ fun DotoriButtonPreview() {
             colors = Transparent,
             paddingValues = PaddingValues(vertical = 8.dp, horizontal = 16.dp),
             shape = CircleShape,
-            border = BorderStroke(1.dp, DotoriTheme.colors.subRed)
+            border = BorderStroke(1.dp, DotoriTheme.colors.subRed),
+            textColor = DotoriTheme.colors.subRed
         ) {}
         Spacer(modifier = Modifier.height(10.dp))