diff --git a/APK/WallpaperCollectApp-v1.1.apk b/APK/WallpaperCollectApp-v1.1..apk similarity index 98% rename from APK/WallpaperCollectApp-v1.1.apk rename to APK/WallpaperCollectApp-v1.1..apk index 49ab181..10210f4 100644 Binary files a/APK/WallpaperCollectApp-v1.1.apk and b/APK/WallpaperCollectApp-v1.1..apk differ diff --git a/app/src/main/java/com/example/wallpapercollect/presentation/ui/home/Profile.kt b/app/src/main/java/com/example/wallpapercollect/presentation/ui/home/Profile.kt index 546425f..30d78a8 100644 --- a/app/src/main/java/com/example/wallpapercollect/presentation/ui/home/Profile.kt +++ b/app/src/main/java/com/example/wallpapercollect/presentation/ui/home/Profile.kt @@ -357,11 +357,11 @@ fun BottomPartOfProfile( ) { if (isEditButtonClicked){ - TextFieldProfile(placeHolder = "User Name", content = {userNameContent(it)}, firstContent = userName) + TextFieldProfile(label = "User Name", content = {userNameContent(it)}, firstContent = userName) Spacer(modifier = Modifier.padding(top = 16.dp)) - TextFieldProfile(placeHolder = "Phone", content = {phoneNumberContent(it)}, firstContent = phoneNumber) + TextFieldProfile(label = "Phone", content = {phoneNumberContent(it)}, firstContent = phoneNumber) Spacer(modifier = Modifier.padding(top = 16.dp)) - TextFieldProfile(placeHolder = "Email", content = {emailContent(it)}, firstContent = email) + TextFieldProfile(label = "Email", content = {emailContent(it)}, firstContent = email) }else { BoxContent(startText = "Phone", endText = phoneNumber) BoxContent(startText = "Email", endText = email) diff --git a/app/src/main/java/com/example/wallpapercollect/presentation/ui/utils/ProfileUtils.kt b/app/src/main/java/com/example/wallpapercollect/presentation/ui/utils/ProfileUtils.kt index 76352b4..c9cdc2b 100644 --- a/app/src/main/java/com/example/wallpapercollect/presentation/ui/utils/ProfileUtils.kt +++ b/app/src/main/java/com/example/wallpapercollect/presentation/ui/utils/ProfileUtils.kt @@ -30,10 +30,9 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import coil.compose.AsyncImage import com.example.wallpapercollect.R +import com.example.wallpapercollect.presentation.ui.theme.brand500 import com.example.wallpapercollect.presentation.ui.theme.gray10 -import com.example.wallpapercollect.presentation.ui.theme.gray100 import com.example.wallpapercollect.presentation.ui.theme.gray200 -import com.example.wallpapercollect.presentation.ui.theme.interFont @Composable fun BoxContent(startText :String, endText:String) { @@ -113,9 +112,9 @@ fun PhotoProfileCustom( @Composable fun TextFieldProfile( - placeHolder:String, - content : (String) -> Unit, - firstContent:String + label:String, + content : (String) -> Unit, + firstContent:String ) { var text by rememberSaveable { mutableStateOf(firstContent) @@ -131,23 +130,15 @@ fun TextFieldProfile( .fillMaxWidth() .height(56.dp) .border(1.dp, gray10, RoundedCornerShape(10.dp)), - placeholder = { - Text( - text = placeHolder, - fontFamily = interFont, - fontWeight = FontWeight.Normal, - color = gray100, - fontSize = 12.sp - ) - }, singleLine = true, colors = TextFieldDefaults.colors( unfocusedContainerColor = Color(0xFFF7F8F9), focusedIndicatorColor = Color.Transparent, unfocusedIndicatorColor = Color.Transparent, - disabledTextColor = gray200 + disabledTextColor = gray200, + focusedLabelColor = brand500 ), shape = RoundedCornerShape(10.dp), - label = { Text(text = placeHolder)} + label = { Text(text = label)} ) } \ No newline at end of file