[MERGE] #313 -> develop

[FEAT/#313] 직무 필터링 추가
teamterning · Jan 4, 2025 · f93f578 · f93f578
2 parents a06bb49 + e69e3e5
commit f93f578
Show file tree

Hide file tree

Showing 26 changed files with 1,204 additions and 340 deletions.
diff --git a/...esignsystem/src/main/java/com/terning/core/designsystem/component/button/SortingButton.kt b/...esignsystem/src/main/java/com/terning/core/designsystem/component/button/SortingButton.kt
@@ -1,5 +1,6 @@
 package com.terning.core.designsystem.component.button
 
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.padding
@@ -11,11 +12,13 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.unit.dp
 import com.terning.core.designsystem.R
 import com.terning.core.designsystem.extension.noRippleClickable
+import com.terning.core.designsystem.theme.Black
 import com.terning.core.designsystem.theme.Grey350
 import com.terning.core.designsystem.theme.TerningTheme
 import com.terning.core.designsystem.type.SortBy
@@ -27,36 +30,31 @@ fun SortingButton(
     onCLick: () -> Unit,
 ) {
     Row(
-        verticalAlignment = Alignment.CenterVertically,
         modifier = modifier
-            .border(
-                width = 1.dp,
-                color = Grey350,
-                shape = RoundedCornerShape(5.dp)
-            )
             .noRippleClickable(onCLick),
     ) {
-        Icon(
-            imageVector = ImageVector.vectorResource(id = R.drawable.ic_down_18),
-            contentDescription = stringResource(id = R.string.sort_button_description),
-            tint = Grey350,
-            modifier = Modifier
-                .padding(
-                    start = 7.dp,
-                    end = 6.dp,
-                    top = 5.dp,
-                    bottom = 5.dp,
-                )
-                .size(20.dp)
-        )
         Text(
             text = stringResource(
                 id = SortBy.entries[sortBy].sortBy
             ),
             style = TerningTheme.typography.button3,
-            color = Grey350,
+            color = Black,
+            modifier = Modifier
+                .padding(
+                    top = 6.dp,
+                    bottom = 6.dp,
+                )
+        )
+        Image(
+            painter = painterResource(id = R.drawable.ic_down_18),
+            contentDescription = stringResource(id = R.string.sort_button_description),
             modifier = Modifier
-                .padding(end = 11.dp)
+                .padding(
+                    start = 2.dp,
+                    end = 2.dp,
+                    top = 6.dp,
+                    bottom = 4.dp,
+                )
         )
     }
-}
+}
diff --git a/core/designsystem/src/main/java/com/terning/core/designsystem/type/JobType.kt b/core/designsystem/src/main/java/com/terning/core/designsystem/type/JobType.kt
@@ -0,0 +1,36 @@
+package com.terning.core.designsystem.type
+
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+import com.terning.core.designsystem.R
+
+enum class JobType(
+    val stringValue: String,
+    @DrawableRes val drawableResId: Int,
+    @StringRes val stringResId: Int,
+) {
+    PLAN("plan", R.drawable.ic_job_plan_24, R.string.job_type_plan),
+    MARKETING("marketing", R.drawable.ic_job_marketing_24, R.string.job_type_marketing),
+    SALES("sales", R.drawable.ic_job_sales_24, R.string.job_type_sales),
+    ADMIN("admin", R.drawable.ic_job_accounting_24, R.string.job_type_admin),
+    DESIGN("design", R.drawable.ic_job_design_24, R.string.job_type_design),
+    IT("it", R.drawable.ic_job_it_24, R.string.job_type_it),
+    RESEARCH("research", R.drawable.ic_job_research_24, R.string.job_type_research),
+    ETC("etc", R.drawable.ic_job_extra_24, R.string.job_type_etc),
+    TOTAL("total", R.drawable.ic_job_all_24, R.string.job_type_total), ;
+
+
+    companion object {
+        fun fromString(value: String?): JobType = when (value) {
+            "plan" -> PLAN
+            "marketing" -> MARKETING
+            "admin" -> ADMIN
+            "sales" -> SALES
+            "design" -> DESIGN
+            "it" -> IT
+            "research" -> RESEARCH
+            "etc" -> ETC
+            else -> TOTAL
+        }
+    }
+}
diff --git a/core/designsystem/src/main/res/drawable/ic_job_accounting_24.xml b/core/designsystem/src/main/res/drawable/ic_job_accounting_24.xml
@@ -0,0 +1,56 @@
+<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="M18.21,1.06H5.36C4.405,1.06 3.63,1.835 3.63,2.79V21.21C3.63,22.166 4.405,22.94 5.36,22.94H18.21C19.166,22.94 19.94,22.166 19.94,21.21V2.79C19.94,1.835 19.166,1.06 18.21,1.06Z"
+      android:strokeWidth="1.25"
+      android:fillColor="#00000000"
+      android:strokeColor="#1EAC61"/>
+  <path
+      android:pathData="M16.97,3.51H6.61C6.306,3.51 6.06,3.756 6.06,4.06V7.68C6.06,7.984 6.306,8.23 6.61,8.23H16.97C17.274,8.23 17.52,7.984 17.52,7.68V4.06C17.52,3.756 17.274,3.51 16.97,3.51Z"
+      android:strokeWidth="1.25"
+      android:fillColor="#00000000"
+      android:strokeColor="#1EAC61"/>
+  <path
+      android:pathData="M17.51,15.61C17.51,15.063 17.069,14.62 16.525,14.62C15.981,14.62 15.54,15.063 15.54,15.61V19.56C15.54,20.107 15.981,20.55 16.525,20.55C17.069,20.55 17.51,20.107 17.51,19.56V15.61Z"
+      android:strokeWidth="1.1"
+      android:fillColor="#00000000"
+      android:strokeColor="#1EAC61"/>
+  <path
+      android:pathData="M16.53,12.65C17.077,12.65 17.52,12.207 17.52,11.66C17.52,11.113 17.077,10.67 16.53,10.67C15.983,10.67 15.54,11.113 15.54,11.66C15.54,12.207 15.983,12.65 16.53,12.65Z"
+      android:strokeWidth="1.1"
+      android:fillColor="#00000000"
+      android:strokeColor="#1EAC61"/>
+  <path
+      android:pathData="M7.04,12.65C7.587,12.65 8.03,12.207 8.03,11.66C8.03,11.113 7.587,10.67 7.04,10.67C6.493,10.67 6.05,11.113 6.05,11.66C6.05,12.207 6.493,12.65 7.04,12.65Z"
+      android:strokeWidth="1.1"
+      android:fillColor="#00000000"
+      android:strokeColor="#1EAC61"/>
+  <path
+      android:pathData="M11.79,12.65C12.337,12.65 12.78,12.207 12.78,11.66C12.78,11.113 12.337,10.67 11.79,10.67C11.243,10.67 10.8,11.113 10.8,11.66C10.8,12.207 11.243,12.65 11.79,12.65Z"
+      android:strokeWidth="1.1"
+      android:fillColor="#00000000"
+      android:strokeColor="#1EAC61"/>
+  <path
+      android:pathData="M7.04,16.6C7.587,16.6 8.03,16.157 8.03,15.61C8.03,15.063 7.587,14.62 7.04,14.62C6.493,14.62 6.05,15.063 6.05,15.61C6.05,16.157 6.493,16.6 7.04,16.6Z"
+      android:strokeWidth="1.1"
+      android:fillColor="#00000000"
+      android:strokeColor="#1EAC61"/>
+  <path
+      android:pathData="M11.79,16.59C12.337,16.59 12.78,16.147 12.78,15.6C12.78,15.053 12.337,14.61 11.79,14.61C11.243,14.61 10.8,15.053 10.8,15.6C10.8,16.147 11.243,16.59 11.79,16.59Z"
+      android:strokeWidth="1.1"
+      android:fillColor="#00000000"
+      android:strokeColor="#1EAC61"/>
+  <path
+      android:pathData="M7.04,20.55C7.587,20.55 8.03,20.107 8.03,19.56C8.03,19.013 7.587,18.57 7.04,18.57C6.493,18.57 6.05,19.013 6.05,19.56C6.05,20.107 6.493,20.55 7.04,20.55Z"
+      android:strokeWidth="1.1"
+      android:fillColor="#00000000"
+      android:strokeColor="#1EAC61"/>
+  <path
+      android:pathData="M11.79,20.54C12.337,20.54 12.78,20.097 12.78,19.55C12.78,19.003 12.337,18.56 11.79,18.56C11.243,18.56 10.8,19.003 10.8,19.55C10.8,20.097 11.243,20.54 11.79,20.54Z"
+      android:strokeWidth="1.1"
+      android:fillColor="#00000000"
+      android:strokeColor="#1EAC61"/>
+</vector>
diff --git a/core/designsystem/src/main/res/drawable/ic_job_all_24.xml b/core/designsystem/src/main/res/drawable/ic_job_all_24.xml
@@ -0,0 +1,30 @@
+<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="M9.5,3.64H4.94C4.239,3.64 3.67,4.208 3.67,4.91V9.47C3.67,10.171 4.239,10.74 4.94,10.74H9.5C10.201,10.74 10.77,10.171 10.77,9.47V4.91C10.77,4.208 10.201,3.64 9.5,3.64Z"
+      android:strokeWidth="1.25"
+      android:fillColor="#00000000"
+      android:strokeColor="#1EAC61"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M19.07,3.64H14.51C13.809,3.64 13.24,4.208 13.24,4.91V9.47C13.24,10.171 13.809,10.74 14.51,10.74H19.07C19.771,10.74 20.34,10.171 20.34,9.47V4.91C20.34,4.208 19.771,3.64 19.07,3.64Z"
+      android:strokeWidth="1.25"
+      android:fillColor="#00000000"
+      android:strokeColor="#1EAC61"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M9.5,13.1H4.94C4.239,13.1 3.67,13.669 3.67,14.37V18.93C3.67,19.632 4.239,20.2 4.94,20.2H9.5C10.201,20.2 10.77,19.632 10.77,18.93V14.37C10.77,13.669 10.201,13.1 9.5,13.1Z"
+      android:strokeWidth="1.25"
+      android:fillColor="#00000000"
+      android:strokeColor="#1EAC61"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M19.07,13.1H14.51C13.809,13.1 13.24,13.669 13.24,14.37V18.93C13.24,19.632 13.809,20.2 14.51,20.2H19.07C19.771,20.2 20.34,19.632 20.34,18.93V14.37C20.34,13.669 19.771,13.1 19.07,13.1Z"
+      android:strokeWidth="1.25"
+      android:fillColor="#00000000"
+      android:strokeColor="#1EAC61"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/core/designsystem/src/main/res/drawable/ic_job_design_24.xml b/core/designsystem/src/main/res/drawable/ic_job_design_24.xml
@@ -0,0 +1,31 @@
+<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="M1.71,12.03C1.71,17.32 5.69,21.69 10.81,22.28C11.57,22.37 12.3,22.05 12.84,21.51C13.16,21.19 13.34,20.75 13.34,20.29C13.34,19.83 13.16,19.39 12.84,19.07C12.3,18.53 11.86,17.73 12.27,17.08C13.89,14.5 22.29,20.42 22.29,12.04C22.29,6.34 17.68,1.72 12,1.72C6.32,1.72 1.71,6.33 1.71,12.03Z"
+      android:strokeWidth="1.25"
+      android:fillColor="#00000000"
+      android:strokeColor="#1EAC61"/>
+  <path
+      android:pathData="M7.95,8.76C8.646,8.76 9.21,8.196 9.21,7.5C9.21,6.804 8.646,6.24 7.95,6.24C7.254,6.24 6.69,6.804 6.69,7.5C6.69,8.196 7.254,8.76 7.95,8.76Z"
+      android:strokeWidth="1.25"
+      android:fillColor="#00000000"
+      android:strokeColor="#1EAC61"/>
+  <path
+      android:pathData="M6.19,13.51C6.886,13.51 7.45,12.946 7.45,12.25C7.45,11.554 6.886,10.99 6.19,10.99C5.494,10.99 4.93,11.554 4.93,12.25C4.93,12.946 5.494,13.51 6.19,13.51Z"
+      android:strokeWidth="1.25"
+      android:fillColor="#00000000"
+      android:strokeColor="#1EAC61"/>
+  <path
+      android:pathData="M13.58,7.5C14.276,7.5 14.84,6.936 14.84,6.24C14.84,5.544 14.276,4.98 13.58,4.98C12.884,4.98 12.32,5.544 12.32,6.24C12.32,6.936 12.884,7.5 13.58,7.5Z"
+      android:strokeWidth="1.25"
+      android:fillColor="#00000000"
+      android:strokeColor="#1EAC61"/>
+  <path
+      android:pathData="M17.49,10.99C18.186,10.99 18.75,10.426 18.75,9.73C18.75,9.034 18.186,8.47 17.49,8.47C16.794,8.47 16.23,9.034 16.23,9.73C16.23,10.426 16.794,10.99 17.49,10.99Z"
+      android:strokeWidth="1.25"
+      android:fillColor="#00000000"
+      android:strokeColor="#1EAC61"/>
+</vector>
diff --git a/core/designsystem/src/main/res/drawable/ic_job_extra_24.xml b/core/designsystem/src/main/res/drawable/ic_job_extra_24.xml
@@ -0,0 +1,24 @@
+<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="M4.15,13.44C4.995,13.44 5.68,12.755 5.68,11.91C5.68,11.065 4.995,10.38 4.15,10.38C3.305,10.38 2.62,11.065 2.62,11.91C2.62,12.755 3.305,13.44 4.15,13.44Z"
+      android:strokeWidth="1.25"
+      android:fillColor="#00000000"
+      android:strokeColor="#1EAC61"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M12,13.44C12.845,13.44 13.53,12.755 13.53,11.91C13.53,11.065 12.845,10.38 12,10.38C11.155,10.38 10.47,11.065 10.47,11.91C10.47,12.755 11.155,13.44 12,13.44Z"
+      android:strokeWidth="1.25"
+      android:fillColor="#00000000"
+      android:strokeColor="#1EAC61"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M19.85,13.44C20.695,13.44 21.38,12.755 21.38,11.91C21.38,11.065 20.695,10.38 19.85,10.38C19.005,10.38 18.32,11.065 18.32,11.91C18.32,12.755 19.005,13.44 19.85,13.44Z"
+      android:strokeWidth="1.25"
+      android:fillColor="#00000000"
+      android:strokeColor="#1EAC61"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/core/designsystem/src/main/res/drawable/ic_job_it_24.xml b/core/designsystem/src/main/res/drawable/ic_job_it_24.xml
@@ -0,0 +1,44 @@
+<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="M21.5,2.47H2.47C1.879,2.47 1.4,2.949 1.4,3.54V15.38C1.4,15.971 1.879,16.45 2.47,16.45H21.5C22.091,16.45 22.57,15.971 22.57,15.38V3.54C22.57,2.949 22.091,2.47 21.5,2.47Z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1.25"
+      android:fillColor="#00000000"
+      android:strokeColor="#1EAC61"/>
+  <path
+      android:pathData="M14.72,16.45H9.24V22.52H14.72V16.45Z"
+      android:strokeWidth="1.25"
+      android:fillColor="#00000000"
+      android:strokeColor="#1EAC61"/>
+  <path
+      android:pathData="M6.56,22.52H17.4"
+      android:strokeWidth="1.25"
+      android:fillColor="#00000000"
+      android:strokeColor="#1EAC61"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M7.99,6.76L5.42,9.44L7.99,12.13"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1.25"
+      android:fillColor="#00000000"
+      android:strokeColor="#1EAC61"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M15.97,12.13L18.54,9.44L15.97,6.76"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1.25"
+      android:fillColor="#00000000"
+      android:strokeColor="#1EAC61"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M13.27,6.74L10.46,12.17"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1.25"
+      android:fillColor="#00000000"
+      android:strokeColor="#1EAC61"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/core/designsystem/src/main/res/drawable/ic_job_marketing_24.xml b/core/designsystem/src/main/res/drawable/ic_job_marketing_24.xml
@@ -0,0 +1,31 @@
+<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="M5.21,6.45H10.97V13.11H5.21C4.71,13.11 4.31,12.71 4.31,12.21V7.36C4.31,6.86 4.71,6.46 5.21,6.46V6.45Z"
+      android:strokeWidth="1.25"
+      android:fillColor="#00000000"
+      android:strokeColor="#1EAC61"/>
+  <path
+      android:pathData="M10.97,13.11H6.21L8.79,20.61C8.95,21.08 9.27,21.38 9.63,21.38H10.04C10.56,21.38 10.98,20.74 10.98,19.96V13.12L10.97,13.11Z"
+      android:strokeWidth="1.25"
+      android:fillColor="#00000000"
+      android:strokeColor="#1EAC61"/>
+  <path
+      android:pathData="M4.31,11.85H2.17C1.67,11.85 1.27,11.45 1.27,10.95L1.27,8.62C1.27,8.12 1.67,7.72 2.17,7.72H4.31L4.31,11.86V11.85Z"
+      android:strokeWidth="1.25"
+      android:fillColor="#00000000"
+      android:strokeColor="#1EAC61"/>
+  <path
+      android:pathData="M10.97,13.11L19.98,16.87C20.59,17.12 21.23,16.59 21.23,15.83V3.73C21.23,2.97 20.59,2.44 19.98,2.69L10.97,6.45V13.11Z"
+      android:strokeWidth="1.25"
+      android:fillColor="#00000000"
+      android:strokeColor="#1EAC61"/>
+  <path
+      android:pathData="M21.22,11.53C22.32,11.53 23.22,10.75 23.22,9.78C23.22,8.81 22.33,8.03 21.22,8.03V11.53Z"
+      android:strokeWidth="1.25"
+      android:fillColor="#00000000"
+      android:strokeColor="#1EAC61"/>
+</vector>