Merge branch 'main' into fix/#160-home-qa-v2

depromeet · Aug 29, 2024 · 8e42b4b · 8e42b4b
2 parents 83d0bf0 + f4e595e
commit 8e42b4b
Show file tree

Hide file tree

Showing 55 changed files with 1 addition and 780 deletions.
diff --git a/presentation/src/main/java/com/dpm/presentation/viewfinder/StadiumActivity.kt b/presentation/src/main/java/com/dpm/presentation/viewfinder/StadiumActivity.kt
@@ -71,7 +71,7 @@ class StadiumActivity : BaseActivity<ActivityStadiumBinding>({
         private const val MIME_TYPE_TEXT_HTML = "text/html"
 
         private const val BOTTOM_SHEET_PEEK_HEIGHT = 76 // 바텀 시트 peek 높이
-        private const val BUTTON_BOTTOM_MARGIN = 24 // 버튼과 바텀 시트 사이 간격
+        private const val BUTTON_BOTTOM_MARGIN = 22 // 버튼과 바텀 시트 사이 간격
 
         private const val TIP_CONTAINER_HORIZONTAL_MARGIN = 16
     }

diff --git a/presentation/src/main/res/drawable/circle_0c0c0c_fill.xml b/presentation/src/main/res/drawable/circle_0c0c0c_fill.xml
diff --git a/presentation/src/main/res/drawable/circle_gray400_fill.xml b/presentation/src/main/res/drawable/circle_gray400_fill.xml
diff --git a/presentation/src/main/res/drawable/circle_t_black02_fill.xml b/presentation/src/main/res/drawable/circle_t_black02_fill.xml
diff --git a/presentation/src/main/res/drawable/circlr_gray900_fill.xml b/presentation/src/main/res/drawable/circlr_gray900_fill.xml
diff --git a/presentation/src/main/res/drawable/ic_back.xml b/presentation/src/main/res/drawable/ic_back.xml
diff --git a/presentation/src/main/res/drawable/ic_check.xml b/presentation/src/main/res/drawable/ic_check.xml
diff --git a/presentation/src/main/res/drawable/ic_check_image.xml b/presentation/src/main/res/drawable/ic_check_image.xml
diff --git a/presentation/src/main/res/drawable/ic_close.xml b/presentation/src/main/res/drawable/ic_close.xml
diff --git a/presentation/src/main/res/drawable/ic_delete.xml b/presentation/src/main/res/drawable/ic_delete.xml
diff --git a/presentation/src/main/res/drawable/ic_delete_image.xml b/presentation/src/main/res/drawable/ic_delete_image.xml
diff --git a/presentation/src/main/res/drawable/ic_down.xml b/presentation/src/main/res/drawable/ic_down.xml
diff --git a/presentation/src/main/res/drawable/ic_edit.xml b/presentation/src/main/res/drawable/ic_edit.xml
diff --git a/presentation/src/main/res/drawable/ic_folder_blue.xml b/presentation/src/main/res/drawable/ic_folder_blue.xml
diff --git a/presentation/src/main/res/drawable/ic_highlight_off.png b/presentation/src/main/res/drawable/ic_highlight_off.png
diff --git a/presentation/src/main/res/drawable/ic_highlight_on.png b/presentation/src/main/res/drawable/ic_highlight_on.png
diff --git a/presentation/src/main/res/drawable/ic_image_error.png b/presentation/src/main/res/drawable/ic_image_error.png
diff --git a/presentation/src/main/res/drawable/ic_pencil.xml b/presentation/src/main/res/drawable/ic_pencil.xml
diff --git a/presentation/src/main/res/drawable/ic_register_sight.png b/presentation/src/main/res/drawable/ic_register_sight.png
diff --git a/presentation/src/main/res/drawable/ic_reload.xml b/presentation/src/main/res/drawable/ic_reload.xml
diff --git a/presentation/src/main/res/drawable/ic_review_done.xml b/presentation/src/main/res/drawable/ic_review_done.xml
diff --git a/presentation/src/main/res/drawable/ic_sight_seeing.png b/presentation/src/main/res/drawable/ic_sight_seeing.png
diff --git a/presentation/src/main/res/drawable/ic_signup_complete.png b/presentation/src/main/res/drawable/ic_signup_complete.png
diff --git a/presentation/src/main/res/drawable/ic_signup_complete_main.png b/presentation/src/main/res/drawable/ic_signup_complete_main.png
diff --git a/presentation/src/main/res/drawable/ic_solid.xml b/presentation/src/main/res/drawable/ic_solid.xml
diff --git a/presentation/src/main/res/drawable/ic_splash_big_logo.png b/presentation/src/main/res/drawable/ic_splash_big_logo.png
diff --git a/presentation/src/main/res/drawable/ic_uncheck_image.xml b/presentation/src/main/res/drawable/ic_uncheck_image.xml
diff --git a/presentation/src/main/res/drawable/ic_upload_seat_view_image.xml b/presentation/src/main/res/drawable/ic_upload_seat_view_image.xml