diff --git a/app/src/main/java/com/chaeda/chaeda/presentation/review/add/AddProblemPhotoActivity.kt b/app/src/main/java/com/chaeda/chaeda/presentation/review/add/AddProblemPhotoActivity.kt index 8f02172..569a056 100644 --- a/app/src/main/java/com/chaeda/chaeda/presentation/review/add/AddProblemPhotoActivity.kt +++ b/app/src/main/java/com/chaeda/chaeda/presentation/review/add/AddProblemPhotoActivity.kt @@ -311,7 +311,7 @@ class AddProblemPhotoActivity private fun initListener() { with(binding) { - ivBack.setOnSingleClickListener { + llBack.setOnSingleClickListener { finish() } diff --git a/app/src/main/java/com/chaeda/chaeda/presentation/review/add/AddProblemViewModel.kt b/app/src/main/java/com/chaeda/chaeda/presentation/review/add/AddProblemViewModel.kt index 3ffe11c..1ed4092 100644 --- a/app/src/main/java/com/chaeda/chaeda/presentation/review/add/AddProblemViewModel.kt +++ b/app/src/main/java/com/chaeda/chaeda/presentation/review/add/AddProblemViewModel.kt @@ -110,7 +110,7 @@ class AddProblemViewModel @Inject constructor( } companion object { - private const val DATE_REGEX = "^(\\d{4}).(\\d{2}).(\\d{2})\$" + private const val DATE_REGEX = "^(\\d{4})-(\\d{2})-(\\d{2})\$" const val IMAGE_TYPE_HOMEWORK_THUMBNAIL = "HOMEWORK_THUMBNAIL" const val IMAGE_TYPE_REVIEW_NOTE_PROBLEM = "REVIEW_NOTE_PROBLEM" } diff --git a/app/src/main/java/com/chaeda/chaeda/presentation/review/box/ProblemBoxActivity.kt b/app/src/main/java/com/chaeda/chaeda/presentation/review/box/ProblemBoxActivity.kt index 9a5bd03..dff4b57 100644 --- a/app/src/main/java/com/chaeda/chaeda/presentation/review/box/ProblemBoxActivity.kt +++ b/app/src/main/java/com/chaeda/chaeda/presentation/review/box/ProblemBoxActivity.kt @@ -36,8 +36,7 @@ class ProblemBoxActivity initView() initListener() } - - + binding.llBack.setOnSingleClickListener { finish() } observe() } diff --git a/app/src/main/java/com/chaeda/chaeda/presentation/review/folder/ReviewFolderActivity.kt b/app/src/main/java/com/chaeda/chaeda/presentation/review/folder/ReviewFolderActivity.kt index 0f28287..480fef7 100644 --- a/app/src/main/java/com/chaeda/chaeda/presentation/review/folder/ReviewFolderActivity.kt +++ b/app/src/main/java/com/chaeda/chaeda/presentation/review/folder/ReviewFolderActivity.kt @@ -54,6 +54,10 @@ class ReviewFolderActivity private fun initListener() { with(binding) { + llBack.setOnSingleClickListener { + finish() + } + if (id != -1L) { tvFab.text = "오답 폴더 수정하기" etTitle.text.insert(0, title) diff --git a/app/src/main/java/com/chaeda/chaeda/presentation/review/folder/SelectProblemsActivity.kt b/app/src/main/java/com/chaeda/chaeda/presentation/review/folder/SelectProblemsActivity.kt deleted file mode 100644 index 3f99279..0000000 --- a/app/src/main/java/com/chaeda/chaeda/presentation/review/folder/SelectProblemsActivity.kt +++ /dev/null @@ -1,4 +0,0 @@ -package com.chaeda.chaeda.presentation.review.folder - -class SelectProblemsActivity { -} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_add_problem_photo.xml b/app/src/main/res/layout/activity_add_problem_photo.xml index 7296dad..72a9e3c 100644 --- a/app/src/main/res/layout/activity_add_problem_photo.xml +++ b/app/src/main/res/layout/activity_add_problem_photo.xml @@ -71,7 +71,7 @@ android:layout_marginStart="46dp" android:layout_marginTop="20dp" android:fontFamily="@font/nanumsquare_regular" - android:text="틀린 날짜 입력" + android:text="틀린 날짜 입력 (ex. 2024-01-01)" android:textColor="#828282" android:textSize="14sp" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/activity_problem_box.xml b/app/src/main/res/layout/activity_problem_box.xml index 92217bd..fe0bcda 100644 --- a/app/src/main/res/layout/activity_problem_box.xml +++ b/app/src/main/res/layout/activity_problem_box.xml @@ -21,7 +21,7 @@ android:layout_height="65dp" android:background="@color/appbar_background" app:layout_constraintTop_toTopOf="parent" - /> + tools:layout_editor_absoluteX="0dp" /> - - + +