[chore/#60] 수정사항 및 통계 세부사항 화면 반영

blueme0 · Jun 11, 2024 · 654348d · 654348d
1 parent bc97e3c
commit 654348d
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 18 deletions.
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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -21,7 +21,7 @@
             android:layout_height="65dp"
             android:background="@color/appbar_background"
             app:layout_constraintTop_toTopOf="parent"
-            />
+            tools:layout_editor_absoluteX="0dp" />
 
         <LinearLayout
             android:id="@+id/ll_back"
@@ -41,23 +41,31 @@
                 android:src="@drawable/ic_arrow_left"
                 />
 
-            <View
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="match_parent"
-                />
-
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="이전 화면으로"
                 android:fontFamily="@font/nanumsquare_regular"
                 android:textColor="#000000"
                 android:textSize="16sp"
-                android:layout_marginEnd="10dp"
+                android:layout_marginStart="10dp"
                 />
         </LinearLayout>
 
+        <TextView
+            android:id="@+id/tv_delete"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="삭제하기"
+            android:fontFamily="@font/nanumsquare_regular"
+            android:textColor="#000000"
+            android:textSize="16sp"
+            app:layout_constraintTop_toTopOf="@id/ll_back"
+            app:layout_constraintBottom_toBottomOf="@id/ll_back"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:paddingHorizontal="25dp"
+            />
+
         <ScrollView
             android:layout_width="match_parent"
             android:layout_height="0dp"

diff --git a/app/src/main/res/layout/activity_review_folder.xml b/app/src/main/res/layout/activity_review_folder.xml
@@ -161,7 +161,7 @@
 
         <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
             android:id="@+id/fab"
-            android:layout_width="133dp"
+            android:layout_width="153dp"
             android:layout_height="47dp"
             android:layout_gravity="end|bottom"
             android:layout_marginBottom="32dp"