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/#255] Todo / QA 이슈사항 대응 #261

Merged
merged 7 commits into from
Mar 14, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Comment on lines +100 to +101
Copy link
Member

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만큼 맥스라인이 되는걸까요?

etEmojiCounterEtContent.movementMethod = ScrollingMovementMethod()
Copy link
Member

Choose a reason for hiding this comment

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

이걸 커스텀뷰에 넣어버리면 모든 애들이 다 스크롤이될텐데 괜찮나???

Copy link
Member Author

Choose a reason for hiding this comment

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

현재 기본 커스텀뷰 설정은 기본 1줄, 길어지면 2줄 (근데 대부분 최대 15자 제한 있음), 3줄보다 길어지면 작성이 안되는게 아니라 높이는 2줄짜리에서 스크롤 될 수 있도록 설정했음 ! (메모의 경우 따로 둘다 6줄로 설정)
지금은 기본 maxLine 설정이 없었어서, 투두제목에서 한글자하고 띄우고 해서 15줄짜리 제목도 만들 수 있길래, UI적으로 이게 더 나을 것 같아서 !

tvEmojiCounterEtNameCounter.text = context.getString(R.string.counter, 0, maxLen)
}
canBlankError = typedArray.getBoolean(R.styleable.EmojiCounterEditText_canBlankError, false)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -46,6 +47,7 @@ class TodoDetailActivity :
initAllocatorListAdapter()
resetDetailData()
observeTodoDetailState()
observeMemoBinding()
observeTodoDeleteState()
}

Expand Down Expand Up @@ -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) {
Expand Down
Binary file added presentation/src/main/res/drawable/ic_empty.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 0 additions & 11 deletions presentation/src/main/res/drawable/ic_empty.xml

This file was deleted.

12 changes: 0 additions & 12 deletions presentation/src/main/res/drawable/ic_profile.xml

This file was deleted.

90 changes: 45 additions & 45 deletions presentation/src/main/res/drawable/img_ourtodo_main.xml
Original file line number Diff line number Diff line change
@@ -1,108 +1,108 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="94dp"
android:height="112dp"
android:viewportWidth="94"
android:viewportHeight="112">
android:width="112dp"
android:height="135dp"
android:viewportWidth="112"
android:viewportHeight="135">
<group>
<clip-path
android:pathData="M0,0h94v112h-94z"/>
android:pathData="M0,0h112v135h-112z"/>
<path
android:pathData="M12.22,103.36m4.39,-0.01a4.39,4.39 134.83,1 0,-8.78 0.03a4.39,4.39 134.83,1 0,8.78 -0.03"
android:pathData="M15.05,127.21m5.4,-0.02a5.4,5.4 134.83,1 0,-10.81 0.03a5.4,5.4 134.83,1 0,10.81 -0.03"
android:fillColor="#1D1F29"/>
<path
android:pathData="M26.82,103.31m4.39,-0.01a4.39,4.39 134.83,1 0,-8.78 0.03a4.39,4.39 134.83,1 0,8.78 -0.03"
android:pathData="M33.01,127.15m5.4,-0.02a5.4,5.4 134.83,1 0,-10.81 0.03a5.4,5.4 134.83,1 0,10.81 -0.03"
android:fillColor="#1D1F29"/>
<path
android:pathData="M57.93,70.31L60.4,75.43C61.41,77.51 60.95,79.99 59.27,81.58L39.89,99.84C36.91,102.65 32.95,104.2 28.85,104.16L8.78,103.97C6.52,103.95 4.52,102.5 3.81,100.35L2.43,96.21C1.5,93.4 2.21,90.31 4.27,88.19L21.22,70.7C24.2,67.62 28.29,65.89 32.57,65.87L50.76,65.82C53.82,65.81 56.61,67.55 57.93,70.31Z"
android:strokeWidth="1.85151"
android:pathData="M71.31,86.53L74.35,92.84C75.58,95.39 75.02,98.45 72.95,100.4L49.1,122.88C45.43,126.34 40.56,128.25 35.52,128.2L10.81,127.97C8.03,127.94 5.57,126.15 4.7,123.51L3,118.42C1.85,114.96 2.72,111.15 5.26,108.54L26.13,87.01C29.79,83.23 34.83,81.09 40.09,81.07L62.48,81.01C66.24,81 69.68,83.14 71.31,86.53Z"
android:strokeWidth="2.27878"
android:fillColor="#78D6FF"
android:strokeColor="#1D1F29"/>
<path
android:pathData="M60.18,79.56L36.64,79.63C32.57,79.64 28.66,81.22 25.72,84.03L7.82,101.17"
android:strokeWidth="1.85151"
android:pathData="M74.07,97.92L45.1,98C40.09,98.02 35.28,99.96 31.66,103.43L9.63,124.51"
android:strokeWidth="2.27878"
android:fillColor="#00000000"
android:strokeColor="#1D1F29"
android:strokeLineCap="round"/>
<path
android:pathData="M59.37,72.47L34.3,72.55C30.13,72.56 26.13,74.21 23.17,77.14L3.02,97.11"
android:strokeWidth="1.85151"
android:pathData="M73.07,89.19L42.22,89.29C37.09,89.3 32.17,91.33 28.53,94.94L3.73,119.51"
android:strokeWidth="2.27878"
android:fillColor="#00000000"
android:strokeColor="#1D1F29"/>
<path
android:pathData="M47.1,84.87L30.32,100.22"
android:strokeWidth="1.85151"
android:pathData="M57.98,104.45L37.33,123.35"
android:strokeWidth="2.27878"
android:fillColor="#00000000"
android:strokeColor="#1D1F29"
android:strokeLineCap="round"/>
<path
android:pathData="M36.77,85.02L19.83,100.2"
android:strokeWidth="1.85151"
android:pathData="M45.25,104.64L24.41,123.33"
android:strokeWidth="2.27878"
android:fillColor="#00000000"
android:strokeColor="#1D1F29"
android:strokeLineCap="round"/>
<path
android:pathData="M29.61,89.04C29.82,89.55 30.43,90 31.54,90.14C32.62,90.29 34.01,90.1 35.43,89.51C36.86,88.92 37.97,88.07 38.63,87.21C39.31,86.32 39.43,85.57 39.22,85.06C39,84.55 38.39,84.1 37.29,83.96C36.21,83.81 34.82,84 33.39,84.59C31.97,85.18 30.86,86.03 30.19,86.89C29.52,87.78 29.4,88.53 29.61,89.04Z"
android:strokeWidth="1.58701"
android:pathData="M36.45,109.59C36.71,110.21 37.46,110.77 38.82,110.95C40.15,111.12 41.86,110.89 43.61,110.17C45.37,109.44 46.74,108.39 47.55,107.33C48.39,106.24 48.53,105.32 48.27,104.69C48.01,104.06 47.26,103.51 45.9,103.33C44.57,103.16 42.86,103.38 41.1,104.11C39.35,104.83 37.98,105.88 37.17,106.95C36.33,108.04 36.19,108.96 36.45,109.59Z"
android:strokeWidth="1.95324"
android:fillColor="#E0FF66"
android:strokeColor="#1D1F29"/>
<path
android:pathData="M36.85,69.83C35.77,70.85 35.75,72.98 37.3,74.63C38.85,76.29 40.98,76.42 42.06,75.41C43.14,74.39 43.16,72.26 41.61,70.61C40.06,68.95 37.93,68.82 36.85,69.83Z"
android:strokeWidth="1.58701"
android:fillColor="#E4E5ED"
android:pathData="M45.36,85.95C44.03,87.2 44.01,89.82 45.92,91.86C47.83,93.9 50.44,94.05 51.78,92.81C53.11,91.56 53.13,88.94 51.22,86.9C49.31,84.86 46.7,84.7 45.36,85.95Z"
android:strokeWidth="1.95324"
android:fillColor="#D2D4DF"
android:strokeColor="#1D1F29"/>
<path
android:pathData="M39.11,71.05C38.84,71.3 38.73,72.01 39.34,72.66C39.96,73.32 40.67,73.25 40.94,73C41.21,72.75 41.32,72.04 40.71,71.39C40.09,70.73 39.38,70.8 39.11,71.05Z"
android:strokeWidth="1.58701"
android:fillColor="#E4E5ED"
android:pathData="M48.14,87.45C47.81,87.76 47.67,88.62 48.43,89.43C49.18,90.24 50.06,90.16 50.39,89.85C50.72,89.54 50.87,88.67 50.11,87.86C49.35,87.05 48.48,87.13 48.14,87.45Z"
android:strokeWidth="1.95324"
android:fillColor="#D2D4DF"
android:strokeColor="#1D1F29"/>
<path
android:pathData="M49.62,69.7C48.53,70.72 48.52,72.85 50.07,74.5C51.62,76.16 53.74,76.29 54.83,75.28C55.91,74.26 55.92,72.13 54.37,70.48C52.83,68.82 50.7,68.69 49.62,69.7Z"
android:strokeWidth="1.58701"
android:fillColor="#E4E5ED"
android:pathData="M61.06,85.79C59.73,87.03 59.71,89.66 61.62,91.7C63.53,93.74 66.14,93.89 67.48,92.65C68.81,91.4 68.83,88.78 66.92,86.74C65.01,84.7 62.4,84.54 61.06,85.79Z"
android:strokeWidth="1.95324"
android:fillColor="#D2D4DF"
android:strokeColor="#1D1F29"/>
<path
android:pathData="M51.77,70.92C51.5,71.17 51.38,71.88 52,72.54C52.61,73.19 53.32,73.13 53.59,72.87C53.86,72.62 53.98,71.91 53.36,71.26C52.75,70.6 52.04,70.67 51.77,70.92Z"
android:strokeWidth="1.58701"
android:fillColor="#E4E5ED"
android:pathData="M63.72,87.29C63.39,87.6 63.25,88.46 64,89.27C64.76,90.08 65.64,90 65.97,89.69C66.3,89.38 66.44,88.51 65.69,87.7C64.93,86.89 64.06,86.97 63.72,87.29Z"
android:strokeWidth="1.95324"
android:fillColor="#D2D4DF"
android:strokeColor="#1D1F29"/>
<path
android:pathData="M60.31,51.92l-1.91,-1.83l-20.18,21.1l1.91,1.83z"
android:pathData="M74.24,63.9l-2.35,-2.25l-24.83,25.97l2.35,2.25z"
android:fillColor="#1D1F29"/>
<path
android:pathData="M67.74,57.35l-1.91,-1.83l-14.86,15.55l1.91,1.83z"
android:pathData="M83.38,70.58l-2.35,-2.25l-18.29,19.13l2.35,2.25z"
android:fillColor="#1D1F29"/>
<path
android:pathData="M14.4,89.87C14.26,89.54 13.83,89.45 13.57,89.7L6.34,96.85C6.2,96.99 6.15,97.21 6.23,97.39L6.54,98.18C6.67,98.51 7.1,98.6 7.36,98.35L14.59,91.2C14.73,91.06 14.78,90.84 14.71,90.66L14.4,89.87Z"
android:strokeWidth="0.0529003"
android:pathData="M17.72,110.61C17.55,110.2 17.02,110.09 16.71,110.4L7.8,119.2C7.62,119.38 7.57,119.64 7.66,119.87L8.04,120.83C8.21,121.24 8.74,121.36 9.05,121.04L17.96,112.25C18.13,112.07 18.19,111.81 18.1,111.58L17.72,110.61Z"
android:strokeWidth="0.0651081"
android:fillColor="#1D1F29"
android:strokeColor="#1D1F29"/>
<path
android:pathData="M86.8,90.8C103.2,87.86 114.7,77.31 118.68,71.9L98.1,63.75C94.66,70.18 78.12,75.63 73.03,76.98C67.95,78.32 69.44,82.28 69.67,83.11C69.86,83.8 71.61,89.51 72.29,92.37C74.11,100.14 74.76,106 80.82,105.82C89.14,105.58 88.27,95.71 86.8,90.8Z"
android:pathData="M106.84,111.75C127.02,108.13 141.18,95.15 146.07,88.49L120.75,78.47C116.51,86.37 96.16,93.09 89.9,94.74C83.63,96.4 85.47,101.27 85.75,102.29C85.98,103.14 88.15,110.16 88.97,113.69C91.22,123.25 92.01,130.46 99.47,130.24C109.71,129.95 108.65,117.79 106.84,111.75Z"
android:fillColor="#FF4F17"/>
<path
android:pathData="M86.8,90.8C103.2,87.86 114.7,77.31 118.68,71.9L98.1,63.75C94.66,70.18 78.12,75.63 73.03,76.98C67.95,78.32 69.44,82.28 69.67,83.11C69.86,83.8 71.61,89.51 72.29,92.37C74.11,100.14 74.76,106 80.82,105.82C89.14,105.58 88.27,95.71 86.8,90.8ZM86.8,90.8C85.01,91.12 83.17,91.35 81.27,91.48L86.8,90.8Z"
android:pathData="M106.84,111.75C127.02,108.13 141.18,95.15 146.07,88.49L120.75,78.47C116.51,86.37 96.16,93.09 89.9,94.74C83.63,96.4 85.47,101.27 85.75,102.29C85.98,103.14 88.15,110.16 88.97,113.69C91.22,123.25 92.01,130.46 99.47,130.24C109.71,129.95 108.65,117.79 106.84,111.75ZM106.84,111.75C104.64,112.15 102.37,112.43 100.03,112.58L106.84,111.75Z"
android:strokeLineJoin="round"
android:strokeWidth="1.85151"
android:strokeWidth="2.27878"
android:fillColor="#00000000"
android:strokeColor="#1D1F29"/>
<path
android:pathData="M109.03,89.82C109.03,81.68 105.22,72.77 103.31,69.33L83.15,62.38C88.3,72.52 91.97,91.44 93.88,99.56C93.31,109.94 98.81,110.95 101.17,109.94L116.76,103.07C120.12,101.63 123.95,96.56 120.12,91.46C116.95,87.25 110,89.56 105.73,92.11L109.03,89.82Z"
android:pathData="M134.21,110.54C134.21,100.53 129.51,89.56 127.17,85.33L102.35,76.78C108.69,89.26 113.21,112.54 115.56,122.53C114.85,135.31 121.63,136.55 124.53,135.31L143.71,126.85C147.85,125.09 152.57,118.85 147.85,112.57C143.95,107.38 135.4,110.23 130.14,113.36L134.21,110.54Z"
android:strokeLineJoin="round"
android:strokeWidth="1.85151"
android:strokeWidth="2.27878"
android:fillColor="#FF4F17"
android:strokeColor="#1D1F29"/>
<path
android:pathData="M147.76,32.67C146.85,11.56 128.99,-4.81 107.87,-3.9C86.76,-2.98 70.38,14.88 71.3,35.99C72.21,57.1 90.07,73.48 111.19,72.56C132.3,71.65 148.68,53.79 147.76,32.67Z"
android:strokeWidth="1.85151"
android:pathData="M181.86,40.21C180.74,14.23 158.76,-5.93 132.77,-4.8C106.78,-3.67 86.63,18.31 87.76,44.3C88.88,70.28 110.86,90.44 136.85,89.31C162.84,88.18 182.99,66.2 181.86,40.21Z"
android:strokeWidth="2.27878"
android:fillColor="#FF4F17"
android:strokeColor="#1D1F29"/>
<path
android:pathData="M69.49,54.22C71.66,45.94 80.93,41.72 85.29,40.65L83.16,26.4C69.53,29.89 60.89,39.8 56.38,49.51C52.78,57.27 56.83,61.28 59.31,62.31C61.8,63.06 67.32,62.49 69.49,54.22Z"
android:pathData="M85.53,66.73C88.21,56.54 99.61,51.35 104.98,50.03L102.35,32.49C85.58,36.79 74.95,48.98 69.4,60.93C64.97,70.49 69.95,75.42 73,76.68C76.07,77.61 82.86,76.91 85.53,66.73Z"
android:fillColor="#FF4F17"/>
<path
android:pathData="M82.26,41.87C77.89,42.95 71.66,45.94 69.49,54.22C67.32,62.49 61.8,63.06 59.31,62.3C56.83,61.28 52.78,57.27 56.38,49.51C60.89,39.8 66.49,31.11 80.12,27.62"
android:pathData="M101.24,51.54C95.87,52.86 88.2,56.54 85.53,66.73C82.86,76.91 76.06,77.61 73,76.68C69.95,75.42 64.96,70.49 69.4,60.93C74.94,48.98 81.84,38.29 98.61,34"
android:strokeLineJoin="round"
android:strokeWidth="1.85151"
android:strokeWidth="2.27878"
android:fillColor="#00000000"
android:strokeColor="#1D1F29"
android:strokeLineCap="round"/>
Expand Down
1 change: 1 addition & 0 deletions presentation/src/main/res/layout/activity_todo_change.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
15 changes: 8 additions & 7 deletions presentation/src/main/res/layout/activity_todo_create.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The 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"
Expand Down Expand Up @@ -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>
Expand Down
6 changes: 4 additions & 2 deletions presentation/src/main/res/layout/activity_todo_detail.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions presentation/src/main/res/layout/fragment_my_todo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down Expand Up @@ -77,7 +77,7 @@

<TextView
android:id="@+id/tv_my_todo_title_up"
style="@style/TextAppearance.Doorip.Head1"
style="@style/TextAppearance.Doorip.Head2"
Copy link
Contributor

Choose a reason for hiding this comment

The 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"
Expand All @@ -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"
Expand Down
Loading
Loading