diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 77a3af4d2..d3be9d435 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,7 +10,7 @@
android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules"
- android:icon="@mipmap/ic_terning_launcher_foreground"
+ android:icon="@mipmap/ic_terning_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_terning_launcher_round"
android:supportsRtl="true"
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 0d70c933c..4204e68af 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -64,9 +64,9 @@
12자리 이내, 문자/숫자 가능, 특수문자/기호 입력불가
- 이름에 특수문자는 입력할 수 없어요
- 사용 가능한 이름이에요
- 이름은 12자리 이내로 설정해 주세요
+ 닉네임에 특수문자는 입력할 수 없어요
+ 사용 가능한 닉네임이에요
+ 닉네임은 12자리 이내로 설정해 주세요
필터링 재설정
diff --git a/feature/src/main/java/com/terning/feature/intern/component/InternCompanyInfo.kt b/feature/src/main/java/com/terning/feature/intern/component/InternCompanyInfo.kt
index 39d31b248..7d0f12731 100644
--- a/feature/src/main/java/com/terning/feature/intern/component/InternCompanyInfo.kt
+++ b/feature/src/main/java/com/terning/feature/intern/component/InternCompanyInfo.kt
@@ -61,7 +61,6 @@ fun InternCompanyInfo(
contentScale = ContentScale.Fit,
modifier = Modifier
.fillMaxWidth()
- .clip(CircleShape),
)
}
Column(
diff --git a/feature/src/main/java/com/terning/feature/mypage/mypage/component/MyPageItem.kt b/feature/src/main/java/com/terning/feature/mypage/mypage/component/MyPageItem.kt
index ff272a144..6867459f0 100644
--- a/feature/src/main/java/com/terning/feature/mypage/mypage/component/MyPageItem.kt
+++ b/feature/src/main/java/com/terning/feature/mypage/mypage/component/MyPageItem.kt
@@ -1,5 +1,6 @@
package com.terning.feature.mypage.mypage.component
+import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
@@ -9,6 +10,7 @@ import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.terning.core.designsystem.component.image.TerningImage
@@ -38,8 +40,9 @@ fun MyPageItem(
Row(
verticalAlignment = Alignment.CenterVertically
) {
- TerningImage(
- painter = icon,
+ Image(
+ painter = painterResource(id = icon),
+ contentDescription = "my page image",
modifier = modifier.size(28.dp)
)
Text(
@@ -51,7 +54,7 @@ fun MyPageItem(
if (version.isNotEmpty())
Text(
text = version,
- modifier = modifier.padding(end = 16.dp),
+ modifier = modifier.padding(end = 7.dp),
style = TerningTheme.typography.button4,
color = Grey350
)
diff --git a/feature/src/main/res/mipmap-hdpi/ic_terning_launcher.webp b/feature/src/main/res/mipmap-hdpi/ic_terning_launcher.webp
index 1084fbe5f..d25fb5e4f 100644
Binary files a/feature/src/main/res/mipmap-hdpi/ic_terning_launcher.webp and b/feature/src/main/res/mipmap-hdpi/ic_terning_launcher.webp differ
diff --git a/feature/src/main/res/mipmap-hdpi/ic_terning_launcher_foreground.webp b/feature/src/main/res/mipmap-hdpi/ic_terning_launcher_foreground.webp
index bce3ea6a7..7ea3ea9c8 100644
Binary files a/feature/src/main/res/mipmap-hdpi/ic_terning_launcher_foreground.webp and b/feature/src/main/res/mipmap-hdpi/ic_terning_launcher_foreground.webp differ
diff --git a/feature/src/main/res/mipmap-hdpi/ic_terning_launcher_round.webp b/feature/src/main/res/mipmap-hdpi/ic_terning_launcher_round.webp
index 2855c27fe..78dcb435d 100644
Binary files a/feature/src/main/res/mipmap-hdpi/ic_terning_launcher_round.webp and b/feature/src/main/res/mipmap-hdpi/ic_terning_launcher_round.webp differ
diff --git a/feature/src/main/res/mipmap-mdpi/ic_terning_launcher.webp b/feature/src/main/res/mipmap-mdpi/ic_terning_launcher.webp
index 54dedea0d..98d4dac64 100644
Binary files a/feature/src/main/res/mipmap-mdpi/ic_terning_launcher.webp and b/feature/src/main/res/mipmap-mdpi/ic_terning_launcher.webp differ
diff --git a/feature/src/main/res/mipmap-mdpi/ic_terning_launcher_foreground.webp b/feature/src/main/res/mipmap-mdpi/ic_terning_launcher_foreground.webp
index 4dbd01628..3b8a25353 100644
Binary files a/feature/src/main/res/mipmap-mdpi/ic_terning_launcher_foreground.webp and b/feature/src/main/res/mipmap-mdpi/ic_terning_launcher_foreground.webp differ
diff --git a/feature/src/main/res/mipmap-mdpi/ic_terning_launcher_round.webp b/feature/src/main/res/mipmap-mdpi/ic_terning_launcher_round.webp
index 9a5b6253c..8b24ed168 100644
Binary files a/feature/src/main/res/mipmap-mdpi/ic_terning_launcher_round.webp and b/feature/src/main/res/mipmap-mdpi/ic_terning_launcher_round.webp differ
diff --git a/feature/src/main/res/mipmap-xhdpi/ic_terning_launcher.webp b/feature/src/main/res/mipmap-xhdpi/ic_terning_launcher.webp
index afc4e4ef3..92e791122 100644
Binary files a/feature/src/main/res/mipmap-xhdpi/ic_terning_launcher.webp and b/feature/src/main/res/mipmap-xhdpi/ic_terning_launcher.webp differ
diff --git a/feature/src/main/res/mipmap-xhdpi/ic_terning_launcher_foreground.webp b/feature/src/main/res/mipmap-xhdpi/ic_terning_launcher_foreground.webp
index 5d207b314..269a4f060 100644
Binary files a/feature/src/main/res/mipmap-xhdpi/ic_terning_launcher_foreground.webp and b/feature/src/main/res/mipmap-xhdpi/ic_terning_launcher_foreground.webp differ
diff --git a/feature/src/main/res/mipmap-xhdpi/ic_terning_launcher_round.webp b/feature/src/main/res/mipmap-xhdpi/ic_terning_launcher_round.webp
index 60c8592bd..7e72542f1 100644
Binary files a/feature/src/main/res/mipmap-xhdpi/ic_terning_launcher_round.webp and b/feature/src/main/res/mipmap-xhdpi/ic_terning_launcher_round.webp differ
diff --git a/feature/src/main/res/mipmap-xxhdpi/ic_terning_launcher.webp b/feature/src/main/res/mipmap-xxhdpi/ic_terning_launcher.webp
index 4737be0f5..082e008df 100644
Binary files a/feature/src/main/res/mipmap-xxhdpi/ic_terning_launcher.webp and b/feature/src/main/res/mipmap-xxhdpi/ic_terning_launcher.webp differ
diff --git a/feature/src/main/res/mipmap-xxhdpi/ic_terning_launcher_foreground.webp b/feature/src/main/res/mipmap-xxhdpi/ic_terning_launcher_foreground.webp
index f16dcc60b..85e61f3ba 100644
Binary files a/feature/src/main/res/mipmap-xxhdpi/ic_terning_launcher_foreground.webp and b/feature/src/main/res/mipmap-xxhdpi/ic_terning_launcher_foreground.webp differ
diff --git a/feature/src/main/res/mipmap-xxhdpi/ic_terning_launcher_round.webp b/feature/src/main/res/mipmap-xxhdpi/ic_terning_launcher_round.webp
index c4075cf9b..172498a96 100644
Binary files a/feature/src/main/res/mipmap-xxhdpi/ic_terning_launcher_round.webp and b/feature/src/main/res/mipmap-xxhdpi/ic_terning_launcher_round.webp differ
diff --git a/feature/src/main/res/mipmap-xxxhdpi/ic_terning_launcher.webp b/feature/src/main/res/mipmap-xxxhdpi/ic_terning_launcher.webp
index 4a7cc147e..2960f176f 100644
Binary files a/feature/src/main/res/mipmap-xxxhdpi/ic_terning_launcher.webp and b/feature/src/main/res/mipmap-xxxhdpi/ic_terning_launcher.webp differ
diff --git a/feature/src/main/res/mipmap-xxxhdpi/ic_terning_launcher_foreground.webp b/feature/src/main/res/mipmap-xxxhdpi/ic_terning_launcher_foreground.webp
index f4c2c104d..58ba405c9 100644
Binary files a/feature/src/main/res/mipmap-xxxhdpi/ic_terning_launcher_foreground.webp and b/feature/src/main/res/mipmap-xxxhdpi/ic_terning_launcher_foreground.webp differ
diff --git a/feature/src/main/res/mipmap-xxxhdpi/ic_terning_launcher_round.webp b/feature/src/main/res/mipmap-xxxhdpi/ic_terning_launcher_round.webp
index 50484097e..58fe9aff8 100644
Binary files a/feature/src/main/res/mipmap-xxxhdpi/ic_terning_launcher_round.webp and b/feature/src/main/res/mipmap-xxxhdpi/ic_terning_launcher_round.webp differ
diff --git a/feature/src/main/res/values/strings.xml b/feature/src/main/res/values/strings.xml
index 9f037461f..7df248a3e 100644
--- a/feature/src/main/res/values/strings.xml
+++ b/feature/src/main/res/values/strings.xml
@@ -17,11 +17,11 @@
로그인을 취소하였습니다
- 반가워요!\n이름을 알려주세요
+ 반가워요!\n닉네임을 알려주세요
프로필 이미지
프로필 버튼
- 이름
- 이름을 입력해 주세요
+ 닉네임
+ 닉네임을 입력해 주세요
다음으로
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2794f6091..cdd2ba70e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,13 +2,13 @@
compileSdk = "34"
minSdk = "28"
targetSdk = "34"
-versionName = "1.1.0"
-versionCode = "10100"
+versionName = "1.1.2"
+versionCode = "10102"
kotlinCompilerExtensionVersion = "1.5.0"
jvmTarget = "1.8"
## Android gradle plugin
-androidGradlePlugin = "8.6.0"
+androidGradlePlugin = "8.5.0"
androidDesugarJdkLibs = "2.0.4"
## AndroidX