diff --git a/app/src/main/java/com/runnect/runnect/presentation/mypage/history/MyHistoryActivity.kt b/app/src/main/java/com/runnect/runnect/presentation/mypage/history/MyHistoryActivity.kt index 3176e7cfc..e960d8c18 100644 --- a/app/src/main/java/com/runnect/runnect/presentation/mypage/history/MyHistoryActivity.kt +++ b/app/src/main/java/com/runnect/runnect/presentation/mypage/history/MyHistoryActivity.kt @@ -247,7 +247,7 @@ class MyHistoryActivity : BindingActivity(R.layout.act companion object { const val CHOICE_MODE_DESC = "기록 선택" const val EDIT_CANCEL = "취소" - const val EDIT_MODE = "편집" + const val EDIT_MODE = "선택" const val DIALOG_DESC = "러닝 기록을 정말로 삭제하시겠어요?" const val DELETE_BTN = "삭제하기" const val EXTRA_HISTORY_DATA = "historyData" diff --git a/app/src/main/java/com/runnect/runnect/presentation/mypage/upload/MyUploadActivity.kt b/app/src/main/java/com/runnect/runnect/presentation/mypage/upload/MyUploadActivity.kt index fd11de0d7..c9b9de965 100644 --- a/app/src/main/java/com/runnect/runnect/presentation/mypage/upload/MyUploadActivity.kt +++ b/app/src/main/java/com/runnect/runnect/presentation/mypage/upload/MyUploadActivity.kt @@ -242,10 +242,9 @@ class MyUploadActivity : BindingActivity(R.layout.activ companion object { const val DESCRIPTION_CHOICE_MODE = "기록 선택" const val EDIT_CANCEL = "취소" - const val EDIT_MODE = "편집" + const val EDIT_MODE = "선택" const val DESCRIPTION_DIALOG = "코스를 정말로 삭제하시겠어요?" const val DELETE_BTN = "삭제하기" - const val EXTRA_PUBLIC_COURSE_ID = "publicCourseId" const val EXTRA_ROOT = "root" } diff --git a/app/src/main/java/com/runnect/runnect/presentation/storage/StorageMyDrawFragment.kt b/app/src/main/java/com/runnect/runnect/presentation/storage/StorageMyDrawFragment.kt index 22855b58b..808043794 100644 --- a/app/src/main/java/com/runnect/runnect/presentation/storage/StorageMyDrawFragment.kt +++ b/app/src/main/java/com/runnect/runnect/presentation/storage/StorageMyDrawFragment.kt @@ -194,7 +194,7 @@ class StorageMyDrawFragment : false ) } - binding.btnEditCourse.text = "편집" + binding.btnEditCourse.text = EDIT_MODE binding.tvTotalCourseCount.text = "총 코스 ${viewModel.myDrawCourses.size}개" viewModel.clearItemsToDelete() @@ -227,7 +227,7 @@ class StorageMyDrawFragment : fun deleteCourse() { viewModel.deleteMyDrawCourse() - binding.btnEditCourse.text = "편집" + binding.btnEditCourse.text = EDIT_MODE } private fun showLoadingBar() { @@ -355,6 +355,7 @@ class StorageMyDrawFragment : companion object { const val EXTRA_COURSE_ID = "courseId" const val EXTRA_ROOT = "root" + const val EDIT_MODE = "선택" } } diff --git a/app/src/main/res/drawable/radius_24_edit_course_button.xml b/app/src/main/res/drawable/radius_24_edit_course_button.xml new file mode 100644 index 000000000..09e6cdadb --- /dev/null +++ b/app/src/main/res/drawable/radius_24_edit_course_button.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/radius_50_edit_course_button.xml b/app/src/main/res/drawable/radius_50_edit_course_button.xml deleted file mode 100644 index d444fae72..000000000 --- a/app/src/main/res/drawable/radius_50_edit_course_button.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_my_history.xml b/app/src/main/res/layout/activity_my_history.xml index ad1137c78..701523555 100644 --- a/app/src/main/res/layout/activity_my_history.xml +++ b/app/src/main/res/layout/activity_my_history.xml @@ -67,7 +67,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/W1" - android:paddingVertical="4dp" + android:paddingVertical="8dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/toolbar_my_page_history"> @@ -88,12 +88,13 @@ diff --git a/app/src/main/res/layout/activity_my_upload.xml b/app/src/main/res/layout/activity_my_upload.xml index e9873e692..0a3d46121 100644 --- a/app/src/main/res/layout/activity_my_upload.xml +++ b/app/src/main/res/layout/activity_my_upload.xml @@ -85,15 +85,16 @@ diff --git a/app/src/main/res/layout/fragment_storage_my_draw.xml b/app/src/main/res/layout/fragment_storage_my_draw.xml index d281e1688..75dd038f9 100644 --- a/app/src/main/res/layout/fragment_storage_my_draw.xml +++ b/app/src/main/res/layout/fragment_storage_my_draw.xml @@ -58,15 +58,16 @@ current_location 구글로 로그인 카카오로 로그인 - 편집 + 선택 삭제하기 업로드 코스 그리기