[FIX/#262] git pull from develop

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"

core/src/main/res/values/strings.xml

@@ -64,9 +64,9 @@
 
     <!--NameTextField-->
     <string name="sign_up_helper">12자리 이내, 문자/숫자 가능, 특수문자/기호 입력불가</string>
-    <string name="sign_up_helper_error">이름에 특수문자는 입력할 수 없어요</string>
-    <string name="sign_up_helper_available">사용 가능한 이름이에요</string>
-    <string name="sign_up_helper_out">이름은 12자리 이내로 설정해 주세요</string>
+    <string name="sign_up_helper_error">닉네임에 특수문자는 입력할 수 없어요</string>
+    <string name="sign_up_helper_available">사용 가능한 닉네임이에요</string>
+    <string name="sign_up_helper_out">닉네임은 12자리 이내로 설정해 주세요</string>
 
     <!--ChangeFilter-->
     <string name="change_filter_top_bar_title">필터링 재설정</string>

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(

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
             )

feature/src/main/res/values/strings.xml

@@ -17,11 +17,11 @@
     <string name="sign_in_kakao_cancel">로그인을 취소하였습니다</string>
 
     <!--SignUp-->
-    <string name="sign_up_title">반가워요!\n이름을 알려주세요</string>
+    <string name="sign_up_title">반가워요!\n닉네임을 알려주세요</string>
     <string name="sign_up_profile_image">프로필 이미지</string>
     <string name="sign_up_profile_button">프로필 버튼</string>
-    <string name="sign_up_name">이름</string>
-    <string name="sign_up_hint">이름을 입력해 주세요</string>
+    <string name="sign_up_name">닉네임</string>
+    <string name="sign_up_hint">닉네임을 입력해 주세요</string>
     <string name="sign_up_next_button">다음으로</string>
 
     <!--Search-->

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