Release/release 2.0.0

.gitignore

@@ -8,6 +8,7 @@
 /.idea/workspace.xml
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
+/.idea/misc.xml
 .DS_Store
 /build
 /captures

app/build.gradle.kts

@@ -19,8 +19,8 @@ android {
         applicationId = "com.moneymong.moneymong"
         minSdk = 24
         targetSdk = 34
-        versionCode = 29
-        versionName = "1.4.0"
+        versionCode = 30
+        versionName = "2.0.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

core/design-system/src/main/java/com/moneymong/moneymong/design_system/component/button/Button.kt

@@ -16,9 +16,11 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import com.moneymong.moneymong.design_system.theme.Body2
+import com.moneymong.moneymong.design_system.R
+import com.moneymong.moneymong.design_system.theme.Body3
 
 @Composable
 fun MDSButton(
@@ -30,7 +32,7 @@ fun MDSButton(
     @DrawableRes iconResource: Int? = null,
     enabled: Boolean = true,
     contentHorizontalPadding: Dp = 0.dp,
-    cornerShape : Dp = 10.dp,
+    cornerShape: Dp = 10.dp,
 ) {
     val backgroundColor = if (enabled) type.backgroundColor else disabledBackgroundColor
     val contentColor = if (enabled) type.contentColor else disabledContentColor
@@ -57,19 +59,31 @@ fun MDSButton(
             ),
             horizontalArrangement = Arrangement.spacedBy(6.dp)
         ) {
+            Text(
+                text = text,
+                color = contentColor,
+                style = Body3,
+            )
             if (iconResource != null) {
                 Icon(
-                    modifier = Modifier.size(18.dp),
+                    modifier = Modifier.size(20.dp),
                     painter = painterResource(id = iconResource),
                     contentDescription = "Button icon",
                     tint = contentColor
                 )
             }
-            Text(
-                text = text,
-                color = contentColor,
-                style = Body2,
-            )
         }
     }
+}
+
+@Preview
+@Composable
+private fun MDSButtonPreview() {
+    MDSButton(
+        onClick = {},
+        text = "Button",
+        type = MDSButtonType.PRIMARY,
+        size = MDSButtonSize.LARGE,
+        iconResource = R.drawable.ic_scan
+    )
 }

core/design-system/src/main/java/com/moneymong/moneymong/design_system/component/button/ButtonType.kt

@@ -7,13 +7,15 @@ import com.moneymong.moneymong.design_system.theme.Gray02
 import com.moneymong.moneymong.design_system.theme.Gray03
 import com.moneymong.moneymong.design_system.theme.Gray04
 import com.moneymong.moneymong.design_system.theme.Gray05
+import com.moneymong.moneymong.design_system.theme.Gray08
 import com.moneymong.moneymong.design_system.theme.White
 
 enum class MDSButtonType(val backgroundColor: Color, val contentColor: Color) {
 
     PRIMARY(backgroundColor = Blue04, contentColor = White),
     SECONDARY(backgroundColor = Blue01, contentColor = Blue04),
     NEGATIVE(backgroundColor = Gray02, contentColor = Gray05),
+    THIRDARY(backgroundColor = Gray08, contentColor = White)
 }
 
 val disabledBackgroundColor = Gray03