From 53d91c10dae5f17b9899fed7408220d75fd0b087 Mon Sep 17 00:00:00 2001 From: kangyuri1114 Date: Sat, 10 Aug 2024 01:34:36 +0900 Subject: [PATCH 1/7] =?UTF-8?q?[refact]:=20bottom=20navi=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/designsystem/src/main/res/values/colors.xml | 2 ++ .../src/main/res/drawable/ai_members_bottom_navi_24.xml | 2 +- feature/projects/src/main/res/drawable/apply_navi_24.xml | 2 +- feature/projects/src/main/res/drawable/devinfo_navi_24.xml | 2 +- .../projects/src/main/res/drawable/menu_selector_color.xml | 2 +- feature/projects/src/main/res/drawable/projects_navi_24.xml | 2 +- feature/projects/src/main/res/layout/activity_main.xml | 4 ++-- 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/core/designsystem/src/main/res/values/colors.xml b/core/designsystem/src/main/res/values/colors.xml index bbbb329..7f99c60 100644 --- a/core/designsystem/src/main/res/values/colors.xml +++ b/core/designsystem/src/main/res/values/colors.xml @@ -17,6 +17,8 @@ #EDE4E1 #C1C1C1 #A3A3A3 + #7E7E7E + #5E5E5E #FFE5DD diff --git a/feature/projects/src/main/res/drawable/ai_members_bottom_navi_24.xml b/feature/projects/src/main/res/drawable/ai_members_bottom_navi_24.xml index 0c4fa7e..1a6faf9 100644 --- a/feature/projects/src/main/res/drawable/ai_members_bottom_navi_24.xml +++ b/feature/projects/src/main/res/drawable/ai_members_bottom_navi_24.xml @@ -1,4 +1,4 @@ - + diff --git a/feature/projects/src/main/res/drawable/apply_navi_24.xml b/feature/projects/src/main/res/drawable/apply_navi_24.xml index 270e57b..fdd0dc2 100644 --- a/feature/projects/src/main/res/drawable/apply_navi_24.xml +++ b/feature/projects/src/main/res/drawable/apply_navi_24.xml @@ -1,4 +1,4 @@ - diff --git a/feature/projects/src/main/res/drawable/devinfo_navi_24.xml b/feature/projects/src/main/res/drawable/devinfo_navi_24.xml index 385f389..35ca825 100644 --- a/feature/projects/src/main/res/drawable/devinfo_navi_24.xml +++ b/feature/projects/src/main/res/drawable/devinfo_navi_24.xml @@ -1,4 +1,4 @@ - diff --git a/feature/projects/src/main/res/drawable/menu_selector_color.xml b/feature/projects/src/main/res/drawable/menu_selector_color.xml index d9b0827..d0069dd 100644 --- a/feature/projects/src/main/res/drawable/menu_selector_color.xml +++ b/feature/projects/src/main/res/drawable/menu_selector_color.xml @@ -1,5 +1,5 @@ - + diff --git a/feature/projects/src/main/res/drawable/projects_navi_24.xml b/feature/projects/src/main/res/drawable/projects_navi_24.xml index 4b3bca1..139409d 100644 --- a/feature/projects/src/main/res/drawable/projects_navi_24.xml +++ b/feature/projects/src/main/res/drawable/projects_navi_24.xml @@ -1,5 +1,5 @@ diff --git a/feature/projects/src/main/res/layout/activity_main.xml b/feature/projects/src/main/res/layout/activity_main.xml index 6c733d0..0be7af0 100644 --- a/feature/projects/src/main/res/layout/activity_main.xml +++ b/feature/projects/src/main/res/layout/activity_main.xml @@ -21,7 +21,7 @@ + app:itemIconSize="30dp" /> \ No newline at end of file From 093afa2c79276125d96ee5228b4761b8bb743f64 Mon Sep 17 00:00:00 2001 From: kangyuri1114 Date: Sat, 10 Aug 2024 02:00:35 +0900 Subject: [PATCH 2/7] =?UTF-8?q?[refact]:=20project=20detail=20=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80ui=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projects/projects/ProjectDetailActivity.kt | 3 +++ .../src/main/res/layout/activity_dev_detail.xml | 12 ++++++------ .../main/res/layout/activity_project_detail.xml | 15 ++++++++------- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/feature/projects/src/main/java/com/zucchini/projects/projects/ProjectDetailActivity.kt b/feature/projects/src/main/java/com/zucchini/projects/projects/ProjectDetailActivity.kt index ec7cb6f..c3bce84 100644 --- a/feature/projects/src/main/java/com/zucchini/projects/projects/ProjectDetailActivity.kt +++ b/feature/projects/src/main/java/com/zucchini/projects/projects/ProjectDetailActivity.kt @@ -6,6 +6,7 @@ import android.net.Uri import android.os.Bundle import androidx.activity.viewModels import androidx.appcompat.app.AppCompatActivity +import androidx.core.view.isVisible import androidx.lifecycle.flowWithLifecycle import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.GridLayoutManager @@ -63,6 +64,8 @@ class ProjectDetailActivity : AppCompatActivity() { .flowWithLifecycle(lifecycle) .onEach { adapter.submitList(it) + binding.clIntroduceDev.isVisible = it.isNotEmpty() + binding.tvIntroduceDevTitle.isVisible = it.isNotEmpty() }.launchIn(lifecycleScope) viewModel.projectsDetail diff --git a/feature/projects/src/main/res/layout/activity_dev_detail.xml b/feature/projects/src/main/res/layout/activity_dev_detail.xml index 93d0ddd..5447ced 100644 --- a/feature/projects/src/main/res/layout/activity_dev_detail.xml +++ b/feature/projects/src/main/res/layout/activity_dev_detail.xml @@ -97,10 +97,10 @@ android:layout_height="wrap_content" android:layout_marginStart="10dp" android:layout_marginTop="10dp" - android:fontFamily="@font/pretendardmedium" + android:fontFamily="@font/pretendardbold" tools:text="안드로이드 개발자" - android:textColor="@color/olive_black" - android:textSize="10sp" + android:textColor="@color/main_olive" + android:textSize="12sp" app:layout_constraintStart_toStartOf="@id/tv_project_name" app:layout_constraintTop_toBottomOf="@+id/tv_project_name" /> @@ -111,10 +111,10 @@ android:layout_marginStart="10dp" android:layout_marginTop="10dp" android:layout_marginEnd="5dp" - android:fontFamily="@font/pretendardmedium" + android:fontFamily="@font/pretendardbold" tools:text="iOS 개발자" - android:textColor="@color/olive_black" - android:textSize="10sp" + android:textColor="@color/main_olive" + android:textSize="12sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/tv_dev_position1" app:layout_constraintTop_toBottomOf="@+id/tv_project_name" /> diff --git a/feature/projects/src/main/res/layout/activity_project_detail.xml b/feature/projects/src/main/res/layout/activity_project_detail.xml index c78a5eb..f6eaf7d 100644 --- a/feature/projects/src/main/res/layout/activity_project_detail.xml +++ b/feature/projects/src/main/res/layout/activity_project_detail.xml @@ -187,7 +187,7 @@ android:background="@drawable/contents_background" android:fontFamily="@font/pretendardregular" android:gravity="center" - android:padding="5dp" + android:padding="15dp" android:paddingHorizontal="2dp" android:textColor="@color/olive_black" android:textSize="12sp" @@ -433,7 +433,7 @@ android:fontFamily="@font/pretendardbold" android:text="웹 링크" android:textColor="@color/olive_black" - android:textSize="10sp" + android:textSize="12sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -443,7 +443,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="5dp" android:fontFamily="@font/pretendardregular" - android:textColor="@color/olive_black" + android:textColor="@color/gray3" android:textSize="10sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -460,7 +460,7 @@ android:fontFamily="@font/pretendardbold" android:text="앱 다운로드 링크" android:textColor="@color/olive_black" - android:textSize="10sp" + android:textSize="12sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/tv_web_link" /> @@ -470,7 +470,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="5dp" android:fontFamily="@font/pretendardregular" - android:textColor="@color/olive_black" + android:textColor="@color/gray3" android:textSize="10sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -486,7 +486,7 @@ android:fontFamily="@font/pretendardbold" android:text="프로젝트 소개 페이지" android:textColor="@color/olive_black" - android:textSize="10sp" + android:textSize="12sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/tv_app_link" /> @@ -496,7 +496,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="5dp" android:fontFamily="@font/pretendardregular" - android:textColor="@color/olive_black" + android:textColor="@color/gray3" android:textSize="10sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -518,6 +518,7 @@ app:layout_constraintTop_toBottomOf="@+id/cl_project_link" /> Date: Sat, 10 Aug 2024 02:03:26 +0900 Subject: [PATCH 3/7] =?UTF-8?q?[refact]:=20project=20detail=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=EC=88=98=20=ED=85=8D=EC=8A=A4=ED=8A=B8=20=ED=81=AC?= =?UTF-8?q?=EA=B8=B0=20=EC=A6=9D=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projects/src/main/res/layout/activity_project_detail.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/projects/src/main/res/layout/activity_project_detail.xml b/feature/projects/src/main/res/layout/activity_project_detail.xml index f6eaf7d..ac7e46b 100644 --- a/feature/projects/src/main/res/layout/activity_project_detail.xml +++ b/feature/projects/src/main/res/layout/activity_project_detail.xml @@ -61,7 +61,7 @@ android:layout_marginEnd="10dp" android:fontFamily="@font/pretendardbold" android:textColor="@color/olive_black" - android:textSize="10sp" + android:textSize="13sp" app:layout_constraintBottom_toTopOf="@+id/cl_project_info" app:layout_constraintEnd_toEndOf="@id/cl_project_info" /> From f6f28f4b368840e84f4e92beb5ee741f9b5fbdde Mon Sep 17 00:00:00 2001 From: kangyuri1114 Date: Sat, 10 Aug 2024 02:52:52 +0900 Subject: [PATCH 4/7] =?UTF-8?q?[refact]:=20=EC=A0=84=EB=B0=98=EC=A0=81?= =?UTF-8?q?=EC=9D=B8=20ui=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dialog_common_select_checkbox_button.xml | 10 ++-- .../designer/branding/BrandingFragment.kt | 4 -- .../designer/image/ImageDesignFragment.kt | 4 -- .../src/main/res/layout/fragment_branding.xml | 33 ++++--------- .../main/res/layout/fragment_image_design.xml | 32 ++++--------- .../res/layout/fragment_matching_loading.xml | 2 +- .../res/layout/fragment_meeting_summary.xml | 2 +- .../res/layout/fragment_progress_meeting.xml | 48 +++++++++---------- .../fragment_select_matching_conditions.xml | 36 +++++++------- .../fragment_start_progress_meeting.xml | 40 ++++++++-------- .../res/layout/fragment_submit_project.xml | 7 ++- 11 files changed, 89 insertions(+), 129 deletions(-) diff --git a/core/common/src/main/res/layout/dialog_common_select_checkbox_button.xml b/core/common/src/main/res/layout/dialog_common_select_checkbox_button.xml index 254dbcb..f60f0f2 100644 --- a/core/common/src/main/res/layout/dialog_common_select_checkbox_button.xml +++ b/core/common/src/main/res/layout/dialog_common_select_checkbox_button.xml @@ -63,13 +63,13 @@ { - binding.tvCopy.isVisible = false binding.aiDesignerBrandingResult.isVisible = false binding.loadingProgressBar.isVisible = true binding.aiDesignerBrandingResult.text = getString(R.string.loading) } is UiState.Success -> { - binding.tvCopy.isVisible = true binding.aiDesignerBrandingResult.isVisible = true binding.loadingProgressBar.isVisible = false binding.aiDesignerBrandingResult.text = uiState.data } is UiState.Failure -> { - binding.tvCopy.isVisible = false binding.aiDesignerBrandingResult.isVisible = false binding.loadingProgressBar.isVisible = false binding.aiDesignerBrandingResult.text = getString(R.string.fail_to_branding) diff --git a/feature/projects/src/main/java/com/zucchini/ai_members/designer/image/ImageDesignFragment.kt b/feature/projects/src/main/java/com/zucchini/ai_members/designer/image/ImageDesignFragment.kt index a116e5b..ac8989d 100644 --- a/feature/projects/src/main/java/com/zucchini/ai_members/designer/image/ImageDesignFragment.kt +++ b/feature/projects/src/main/java/com/zucchini/ai_members/designer/image/ImageDesignFragment.kt @@ -53,26 +53,22 @@ class ImageDesignFragment : Fragment() { is UiState.Initial -> { // 초기 화면 binding.loadingProgressBar.isVisible = false - binding.tvFileDownload.isVisible = false } is UiState.Loading -> { binding.loadingProgressBar.isVisible = true binding.ivAiDesignerImageResult.isVisible = false - binding.tvFileDownload.isVisible = false } is UiState.Success -> { binding.loadingProgressBar.isVisible = false binding.ivAiDesignerImageResult.isVisible = true - binding.tvFileDownload.isVisible = true binding.ivAiDesignerImageResult.load(uiState.data) { crossfade(true) } } is UiState.Failure -> { - binding.tvFileDownload.isVisible = false binding.loadingProgressBar.isVisible = false } } diff --git a/feature/projects/src/main/res/layout/fragment_branding.xml b/feature/projects/src/main/res/layout/fragment_branding.xml index 0ed2d7c..87fa3ef 100644 --- a/feature/projects/src/main/res/layout/fragment_branding.xml +++ b/feature/projects/src/main/res/layout/fragment_branding.xml @@ -12,8 +12,8 @@ android:id="@+id/iv_ai_designer" android:layout_width="30dp" android:layout_height="30dp" - android:layout_marginStart="15dp" - android:layout_marginTop="10dp" + android:layout_marginStart="25dp" + android:layout_marginTop="25dp" android:src="@drawable/ai_designer" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -37,9 +37,9 @@ android:id="@+id/ai_designer_branding_description" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginStart="15dp" + android:layout_marginStart="25dp" android:layout_marginTop="10dp" - android:layout_marginEnd="15dp" + android:layout_marginEnd="25dp" android:fontFamily="@font/pretendardregular" android:gravity="start" android:text="@string/ai_designer_branding_description" @@ -53,7 +53,7 @@ android:id="@+id/et_branding_description" android:layout_width="match_parent" android:layout_height="0dp" - android:layout_marginHorizontal="15dp" + android:layout_marginHorizontal="25dp" android:layout_marginTop="20dp" android:background="@drawable/projects_background_olive" android:gravity="start" @@ -75,7 +75,7 @@ android:fontFamily="@font/pretendardbold" android:gravity="center" android:paddingVertical="10dp" - android:paddingStart="15dp" + android:paddingStart="25dp" android:paddingEnd="30dp" android:text="@string/btn_submit_branding" android:textAlignment="center" @@ -88,7 +88,7 @@ android:id="@+id/iv_ai_designer_result" android:layout_width="30dp" android:layout_height="30dp" - android:layout_marginStart="15dp" + android:layout_marginStart="25dp" android:layout_marginTop="30dp" android:src="@drawable/ai_designer" app:layout_constraintStart_toStartOf="parent" @@ -112,13 +112,12 @@ android:id="@+id/ai_designer_branding_result" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginHorizontal="15dp" + android:layout_marginHorizontal="25dp" android:layout_marginVertical="15dp" - android:layout_marginStart="15dp" android:background="@drawable/projects_background_olive" android:fontFamily="@font/pretendardregular" android:gravity="start" - android:padding="15dp" + android:padding="25dp" app:layout_constraintBottom_toBottomOf="parent" android:layout_marginBottom="10dp" android:textColor="@color/olive_black" @@ -128,20 +127,6 @@ app:layout_constraintTop_toBottomOf="@+id/ai_designer_branding_result_title" tools:text="@string/default_link" /> - - @@ -33,9 +33,9 @@ android:id="@+id/ai_designer_branding_description" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginStart="15dp" + android:layout_marginStart="25dp" android:layout_marginTop="10dp" - android:layout_marginEnd="15dp" + android:layout_marginEnd="25dp" android:fontFamily="@font/pretendardregular" android:gravity="start" android:text="@string/ai_designer_image_description" @@ -49,7 +49,7 @@ android:id="@+id/et_image_description" android:layout_width="match_parent" android:layout_height="0dp" - android:layout_marginHorizontal="15dp" + android:layout_marginHorizontal="25dp" android:layout_marginTop="20dp" android:background="@drawable/projects_background_olive" android:gravity="start" @@ -71,7 +71,7 @@ android:gravity="center" android:text="@string/btn_submit_image" android:paddingEnd="30dp" - android:paddingStart="15dp" + android:paddingStart="25dp" android:paddingVertical="10dp" android:textAlignment="center" android:textColor="@color/main_olive" @@ -83,7 +83,7 @@ android:id="@+id/iv_ai_designer_result" android:layout_width="30dp" android:layout_height="30dp" - android:layout_marginStart="15dp" + android:layout_marginStart="25dp" android:layout_marginTop="30dp" android:src="@drawable/ai_designer" app:layout_constraintStart_toStartOf="parent" @@ -105,8 +105,8 @@ - - \ No newline at end of file diff --git a/feature/projects/src/main/res/layout/fragment_matching_loading.xml b/feature/projects/src/main/res/layout/fragment_matching_loading.xml index e2d3038..2e605f1 100644 --- a/feature/projects/src/main/res/layout/fragment_matching_loading.xml +++ b/feature/projects/src/main/res/layout/fragment_matching_loading.xml @@ -19,7 +19,7 @@ android:id="@+id/tv_loading" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="프로젝트에 적합한 개발자를 생각 중이에요..." + android:text="매칭 중이에요 ..." android:textSize="20sp" android:layout_marginTop="20dp" app:layout_constraintStart_toStartOf="parent" diff --git a/feature/projects/src/main/res/layout/fragment_meeting_summary.xml b/feature/projects/src/main/res/layout/fragment_meeting_summary.xml index d58037b..0760ac5 100644 --- a/feature/projects/src/main/res/layout/fragment_meeting_summary.xml +++ b/feature/projects/src/main/res/layout/fragment_meeting_summary.xml @@ -106,7 +106,7 @@ android:background="@drawable/projects_background_olive" android:fontFamily="@font/pretendardregular" android:gravity="start" - android:padding="10dp" + android:padding="20dp" android:textColor="@color/olive_black" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="parent" diff --git a/feature/projects/src/main/res/layout/fragment_progress_meeting.xml b/feature/projects/src/main/res/layout/fragment_progress_meeting.xml index 7bbb35a..15b1a55 100644 --- a/feature/projects/src/main/res/layout/fragment_progress_meeting.xml +++ b/feature/projects/src/main/res/layout/fragment_progress_meeting.xml @@ -7,8 +7,8 @@ android:id="@+id/iv_ai_pm" android:layout_width="30dp" android:layout_height="30dp" - android:layout_marginStart="15dp" - android:layout_marginTop="10dp" + android:layout_marginStart="25dp" + android:layout_marginTop="25dp" android:src="@drawable/ai_pm" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -32,9 +32,9 @@ android:id="@+id/ai_pm_meeting_progress_description" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginStart="15dp" + android:layout_marginStart="25dp" android:layout_marginTop="10dp" - android:layout_marginEnd="15dp" + android:layout_marginEnd="25dp" android:fontFamily="@font/pretendardregular" android:gravity="start" android:text="@string/ai_pm_meeting_progress_description" @@ -48,13 +48,13 @@ android:id="@+id/ai_pm_meeting_progress_total_time_title" android:layout_width="wrap_content" android:layout_height="0dp" - android:layout_marginStart="15dp" + android:layout_marginStart="25dp" android:layout_marginTop="15dp" android:fontFamily="@font/pretendardregular" android:gravity="start" android:text="전체 회의 진행 시간(분)" android:textColor="@color/olive_black" - android:textSize="13sp" + android:textSize="15dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/ai_pm_meeting_progress_description" /> @@ -79,7 +79,7 @@ android:gravity="start" android:text="회의 참석 인원" android:textColor="@color/olive_black" - android:textSize="13sp" + android:textSize="15dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/ai_pm_meeting_progress_total_time_title" app:layout_constraintTop_toBottomOf="@+id/ai_pm_meeting_progress_description" /> @@ -100,7 +100,7 @@ android:id="@+id/cl_ai_pm_meeting_progress_introduceMyself" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="15dp" + android:layout_marginStart="25dp" android:layout_marginTop="30dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/et_progress_total_time"> @@ -120,7 +120,7 @@ android:gravity="start" android:text="자기소개" android:textColor="@color/olive_black" - android:textSize="13sp" + android:textSize="15dp" app:layout_constraintBottom_toBottomOf="@+id/cb_ai_pm_meeting_progress_introduceMyself" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/cb_ai_pm_meeting_progress_introduceMyself" @@ -132,7 +132,7 @@ android:id="@+id/cl_ai_pm_meeting_progress_iceBreaking" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="30dp" + android:layout_marginStart="25dp" app:layout_constraintStart_toEndOf="@+id/cl_ai_pm_meeting_progress_introduceMyself" app:layout_constraintTop_toTopOf="@+id/cl_ai_pm_meeting_progress_introduceMyself"> @@ -151,7 +151,7 @@ android:gravity="start" android:text="아이스브레이킹" android:textColor="@color/olive_black" - android:textSize="13sp" + android:textSize="15dp" app:layout_constraintBottom_toBottomOf="@+id/cb_ai_pm_meeting_progress_iceBreaking" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/cb_ai_pm_meeting_progress_iceBreaking" @@ -162,7 +162,7 @@ android:id="@+id/cl_ai_pm_meeting_progress_brainsTorming" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="30dp" + android:layout_marginStart="25dp" app:layout_constraintStart_toEndOf="@+id/cl_ai_pm_meeting_progress_iceBreaking" app:layout_constraintTop_toTopOf="@+id/cl_ai_pm_meeting_progress_iceBreaking"> @@ -181,7 +181,7 @@ android:gravity="start" android:text="브레인스토밍" android:textColor="@color/olive_black" - android:textSize="13sp" + android:textSize="15dp" app:layout_constraintBottom_toBottomOf="@+id/cb_ai_pm_meeting_progress_brainsTorming" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/cb_ai_pm_meeting_progress_brainsTorming" @@ -192,7 +192,7 @@ android:id="@+id/cl_ai_pm_meeting_progress_topic" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="15dp" + android:layout_marginStart="25dp" android:layout_marginTop="20dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/cl_ai_pm_meeting_progress_introduceMyself"> @@ -212,7 +212,7 @@ android:gravity="start" android:text="프로젝트 주제 선정" android:textColor="@color/olive_black" - android:textSize="13sp" + android:textSize="15dp" app:layout_constraintBottom_toBottomOf="@+id/cb_ai_pm_meeting_progress_topic" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/cb_ai_pm_meeting_progress_topic" @@ -242,7 +242,7 @@ android:gravity="start" android:text="진행상황 공유" android:textColor="@color/olive_black" - android:textSize="13sp" + android:textSize="15dp" app:layout_constraintBottom_toBottomOf="@+id/cb_ai_pm_meeting_progress_progress" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/cb_ai_pm_meeting_progress_progress" @@ -253,7 +253,7 @@ android:id="@+id/cl_ai_pm_meeting_progress_role" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="30dp" + android:layout_marginStart="25dp" app:layout_constraintStart_toEndOf="@+id/cl_ai_pm_meeting_progress_troubleshooting" app:layout_constraintTop_toTopOf="@+id/cl_ai_pm_meeting_progress_troubleshooting"> @@ -272,7 +272,7 @@ android:gravity="start" android:text="역할 분배" android:textColor="@color/olive_black" - android:textSize="13sp" + android:textSize="15dp" app:layout_constraintBottom_toBottomOf="@+id/cb_ai_pm_meeting_progress_role" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/cb_ai_pm_meeting_progress_role" @@ -283,7 +283,7 @@ android:id="@+id/cl_ai_pm_meeting_progress_feedback" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="30dp" + android:layout_marginStart="25dp" app:layout_constraintStart_toEndOf="@+id/cl_ai_pm_meeting_progress_role" app:layout_constraintTop_toTopOf="@+id/cl_ai_pm_meeting_progress_role"> @@ -302,7 +302,7 @@ android:gravity="start" android:text="피드백" android:textColor="@color/olive_black" - android:textSize="13sp" + android:textSize="15dp" app:layout_constraintBottom_toBottomOf="@+id/cb_ai_pm_meeting_progress_feedback" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/cb_ai_pm_meeting_progress_feedback" @@ -313,7 +313,7 @@ android:id="@+id/cl_ai_pm_meeting_progress_troubleshooting" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="15dp" + android:layout_marginStart="25dp" android:layout_marginTop="20dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/cl_ai_pm_meeting_progress_topic"> @@ -333,7 +333,7 @@ android:gravity="start" android:text="트러블슈팅 공유" android:textColor="@color/olive_black" - android:textSize="13sp" + android:textSize="15dp" app:layout_constraintBottom_toBottomOf="@+id/cb_ai_pm_meeting_progress_troubleshooting" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/cb_ai_pm_meeting_progress_troubleshooting" @@ -345,7 +345,6 @@ android:layout_width="match_parent" android:layout_height="50dp" android:layout_marginHorizontal="50dp" - android:layout_marginTop="40dp" android:layout_marginBottom="30dp" android:background="@drawable/submit_button_background" android:fontFamily="@font/pretendardbold" @@ -356,8 +355,7 @@ android:textSize="15sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/cl_ai_pm_meeting_progress_troubleshooting" /> + app:layout_constraintStart_toStartOf="parent" /> \ No newline at end of file diff --git a/feature/projects/src/main/res/layout/fragment_select_matching_conditions.xml b/feature/projects/src/main/res/layout/fragment_select_matching_conditions.xml index 10361f4..2c73a26 100644 --- a/feature/projects/src/main/res/layout/fragment_select_matching_conditions.xml +++ b/feature/projects/src/main/res/layout/fragment_select_matching_conditions.xml @@ -9,8 +9,8 @@ android:id="@+id/iv_matching_bot" android:layout_width="50dp" android:layout_height="30dp" - android:layout_marginStart="15dp" - android:layout_marginTop="10dp" + android:layout_marginStart="25dp" + android:layout_marginTop="25dp" android:src="@drawable/ai_matching_bot" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -33,9 +33,9 @@ android:id="@+id/ai_matching_description" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginStart="15dp" + android:layout_marginStart="25dp" android:layout_marginTop="10dp" - android:layout_marginEnd="15dp" + android:layout_marginEnd="25dp" android:fontFamily="@font/pretendardregular" android:gravity="start" android:text="@string/ai_matching_description" @@ -50,7 +50,7 @@ android:id="@+id/tv_matching_dev_stack_title" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="20dp" + android:layout_marginStart="25dp" android:layout_marginTop="20dp" android:fontFamily="@font/pretendardmedium" android:text="@string/tv_matching_dev_stack_title" @@ -66,13 +66,13 @@ android:layout_marginStart="30dp" android:layout_marginTop="10dp" android:layout_marginEnd="20dp" - android:background="@drawable/stack_background" - android:fontFamily="@font/pretendardmedium" + android:background="@drawable/dialog_button_background_main_olive" + android:fontFamily="@font/pretendardbold" android:gravity="center" android:padding="12dp" android:text="@string/dev_part" android:textColor="@color/olive_black" - android:textSize="10sp" + android:textSize="11sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/tv_matching_dev_stack_title" /> @@ -83,13 +83,13 @@ android:layout_marginStart="20dp" android:layout_marginTop="10dp" android:layout_marginEnd="20dp" - android:background="@drawable/stack_background" - android:fontFamily="@font/pretendardmedium" + android:background="@drawable/dialog_button_background_main_olive" + android:fontFamily="@font/pretendardbold" android:gravity="center" android:padding="12dp" android:text="@string/dev_language" android:textColor="@color/olive_black" - android:textSize="10sp" + android:textSize="11sp" app:layout_constraintStart_toEndOf="@+id/tv_dev_part" app:layout_constraintTop_toBottomOf="@+id/tv_matching_dev_stack_title" /> @@ -100,13 +100,13 @@ android:layout_marginStart="20dp" android:layout_marginTop="10dp" android:layout_marginEnd="20dp" - android:background="@drawable/stack_background" - android:fontFamily="@font/pretendardmedium" + android:background="@drawable/dialog_button_background_main_olive" + android:fontFamily="@font/pretendardbold" android:gravity="center" android:padding="12dp" android:text="@string/dev_tech_stack" android:textColor="@color/olive_black" - android:textSize="10sp" + android:textSize="11sp" app:layout_constraintStart_toEndOf="@+id/tv_dev_language" app:layout_constraintTop_toBottomOf="@+id/tv_matching_dev_stack_title" /> @@ -114,7 +114,7 @@ android:id="@+id/tv_student_id_title" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="20dp" + android:layout_marginStart="25dp" android:layout_marginTop="20dp" android:fontFamily="@font/pretendardmedium" android:text="@string/tv_student_id_title" @@ -131,7 +131,7 @@ android:layout_marginTop="40dp" android:gravity="center" android:padding="12dp" - android:layout_marginStart="20dp" + android:layout_marginStart="25dp" android:text="@string/min" android:fontFamily="@font/pretendardmedium" android:textColor="@color/olive_black" @@ -204,7 +204,7 @@ android:id="@+id/et_matching_description" android:layout_width="match_parent" android:layout_height="0dp" - android:layout_marginHorizontal="15dp" + android:layout_marginHorizontal="25dp" android:layout_marginTop="20dp" android:background="@drawable/projects_background_olive" android:gravity="start" @@ -221,7 +221,7 @@ android:id="@+id/cb_project_experience" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="20dp" + android:layout_marginStart="25dp" android:layout_marginTop="20dp" android:fontFamily="@font/pretendardregular" android:text="@string/cb_project_experience" diff --git a/feature/projects/src/main/res/layout/fragment_start_progress_meeting.xml b/feature/projects/src/main/res/layout/fragment_start_progress_meeting.xml index a6fa402..6a833c3 100644 --- a/feature/projects/src/main/res/layout/fragment_start_progress_meeting.xml +++ b/feature/projects/src/main/res/layout/fragment_start_progress_meeting.xml @@ -13,7 +13,7 @@ android:id="@+id/iv_pm" android:layout_width="60dp" android:layout_height="60dp" - android:layout_margin="15dp" + android:layout_margin="25dp" android:src="@drawable/ai_pm" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -22,12 +22,12 @@ android:id="@+id/tv_pm_title" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="15dp" - android:layout_marginEnd="5dp" + android:layout_marginStart="25dp" + android:layout_marginEnd="25dp" android:fontFamily="@font/pretendardregular" android:text="@string/ai_pm_description" android:textSize="15dp" - android:layout_marginTop="10dp" + android:layout_marginTop="25dp" app:layout_constraintBottom_toBottomOf="@+id/iv_pm" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/iv_pm" @@ -37,7 +37,7 @@ android:id="@+id/tv_meeting_progress_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_margin="15dp" + android:layout_margin="25dp" android:fontFamily="@font/pretendardbold" android:text="@string/tv_meeting_progress_title" android:textColor="@color/olive_black" @@ -49,7 +49,7 @@ android:id="@+id/tv_total_time" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="18dp" + android:layout_marginStart="30dp" android:layout_marginTop="15dp" android:fontFamily="@font/pretendardbold" android:text="@string/tv_total_time" @@ -76,7 +76,7 @@ android:id="@+id/tv_introduce_time" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="15dp" + android:layout_marginStart="30dp" android:layout_marginTop="15dp" android:fontFamily="@font/pretendardsemibold" android:text="@string/tv_introduce_time" @@ -103,7 +103,7 @@ android:id="@+id/tv_icebreaking_time" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="15dp" + android:layout_marginStart="30dp" android:layout_marginTop="15dp" android:fontFamily="@font/pretendardsemibold" android:text="@string/tv_icebreaking_time" @@ -131,7 +131,7 @@ android:id="@+id/tv_brainstorming_time" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="15dp" + android:layout_marginStart="30dp" android:layout_marginTop="15dp" android:fontFamily="@font/pretendardsemibold" android:text="@string/tv_brainstorming_time" @@ -159,7 +159,7 @@ android:id="@+id/tv_topic_time" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="15dp" + android:layout_marginStart="30dp" android:layout_marginTop="15dp" android:fontFamily="@font/pretendardsemibold" android:text="@string/tv_topic_time" @@ -186,7 +186,7 @@ android:id="@+id/tv_current_progress_time" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="15dp" + android:layout_marginStart="30dp" android:layout_marginTop="15dp" android:fontFamily="@font/pretendardsemibold" android:text="@string/tv_current_progress_time" @@ -213,7 +213,7 @@ android:id="@+id/tv_role_time" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="15dp" + android:layout_marginStart="30dp" android:layout_marginTop="15dp" android:fontFamily="@font/pretendardsemibold" android:text="- 역할 분담" @@ -240,7 +240,7 @@ android:id="@+id/tv_trouble_shooting_time" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="15dp" + android:layout_marginStart="30dp" android:layout_marginTop="15dp" android:fontFamily="@font/pretendardsemibold" android:text="@string/tv_trouble_shooting_time" @@ -267,7 +267,7 @@ android:id="@+id/tv_feedback_time" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="15dp" + android:layout_marginStart="30dp" android:layout_marginTop="15dp" android:fontFamily="@font/pretendardsemibold" android:text="@string/tv_feedback_time" @@ -294,7 +294,7 @@ android:id="@+id/tv_timer_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="15dp" + android:layout_marginStart="25dp" android:layout_marginTop="25dp" android:fontFamily="@font/pretendardbold" android:text="타이머" @@ -307,8 +307,8 @@ android:id="@+id/tv_timer" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_margin="15dp" - android:layout_marginStart="15dp" + android:layout_marginTop="15dp" + android:layout_marginStart="25dp" android:fontFamily="@font/pretendardbold" android:text="@string/set_timer" android:textColor="@color/main_olive" @@ -333,7 +333,7 @@ android:id="@+id/tv_current_meeting_progress" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_margin="15dp" + android:layout_margin="25dp" android:fontFamily="@font/pretendardbold" android:textColor="@color/olive_black" android:textSize="15dp" @@ -345,8 +345,8 @@ android:id="@+id/pb_timer" style="@style/Widget.AppCompat.ProgressBar.Horizontal" android:layout_width="0dp" - android:layout_height="8dp" - android:layout_marginHorizontal="22dp" + android:layout_height="20dp" + android:layout_marginHorizontal="25dp" android:layout_marginTop="5dp" android:layout_marginBottom="60dp" android:progressDrawable="@drawable/progress_bar" diff --git a/feature/projects/src/main/res/layout/fragment_submit_project.xml b/feature/projects/src/main/res/layout/fragment_submit_project.xml index a4108b1..ae4baef 100644 --- a/feature/projects/src/main/res/layout/fragment_submit_project.xml +++ b/feature/projects/src/main/res/layout/fragment_submit_project.xml @@ -71,8 +71,7 @@ android:inputType="text" android:maxLines="1" android:textColor="@color/olive_black" - android:textSize="10sp" - + android:textSize="12sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/tv_project_name" /> @@ -103,7 +102,7 @@ android:inputType="text" android:maxLines="1" android:textColor="@color/olive_black" - android:textSize="10sp" + android:textSize="12sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/tv_github_title" /> @@ -136,7 +135,7 @@ android:maxLines="1" android:paddingHorizontal="2dp" android:textColor="@color/olive_black" - android:textSize="10sp" + android:textSize="12sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/tv_project_intro_submit_title" /> From 10bee3dad379e410829118e02428cba9f3310e27 Mon Sep 17 00:00:00 2001 From: kangyuri1114 Date: Sat, 10 Aug 2024 15:44:16 +0900 Subject: [PATCH 5/7] =?UTF-8?q?[refact]:=20=EC=A0=84=EB=B0=98=EC=A0=81?= =?UTF-8?q?=EC=9D=B8=20ui=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../designer/AiDesignerViewModel.kt | 1 + .../designer/branding/BrandingFragment.kt | 4 +-- .../designer/image/ImageDesignFragment.kt | 3 +- .../fragment/SubmitProjectWithDevFragment.kt | 3 +- .../main/res/drawable/menu_selector_color.xml | 2 +- .../src/main/res/drawable/nav_color.xml | 5 +++ .../main/res/drawable/round_bottom_nav.xml | 5 +++ .../src/main/res/layout/activity_main.xml | 9 +++-- .../main/res/layout/fragment_ai_members.xml | 22 +++++++++---- .../res/layout/fragment_meeting_summary.xml | 12 +++---- .../fragment_select_matching_conditions.xml | 33 ++++++++++--------- .../projects/src/main/res/values/strings.xml | 2 +- 12 files changed, 63 insertions(+), 38 deletions(-) create mode 100644 feature/projects/src/main/res/drawable/nav_color.xml create mode 100644 feature/projects/src/main/res/drawable/round_bottom_nav.xml diff --git a/feature/projects/src/main/java/com/zucchini/ai_members/designer/AiDesignerViewModel.kt b/feature/projects/src/main/java/com/zucchini/ai_members/designer/AiDesignerViewModel.kt index 0985b0c..cdcd24f 100644 --- a/feature/projects/src/main/java/com/zucchini/ai_members/designer/AiDesignerViewModel.kt +++ b/feature/projects/src/main/java/com/zucchini/ai_members/designer/AiDesignerViewModel.kt @@ -1,5 +1,6 @@ package com.zucchini.ai_members.designer +import android.util.Log import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.zucchini.domain.repository.AiRepository diff --git a/feature/projects/src/main/java/com/zucchini/ai_members/designer/branding/BrandingFragment.kt b/feature/projects/src/main/java/com/zucchini/ai_members/designer/branding/BrandingFragment.kt index fea5e3b..47b86eb 100644 --- a/feature/projects/src/main/java/com/zucchini/ai_members/designer/branding/BrandingFragment.kt +++ b/feature/projects/src/main/java/com/zucchini/ai_members/designer/branding/BrandingFragment.kt @@ -1,6 +1,7 @@ package com.zucchini.ai_members.designer.branding import android.os.Bundle +import android.util.Log import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View @@ -40,10 +41,9 @@ class BrandingFragment : Fragment() { } private fun sendProjectBrandingInfoRequest() { - val requestProjectInfo = binding.etBrandingDescription.text.toString() - binding.btnSubmit.setOnClickListener { hideKeyboard() + val requestProjectInfo = binding.etBrandingDescription.text.toString() viewModel.getProjectBranding(requestProjectInfo) } } diff --git a/feature/projects/src/main/java/com/zucchini/ai_members/designer/image/ImageDesignFragment.kt b/feature/projects/src/main/java/com/zucchini/ai_members/designer/image/ImageDesignFragment.kt index ac8989d..84f09d3 100644 --- a/feature/projects/src/main/java/com/zucchini/ai_members/designer/image/ImageDesignFragment.kt +++ b/feature/projects/src/main/java/com/zucchini/ai_members/designer/image/ImageDesignFragment.kt @@ -38,10 +38,9 @@ class ImageDesignFragment : Fragment() { } private fun sendProjectImageRequest() { - val requestProjectInfo = binding.etImageDescription.text.toString() - binding.btnSubmitImage.setOnClickListener { hideKeyboard() + val requestProjectInfo = binding.etImageDescription.text.toString() viewModel.getProjectImage(requestProjectInfo) } } diff --git a/feature/projects/src/main/java/com/zucchini/submit/project/fragment/SubmitProjectWithDevFragment.kt b/feature/projects/src/main/java/com/zucchini/submit/project/fragment/SubmitProjectWithDevFragment.kt index 4ba4f76..e521e1b 100644 --- a/feature/projects/src/main/java/com/zucchini/submit/project/fragment/SubmitProjectWithDevFragment.kt +++ b/feature/projects/src/main/java/com/zucchini/submit/project/fragment/SubmitProjectWithDevFragment.kt @@ -1,6 +1,7 @@ package com.zucchini.submit.project.fragment import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -80,7 +81,7 @@ class SubmitProjectWithDevFragment : Fragment() { requireActivity().finish() } } else { - showShortToast(getString(R.string.fail_submit_project)) + Log.d("SubmitProjectWithDevFragment", "Failed to submit project") } }.launchIn(lifecycleScope) } diff --git a/feature/projects/src/main/res/drawable/menu_selector_color.xml b/feature/projects/src/main/res/drawable/menu_selector_color.xml index d0069dd..aa6ddd0 100644 --- a/feature/projects/src/main/res/drawable/menu_selector_color.xml +++ b/feature/projects/src/main/res/drawable/menu_selector_color.xml @@ -1,5 +1,5 @@ - + diff --git a/feature/projects/src/main/res/drawable/nav_color.xml b/feature/projects/src/main/res/drawable/nav_color.xml new file mode 100644 index 0000000..34e30af --- /dev/null +++ b/feature/projects/src/main/res/drawable/nav_color.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/feature/projects/src/main/res/drawable/round_bottom_nav.xml b/feature/projects/src/main/res/drawable/round_bottom_nav.xml new file mode 100644 index 0000000..9cc566f --- /dev/null +++ b/feature/projects/src/main/res/drawable/round_bottom_nav.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/feature/projects/src/main/res/layout/activity_main.xml b/feature/projects/src/main/res/layout/activity_main.xml index 0be7af0..61f8a21 100644 --- a/feature/projects/src/main/res/layout/activity_main.xml +++ b/feature/projects/src/main/res/layout/activity_main.xml @@ -22,11 +22,14 @@ android:id="@+id/bnv_main" android:layout_width="0dp" android:layout_height="75dp" - android:background="@color/main_olive" - app:itemActiveIndicatorStyle="@android:color/transparent" + android:background="@drawable/round_bottom_nav" + app:elevation="20dp" + app:layout_constraintVertical_bias=".9" + app:layout_constraintHeight_percent=".1" + app:itemActiveIndicatorStyle="@color/background_olive" app:itemBackground="@android:color/transparent" app:itemIconTint="@drawable/menu_selector_color" - app:itemRippleColor="@android:color/transparent" + app:itemRippleColor="@color/background_olive" app:itemTextColor="@drawable/menu_selector_color" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/feature/projects/src/main/res/layout/fragment_ai_members.xml b/feature/projects/src/main/res/layout/fragment_ai_members.xml index bdcc421..5a97909 100644 --- a/feature/projects/src/main/res/layout/fragment_ai_members.xml +++ b/feature/projects/src/main/res/layout/fragment_ai_members.xml @@ -30,23 +30,33 @@ + @@ -84,7 +94,7 @@ android:layout_width="130dp" android:layout_height="120dp" android:layout_marginStart="10dp" - android:layout_marginTop="30dp" + android:layout_marginTop="50dp" android:layout_marginBottom="100dp" android:src="@drawable/ai_designer" app:layout_constraintStart_toStartOf="parent" @@ -121,7 +131,7 @@ android:layout_width="130dp" android:layout_height="100dp" android:layout_marginStart="22dp" - android:layout_marginTop="24dp" + android:layout_marginTop="50dp" android:src="@drawable/matching_bot" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/ai_members_designer_button" /> @@ -130,7 +140,7 @@ android:id="@+id/tv_ai_matching_text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="20dp" + android:layout_marginTop="24dp" android:fontFamily="@font/pretendardbold" android:text="@string/ai_matching_bot" android:textColor="@color/olive_black" diff --git a/feature/projects/src/main/res/layout/fragment_meeting_summary.xml b/feature/projects/src/main/res/layout/fragment_meeting_summary.xml index 0760ac5..bd95681 100644 --- a/feature/projects/src/main/res/layout/fragment_meeting_summary.xml +++ b/feature/projects/src/main/res/layout/fragment_meeting_summary.xml @@ -10,8 +10,8 @@ android:id="@+id/iv_ai_pm" android:layout_width="30dp" android:layout_height="30dp" - android:layout_marginStart="15dp" - android:layout_marginTop="10dp" + android:layout_marginStart="25dp" + android:layout_marginTop="25dp" android:src="@drawable/ai_pm" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -35,7 +35,7 @@ android:id="@+id/ai_pm_summary_meeting_description" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginStart="15dp" + android:layout_marginStart="25dp" android:layout_marginTop="10dp" android:layout_marginEnd="15dp" android:fontFamily="@font/pretendardregular" @@ -75,7 +75,7 @@ android:id="@+id/iv_ai_designer_result" android:layout_width="30dp" android:layout_height="30dp" - android:layout_marginStart="15dp" + android:layout_marginStart="25dp" android:layout_marginTop="60dp" android:src="@drawable/ai_pm" app:layout_constraintStart_toStartOf="parent" @@ -99,9 +99,9 @@ android:id="@+id/ai_pm_summary_meeting_result" android:layout_width="match_parent" android:layout_height="0dp" - android:layout_marginStart="15dp" + android:layout_marginStart="25dp" android:layout_marginTop="10dp" - android:layout_marginEnd="15dp" + android:layout_marginEnd="25dp" android:layout_marginBottom="10dp" android:background="@drawable/projects_background_olive" android:fontFamily="@font/pretendardregular" diff --git a/feature/projects/src/main/res/layout/fragment_select_matching_conditions.xml b/feature/projects/src/main/res/layout/fragment_select_matching_conditions.xml index 2c73a26..8f91442 100644 --- a/feature/projects/src/main/res/layout/fragment_select_matching_conditions.xml +++ b/feature/projects/src/main/res/layout/fragment_select_matching_conditions.xml @@ -1,7 +1,5 @@ - @@ -66,13 +64,14 @@ android:layout_marginStart="30dp" android:layout_marginTop="10dp" android:layout_marginEnd="20dp" - android:background="@drawable/dialog_button_background_main_olive" + android:background="@drawable/stack_background" android:fontFamily="@font/pretendardbold" android:gravity="center" android:padding="12dp" android:text="@string/dev_part" android:textColor="@color/olive_black" android:textSize="11sp" + app:elevation="10dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/tv_matching_dev_stack_title" /> @@ -83,13 +82,14 @@ android:layout_marginStart="20dp" android:layout_marginTop="10dp" android:layout_marginEnd="20dp" - android:background="@drawable/dialog_button_background_main_olive" + android:background="@drawable/stack_background" android:fontFamily="@font/pretendardbold" android:gravity="center" android:padding="12dp" android:text="@string/dev_language" android:textColor="@color/olive_black" android:textSize="11sp" + app:elevation="10dp" app:layout_constraintStart_toEndOf="@+id/tv_dev_part" app:layout_constraintTop_toBottomOf="@+id/tv_matching_dev_stack_title" /> @@ -100,13 +100,14 @@ android:layout_marginStart="20dp" android:layout_marginTop="10dp" android:layout_marginEnd="20dp" - android:background="@drawable/dialog_button_background_main_olive" + android:background="@drawable/stack_background" android:fontFamily="@font/pretendardbold" android:gravity="center" android:padding="12dp" android:text="@string/dev_tech_stack" android:textColor="@color/olive_black" android:textSize="11sp" + app:elevation="10dp" app:layout_constraintStart_toEndOf="@+id/tv_dev_language" app:layout_constraintTop_toBottomOf="@+id/tv_matching_dev_stack_title" /> @@ -128,12 +129,12 @@ android:id="@+id/tv_min_student_id" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginStart="25dp" android:layout_marginTop="40dp" + android:fontFamily="@font/pretendardmedium" android:gravity="center" android:padding="12dp" - android:layout_marginStart="25dp" android:text="@string/min" - android:fontFamily="@font/pretendardmedium" android:textColor="@color/olive_black" android:textSize="12sp" app:layout_constraintStart_toStartOf="parent" @@ -144,8 +145,8 @@ android:layout_width="45dp" android:layout_height="100dp" android:gravity="center_horizontal" - app:layout_constraintStart_toEndOf="@+id/tv_min_student_id" app:layout_constraintBottom_toBottomOf="@+id/tv_min_student_id" + app:layout_constraintStart_toEndOf="@+id/tv_min_student_id" app:layout_constraintTop_toTopOf="@+id/tv_min_student_id" /> + app:layout_constraintStart_toStartOf="parent" /> \ No newline at end of file diff --git a/feature/projects/src/main/res/values/strings.xml b/feature/projects/src/main/res/values/strings.xml index 3a3a583..26bf082 100644 --- a/feature/projects/src/main/res/values/strings.xml +++ b/feature/projects/src/main/res/values/strings.xml @@ -141,7 +141,7 @@ 함께한 개발자 추가하러 가기 다음 프로젝트 등록에 실패했습니다. 입력 값을 다시 확인해주세요. - 프로젝트가 등록습니다. + 프로젝트가 등록되었습니다. 개발자 매칭 봇 프로젝트 경험이 있는 팀원을 찾고 있어요 최소 From 26d6867b682748cc81efa14c39ac2b2139c6162d Mon Sep 17 00:00:00 2001 From: kangyuri1114 Date: Mon, 12 Aug 2024 17:14:14 +0900 Subject: [PATCH 6/7] =?UTF-8?q?[refact]:=20=EA=B0=9C=EB=B0=9C=EC=9E=90=20?= =?UTF-8?q?=EC=B6=94=EC=B2=9C=20=EA=B2=B0=EA=B3=BC=20=ED=99=94=EB=A9=B4=20?= =?UTF-8?q?ui=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20=EB=B0=98=ED=99=98=20?= =?UTF-8?q?=EA=B2=B0=EA=B3=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reponse/DeveloperMatchingResponse.kt | 6 + .../zucchini/mapper/ProgressMeetingMapper.kt | 3 + .../domain/model/ai/MatchingResult.kt | 3 + .../matching/MatchingResultFragment.kt | 11 + .../res/layout/fragment_matching_result.xml | 222 +++++++++++++++--- 5 files changed, 207 insertions(+), 38 deletions(-) diff --git a/core/network/src/main/java/com/sample/network/reponse/DeveloperMatchingResponse.kt b/core/network/src/main/java/com/sample/network/reponse/DeveloperMatchingResponse.kt index b2303b5..4534468 100644 --- a/core/network/src/main/java/com/sample/network/reponse/DeveloperMatchingResponse.kt +++ b/core/network/src/main/java/com/sample/network/reponse/DeveloperMatchingResponse.kt @@ -11,4 +11,10 @@ data class DeveloperMatchingResponse( val name: String?, @SerialName("email") val email: String?, + @SerialName("part1") + val part1: String?, + @SerialName("part2") + val part2: String?, + @SerialName("shortIntro") + val shortIntro: String?, ) \ No newline at end of file diff --git a/data/src/main/java/com/zucchini/mapper/ProgressMeetingMapper.kt b/data/src/main/java/com/zucchini/mapper/ProgressMeetingMapper.kt index 24ef2d0..6c641cb 100644 --- a/data/src/main/java/com/zucchini/mapper/ProgressMeetingMapper.kt +++ b/data/src/main/java/com/zucchini/mapper/ProgressMeetingMapper.kt @@ -41,5 +41,8 @@ internal fun List.toMatchingResult(): List @@ -67,7 +67,7 @@ android:fontFamily="@font/pretendardbold" android:gravity="start" android:textColor="@color/olive_black" - android:textSize="14sp" + android:textSize="18sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" tools:text="Name" /> @@ -76,32 +76,81 @@ android:id="@+id/tv_developer_email1" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginHorizontal="2dp" - android:layout_marginTop="5dp" + android:layout_marginTop="6dp" android:ellipsize="end" android:fontFamily="@font/pretendardmedium" android:gravity="center" - android:maxLines="2" - android:textColor="@color/white" + android:maxLines="1" + android:textColor="@color/gray3" android:textSize="10sp" + app:layout_constraintStart_toStartOf="@id/tv_developer1_part1" + app:layout_constraintTop_toBottomOf="@+id/tv_developer1_part1" + tools:text="yuri1231231231ssss23@naver.com" /> + + + + + + + app:layout_constraintStart_toStartOf="@+id/tv_developer1_part1" + app:layout_constraintTop_toBottomOf="@+id/tv_developer_email1" + tools:text="ssssssssssssssssssssssssddddddddddddddddsssdddddddssssssssssssssssssssssssssssssssssss" /> + + + + + app:layout_constraintTop_toBottomOf="@+id/v_divider1"> @@ -121,32 +170,82 @@ android:id="@+id/tv_developer_email2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginHorizontal="2dp" - android:layout_marginTop="5dp" + android:layout_marginTop="6dp" android:ellipsize="end" android:fontFamily="@font/pretendardmedium" android:gravity="center" - android:maxLines="2" - android:textColor="@color/white" + android:maxLines="1" + android:textColor="@color/gray3" android:textSize="10sp" + app:layout_constraintStart_toStartOf="@id/tv_developer2_part1" + app:layout_constraintTop_toBottomOf="@+id/tv_developer2_part1" + tools:text="yuri1231231231ssss23@naver.com" /> + + + + + + + + app:layout_constraintStart_toStartOf="@+id/tv_developer2_part1" + app:layout_constraintTop_toBottomOf="@+id/tv_developer_email2" + tools:text="ssssssssssssssssssssssssddddddddddddddddsssdddddddssssssssssssssssssssssssssssssssssss" /> + + + + + app:layout_constraintTop_toBottomOf="@+id/v_divider2"> @@ -166,20 +265,67 @@ android:id="@+id/tv_developer_email3" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginHorizontal="2dp" - android:layout_marginTop="5dp" + android:layout_marginVertical="5dp" android:ellipsize="end" android:fontFamily="@font/pretendardmedium" android:gravity="center" - android:maxLines="2" - android:textColor="@color/white" + android:maxLines="1" + android:textColor="@color/gray3" android:textSize="10sp" + app:layout_constraintStart_toStartOf="@id/tv_developer3_part1" + app:layout_constraintTop_toBottomOf="@+id/tv_developer3_part1" + tools:text="yuri1231231231ssss23@naver.com" /> + + + + + + + app:layout_constraintStart_toStartOf="@+id/tv_developer3_part1" + app:layout_constraintTop_toBottomOf="@+id/tv_developer_email3" + tools:text="ssssssssssssssssssssssssddddddddddddddddsssdddddddssssssssssssssssssssssssssssssssssss" /> + + + From a2b125d4620a5a55e353729ebf7101da0baaa932 Mon Sep 17 00:00:00 2001 From: kangyuri1114 Date: Mon, 12 Aug 2024 17:42:59 +0900 Subject: [PATCH 7/7] =?UTF-8?q?[refact]:=20=EA=B0=9C=EB=B0=9C=EC=9E=90=20?= =?UTF-8?q?=EC=B6=94=EC=B2=9C=20=EA=B2=B0=EA=B3=BC=20=ED=99=94=EB=A9=B4=20?= =?UTF-8?q?ui=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20=EB=B0=98=ED=99=98=20?= =?UTF-8?q?=EA=B2=B0=EA=B3=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/layout/fragment_matching_result.xml | 41 ++++++++----------- 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/feature/projects/src/main/res/layout/fragment_matching_result.xml b/feature/projects/src/main/res/layout/fragment_matching_result.xml index 505f494..35b58c8 100644 --- a/feature/projects/src/main/res/layout/fragment_matching_result.xml +++ b/feature/projects/src/main/res/layout/fragment_matching_result.xml @@ -9,8 +9,8 @@ android:id="@+id/iv_bot" android:layout_width="30dp" android:layout_height="30dp" - android:layout_marginStart="15dp" - android:layout_marginTop="10dp" + android:layout_marginStart="25dp" + android:layout_marginTop="25dp" android:src="@drawable/matching_bot" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -34,8 +34,8 @@ android:id="@+id/ai_matching_result_description" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginStart="15dp" - android:layout_marginTop="10dp" + android:layout_marginStart="25dp" + android:layout_marginTop="15dp" android:layout_marginEnd="15dp" android:fontFamily="@font/pretendardregular" android:gravity="start" @@ -52,6 +52,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="20dp" android:layout_marginTop="60dp" + android:background="@drawable/stack_background" android:paddingHorizontal="15dp" android:paddingVertical="20dp" app:layout_constraintEnd_toEndOf="parent" @@ -133,12 +134,12 @@ android:id="@+id/v_divider1" android:layout_width="match_parent" android:layout_height="2dp" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toBottomOf="@+id/cl_matching_result_dev_info1" - android:background="@color/gray1" android:layout_marginHorizontal="20dp" - android:layout_marginTop="20dp" /> + android:layout_marginTop="20dp" + android:background="@color/gray1" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/cl_matching_result_dev_info1" /> + android:layout_marginTop="20dp" + android:background="@color/gray1" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/cl_matching_result_dev_info2" /> - -