Skip to content

Feature/#183 mod search tab #186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weโ€™ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Sangwook123 merged 3 commits into from
Nov 6, 2024
Merged

Feature/#183 mod search tab #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
43f4acc
[feat] #183 add search module
Sangwook123 Nov 6, 2024
17c43b8
[mod] #183 main nav
Sangwook123 Nov 6, 2024
0c7474e
[mod] #183 refactor code and sync with design
Sangwook123 Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_search_24.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M15.232,14.002C14.855,13.598 14.222,13.576 13.818,13.952C13.414,14.329 13.392,14.961 13.768,15.366L15.232,14.002ZM18.768,20.733C19.145,21.137 19.778,21.159 20.182,20.783C20.586,20.406 20.608,19.774 20.232,19.369L18.768,20.733ZM10.333,15.473C7.73,15.473 5.5,13.185 5.5,10.211H3.5C3.5,14.154 6.494,17.473 10.333,17.473V15.473ZM5.5,10.211C5.5,7.237 7.73,4.949 10.333,4.949V2.949C6.494,2.949 3.5,6.268 3.5,10.211H5.5ZM10.333,4.949C12.937,4.949 15.167,7.237 15.167,10.211H17.167C17.167,6.268 14.173,2.949 10.333,2.949V4.949ZM15.167,10.211C15.167,13.185 12.937,15.473 10.333,15.473V17.473C14.173,17.473 17.167,14.154 17.167,10.211H15.167ZM13.768,15.366L18.768,20.733L20.232,19.369L15.232,14.002L13.768,15.366Z"
android:fillColor="#191919"/>
</vector>
9 changes: 9 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_search_24_unselected.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M15.232,14.002C14.855,13.598 14.222,13.576 13.818,13.952C13.414,14.329 13.392,14.961 13.768,15.366L15.232,14.002ZM18.768,20.733C19.145,21.137 19.778,21.159 20.182,20.783C20.586,20.406 20.608,19.774 20.232,19.369L18.768,20.733ZM10.333,15.473C7.73,15.473 5.5,13.185 5.5,10.211H3.5C3.5,14.154 6.494,17.473 10.333,17.473V15.473ZM5.5,10.211C5.5,7.237 7.73,4.949 10.333,4.949V2.949C6.494,2.949 3.5,6.268 3.5,10.211H5.5ZM10.333,4.949C12.937,4.949 15.167,7.237 15.167,10.211H17.167C17.167,6.268 14.173,2.949 10.333,2.949V4.949ZM15.167,10.211C15.167,13.185 12.937,15.473 10.333,15.473V17.473C14.173,17.473 17.167,14.154 17.167,10.211H15.167ZM13.768,15.366L18.768,20.733L20.232,19.369L15.232,14.002L13.768,15.366Z"
android:fillColor="#D9D9D9"/>
</vector>
10 changes: 10 additions & 0 deletions core/designsystem/src/main/res/drawable/sel_bnv_search.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<item android:drawable="@drawable/ic_search_24"
android:state_checked="true" />
<item android:drawable="@drawable/ic_search_24_unselected"
android:state_checked="false"
android:color="@color/neutrals150"/>
</selector>
7 changes: 0 additions & 7 deletions feature/clip/src/main/java/org/sopt/clip/clip/ClipFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ class ClipFragment : BindingFragment<FragmentClipBinding>({ FragmentClipBinding.
viewModel.getCategoryAll()
updateClipList()
updateAllClipCount()
onClickSearchButton()
onClickEditButton()
onClickAddButton()
isCheckClipCount()
Expand Down Expand Up @@ -134,12 +133,6 @@ class ClipFragment : BindingFragment<FragmentClipBinding>({ FragmentClipBinding.
}
}

private fun onClickSearchButton() {
binding.clClipSearch.onThrottleClick {
navigateToDestination("featureMyPage://fragmentSearch")
}
}

private fun navigateToDestination(destination: String) {
val (request, navOptions) = DeepLinkUtil.getNavRequestNotPopUpAndOption(
destination,
Expand Down
171 changes: 0 additions & 171 deletions feature/clip/src/main/java/org/sopt/clip/search/SearchFragment.kt
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions feature/clip/src/main/java/org/sopt/clip/search/SearchState.kt
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions feature/clip/src/main/java/org/sopt/clip/search/SearchViewModel.kt
View file
Open in desktop

This file was deleted.

38 changes: 3 additions & 35 deletions feature/clip/src/main/res/layout/fragment_clip.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,38 +32,6 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />


<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_clip_search"
android:layout_width="match_parent"
android:layout_marginHorizontal="20dp"
android:background="@drawable/shape_neutrals_fill_12_rect"
app:layout_constraintTop_toBottomOf="@+id/tv_clip_bar_title"
android:layout_height="wrap_content">

<ImageView
android:id="@+id/iv_clip_search"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_search_20"
android:paddingVertical="11dp"
android:paddingStart="12dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:paddingEnd="8dp"/>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/clip_enter_search_word"
android:textAppearance="@style/Typography.suit.regular_16"
android:textColor="@color/neutrals400"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/iv_clip_search"
app:layout_constraintTop_toTopOf="parent" />

</androidx.constraintlayout.widget.ConstraintLayout>

<TextView
android:id="@+id/tv_clip_all"
android:layout_width="wrap_content"
Expand All @@ -74,7 +42,7 @@
android:textAppearance="@style/Typography.suit.medium_12"
android:textColor="@color/neutrals400"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cl_clip_search" />
app:layout_constraintTop_toBottomOf="@id/tv_clip_bar_title" />

<TextView
android:id="@+id/tv_clip_all_count"
Expand All @@ -86,7 +54,7 @@
android:textAppearance="@style/Typography.suit.medium_12"
android:textColor="@color/neutrals400"
app:layout_constraintStart_toEndOf="@id/tv_clip_all"
app:layout_constraintTop_toBottomOf="@id/cl_clip_search" />
app:layout_constraintTop_toBottomOf="@id/tv_clip_bar_title" />

<ImageView
android:layout_width="wrap_content"
Expand All @@ -111,7 +79,7 @@
android:textAppearance="@style/Typography.suit.bold_12"
android:textColor="@color/primary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/cl_clip_search" />
app:layout_constraintTop_toBottomOf="@id/tv_clip_bar_title" />

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_clip_clip"
Expand Down
7 changes: 0 additions & 7 deletions feature/clip/src/main/res/navigation/nav_graph_clip.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,6 @@
android:name="org.sopt.clip.clipedit.ClipEditFragment"
android:label="ClipEditFragment"
tools:layout="@layout/fragment_clip_edit" />
<fragment
android:id="@+id/navigation_search"
android:name="org.sopt.clip.search.SearchFragment"
android:label="SearchFragment"
tools:layout="@layout/fragment_search">
<deepLink app:uri="featureMyPage://fragmentSearch" />
</fragment>
<fragment
android:id="@+id/navigation_clip_change"
android:name="org.sopt.clip.clipchange.ClipChangeFragment"
Expand Down
1 change: 0 additions & 1 deletion feature/home/src/main/java/org/sopt/home/HomeContract.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ data class HomeState(

sealed interface HomeSideEffect {
data object NavigateSetting : HomeSideEffect
data object NavigateSearch : HomeSideEffect
data object NavigateClipLink : HomeSideEffect
data object NavigateAllClip : HomeSideEffect
data object NavigateWebView : HomeSideEffect
Expand Down
8 changes: 0 additions & 8 deletions feature/home/src/main/java/org/sopt/home/HomeFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ class HomeFragment : BindingFragment<FragmentHomeBinding>({ FragmentHomeBinding.
initView()
collectState()
navigateToSetting()
navigateToSearch()
navigateToAllClip()
}

Expand All @@ -59,7 +58,6 @@ class HomeFragment : BindingFragment<FragmentHomeBinding>({ FragmentHomeBinding.

private fun handleSideEffect(sideEffect: HomeSideEffect) {
when (sideEffect) {
is HomeSideEffect.NavigateSearch -> navigateToDestination("featureMyPage://fragmentSearch")
is HomeSideEffect.NavigateSetting -> navigateToDestination("featureMyPage://fragmentSetting")
is HomeSideEffect.NavigateClipLink -> navigateToDestination(
"featureSaveLink://ClipLinkFragment/${viewModel.container.stateFlow.value.categoryId}/${viewModel.container.stateFlow.value.categoryName}",
Expand Down Expand Up @@ -99,12 +97,6 @@ class HomeFragment : BindingFragment<FragmentHomeBinding>({ FragmentHomeBinding.
}
}

private fun navigateToSearch() {
binding.clHomeSearch.onThrottleClick {
viewModel.navigateSearch()
}
}

private fun navigateToAllClip() {
binding.ivRecentClip.onThrottleClick {
viewModel.navigateAllClip()
Expand Down
Loading
Loading