From 3f32d8a50d1ee13e5b119f16eafc53db1c273194 Mon Sep 17 00:00:00 2001 From: jhg3410 Date: Sun, 22 Sep 2024 02:32:13 +0900 Subject: [PATCH 1/3] =?UTF-8?q?MONEYMONG-508=20feat:=20MDSButton=20corner?= =?UTF-8?q?=20radius,=20Icon=20Size,=20TextStyle=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../moneymong/design_system/component/button/Button.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/core/design-system/src/main/java/com/moneymong/moneymong/design_system/component/button/Button.kt b/core/design-system/src/main/java/com/moneymong/moneymong/design_system/component/button/Button.kt index 428762d4..732bd0f1 100644 --- a/core/design-system/src/main/java/com/moneymong/moneymong/design_system/component/button/Button.kt +++ b/core/design-system/src/main/java/com/moneymong/moneymong/design_system/component/button/Button.kt @@ -18,7 +18,7 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import com.moneymong.moneymong.design_system.theme.Body3 +import com.moneymong.moneymong.design_system.theme.Body2 @Composable fun MDSButton( @@ -38,10 +38,10 @@ fun MDSButton( modifier = modifier .background( color = backgroundColor, - shape = RoundedCornerShape(12.dp) + shape = RoundedCornerShape(10.dp) ) .clip( - RoundedCornerShape(12.dp) + RoundedCornerShape(10.dp) ) .clickable( onClick = onClick, @@ -58,7 +58,7 @@ fun MDSButton( ) { if (iconResource != null) { Icon( - modifier = Modifier.size(20.dp), + modifier = Modifier.size(18.dp), painter = painterResource(id = iconResource), contentDescription = "Button icon", tint = contentColor @@ -67,7 +67,7 @@ fun MDSButton( Text( text = text, color = contentColor, - style = Body3, + style = Body2, ) } } From 23bcb3c41d62245c7cf110f15c7ab53c3545acf2 Mon Sep 17 00:00:00 2001 From: jhg3410 Date: Sun, 22 Sep 2024 02:33:48 +0900 Subject: [PATCH 2/3] =?UTF-8?q?MONEYMONG-508=20feat:=20MDSNavigationBar=20?= =?UTF-8?q?=EA=B7=B8=EB=A6=BC=EC=9E=90=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/navigation/NavigationBar.kt | 32 ------------------- 1 file changed, 32 deletions(-) diff --git a/core/design-system/src/main/java/com/moneymong/moneymong/design_system/component/navigation/NavigationBar.kt b/core/design-system/src/main/java/com/moneymong/moneymong/design_system/component/navigation/NavigationBar.kt index 0909c1b2..b86c1ba4 100644 --- a/core/design-system/src/main/java/com/moneymong/moneymong/design_system/component/navigation/NavigationBar.kt +++ b/core/design-system/src/main/java/com/moneymong/moneymong/design_system/component/navigation/NavigationBar.kt @@ -1,6 +1,5 @@ package com.moneymong.moneymong.design_system.component.navigation -import android.graphics.BlurMaskFilter import androidx.annotation.DrawableRes import androidx.compose.foundation.background import androidx.compose.foundation.interaction.MutableInteractionSource @@ -22,9 +21,6 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.drawBehind import androidx.compose.ui.geometry.Offset -import androidx.compose.ui.graphics.Paint -import androidx.compose.ui.graphics.drawscope.drawIntoCanvas -import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.res.painterResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp @@ -33,7 +29,6 @@ import com.moneymong.moneymong.design_system.component.navigation.MDSNavigationB import com.moneymong.moneymong.design_system.component.navigation.MDSNavigationBarItemDefaults.selectedLabelColor import com.moneymong.moneymong.design_system.component.navigation.MDSNavigationBarItemDefaults.unSelectedIconColor import com.moneymong.moneymong.design_system.component.navigation.MDSNavigationBarItemDefaults.unSelectedLabelColor -import com.moneymong.moneymong.design_system.theme.Black import com.moneymong.moneymong.design_system.theme.Blue04 import com.moneymong.moneymong.design_system.theme.Body2 import com.moneymong.moneymong.design_system.theme.Gray02 @@ -49,7 +44,6 @@ fun MDSNavigationBar( modifier = modifier .fillMaxWidth() .navigationBarsPadding() - .navigationBarShadow() .background(color = White) .drawBehind { val strokeWidth = 1.dp.toPx() @@ -66,32 +60,6 @@ fun MDSNavigationBar( ) } -private fun Modifier.navigationBarShadow(): Modifier { - val shadowOffsetY = (-4).dp - val shadowBlurRadius = 8.dp - val shadowColor = Black.copy(alpha = 0.04f).toArgb() - - return this.drawBehind { - drawIntoCanvas { canvas -> - val paint = Paint() - val frameworkPaint = paint.asFrameworkPaint() - frameworkPaint.color = shadowColor - frameworkPaint.maskFilter = BlurMaskFilter( - shadowBlurRadius.toPx(), - BlurMaskFilter.Blur.NORMAL - ) - - canvas.drawRect( - left = 0f, - top = shadowOffsetY.toPx(), - right = size.width, - bottom = size.height + shadowOffsetY.toPx(), - paint = paint - ) - } - } -} - @Composable fun RowScope.MDSNavigationBarItem( From 933471d0148132691d95d7528b49fe46880744b6 Mon Sep 17 00:00:00 2001 From: jhg3410 Date: Sun, 22 Sep 2024 02:45:43 +0900 Subject: [PATCH 3/3] =?UTF-8?q?MONEYMONG-508=20feat:=20=EB=8C=80=ED=95=99?= =?UTF-8?q?=20=EC=A0=95=EB=B3=B4=EA=B0=80=20=EC=97=86=EC=9D=84=20=EB=95=8C?= =?UTF-8?q?=EC=9D=98=20=EB=B0=98=ED=99=98=EA=B0=92=20=EB=B3=80=EA=B2=BD(Nu?= =?UTF-8?q?ll=20->=20"")?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/moneymong/moneymong/model/sign/UnivResponse.kt | 2 +- .../moneymong/feature/agency/search/AgencySearchViewModel.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/model/src/main/java/com/moneymong/moneymong/model/sign/UnivResponse.kt b/core/model/src/main/java/com/moneymong/moneymong/model/sign/UnivResponse.kt index 6a098bd1..46dbf79f 100644 --- a/core/model/src/main/java/com/moneymong/moneymong/model/sign/UnivResponse.kt +++ b/core/model/src/main/java/com/moneymong/moneymong/model/sign/UnivResponse.kt @@ -1,6 +1,6 @@ package com.moneymong.moneymong.model.sign data class UnivResponse( - val universityName: String?, + val universityName: String, val grade: Int ) \ No newline at end of file diff --git a/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/search/AgencySearchViewModel.kt b/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/search/AgencySearchViewModel.kt index 0f7ff711..323d3b74 100644 --- a/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/search/AgencySearchViewModel.kt +++ b/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/search/AgencySearchViewModel.kt @@ -65,7 +65,7 @@ class AgencySearchViewModel @Inject constructor( isLoading = false, joinedAgencies = fetchMyAgenciesResult.getOrThrow() .map { myAgencyResponse -> myAgencyResponse.toAgency() }, - isUniversityStudent = fetchMyUniversityResult.getOrThrow().universityName != null, + isUniversityStudent = fetchMyUniversityResult.getOrThrow().universityName.isNotBlank(), ) } } else {