[FEAT] 탐색화면의 이동 로직 추가 #82 (#83)

* [FEAT] #82 - 탐색 화면에서 검색 화면으로 이동 * [FEAT] #82 - 검색 화면의 Padding 제거
YAPP-Github · Jul 23, 2023 · bae0f31 · bae0f31
1 parent 81a4953
commit bae0f31
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 7 deletions.
diff --git a/app/src/main/java/com/peonlee/PeonLeeNavigator.kt b/app/src/main/java/com/peonlee/PeonLeeNavigator.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.content.Intent
 import androidx.activity.result.ActivityResultLauncher
 import com.peonlee.core.ui.Navigator
+import com.peonlee.explore.ExploreActivity
 import com.peonlee.feature.detail.ProductCommentsActivity
 import com.peonlee.feature.detail.ProductDetailActivity
 import com.peonlee.feature.detail.ProductExtra
@@ -32,4 +33,8 @@ class PeonLeeNavigator @Inject constructor() : Navigator {
     ) {
         launcher.launch(EditReviewActivity.newIntent(context, productId, imageUrl, productName, price, content))
     }
+
+    override fun navigateToExplore(context: Context) {
+        ExploreActivity.startActivity(context)
+    }
 }
diff --git a/core/ui/src/main/java/com/peonlee/core/ui/Navigator.kt b/core/ui/src/main/java/com/peonlee/core/ui/Navigator.kt
@@ -17,4 +17,9 @@ interface Navigator {
         content: String?,
         launcher: ActivityResultLauncher<Intent>
     )
+
+    /**
+     * 검색 화면으로 이동
+     */
+    fun navigateToExplore(context: Context)
 }
diff --git a/feature/explore/src/main/java/com/peonlee/explore/ExploreActivity.kt b/feature/explore/src/main/java/com/peonlee/explore/ExploreActivity.kt
@@ -1,5 +1,7 @@
 package com.peonlee.explore
 
+import android.content.Context
+import android.content.Intent
 import androidx.activity.viewModels
 import androidx.core.view.isVisible
 import androidx.core.widget.addTextChangedListener
@@ -33,4 +35,12 @@ class ExploreActivity : BaseActivity<ActivityExploreActivityBinding>() {
             .replace(R.id.layout_search_product, ProductFragment.getInstance())
             .commit()
     }
+
+    companion object {
+        fun startActivity(context: Context) {
+            context.startActivity(
+                Intent(context, ExploreActivity::class.java)
+            )
+        }
+    }
 }
diff --git a/feature/explore/src/main/java/com/peonlee/explore/ExploreFragment.kt b/feature/explore/src/main/java/com/peonlee/explore/ExploreFragment.kt
@@ -22,6 +22,10 @@ class ExploreFragment : BaseFragment<FragmentExploreBinding>() {
         childFragmentManager.commit {
             add(R.id.layoutProduct, ProductFragment.getInstance(), "Product")
         }
+        // 상단 검색 바 클릭 시, 검색 화면으로 이동
+        binding.layoutSearch.setOnClickListener {
+            navigator.navigateToExplore(requireContext())
+        }
     }
 
     companion object {

diff --git a/feature/explore/src/main/res/layout/activity_explore_activity.xml b/feature/explore/src/main/res/layout/activity_explore_activity.xml
@@ -23,7 +23,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:hint="라면, 음료, 과자, 빵 등"
-        tools:text="우유"></EditText>
+        tools:text="우유"/>
 
     <TextView
         android:id="@+id/tv_explore_cancel"
@@ -36,7 +36,7 @@
         android:textColor="@color/bg40"
         app:layout_constraintBottom_toBottomOf="@+id/et_explore_bar"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/et_explore_bar"></TextView>
+        app:layout_constraintTop_toTopOf="@+id/et_explore_bar"/>
 
     <ImageView
         android:id="@+id/iv_search"
@@ -47,7 +47,7 @@
         android:backgroundTint="@color/bg40"
         app:layout_constraintBottom_toBottomOf="@+id/et_explore_bar"
         app:layout_constraintStart_toStartOf="@+id/et_explore_bar"
-        app:layout_constraintTop_toTopOf="@+id/et_explore_bar"></ImageView>
+        app:layout_constraintTop_toTopOf="@+id/et_explore_bar" />
 
     <ImageView
         android:id="@+id/iv_text_cleaer"
@@ -59,15 +59,15 @@
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@+id/et_explore_bar"
         app:layout_constraintEnd_toEndOf="@+id/et_explore_bar"
-        app:layout_constraintTop_toTopOf="@+id/et_explore_bar"></ImageView>
+        app:layout_constraintTop_toTopOf="@+id/et_explore_bar"/>
 
     <FrameLayout
         android:id="@+id/layout_search_product"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_marginTop="@dimen/space_s_large"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="@+id/tv_explore_cancel"
-        app:layout_constraintStart_toStartOf="@+id/et_explore_bar"
-        app:layout_constraintTop_toBottomOf="@+id/et_explore_bar"></FrameLayout>
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/et_explore_bar"/>
 </androidx.constraintlayout.widget.ConstraintLayout>