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

[FIX/#139] 폰트 대응 #141

Merged
merged 9 commits into from
Jan 16, 2024
Merged

[FIX/#139] 폰트 대응 #141

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a20402b
[FIX/#139] hint 두줄 및 여러줄 가능 처리 - max 3줄
chattymin Jan 16, 2024
4e7a980
[FIX/#139] tendencyTest 내부 버튼 글자 크기에 맞게 bg 동적 조정
chattymin Jan 16, 2024
f7efb36
[FIX/#139] tendencyTest title 우측 짤리는 부분 수정
chattymin Jan 16, 2024
fb08133
[FIX/#139] tendencyTest 프로그래스바 애니메이션 추가
chattymin Jan 16, 2024
a84e093
[FIX/#139] tendencyTest 스크롤뷰 적용
chattymin Jan 16, 2024
f77e490
[FIX/#139] tendencyTest tag 범위 오버시 정렬 기준 추가
chattymin Jan 16, 2024
c4e547e
[FIX/#139] tendencyTest 체크 파일 흰색 배경 추가
chattymin Jan 16, 2024
ce28029
Merge branch 'develop' into fix/#139-font-react
chattymin Jan 16, 2024
2c31f11
[FIX/#139] tendencyTest 가운데 정렬
chattymin Jan 16, 2024
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 presentation/src/main/java/com/going/presentation/tendency/ttest/TendencyTestActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class TendencyTestActivity :
object : Animator.AnimatorListener {
override fun onAnimationStart(animation: Animator) {
viewModel.clearAllChecked()
setProgressAnimate(binding.pbTendencyTest, viewModel.step.value)
setProgressAnimate(binding.pbTendencyTest, viewModel.step.value + 1)

for (i in 1 until fadeOutList.size) {
fadeOutList[i].start()
Expand Down
8 changes: 8 additions & 0 deletions presentation/src/main/res/drawable/shape_rect_8_red500_line_white000_fill.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke android:width="1dp" />
<solid android:color="@color/white_000"/>
<stroke android:color="@color/red_500" />
<corners android:radius="8dp" />
</shape>

4 changes: 2 additions & 2 deletions presentation/src/main/res/layout/activity_onboarding_profile_setting.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@
android:background="@drawable/shape_rect_4_gray200_line"
android:hint="@string/onboarding_one_line_et_info"
android:imeOptions="actionDone"
android:inputType="text"
android:maxLines="1"
android:inputType="text|textMultiLine"
android:maxLines="3"
android:text="@={viewModel.info}"
android:textAppearance="@style/TextAppearance.Doorip.Detail1.Regular"
app:layout_constraintEnd_toEndOf="parent"
Expand Down
96 changes: 44 additions & 52 deletions presentation/src/main/res/layout/activity_tendency_result.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@
android:layout_marginTop="32dp"
android:layout_marginBottom="16dp"
android:text="@string/tendency_test_title"
app:layout_constraintBottom_toBottomOf="@id/toolbar_tendency_result"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@id/toolbar_tendency_result"/>
app:layout_constraintTop_toTopOf="parent" />

<ImageView
android:id="@+id/btn_tendency_result_download"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="9dp"
android:padding="24dp"
android:layout_marginBottom="-5dp"
android:padding="24dp"
android:src="@drawable/ic_download"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
Expand Down Expand Up @@ -109,70 +109,62 @@
<TextView
android:id="@+id/tv_tendency_test_result_sub_type"
style="@style/TextAppearance.Doorip.Detail1.Regular"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="center"
android:textColor="@color/gray_300"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_tendency_test_result_type" />

<LinearLayout
<androidx.constraintlayout.helper.widget.Flow
android:id="@+id/ll_tags"
android:layout_width="0dp"
android:layout_marginTop="12dp"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:gravity="center"
android:orientation="horizontal"
app:flow_horizontalGap="8dp"
app:flow_wrapMode="chain"
app:constraint_referenced_ids="tv_tendency_test_result_tag1,tv_tendency_test_result_tag2,tv_tendency_test_result_tag3"
app:flow_horizontalStyle="packed"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_tendency_test_result_sub_type">
app:layout_constraintTop_toBottomOf="@id/tv_tendency_test_result_sub_type" />

<TextView
android:id="@+id/tv_tendency_test_result_tag1"
style="@style/TextAppearance.Doorip.Detail1.Regular"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_rect_10_red300_line"
android:paddingHorizontal="8dp"
android:paddingVertical="1dp"
android:textColor="@color/red_300"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_tendency_test_result_sub_type" />

<androidx.legacy.widget.Space
android:layout_width="8dp"
android:layout_height="0dp" />
<TextView
android:id="@+id/tv_tendency_test_result_tag1"
style="@style/TextAppearance.Doorip.Detail1.Regular"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_rect_10_red300_line"
android:paddingHorizontal="8dp"
android:paddingVertical="1dp"
android:textColor="@color/red_300"
app:layout_constraintHorizontal_weight="1" />

<TextView
android:id="@+id/tv_tendency_test_result_tag2"
style="@style/TextAppearance.Doorip.Detail1.Regular"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_rect_10_red300_line"
android:paddingHorizontal="8dp"
android:paddingVertical="1dp"
android:textColor="@color/red_300"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_tendency_test_result_sub_type" />
<TextView
android:id="@+id/tv_tendency_test_result_tag2"
style="@style/TextAppearance.Doorip.Detail1.Regular"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_rect_10_red300_line"
android:paddingHorizontal="8dp"
android:paddingVertical="1dp"
android:textColor="@color/red_300"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintHorizontal_weight="1" />

<androidx.legacy.widget.Space
android:layout_width="8dp"
android:layout_height="0dp" />
<TextView
android:id="@+id/tv_tendency_test_result_tag3"
style="@style/TextAppearance.Doorip.Detail1.Regular"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_rect_10_red300_line"
android:paddingHorizontal="8dp"
android:paddingVertical="1dp"
android:textColor="@color/red_300"
app:layout_constraintHorizontal_chainStyle="packed" />

<TextView
android:id="@+id/tv_tendency_test_result_tag3"
style="@style/TextAppearance.Doorip.Detail1.Regular"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_rect_10_red300_line"
android:paddingHorizontal="8dp"
android:paddingVertical="1dp"
android:textColor="@color/red_300"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_tendency_test_result_sub_type" />
</LinearLayout>

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_box_description_first"
Expand Down
Loading