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.

Sign up for GitHub

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

Jump to bottom

[mod] 온보딩 / 1차 릴리즈 QA 피드백 반영 #155

Merged
merged 12 commits into from
Aug 26, 2023
Merged

[mod] 온보딩 / 1차 릴리즈 QA 피드백 반영 #155

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
820c25c
[mod] #150 사용 가이드 화면에서 손가락으로도 스와이프 가능하도록 변경
leeeha Aug 24, 2023
e0d7ee6
[mod] #150 로티 애니메이션 높이 30dp 축소
leeeha Aug 24, 2023
14a6825
[fix] #150 첫번째 스토리 화면에서 위니국 말풍선 텍스트 개행되는 이슈 해결
leeeha Aug 25, 2023
6637c92
[fix] #150 말풍선과 텍스트가 로티 애니메이션 배경에 가려지는 이슈 해결
leeeha Aug 25, 2023
ae32d81
[ui] #150 스토리 화면 텍스트 컬러 수정
leeeha Aug 25, 2023
18587de
[feat] #150 세계관 스토리텔링 화면에서 메인 피드로 건너뛰는 기능 구현
leeeha Aug 25, 2023
41b9991
[fix] #150 닉네임 중복확인 버튼 개행되는 이슈 해결 (Linear 대신 Constraint 레이아웃 사용)
leeeha Aug 25, 2023
3a1d1c5
[mod] #150 바인딩 어댑터 사용해서 닉네임 close 버튼, 타이틀 텍스트, 버튼 텍스트 조정하도록 변경
leeeha Aug 25, 2023
9d8f3fe
[ui] #150 닉네임 텍스트 필드 테두리 색상, 닉네임 중복확인 버튼 색상 변경
leeeha Aug 25, 2023
55a5015
[mod] #150 마이페이지에서 닉네임 수정할 때는 힌트로 기존 닉네임이 보이도록 구현
leeeha Aug 25, 2023
0960952
[mod] #150 닉네임 중복체크를 하지 않은 상태에서 확인 버튼을 누르면 에러 표시하도록 변경
leeeha Aug 25, 2023
9019d34
[mod] #150 스토리에서 스킵 버튼 누르면 닉네임 화면으로 이동하도록 변경
leeeha Aug 26, 2023
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
29 changes: 17 additions & 12 deletions app/src/main/res/layout/activity_nickname.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,21 +50,25 @@
app:layout_constraintStart_toStartOf="@id/tv_nickname_title"
app:layout_constraintTop_toBottomOf="@id/tv_nickname_title" />

<LinearLayout
android:id="@+id/ll_nickname_container"
<androidx.constraintlayout.widget.ConstraintLayout
Copy link
Contributor

Choose a reason for hiding this comment

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

👍

android:id="@+id/cl_nickname_container"
android:layout_width="0dp"
android:layout_height="56dp"
android:layout_marginHorizontal="20dp"
android:layout_marginTop="42dp"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_nickname_guide">

<FrameLayout
android:id="@+id/fl_nickname_input"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="3">
android:layout_height="0dp"
android:layout_marginEnd="10dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/btn_nickname_duplicate_check"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">

<EditText
android:id="@+id/et_nickname"
Expand Down Expand Up @@ -98,10 +102,8 @@

<com.google.android.material.button.MaterialButton
android:id="@+id/btn_nickname_duplicate_check"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="10dp"
android:layout_weight="1"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:insetTop="0dp"
android:insetBottom="0dp"
android:stateListAnimator="@null"
Expand All @@ -110,8 +112,11 @@
android:textColor="@color/gray_700"
app:backgroundTint="@color/gray_50"
app:cornerRadius="5dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:rippleColor="@color/purple_200" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

<TextView
android:id="@+id/tv_nickname_helper_text"
Expand All @@ -122,8 +127,8 @@
android:layout_marginStart="4dp"
android:layout_marginTop="4dp"
android:textAppearance="@style/TextAppearance.WINEY.detail_m_13"
app:layout_constraintStart_toStartOf="@id/ll_nickname_container"
app:layout_constraintTop_toBottomOf="@id/ll_nickname_container" />
app:layout_constraintStart_toStartOf="@id/cl_nickname_container"
app:layout_constraintTop_toBottomOf="@id/cl_nickname_container" />

<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_nickname_complete"
Expand Down