Skip to content

Commit 6a6c8f5

Browse files
INN-1581 Changes according to onBoardingScreen QA round 1
- INN-2098 Modified LocaleButton - INN-2106 Modified OutlinedTextField() ErrorText() and TextFieldSupportingText order
1 parent d69e6ce commit 6a6c8f5

File tree

2 files changed

+15
-8
lines changed

2 files changed

+15
-8
lines changed

components/src/main/java/com/ifeel/components/ui/components/common/button/LocaleButton.kt

+11-4
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,19 @@ package com.ifeel.components.ui.components.common.button
33
import androidx.compose.foundation.BorderStroke
44
import androidx.compose.foundation.Image
55
import androidx.compose.foundation.background
6+
import androidx.compose.foundation.border
67
import androidx.compose.foundation.layout.size
78
import androidx.compose.foundation.shape.RoundedCornerShape
89
import androidx.compose.material3.OutlinedIconButton
910
import androidx.compose.runtime.Composable
1011
import androidx.compose.ui.Modifier
12+
import androidx.compose.ui.draw.clip
13+
import androidx.compose.ui.graphics.Color
1114
import androidx.compose.ui.tooling.preview.Preview
1215
import androidx.compose.ui.unit.dp
1316
import coil.compose.rememberAsyncImagePainter
1417
import com.ifeel.components.ui.theme.IfeelComponentsTheme
1518
import com.ifeel.components.ui.theme.color_text_400
16-
import com.ifeel.components.ui.theme.color_white
1719

1820
@Composable
1921
fun LocaleButton(
@@ -23,10 +25,15 @@ fun LocaleButton(
2325
) {
2426
OutlinedIconButton(
2527
onClick = onClick,
26-
shape = RoundedCornerShape(6.dp),
27-
border = BorderStroke(1.dp, color_text_400),
28+
border = BorderStroke(0.dp, Color.Transparent),
2829
modifier = modifier
29-
.background(color_white, RoundedCornerShape(6.dp))
30+
.border(
31+
width = 1.dp,
32+
color = color_text_400,
33+
shape = RoundedCornerShape(6.dp)
34+
)
35+
.clip(shape = RoundedCornerShape(6.dp))
36+
.background(color = Color.White)
3037
.size(height = 44.dp, width = 48.dp)
3138
) {
3239
Image(

components/src/main/java/com/ifeel/components/ui/components/generic/textfield/OutlinedTextField.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,13 @@ fun OutlinedTextField(
108108
)
109109
)
110110

111-
AnimatedVisibility(visible = supportingText != null && isFocused) {
112-
TextFieldSupportingText(text = supportingText!!)
113-
}
114-
115111
AnimatedVisibility(isError && errorMessage != null) {
116112
ErrorText(text = errorMessage!!)
117113
}
114+
115+
AnimatedVisibility(visible = supportingText != null && isFocused) {
116+
TextFieldSupportingText(text = supportingText!!)
117+
}
118118
}
119119
}
120120

0 commit comments

Comments
 (0)