Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX/#274] 온보딩, 마이페이지 / 최종 QA #277

Merged
merged 9 commits into from
Oct 6, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down Expand Up @@ -38,8 +40,9 @@ fun MyPageItem(
Row(
verticalAlignment = Alignment.CenterVertically
) {
TerningImage(
painter = icon,
Image(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

오!! 요것도 바꿔주셨군요!!!!

painter = painterResource(id = icon),
contentDescription = "my page image",
modifier = modifier.size(28.dp)
)
Text(
Expand All @@ -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
)
Expand Down
Binary file modified feature/src/main/res/mipmap-hdpi/ic_terning_launcher.webp
Binary file not shown.
Binary file not shown.
Binary file modified feature/src/main/res/mipmap-hdpi/ic_terning_launcher_round.webp
Binary file not shown.
Binary file modified feature/src/main/res/mipmap-mdpi/ic_terning_launcher.webp
Binary file not shown.
Binary file not shown.
Binary file modified feature/src/main/res/mipmap-mdpi/ic_terning_launcher_round.webp
Binary file not shown.
Binary file modified feature/src/main/res/mipmap-xhdpi/ic_terning_launcher.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified feature/src/main/res/mipmap-xxhdpi/ic_terning_launcher.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified feature/src/main/res/mipmap-xxxhdpi/ic_terning_launcher.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
6 changes: 3 additions & 3 deletions feature/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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-->
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ kotlinCompilerExtensionVersion = "1.5.0"
jvmTarget = "1.8"

## Android gradle plugin
androidGradlePlugin = "8.6.0"
androidGradlePlugin = "8.5.0"
androidDesugarJdkLibs = "2.0.4"

## AndroidX
Expand Down
Loading