refactor: 서기 다크모드 대응 (#603)

* feat: 검색창 x버튼 검색키워드가 있을 경우에만 보이도록 구현 * refactor: 공모 상세 페이지 내용 하단에 여백 추가 * refactor: 검색창 가로 모드에서 확장형 키보드 안뜨도록 변경 * refactor: 이미지 크기 조정 * refactor: activity_main 배경 색 제거 * refactor: 메인 페이지 다크모드 대응 * refactor: 공모 상세 페이지 다크모드 대응 * refactor: 마이페이지 다크모드 대응
woowacourse-teams · Oct 20, 2024 · 893c533 · 893c533
1 parent 6ce2c0d
commit 893c533
Show file tree

Hide file tree

Showing 16 changed files with 63 additions and 50 deletions.
diff --git a/android/app/src/main/java/com/zzang/chongdae/presentation/view/home/OfferingViewModel.kt b/android/app/src/main/java/com/zzang/chongdae/presentation/view/home/OfferingViewModel.kt
@@ -42,6 +42,7 @@ class OfferingViewModel
         val offerings: LiveData<PagingData<Offering>> get() = _offerings
 
         val search: MutableLiveData<String?> = MutableLiveData(null)
+        val isSearchKeywordExist = search.map { (it != null) && (it != "") }
 
         private val _filters: MutableLiveData<List<Filter>> = MutableLiveData()
         val filters: LiveData<List<Filter>> get() = _filters

diff --git a/android/app/src/main/res/drawable/bg_white_radius_16dp.xml b/android/app/src/main/res/drawable/bg_white_radius_16dp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@color/white" />
+    <solid android:color="@color/offering_detail_background" />
     <corners
         android:topLeftRadius="16dp"
         android:topRightRadius="16dp" />

diff --git a/android/app/src/main/res/drawable/ic_detail_clock.xml b/android/app/src/main/res/drawable/ic_detail_clock.xml
@@ -5,16 +5,16 @@
     android:viewportWidth="18"
     android:viewportHeight="18">
     <path
+        android:fillColor="#00000000"
         android:pathData="M9,2.25C5.273,2.25 2.25,5.273 2.25,9C2.25,12.727 5.273,15.75 9,15.75C12.727,15.75 15.75,12.727 15.75,9C15.75,5.273 12.727,2.25 9,2.25Z"
         android:strokeWidth="1.5"
-        android:fillColor="#00000000"
-        android:strokeColor="#3F3F3F"/>
+        android:strokeColor="@color/default_icon_color" />
     <path
+        android:fillColor="#00000000"
         android:pathData="M9,4.5V9.563H12.375"
-        android:strokeLineJoin="round"
         android:strokeWidth="1.5"
-        android:fillColor="#00000000"
-        android:strokeColor="#3F3F3F"
-        android:strokeLineCap="round"/>
+        android:strokeColor="@color/default_icon_color"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
 </vector>
 
diff --git a/android/app/src/main/res/drawable/ic_detail_location.xml b/android/app/src/main/res/drawable/ic_detail_location.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="18"
     android:viewportHeight="18">
     <path
-        android:pathData="M7,0.875C4.585,0.875 2.625,2.639 2.625,4.813C2.625,8.313 7,13.125 7,13.125C7,13.125 11.375,8.313 11.375,4.813C11.375,2.639 9.415,0.875 7,0.875ZM7,7C6.654,7 6.316,6.897 6.028,6.705C5.74,6.513 5.516,6.239 5.383,5.92C5.251,5.6 5.216,5.248 5.284,4.909C5.351,4.569 5.518,4.257 5.763,4.013C6.007,3.768 6.319,3.601 6.659,3.534C6.998,3.466 7.35,3.501 7.67,3.633C7.989,3.766 8.263,3.99 8.455,4.278C8.647,4.566 8.75,4.904 8.75,5.25C8.749,5.714 8.565,6.159 8.237,6.487C7.909,6.815 7.464,6.999 7,7Z"
-        android:fillColor="#000000"/>
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M7,0.875C4.585,0.875 2.625,2.639 2.625,4.813C2.625,8.313 7,13.125 7,13.125C7,13.125 11.375,8.313 11.375,4.813C11.375,2.639 9.415,0.875 7,0.875ZM7,7C6.654,7 6.316,6.897 6.028,6.705C5.74,6.513 5.516,6.239 5.383,5.92C5.251,5.6 5.216,5.248 5.284,4.909C5.351,4.569 5.518,4.257 5.763,4.013C6.007,3.768 6.319,3.601 6.659,3.534C6.998,3.466 7.35,3.501 7.67,3.633C7.989,3.766 8.263,3.99 8.455,4.278C8.647,4.566 8.75,4.904 8.75,5.25C8.749,5.714 8.565,6.159 8.237,6.487C7.909,6.815 7.464,6.999 7,7Z" />
 </vector>
diff --git a/android/app/src/main/res/drawable/ic_detail_modify.xml b/android/app/src/main/res/drawable/ic_detail_modify.xml
@@ -1,20 +1,17 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:width="19dp"
+    android:height="19dp"
+    android:viewportWidth="19"
+    android:viewportHeight="19">
   <path
-      android:pathData="M2,0L22,0A2,2 0,0 1,24 2L24,22A2,2 0,0 1,22 24L2,24A2,2 0,0 1,0 22L0,2A2,2 0,0 1,2 0z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M7,7H6C5.47,7 4.961,7.211 4.586,7.586C4.211,7.961 4,8.47 4,9V18C4,18.53 4.211,19.039 4.586,19.414C4.961,19.789 5.47,20 6,20H15C15.53,20 16.039,19.789 16.414,19.414C16.789,19.039 17,18.53 17,18V17"
+      android:pathData="M4,5H3C2.47,5 1.961,5.211 1.586,5.586C1.211,5.961 1,6.47 1,7V16C1,16.53 1.211,17.039 1.586,17.414C1.961,17.789 2.47,18 3,18H12C12.53,18 13.039,17.789 13.414,17.414C13.789,17.039 14,16.53 14,16V15"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
       android:strokeColor="#F15642"
       android:strokeLineCap="round"/>
   <path
-      android:pathData="M16,5L19,8M20.385,6.585C20.779,6.191 21,5.657 21,5.1C21,4.543 20.779,4.009 20.385,3.615C19.991,3.221 19.457,3 18.9,3C18.343,3 17.809,3.221 17.415,3.615L9,12V15H12L20.385,6.585Z"
+      android:pathData="M13,3L16,6M17.385,4.585C17.779,4.191 18,3.657 18,3.1C18,2.543 17.779,2.009 17.385,1.615C16.991,1.221 16.457,1 15.9,1C15.343,1 14.809,1.221 14.415,1.615L6,10V13H9L17.385,4.585Z"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"

diff --git a/android/app/src/main/res/drawable/ic_detail_money.xml b/android/app/src/main/res/drawable/ic_detail_money.xml
@@ -5,9 +5,9 @@
     android:viewportWidth="18"
     android:viewportHeight="18">
     <path
-        android:fillColor="#000000"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M9,9.375C8.304,9.375 7.636,9.652 7.144,10.144C6.652,10.636 6.375,11.304 6.375,12C6.375,12.696 6.652,13.364 7.144,13.856C7.636,14.348 8.304,14.625 9,14.625C9.696,14.625 10.364,14.348 10.856,13.856C11.348,13.364 11.625,12.696 11.625,12C11.625,11.304 11.348,10.636 10.856,10.144C10.364,9.652 9.696,9.375 9,9.375ZM7.875,12C7.875,11.702 7.994,11.415 8.205,11.205C8.415,10.993 8.702,10.875 9,10.875C9.298,10.875 9.585,10.993 9.795,11.205C10.007,11.415 10.125,11.702 10.125,12C10.125,12.298 10.007,12.585 9.795,12.795C9.585,13.007 9.298,13.125 9,13.125C8.702,13.125 8.415,13.007 8.205,12.795C7.994,12.585 7.875,12.298 7.875,12Z" />
     <path
-        android:fillColor="#000000"
+        android:fillColor="@color/default_icon_color"
         android:pathData="M13.144,3.837L10.76,0.494L1.993,7.498L1.508,7.493V7.5H1.125V16.5H16.875V7.5H16.153L14.718,3.301L13.144,3.837ZM14.569,7.5H7.048L12.649,5.591L13.791,5.225L14.569,7.5ZM11.663,4.343L5.88,6.314L10.46,2.655L11.663,4.343ZM2.625,13.627V10.372C2.942,10.26 3.229,10.079 3.467,9.841C3.704,9.604 3.886,9.317 3.997,9H14.002C14.114,9.317 14.296,9.604 14.533,9.842C14.771,10.079 15.058,10.261 15.375,10.373V13.627C15.058,13.739 14.771,13.921 14.533,14.158C14.296,14.396 14.114,14.683 14.002,15H3.999C3.887,14.683 3.705,14.396 3.467,14.158C3.23,13.92 2.942,13.739 2.625,13.627Z" />
 </vector>
diff --git a/android/app/src/main/res/drawable/ic_detail_remove.xml b/android/app/src/main/res/drawable/ic_detail_remove.xml
@@ -1,12 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:width="16dp"
+    android:height="18dp"
+    android:viewportWidth="16"
+    android:viewportHeight="18">
   <path
-      android:pathData="M2,0L22,0A2,2 0,0 1,24 2L24,22A2,2 0,0 1,22 24L2,24A2,2 0,0 1,0 22L0,2A2,2 0,0 1,2 0z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M7,21C6.45,21 5.979,20.804 5.588,20.413C5.197,20.022 5.001,19.551 5,19V6H4V4H9V3H15V4H20V6H19V19C19,19.55 18.804,20.021 18.413,20.413C18.022,20.805 17.551,21.001 17,21H7ZM9,17H11V8H9V17ZM13,17H15V8H13V17Z"
+      android:pathData="M3,18C2.45,18 1.979,17.804 1.588,17.413C1.197,17.022 1.001,16.551 1,16V3H0V1H5V0H11V1H16V3H15V16C15,16.55 14.804,17.021 14.413,17.413C14.022,17.805 13.551,18.001 13,18H3ZM5,14H7V5H5V14ZM9,14H11V5H9V14Z"
       android:fillColor="#F15642"/>
 </vector>
diff --git a/android/app/src/main/res/drawable/ic_my_page_logout.xml b/android/app/src/main/res/drawable/ic_my_page_logout.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="10">
   <path
       android:pathData="M7.013,7.021C6.908,6.907 6.856,6.777 6.856,6.631C6.856,6.486 6.908,6.365 7.013,6.268L8.065,5.289H3.983C3.822,5.289 3.687,5.238 3.578,5.137C3.469,5.036 3.414,4.91 3.414,4.76C3.414,4.61 3.469,4.485 3.578,4.383C3.687,4.282 3.822,4.231 3.983,4.231H8.065L7.013,3.253C6.899,3.147 6.842,3.022 6.842,2.876C6.842,2.731 6.899,2.605 7.013,2.499C7.117,2.393 7.248,2.34 7.404,2.34C7.561,2.34 7.691,2.389 7.795,2.486L9.844,4.39C9.9,4.443 9.941,4.5 9.965,4.562C9.988,4.624 10,4.69 10,4.76C10,4.831 9.988,4.897 9.965,4.959C9.941,5.02 9.9,5.078 9.844,5.131L7.795,7.035C7.672,7.149 7.537,7.2 7.39,7.187C7.243,7.173 7.117,7.118 7.013,7.021ZM1.138,9.521C0.825,9.521 0.557,9.417 0.334,9.21C0.111,9.003 0,8.754 0,8.463V1.058C0,0.767 0.111,0.518 0.334,0.31C0.557,0.103 0.825,0 1.138,0H4.552C4.713,0 4.848,0.051 4.958,0.152C5.066,0.253 5.121,0.379 5.121,0.529C5.121,0.679 5.066,0.804 4.958,0.906C4.848,1.007 4.713,1.058 4.552,1.058H1.138V8.463H4.552C4.713,8.463 4.848,8.514 4.958,8.615C5.066,8.716 5.121,8.842 5.121,8.992C5.121,9.142 5.066,9.267 4.958,9.368C4.848,9.47 4.713,9.521 4.552,9.521H1.138Z"
-      android:fillColor="#343434"/>
+      android:fillColor="@color/default_icon_color"/>
 </vector>
diff --git a/android/app/src/main/res/drawable/ic_my_page_privacy.xml b/android/app/src/main/res/drawable/ic_my_page_privacy.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="12">
   <path
       android:pathData="M5,8.579C5.177,8.579 5.326,8.524 5.446,8.413C5.565,8.302 5.625,8.165 5.625,8.002V5.691C5.625,5.527 5.565,5.39 5.446,5.279C5.326,5.168 5.177,5.113 5,5.113C4.823,5.113 4.675,5.168 4.555,5.279C4.435,5.39 4.375,5.527 4.375,5.691V8.002C4.375,8.165 4.435,8.302 4.555,8.413C4.675,8.524 4.823,8.579 5,8.579ZM5,3.957C5.177,3.957 5.326,3.902 5.446,3.791C5.565,3.681 5.625,3.543 5.625,3.38C5.625,3.216 5.565,3.079 5.446,2.968C5.326,2.857 5.177,2.802 5,2.802C4.823,2.802 4.675,2.857 4.555,2.968C4.435,3.079 4.375,3.216 4.375,3.38C4.375,3.543 4.435,3.681 4.555,3.791C4.675,3.902 4.823,3.957 5,3.957ZM5,11.425H4.844C4.792,11.425 4.745,11.415 4.703,11.396C3.339,11.001 2.214,10.219 1.328,9.049C0.443,7.879 0,6.586 0,5.171V2.441C0,2.2 0.076,1.984 0.227,1.791C0.378,1.598 0.573,1.459 0.813,1.372L4.563,0.072C4.708,0.024 4.854,0 5,0C5.146,0 5.292,0.024 5.438,0.072L9.188,1.372C9.427,1.459 9.623,1.598 9.774,1.791C9.925,1.984 10,2.2 10,2.441V5.171C10,6.586 9.557,7.879 8.672,9.049C7.786,10.219 6.661,11.001 5.297,11.396C5.245,11.415 5.146,11.425 5,11.425ZM5,10.255C6.083,9.937 6.979,9.302 7.688,8.348C8.396,7.395 8.75,6.336 8.75,5.171V2.441L5,1.141L1.25,2.441V5.171C1.25,6.336 1.604,7.395 2.313,8.348C3.021,9.302 3.917,9.937 5,10.255Z"
-      android:fillColor="#343434"/>
+      android:fillColor="@color/default_icon_color"/>
 </vector>
diff --git a/android/app/src/main/res/drawable/ic_my_page_terms_of_use.xml b/android/app/src/main/res/drawable/ic_my_page_terms_of_use.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="8">
   <path
       android:pathData="M3.206,5.485L8.498,0.244C8.662,0.081 8.871,0 9.126,0C9.38,0 9.589,0.081 9.753,0.244C9.918,0.407 10,0.614 10,0.866C10,1.118 9.918,1.325 9.753,1.488L3.834,7.35C3.655,7.528 3.445,7.617 3.206,7.617C2.967,7.617 2.758,7.528 2.578,7.35L0.247,5.041C0.082,4.878 0,4.671 0,4.419C0,4.167 0.082,3.96 0.247,3.797C0.411,3.634 0.62,3.553 0.874,3.553C1.129,3.553 1.338,3.634 1.502,3.797L3.206,5.485Z"
-      android:fillColor="#343434"/>
+      android:fillColor="@color/default_icon_color"/>
 </vector>
diff --git a/android/app/src/main/res/drawable/ic_my_page_withdrawal.xml b/android/app/src/main/res/drawable/ic_my_page_withdrawal.xml
@@ -3,7 +3,7 @@
     android:height="13dp"
     android:viewportWidth="13"
     android:viewportHeight="13">
-  <path
-      android:pathData="M10.969,2.438H8.938V2.031C8.938,1.708 8.809,1.398 8.581,1.169C8.352,0.941 8.042,0.813 7.719,0.813H5.281C4.958,0.813 4.648,0.941 4.419,1.169C4.191,1.398 4.063,1.708 4.063,2.031V2.438H2.031C1.924,2.438 1.82,2.48 1.744,2.556C1.668,2.633 1.625,2.736 1.625,2.844C1.625,2.951 1.668,3.055 1.744,3.131C1.82,3.207 1.924,3.25 2.031,3.25H2.438V10.563C2.438,10.778 2.523,10.985 2.675,11.137C2.828,11.289 3.035,11.375 3.25,11.375H9.75C9.965,11.375 10.172,11.289 10.325,11.137C10.477,10.985 10.563,10.778 10.563,10.563V3.25H10.969C11.076,3.25 11.18,3.207 11.256,3.131C11.332,3.055 11.375,2.951 11.375,2.844C11.375,2.736 11.332,2.633 11.256,2.556C11.18,2.48 11.076,2.438 10.969,2.438ZM4.875,2.031C4.875,1.924 4.918,1.82 4.994,1.744C5.07,1.668 5.174,1.625 5.281,1.625H7.719C7.826,1.625 7.93,1.668 8.006,1.744C8.082,1.82 8.125,1.924 8.125,2.031V2.438H4.875V2.031ZM9.75,10.563H3.25V3.25H9.75V10.563ZM5.688,5.281V8.531C5.688,8.639 5.645,8.742 5.569,8.819C5.492,8.895 5.389,8.938 5.281,8.938C5.174,8.938 5.07,8.895 4.994,8.819C4.918,8.742 4.875,8.639 4.875,8.531V5.281C4.875,5.174 4.918,5.07 4.994,4.994C5.07,4.918 5.174,4.875 5.281,4.875C5.389,4.875 5.492,4.918 5.569,4.994C5.645,5.07 5.688,5.174 5.688,5.281ZM8.125,5.281V8.531C8.125,8.639 8.082,8.742 8.006,8.819C7.93,8.895 7.826,8.938 7.719,8.938C7.611,8.938 7.508,8.895 7.431,8.819C7.355,8.742 7.313,8.639 7.313,8.531V5.281C7.313,5.174 7.355,5.07 7.431,4.994C7.508,4.918 7.611,4.875 7.719,4.875C7.826,4.875 7.93,4.918 8.006,4.994C8.082,5.07 8.125,5.174 8.125,5.281Z"
-      android:fillColor="#000000"/>
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M10.969,2.438H8.938V2.031C8.938,1.708 8.809,1.398 8.581,1.169C8.352,0.941 8.042,0.813 7.719,0.813H5.281C4.958,0.813 4.648,0.941 4.419,1.169C4.191,1.398 4.063,1.708 4.063,2.031V2.438H2.031C1.924,2.438 1.82,2.48 1.744,2.556C1.668,2.633 1.625,2.736 1.625,2.844C1.625,2.951 1.668,3.055 1.744,3.131C1.82,3.207 1.924,3.25 2.031,3.25H2.438V10.563C2.438,10.778 2.523,10.985 2.675,11.137C2.828,11.289 3.035,11.375 3.25,11.375H9.75C9.965,11.375 10.172,11.289 10.325,11.137C10.477,10.985 10.563,10.778 10.563,10.563V3.25H10.969C11.076,3.25 11.18,3.207 11.256,3.131C11.332,3.055 11.375,2.951 11.375,2.844C11.375,2.736 11.332,2.633 11.256,2.556C11.18,2.48 11.076,2.438 10.969,2.438ZM4.875,2.031C4.875,1.924 4.918,1.82 4.994,1.744C5.07,1.668 5.174,1.625 5.281,1.625H7.719C7.826,1.625 7.93,1.668 8.006,1.744C8.082,1.82 8.125,1.924 8.125,2.031V2.438H4.875V2.031ZM9.75,10.563H3.25V3.25H9.75V10.563ZM5.688,5.281V8.531C5.688,8.639 5.645,8.742 5.569,8.819C5.492,8.895 5.389,8.938 5.281,8.938C5.174,8.938 5.07,8.895 4.994,8.819C4.918,8.742 4.875,8.639 4.875,8.531V5.281C4.875,5.174 4.918,5.07 4.994,4.994C5.07,4.918 5.174,4.875 5.281,4.875C5.389,4.875 5.492,4.918 5.569,4.994C5.645,5.07 5.688,5.174 5.688,5.281ZM8.125,5.281V8.531C8.125,8.639 8.082,8.742 8.006,8.819C7.93,8.895 7.826,8.938 7.719,8.938C7.611,8.938 7.508,8.895 7.431,8.819C7.355,8.742 7.313,8.639 7.313,8.531V5.281C7.313,5.174 7.355,5.07 7.431,4.994C7.508,4.918 7.611,4.875 7.719,4.875C7.826,4.875 7.93,4.918 8.006,4.994C8.082,5.07 8.125,5.174 8.125,5.281Z" />
 </vector>
diff --git a/android/app/src/main/res/layout/activity_main.xml b/android/app/src/main/res/layout/activity_main.xml
@@ -7,7 +7,6 @@
         android:id="@+id/main"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/white"
         tools:context=".presentation.view.home.MainActivity">
 
         <androidx.fragment.app.FragmentContainerView

diff --git a/android/app/src/main/res/layout/fragment_home.xml b/android/app/src/main/res/layout/fragment_home.xml
@@ -30,11 +30,12 @@
                 android:backgroundTint="@color/main_color"
                 android:fontFamily="@font/suit_medium"
                 android:hint="@string/home_search_hint_text"
+                android:imeOptions="flagNoExtractUi"
                 android:inputType="text"
                 android:paddingStart="15dp"
                 android:paddingEnd="30dp"
                 android:text="@={vm.search}"
-                android:textSize="12sp"
+                android:textSize="@dimen/size_15"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -43,11 +44,13 @@
                 android:id="@+id/iv_clear_url"
                 android:layout_width="@dimen/icon_size_20"
                 android:layout_height="@dimen/icon_size_20"
+                android:layout_marginTop="@dimen/size_6"
                 android:layout_marginEnd="@dimen/size_3"
                 android:layout_marginBottom="5dp"
                 android:padding="@dimen/size_3"
                 android:src="@drawable/btn_offering_write_clear"
                 app:debouncedOnClick="@{() -> vm.refreshOfferings(true)}"
+                app:isVisible="@{vm.isSearchKeywordExist}"
                 app:layout_constraintBottom_toBottomOf="@id/et_search"
                 app:layout_constraintEnd_toStartOf="@id/iv_search_button"
                 app:layout_constraintTop_toTopOf="@id/iv_search_button" />
@@ -62,8 +65,8 @@
                 android:paddingEnd="10dp"
                 android:paddingBottom="10dp"
                 android:src="@drawable/ic_main_search"
-                app:debouncedOnClick="@{() -> vm.onClickSearchButton()}"
                 app:debounceTime="@{800L}"
+                app:debouncedOnClick="@{() -> vm.onClickSearchButton()}"
                 app:layout_constraintBottom_toBottomOf="@id/et_search"
                 app:layout_constraintEnd_toEndOf="@id/et_search" />