-
Notifications
You must be signed in to change notification settings - Fork 2
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/#255] Todo / QA 이슈사항 대응 #261
Changes from all commits
1831d1c
c670ce7
10f5093
6fd33e4
02af8ec
dd27e4a
3fa4918
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,6 +2,7 @@ package com.going.presentation.designsystem.edittext | |
|
||
import android.content.Context | ||
import android.content.res.TypedArray | ||
import android.text.method.ScrollingMovementMethod | ||
import android.util.AttributeSet | ||
import android.view.LayoutInflater | ||
import android.view.View.OnFocusChangeListener | ||
|
@@ -96,6 +97,9 @@ class EmojiCounterEditText(context: Context, attrs: AttributeSet) : | |
typedArray.getString(R.styleable.EmojiCounterEditText_hint) | ||
etEmojiCounterEtContent.minLines = | ||
typedArray.getInt(R.styleable.EmojiCounterEditText_minLines, 1) | ||
etEmojiCounterEtContent.maxLines = | ||
typedArray.getInt(R.styleable.EmojiCounterEditText_minLines, 2) | ||
etEmojiCounterEtContent.movementMethod = ScrollingMovementMethod() | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 이걸 커스텀뷰에 넣어버리면 모든 애들이 다 스크롤이될텐데 괜찮나??? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 현재 기본 커스텀뷰 설정은 기본 1줄, 길어지면 2줄 (근데 대부분 최대 15자 제한 있음), 3줄보다 길어지면 작성이 안되는게 아니라 높이는 2줄짜리에서 스크롤 될 수 있도록 설정했음 ! (메모의 경우 따로 둘다 6줄로 설정) |
||
tvEmojiCounterEtNameCounter.text = context.getString(R.string.counter, 0, maxLen) | ||
} | ||
canBlankError = typedArray.getBoolean(R.styleable.EmojiCounterEditText_canBlankError, false) | ||
|
This file was deleted.
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -48,19 +48,19 @@ | |
|
||
<TextView | ||
android:id="@+id/btn_todo_memo_finish" | ||
style="@style/TextAppearance.Doorip.Body2.Bold" | ||
android:layout_width="wrap_content" | ||
android:layout_height="wrap_content" | ||
style="@style/TextAppearance.Doorip.Body2.Bold" | ||
android:enabled="@{vm.isFinishAvailable()}" | ||
android:text="@string/my_todo_create_btn_finish" | ||
android:textColor="@{vm.isFinishAvailable() == true ? @color/red_500 : @color/gray_200}" | ||
app:layout_constraintTop_toTopOf="@id/tv_todo_create_title" | ||
app:layout_constraintBottom_toBottomOf="@id/tv_todo_create_title" | ||
android:layout_marginEnd="12dp" | ||
android:enabled="@{vm.isFinishAvailable()}" | ||
android:paddingHorizontal="11dp" | ||
android:paddingTop="13dp" | ||
android:paddingBottom="12dp" | ||
app:layout_constraintEnd_toEndOf="parent" /> | ||
android:text="@string/my_todo_create_btn_finish" | ||
android:textColor="@{vm.isFinishAvailable() == true ? @color/red_500 : @color/gray_200}" | ||
app:layout_constraintBottom_toBottomOf="@id/tv_todo_create_title" | ||
Comment on lines
+60
to
+61
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 옹 좋네요!! |
||
app:layout_constraintEnd_toEndOf="parent" | ||
app:layout_constraintTop_toTopOf="@id/tv_todo_create_title" /> | ||
|
||
<com.google.android.material.divider.MaterialDivider | ||
android:layout_width="0dp" | ||
|
@@ -241,6 +241,7 @@ | |
app:layout_constraintStart_toStartOf="parent" | ||
app:layout_constraintTop_toBottomOf="@id/rv_our_todo_create_person" | ||
app:minLines="6" | ||
app:maxLines="6" | ||
app:title="@string/my_todo_create_tv_memo" /> | ||
|
||
</androidx.constraintlayout.widget.ConstraintLayout> | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -40,7 +40,7 @@ | |
android:layout_marginTop="18dp" | ||
android:layout_marginEnd="10dp" | ||
android:layout_marginBottom="4dp" | ||
android:src="@drawable/ic_profile" | ||
android:src="@drawable/ic_trip_info" | ||
app:layout_constraintBottom_toBottomOf="parent" | ||
app:layout_constraintEnd_toEndOf="parent" | ||
app:layout_constraintTop_toTopOf="parent" /> | ||
|
@@ -77,7 +77,7 @@ | |
|
||
<TextView | ||
android:id="@+id/tv_my_todo_title_up" | ||
style="@style/TextAppearance.Doorip.Head1" | ||
style="@style/TextAppearance.Doorip.Head2" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 굿굿!! 반영 좋습니다~~ |
||
android:layout_width="0dp" | ||
android:layout_height="wrap_content" | ||
android:layout_marginStart="24dp" | ||
|
@@ -89,7 +89,7 @@ | |
|
||
<TextView | ||
android:id="@+id/tv_my_todo_title_down" | ||
style="@style/TextAppearance.Doorip.Head1" | ||
style="@style/TextAppearance.Doorip.Head2" | ||
android:layout_width="0dp" | ||
android:layout_height="wrap_content" | ||
android:layout_marginBottom="28dp" | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
대부분은 minLine을 설정 안하니까 default인 1이 maxLine이 되고, minLine을 설정한 친구(메모)같은 애들은 minLine만큼 맥스라인이 되는걸까요?