diff --git a/app/src/main/java/com/sopt/geonppang/presentation/detail/DetailActivity.kt b/app/src/main/java/com/sopt/geonppang/presentation/detail/DetailActivity.kt index 4867d791..9bcbf3fb 100644 --- a/app/src/main/java/com/sopt/geonppang/presentation/detail/DetailActivity.kt +++ b/app/src/main/java/com/sopt/geonppang/presentation/detail/DetailActivity.kt @@ -138,6 +138,11 @@ class DetailActivity : BindingActivity(R.layout.activity_ binding.root, getString(R.string.snackbar_save) ) + } else { + CustomSnackbar.makeSnackbar( + binding.root, + getString(R.string.snackbar_save_cancel) + ) } } diff --git a/app/src/main/res/layout/activity_report.xml b/app/src/main/res/layout/activity_report.xml index b11d2044..aeb3cd3e 100644 --- a/app/src/main/res/layout/activity_report.xml +++ b/app/src/main/res/layout/activity_report.xml @@ -65,117 +65,159 @@ app:layout_constraintStart_toStartOf="@+id/gl_start" app:layout_constraintTop_toTopOf="parent" /> - + app:layout_constraintTop_toBottomOf="@id/tv_report_category"> - - - + - + + + + - - + android:padding="8dp" + app:layout_constraintStart_toStartOf="@id/layout_report_category_advertising" + app:layout_constraintTop_toBottomOf="@id/layout_report_category_advertising"> - + + + + + + - - + android:padding="8dp" + app:layout_constraintStart_toStartOf="@id/layout_report_category_hate" + app:layout_constraintTop_toBottomOf="@id/layout_report_category_hate"> - + + + + + + + android:padding="8dp" + app:layout_constraintStart_toStartOf="@id/layout_report_category_copyright" + app:layout_constraintTop_toBottomOf="@id/layout_report_category_copyright"> + + + + + + app:layout_constraintTop_toBottomOf="@id/layout_report_category_etc" /> - - - - - - - - - - - - - - - - - + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_main_purpose_filter.xml b/app/src/main/res/layout/fragment_main_purpose_filter.xml index 962244f5..4511e862 100644 --- a/app/src/main/res/layout/fragment_main_purpose_filter.xml +++ b/app/src/main/res/layout/fragment_main_purpose_filter.xml @@ -19,103 +19,123 @@ android:layout_height="match_parent" tools:context=".presentation.filterSetting.MainPurposeFilterActivity"> - - - - - - - - - - - - - + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> - - - - - - + android:paddingBottom="@dimen/spacing24"> + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_my_page.xml b/app/src/main/res/layout/fragment_my_page.xml index 2fe6c2fa..f0c2d467 100644 --- a/app/src/main/res/layout/fragment_my_page.xml +++ b/app/src/main/res/layout/fragment_my_page.xml @@ -112,9 +112,8 @@ android:id="@+id/iv_my_page_profile_right_arrow" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="21dp" - android:layout_marginEnd="5dp" - android:padding="12dp" + android:layout_marginTop="33dp" + android:layout_marginEnd="17dp" android:src="@drawable/ic_arrow_right" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@+id/chip_my_page_profile_purpose" /> @@ -142,11 +141,12 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:layout_marginEnd="17dp" + android:layout_marginEnd="29dp" android:paddingBottom="8dp" app:chipSpacing="4dp" app:chipSpacingHorizontal="4dp" app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> @@ -381,11 +381,12 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/spacing24" - android:layout_marginTop="8dp" + android:layout_marginVertical="8dp" android:paddingVertical="13dp" android:text="@string/my_page_withdraw" android:textAppearance="@style/TextAppearance.BodyM2" android:textColor="@color/gray_400" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tv_my_page_logout" /> diff --git a/app/src/main/res/layout/fragment_nutrient_type_filter.xml b/app/src/main/res/layout/fragment_nutrient_type_filter.xml index 4789511a..8907863f 100644 --- a/app/src/main/res/layout/fragment_nutrient_type_filter.xml +++ b/app/src/main/res/layout/fragment_nutrient_type_filter.xml @@ -17,95 +17,113 @@ android:layout_height="match_parent" tools:context=".presentation.filterSetting.NutrientTypeFilterActivity"> - - - - - - - - - - - - - + android:layout_height="0dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_detail_bakery_info.xml b/app/src/main/res/layout/item_detail_bakery_info.xml index ada34af2..7b1a798a 100644 --- a/app/src/main/res/layout/item_detail_bakery_info.xml +++ b/app/src/main/res/layout/item_detail_bakery_info.xml @@ -86,6 +86,11 @@ android:id="@+id/tv_item_detail_bakery_info_bakery_name" android:layout_width="0dp" android:layout_height="wrap_content" + android:autoSizeMaxTextSize="24dp" + android:autoSizeMinTextSize="20dp" + android:autoSizeStepGranularity="4dp" + android:autoSizeTextType="uniform" + android:maxLines="1" android:text="@{bakeryInfo.bakeryName}" android:textAppearance="@style/TextAppearance.Title1" android:textColor="@color/gray_700" @@ -201,7 +206,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="24dp" - android:paddingBottom="20dp" + android:paddingBottom="19dp" app:layout_constraintEnd_toEndOf="@id/gl_end" app:layout_constraintStart_toStartOf="@+id/gl_start" app:layout_constraintTop_toBottomOf="@+id/view_item_detail_bakery_info_first_line"> @@ -244,7 +249,7 @@ visibility="@{!bakeryInfo.homepageUrl.isEmpty() || !bakeryInfo.instagramUrl.isEmpty()}" android:layout_width="0dp" android:layout_height="wrap_content" - android:paddingBottom="16dp" + android:paddingBottom="18dp" app:layout_constraintEnd_toStartOf="@+id/gl_end" app:layout_constraintStart_toStartOf="@+id/gl_start" app:layout_constraintTop_toBottomOf="@+id/layout_item_detail_bakery_info"> @@ -253,6 +258,8 @@ android:id="@+id/iv_item_detail_bakery_info_link" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginTop="1dp" + android:paddingEnd="6dp" android:src="@drawable/ic_link" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -262,26 +269,30 @@ visibility="@{!bakeryInfo.homepageUrl.isEmpty()}" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="12dp" + android:layout_marginStart="4dp" + android:layout_marginEnd="4dp" + android:paddingHorizontal="2dp" + android:paddingVertical="4dp" android:text="@string/detail_homepage" android:textAppearance="@style/TextAppearance.Subhead" android:textColor="@color/gray_400" - app:layout_constraintBottom_toBottomOf="@+id/iv_item_detail_bakery_info_link" + app:layout_constraintEnd_toStartOf="@id/tv_item_detail_bakery_info_instagram" app:layout_constraintStart_toEndOf="@+id/iv_item_detail_bakery_info_link" - app:layout_constraintTop_toTopOf="@+id/iv_item_detail_bakery_info_link" /> + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/item_detail_review.xml b/app/src/main/res/layout/item_detail_review.xml index a11fc934..d3470aec 100644 --- a/app/src/main/res/layout/item_detail_review.xml +++ b/app/src/main/res/layout/item_detail_review.xml @@ -57,7 +57,7 @@ android:id="@+id/tv_item_detail_review_date" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginEnd="11dp" + android:layout_marginEnd="7dp" android:text="@{review.createdAt}" android:textAppearance="@style/TextAppearance.CaptionM1" android:textColor="@color/gray_400" @@ -70,11 +70,13 @@ android:id="@+id/tv_item_detail_review_report" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginEnd="23dp" + android:padding="4dp" android:text="@string/detail_declare" android:textAppearance="@style/TextAppearance.CaptionM1" android:textColor="@color/gray_300" app:layout_constraintBottom_toBottomOf="@+id/iv_item_detail_review_profile_img" - app:layout_constraintEnd_toStartOf="@+id/gl_end" + app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@+id/iv_item_detail_review_profile_img" /> - + android:layout_marginHorizontal="@dimen/spacing12" + android:layout_marginTop="5dp" + app:layout_constraintBottom_toBottomOf="@+id/iv_speech_bubble" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> - + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 60da7733..14453559 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -102,6 +102,7 @@ 저장되었어요 ! + 저장이 취소되었어요 ! 정렬 @@ -186,14 +187,14 @@ 리뷰 신고 - 신고하려는 사유를 선택해주세요! + 신고하려는 사유를 선택해 주세요! 홍보 및 신뢰할 수 없는 게시물 욕설, 음란어, 혐오 발언 사용 명예훼손, 저작권 침해 그 외 다른 문제 자세한 신고 사유는 아래 적어주세요! - 신고 내용을 입력해주세요. + 신고 내용을 입력해 주세요. %d/140자 여러분의 신고를 바탕으로 깨끗한 리뷰를 제공해 드릴 수 있도록 노력하겠습니다.