From 1c408f6b01543ad7074a69970a0679ab231c7e4e Mon Sep 17 00:00:00 2001 From: Bandal Date: Tue, 31 Oct 2023 15:56:27 +0900 Subject: [PATCH 1/7] =?UTF-8?q?fix:=20=EC=8A=A4=EB=A0=88=EB=93=9C=EC=97=90?= =?UTF-8?q?=20=EC=9E=85=EB=A0=A5=ED=95=98=EA=B3=A0=20=EC=A0=84=EC=86=A1=20?= =?UTF-8?q?=EB=B2=84=ED=8A=BC=EC=9D=84=20=ED=81=B4=EB=A6=AD=20=EC=8B=9C=20?= =?UTF-8?q?=ED=82=A4=EB=B3=B4=EB=93=9C=EA=B0=80=20=EB=82=B4=EB=A0=A4?= =?UTF-8?q?=EA=B0=80=EB=8A=94=20=ED=98=84=EC=83=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../created/team201/presentation/studyThread/ThreadActivity.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/android/app/src/main/java/com/created/team201/presentation/studyThread/ThreadActivity.kt b/android/app/src/main/java/com/created/team201/presentation/studyThread/ThreadActivity.kt index aca85edb..2000115e 100644 --- a/android/app/src/main/java/com/created/team201/presentation/studyThread/ThreadActivity.kt +++ b/android/app/src/main/java/com/created/team201/presentation/studyThread/ThreadActivity.kt @@ -105,8 +105,6 @@ class ThreadActivity : BindingActivity(R.layout.activity_ threadViewModel.dispatchFeed(message) binding.etThreadInput.run { text.clear() - clearFocus() - hideKeyboard() } } } From 55b60f2b17509549ecbee206836400d809c8cbbc Mon Sep 17 00:00:00 2001 From: Bandal Date: Tue, 31 Oct 2023 15:57:47 +0900 Subject: [PATCH 2/7] =?UTF-8?q?fix:=20=EC=97=AC=EB=9F=AC=EC=A4=84=20?= =?UTF-8?q?=EC=9E=85=EB=A0=A5=20=EA=B0=80=EB=8A=A5=ED=95=98=EA=B2=8C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/app/src/main/res/layout/activity_thread.xml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/android/app/src/main/res/layout/activity_thread.xml b/android/app/src/main/res/layout/activity_thread.xml index dbeba863..921abeae 100644 --- a/android/app/src/main/res/layout/activity_thread.xml +++ b/android/app/src/main/res/layout/activity_thread.xml @@ -100,9 +100,12 @@ android:background="@drawable/bg_rectangle_radius_10dp_black02" android:ems="10" android:hint="잡담 및 질답하기" - android:inputType="text" + android:inputType="textMultiLine" android:maxLength="200" + android:maxLines="4" + android:minHeight="40dp" android:padding="8dp" + android:scrollbars="vertical" android:textAppearance="@style/text_r16" android:textColor="@color/white" android:textColorHint="@color/grey02_78808B" @@ -116,10 +119,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="12dp" + android:layout_marginBottom="12dp" android:src="@drawable/icn_direct_message_btn" - app:layout_constraintBottom_toBottomOf="@+id/et_thread_input" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="@+id/et_thread_input" /> + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" /> From 7002dd656ad6ec5119aaed70912a2ea5d0cff0c3 Mon Sep 17 00:00:00 2001 From: Bandal Date: Tue, 31 Oct 2023 16:01:03 +0900 Subject: [PATCH 3/7] =?UTF-8?q?refactor:=20=EC=8A=A4=EB=A0=88=EB=93=9C=20?= =?UTF-8?q?=EC=9E=85=EB=A0=A5=20=ED=9E=8C=ED=8A=B8=20strings.xml=20?= =?UTF-8?q?=EB=A6=AC=EC=86=8C=EC=8A=A4=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/app/src/main/res/layout/activity_thread.xml | 2 +- android/app/src/main/res/values/strings.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/android/app/src/main/res/layout/activity_thread.xml b/android/app/src/main/res/layout/activity_thread.xml index 921abeae..c4a3f713 100644 --- a/android/app/src/main/res/layout/activity_thread.xml +++ b/android/app/src/main/res/layout/activity_thread.xml @@ -99,7 +99,7 @@ android:layout_marginBottom="12dp" android:background="@drawable/bg_rectangle_radius_10dp_black02" android:ems="10" - android:hint="잡담 및 질답하기" + android:hint="@string/thread_input_hint" android:inputType="textMultiLine" android:maxLength="200" android:maxLines="4" diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 28ada428..7ffb30b2 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -294,6 +294,7 @@ 내용을 입력해 주세요 + 잡담 및 질답하기 %d주차 From 1ad9fa9593e55fe9b4d7265a2ddb3c87e1a5e870 Mon Sep 17 00:00:00 2001 From: Bandal Date: Tue, 31 Oct 2023 20:42:30 +0900 Subject: [PATCH 4/7] =?UTF-8?q?feat:=20=EC=9E=85=EB=A0=A5=20=EC=BB=A4?= =?UTF-8?q?=EC=84=9C=20=ED=85=8C=EB=A7=88=20=EC=A0=81=EC=9A=A9=20=EB=B0=8F?= =?UTF-8?q?=20=EB=A7=81=ED=81=AC=20=ED=81=B4=EB=A6=AD=20=EA=B8=B0=EB=8A=A5?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/src/main/res/drawable/cursor_color.xml | 6 +++--- .../app/src/main/res/layout/activity_profile.xml | 4 +++- .../main/res/layout/activity_study_detail.xml | 2 ++ .../app/src/main/res/layout/activity_thread.xml | 16 ++++++++-------- .../main/res/layout/dialog_study_informaion.xml | 4 +++- .../src/main/res/layout/item_home_study_list.xml | 2 ++ .../src/main/res/layout/item_thread_comment.xml | 3 ++- android/app/src/main/res/values/themes.xml | 5 +++++ 8 files changed, 28 insertions(+), 14 deletions(-) diff --git a/android/app/src/main/res/drawable/cursor_color.xml b/android/app/src/main/res/drawable/cursor_color.xml index 6016139d..db3e0ceb 100644 --- a/android/app/src/main/res/drawable/cursor_color.xml +++ b/android/app/src/main/res/drawable/cursor_color.xml @@ -1,5 +1,5 @@ - + - - \ No newline at end of file + + diff --git a/android/app/src/main/res/layout/activity_profile.xml b/android/app/src/main/res/layout/activity_profile.xml index 2fba2659..ced9dc88 100644 --- a/android/app/src/main/res/layout/activity_profile.xml +++ b/android/app/src/main/res/layout/activity_profile.xml @@ -149,13 +149,15 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_marginTop="24dp" + android:autoLink="email|web" android:background="@drawable/bg_rectangle_radius_5dp" + android:lines="8" android:maxLines="8" android:padding="16dp" - android:lines="8" android:text="@{viewModel.profile.profile.profileInformation.introduction}" android:textAppearance="@style/text_r16" android:textColor="@color/white" + android:textIsSelectable="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/layout_profile_study_success_rate" diff --git a/android/app/src/main/res/layout/activity_study_detail.xml b/android/app/src/main/res/layout/activity_study_detail.xml index 298ae788..71628091 100644 --- a/android/app/src/main/res/layout/activity_study_detail.xml +++ b/android/app/src/main/res/layout/activity_study_detail.xml @@ -127,12 +127,14 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="16dp" android:layout_marginTop="20dp" + android:autoLink="web|email" android:background="@drawable/bg_rectangle_radius_5dp" android:minHeight="150dp" android:padding="16dp" android:text="@{viewModel.study.introduction}" android:textAppearance="@style/text_r16" android:textColor="@color/white" + android:textIsSelectable="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/cl_study_detail_inform" diff --git a/android/app/src/main/res/layout/activity_thread.xml b/android/app/src/main/res/layout/activity_thread.xml index c4a3f713..e6830450 100644 --- a/android/app/src/main/res/layout/activity_thread.xml +++ b/android/app/src/main/res/layout/activity_thread.xml @@ -29,10 +29,10 @@ android:layout_marginStart="12dp" android:textAppearance="@style/picker_sb18" android:textColor="@color/white" - app:layout_constraintBottom_toBottomOf="@+id/iv_thread_back_button" - app:layout_constraintEnd_toStartOf="@+id/spinner_thread" - app:layout_constraintStart_toEndOf="@+id/iv_thread_back_button" - app:layout_constraintTop_toTopOf="@+id/iv_thread_back_button" + app:layout_constraintBottom_toBottomOf="@id/iv_thread_back_button" + app:layout_constraintEnd_toStartOf="@id/spinner_thread" + app:layout_constraintStart_toEndOf="@id/iv_thread_back_button" + app:layout_constraintTop_toTopOf="@id/iv_thread_back_button" tools:text="자두타먹는 스터디" /> @@ -61,7 +61,7 @@ app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/iv_thread_back_button" + app:layout_constraintTop_toBottomOf="@id/iv_thread_back_button" tools:listitem="@layout/item_thread_must_do" /> @@ -111,7 +111,7 @@ android:textColorHint="@color/grey02_78808B" android:textCursorDrawable="@drawable/cursor_color" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toStartOf="@+id/iv_thread_direct_button" + app:layout_constraintEnd_toStartOf="@id/iv_thread_direct_button" app:layout_constraintStart_toStartOf="parent" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/item_home_study_list.xml b/android/app/src/main/res/layout/item_home_study_list.xml index 16ebc4e0..55d37636 100644 --- a/android/app/src/main/res/layout/item_home_study_list.xml +++ b/android/app/src/main/res/layout/item_home_study_list.xml @@ -117,10 +117,12 @@ android:layout_marginStart="20dp" android:layout_marginTop="8dp" android:layout_marginEnd="20dp" + android:autoLink="email|web" android:maxLines="2" android:text="@{item.mustDo.blank ? @string/hom_study_list_must_do_default_message : item.mustDo}" android:textAppearance="@style/text_r16" android:textColor="@{item.mustDo.blank ? @color/grey06_30363D : @color/white}" + android:textIsSelectable="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/tv_home_study_list_must_do" diff --git a/android/app/src/main/res/layout/item_thread_comment.xml b/android/app/src/main/res/layout/item_thread_comment.xml index 037853a6..3d6f9af6 100644 --- a/android/app/src/main/res/layout/item_thread_comment.xml +++ b/android/app/src/main/res/layout/item_thread_comment.xml @@ -96,6 +96,7 @@ android:layout_marginTop="20dp" android:layout_marginEnd="20dp" android:layout_marginBottom="20dp" + android:autoLink="web|email" android:maxLines="10" android:text="@{item.content}" android:textAppearance="@style/subtitle_r20" @@ -105,7 +106,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/cl_member_info" - tools:text="아아 언제다하냐 진짜 ㅋㅋ" /> + tools:text="스터디 날짜가 언제인가요?" /> @style/BottomSheetDialogTheme + + + @color/green02_E639D353 + @color/green04_26A641 + @color/green04_26A641