diff --git a/presentation/src/main/java/com/going/presentation/designsystem/edittext/EmojiCounterEditText.kt b/presentation/src/main/java/com/going/presentation/designsystem/edittext/EmojiCounterEditText.kt index 88c28a3b..2ed5a129 100644 --- a/presentation/src/main/java/com/going/presentation/designsystem/edittext/EmojiCounterEditText.kt +++ b/presentation/src/main/java/com/going/presentation/designsystem/edittext/EmojiCounterEditText.kt @@ -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() tvEmojiCounterEtNameCounter.text = context.getString(R.string.counter, 0, maxLen) } canBlankError = typedArray.getBoolean(R.styleable.EmojiCounterEditText_canBlankError, false) diff --git a/presentation/src/main/java/com/going/presentation/todo/detail/TodoDetailActivity.kt b/presentation/src/main/java/com/going/presentation/todo/detail/TodoDetailActivity.kt index d1dd0b2d..59d17ed7 100644 --- a/presentation/src/main/java/com/going/presentation/todo/detail/TodoDetailActivity.kt +++ b/presentation/src/main/java/com/going/presentation/todo/detail/TodoDetailActivity.kt @@ -4,6 +4,7 @@ import android.app.Activity import android.content.Context import android.content.Intent import android.os.Bundle +import android.text.method.ScrollingMovementMethod import android.view.View import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.viewModels @@ -46,6 +47,7 @@ class TodoDetailActivity : initAllocatorListAdapter() resetDetailData() observeTodoDetailState() + observeMemoBinding() observeTodoDeleteState() } @@ -137,6 +139,12 @@ class TodoDetailActivity : }.launchIn(lifecycleScope) } + private fun observeMemoBinding() { + viewModel.memo.observe(this) { + binding.etTodoCreateMemo.movementMethod = ScrollingMovementMethod() + } + } + private fun observeTodoDeleteState() { viewModel.todoDeleteState.flowWithLifecycle(lifecycle).onEach { state -> when (state) { diff --git a/presentation/src/main/res/drawable/ic_empty.png b/presentation/src/main/res/drawable/ic_empty.png new file mode 100644 index 00000000..888bfa56 Binary files /dev/null and b/presentation/src/main/res/drawable/ic_empty.png differ diff --git a/presentation/src/main/res/drawable/ic_empty.xml b/presentation/src/main/res/drawable/ic_empty.xml deleted file mode 100644 index ab7a72aa..00000000 --- a/presentation/src/main/res/drawable/ic_empty.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - diff --git a/presentation/src/main/res/drawable/ic_profile.xml b/presentation/src/main/res/drawable/ic_profile.xml deleted file mode 100644 index fa66b9ab..00000000 --- a/presentation/src/main/res/drawable/ic_profile.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/presentation/src/main/res/drawable/img_ourtodo_main.xml b/presentation/src/main/res/drawable/img_ourtodo_main.xml index c8b02cdf..507261f1 100644 --- a/presentation/src/main/res/drawable/img_ourtodo_main.xml +++ b/presentation/src/main/res/drawable/img_ourtodo_main.xml @@ -1,108 +1,108 @@ + android:width="112dp" + android:height="135dp" + android:viewportWidth="112" + android:viewportHeight="135"> + android:pathData="M0,0h112v135h-112z"/> diff --git a/presentation/src/main/res/layout/activity_todo_change.xml b/presentation/src/main/res/layout/activity_todo_change.xml index 14ec84a8..c671d460 100644 --- a/presentation/src/main/res/layout/activity_todo_change.xml +++ b/presentation/src/main/res/layout/activity_todo_change.xml @@ -235,6 +235,7 @@ android:layout_height="wrap_content" android:layout_marginTop="40dp" android:imeOptions="actionDone" + app:maxLines="6" android:visibility="gone" app:canBlankError="false" app:hint="@string/my_todo_create_tv_memo_hint" diff --git a/presentation/src/main/res/layout/activity_todo_create.xml b/presentation/src/main/res/layout/activity_todo_create.xml index 0b09ed82..b12ec6fc 100644 --- a/presentation/src/main/res/layout/activity_todo_create.xml +++ b/presentation/src/main/res/layout/activity_todo_create.xml @@ -48,19 +48,19 @@ + 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" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="@id/tv_todo_create_title" /> diff --git a/presentation/src/main/res/layout/activity_todo_detail.xml b/presentation/src/main/res/layout/activity_todo_detail.xml index 1eddbbad..5d51086e 100644 --- a/presentation/src/main/res/layout/activity_todo_detail.xml +++ b/presentation/src/main/res/layout/activity_todo_detail.xml @@ -257,10 +257,12 @@ android:autoLink="web" android:background="@drawable/shape_rect_4_gray700_line" android:gravity="top" + android:maxLines="6" android:minLines="6" + android:overScrollMode="always" android:paddingVertical="20dp" - android:paddingStart="16dp" - android:paddingEnd="30dp" + android:paddingHorizontal="16dp" + android:scrollbars="vertical" android:text="@={vm.memo}" android:visibility="gone" app:layout_constraintEnd_toEndOf="parent" diff --git a/presentation/src/main/res/layout/fragment_my_todo.xml b/presentation/src/main/res/layout/fragment_my_todo.xml index 47d3a292..57cd69e2 100644 --- a/presentation/src/main/res/layout/fragment_my_todo.xml +++ b/presentation/src/main/res/layout/fragment_my_todo.xml @@ -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 @@ @@ -73,7 +73,9 @@ style="@style/TextAppearance.Doorip.Detail2.Regular" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:gravity="center" + android:layout_gravity="center" + android:layout_marginBottom="1dp" + android:paddingVertical="0dp" android:text="@string/our_todo_tv_empty_allocator" android:textColor="@color/gray_300" /> diff --git a/presentation/src/main/res/layout/view_emoji_counter_edittext.xml b/presentation/src/main/res/layout/view_emoji_counter_edittext.xml index 08806bac..980bdf4b 100644 --- a/presentation/src/main/res/layout/view_emoji_counter_edittext.xml +++ b/presentation/src/main/res/layout/view_emoji_counter_edittext.xml @@ -25,8 +25,10 @@ android:includeFontPadding="false" android:inputType="textMultiLine" android:lineSpacingMultiplier="1.2" + android:overScrollMode="always" android:paddingVertical="20dp" android:paddingEnd="30dp" + android:scrollbars="vertical" android:textAppearance="@style/TextAppearance.Doorip.Body3.Medi" android:textColorHint="@color/gray_200" app:layout_constraintEnd_toEndOf="parent" diff --git a/presentation/src/main/res/values/attrs.xml b/presentation/src/main/res/values/attrs.xml index 7f753108..d18c1c79 100644 --- a/presentation/src/main/res/values/attrs.xml +++ b/presentation/src/main/res/values/attrs.xml @@ -4,6 +4,7 @@ +