Feature/search UI

core/presentation/designsystem/src/main/java/com/hyunjung/core/presentation/designsystem/Icons.kt

@@ -12,6 +12,10 @@ val ArrowRightIcon: ImageVector
     @Composable
     get() = ImageVector.vectorResource(id = R.drawable.ic_arrow_right)
 
+val ArrowDownIcon: ImageVector
+    @Composable
+    get() = ImageVector.vectorResource(id = R.drawable.ic_arrow_down)
+
 val CalendarIcon: ImageVector
     @Composable
     get() = ImageVector.vectorResource(id = R.drawable.ic_calendar)
@@ -36,6 +40,10 @@ val NotificationIcon: ImageVector
     @Composable
     get() = ImageVector.vectorResource(id = R.drawable.ic_notification)
 
+val NotificationSmallIcon: ImageVector
+    @Composable
+    get() = ImageVector.vectorResource(id = R.drawable.ic_notification_small)
+
 val SearchIcon: ImageVector
     @Composable
     get() = ImageVector.vectorResource(id = R.drawable.ic_search)
@@ -118,4 +126,12 @@ val CircleUnselectedIcon: ImageVector
 
 val CircleCheckedIcon: ImageVector
     @Composable
-    get() = ImageVector.vectorResource(id = R.drawable.ic_circle_checked)
+    get() = ImageVector.vectorResource(id = R.drawable.ic_circle_checked)
+
+val SearchCancelIcon: ImageVector
+    @Composable
+    get() = ImageVector.vectorResource(id = R.drawable.ic_search_cancel)
+
+val CloseIcon: ImageVector
+    @Composable
+    get() = ImageVector.vectorResource(id = R.drawable.ic_close)

core/presentation/designsystem/src/main/res/drawable/ic_arrow_down.xml

@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:strokeWidth="1"
+      android:pathData="M5,8L10,13L15,8"
+      android:fillColor="#00000000"
+      android:strokeColor="#262626"/>
+</vector>

core/presentation/designsystem/src/main/res/drawable/ic_close.xml

@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="12dp"
+    android:viewportWidth="12"
+    android:viewportHeight="12">
+  <path
+      android:strokeWidth="1"
+      android:pathData="M1,1L11,11"
+      android:fillColor="#00000000"
+      android:strokeColor="#262626"/>
+  <path
+      android:strokeWidth="1"
+      android:pathData="M1,11L11,1"
+      android:fillColor="#00000000"
+      android:strokeColor="#262626"/>
+</vector>

core/presentation/designsystem/src/main/res/drawable/ic_notification_small.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M3.147,4.512C3.363,1.961 5.497,0 8.057,0V0C10.618,0 12.751,1.961 12.967,4.512L13.232,7.644L15.114,12.076V12.831H1V12.076L2.882,7.644L3.147,4.512Z"
+      android:fillColor="#515151"/>
+  <path
+      android:pathData="M11,13.5C11,13.828 10.922,14.153 10.772,14.457C10.621,14.76 10.4,15.036 10.121,15.268C9.843,15.5 9.512,15.684 9.148,15.81C8.784,15.935 8.394,16 8,16C7.606,16 7.216,15.935 6.852,15.81C6.488,15.684 6.157,15.5 5.879,15.268C5.6,15.036 5.379,14.76 5.228,14.457C5.078,14.153 5,13.828 5,13.5L8,13.5H11Z"
+      android:fillColor="#515151"/>
+</vector>

core/presentation/designsystem/src/main/res/drawable/ic_search_cancel.xml

@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M8,0L8,0A8,8 0,0 1,16 8L16,8A8,8 0,0 1,8 16L8,16A8,8 0,0 1,0 8L0,8A8,8 0,0 1,8 0z"
+      android:fillColor="#515151"/>
+  <path
+      android:strokeWidth="1"
+      android:pathData="M5,5L11,11"
+      android:fillColor="#00000000"
+      android:strokeColor="#ffffff"/>
+  <path
+      android:strokeWidth="1"
+      android:pathData="M5,11L11,5"
+      android:fillColor="#00000000"
+      android:strokeColor="#ffffff"/>
+</vector>

core/presentation/ui/src/main/res/values/strings.xml

@@ -35,4 +35,15 @@
     <string name="notification_read">읽음</string>
     <string name="notification_delete">삭제</string>
     <string name="notification_cancel">취소</string>
+
+    <!-- Search Screen -->
+    <string name="search_placeholder">검색어를 입력해 주세요</string>
+    <string name="search_cancel">닫기</string>
+    <string name="search_latest">최근 검색</string>
+    <string name="search_all_delete">전체 삭제</string>
+    <string name="search_label_region">지역</string>
+    <string name="search_label_product">제품</string>
+    <string name="search_toast_keyword">키워드 알림을 추가했어요.</string>
+    <string name="search_toast_cannot_keyword_1">키워드 알림을 더이상 추가할 수 없어요.</string>
+    <string name="search_toast_cannot_keyword_2">(마이페이지 > 내 정보 > 키워드 알림)에서 확인해 주세요.</string>
 </resources>

notification/presentation/src/main/java/com/hyunjung/notification/presentation/NotificationScreen.kt

@@ -36,10 +36,10 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.hyunjung.auth.presentation.AlertType
+import com.hyunjung.notification.presentation.component.AlertType
 import com.hyunjung.auth.presentation.LocalCherrydanContentColor
-import com.hyunjung.auth.presentation.NotificationActiveToggleItem
-import com.hyunjung.auth.presentation.NotificationToggleItem
+import com.hyunjung.notification.presentation.component.NotificationActiveToggleItem
+import com.hyunjung.notification.presentation.component.NotificationToggleItem
 import com.hyunjung.core.presentation.designsystem.BackIcon
 import com.hyunjung.core.presentation.designsystem.CherrydanColors
 import com.hyunjung.core.presentation.designsystem.CherrydanTheme

notification/presentation/src/main/java/com/hyunjung/notification/presentation/component/NotificationToggleItem.kt

@@ -1,4 +1,4 @@
-package com.hyunjung.auth.presentation
+package com.hyunjung.notification.presentation.component
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable

search/data/.gitignore

@@ -0,0 +1 @@
+/build

search/data/build.gradle.kts

@@ -0,0 +1,16 @@
+plugins {
+    alias(libs.plugins.hyunjung.cherrydan.android.library)
+    alias(libs.plugins.hyunjung.cherrydan.jvm.ktor)
+}
+
+android {
+    namespace = "com.hyunjung.search.data"
+}
+
+dependencies {
+    implementation(libs.bundles.koin)
+
+    implementation(projects.search.domain)
+    implementation(projects.core.domain)
+    implementation(projects.core.data)
+}

search/data/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

search/data/src/androidTest/java/com/hyunjung/search/data/ExampleInstrumentedTest.kt

@@ -0,0 +1,24 @@
+package com.hyunjung.search.data
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.hyunjung.search.data.test", appContext.packageName)
+    }
+}

search/data/src/main/AndroidManifest.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>

search/data/src/test/java/com/hyunjung/search/data/ExampleUnitTest.kt

@@ -0,0 +1,17 @@
+package com.hyunjung.search.data
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}

search/domain/.gitignore

@@ -0,0 +1 @@
+/build

search/domain/build.gradle.kts

@@ -0,0 +1,7 @@
+plugins {
+    alias(libs.plugins.hyunjung.cherrydan.jvm.library)
+}
+
+dependencies {
+    implementation(projects.core.domain)
+}

search/domain/src/main/java/com/hyunjung/search/domain/MyClass.kt

@@ -0,0 +1,4 @@
+package com.hyunjung.search.domain
+
+class MyClass {
+}

search/presentation/.gitignore

@@ -0,0 +1 @@
+/build

search/presentation/build.gradle.kts

@@ -0,0 +1,14 @@
+plugins {
+    alias(libs.plugins.hyunjung.cherrydan.android.feature.ui)
+}
+
+android {
+    namespace = "com.hyunjung.search.presentation"
+}
+
+dependencies {
+    implementation(libs.androidx.navigation.compose)
+
+    implementation(projects.core.domain)
+    implementation(projects.search.domain)
+}

search/presentation/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

search/presentation/src/androidTest/java/com/hyunjung/search/presentation/ExampleInstrumentedTest.kt

@@ -0,0 +1,24 @@
+package com.hyunjung.search.presentation
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.hyunjung.search.presentation.test", appContext.packageName)
+    }
+}

search/presentation/src/main/AndroidManifest.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>