Merge pull request #36 from Team-Umbba/design/#29

[Design/#29] Color System 및 바뀐 placeHolder 적용

app/src/main/res/color/sel_answer_input_layout.xml

@@ -1,5 +1,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="@color/grey_800" android:state_focused="true" />
     <item android:color="@color/grey_800" android:state_hovered="true" />
-    <item android:color="@color/grey_800" android:state_hovered="true" />
 </selector>

app/src/main/res/color/sel_btn_pri500_text.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/umbba_white" android:state_enabled="false" />
+    <item android:color="@color/primary_500" android:state_enabled="true"/>
+</selector>

app/src/main/res/color/sel_choice_chip_pri500_color.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/primary_500" android:state_checked="true" />
+    <item android:color="@color/umbba_white"/>
+</selector>

app/src/main/res/color/sel_choice_chip_pri500_stroke.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/primary_500" android:state_checked="true" />
+    <item android:color="@color/grey_400"/>
+</selector>

app/src/main/res/color/sel_choice_chip_pri500_text.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/umbba_white" android:state_checked="true" />
+    <item android:color="@color/umbba_black"/>
+</selector>

app/src/main/res/color/sel_quest_choice_chip_text.xml → app/src/main/res/color/sel_choice_chip_pri600_text.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/white" android:state_checked="true" />
+    <item android:color="@color/umbba_white" android:state_checked="true" />
     <item android:color="@color/primary_600"/>
 </selector>

app/src/main/res/color/sel_invite_code_input_layout.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/grey_300" android:state_focused="true" />
-    <item android:color="@color/grey_300" android:state_hovered="true" />
-    <item android:color="@color/grey_300" android:state_hovered="true" />
+    <item android:color="@color/grey_400" android:state_focused="true" />
+    <item android:color="@color/grey_400" android:state_hovered="true" />
 </selector>

app/src/main/res/drawable/ic_kakao_talk_logo.xml

@@ -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="M12,3C17.8,3 22.501,6.664 22.501,11.185C22.501,15.705 17.8,19.369 12.001,19.369C11.424,19.369 10.847,19.333 10.274,19.259L5.866,22.142C5.365,22.407 5.188,22.378 5.394,21.729L6.286,18.051C3.406,16.591 1.501,14.061 1.501,11.185C1.501,6.665 6.201,3 12.001,3H12ZM17.908,11.06L19.378,9.636C19.463,9.548 19.51,9.43 19.51,9.308C19.51,9.186 19.462,9.068 19.377,8.98C19.292,8.893 19.176,8.841 19.054,8.837C18.932,8.833 18.813,8.876 18.722,8.958L16.794,10.824V9.282C16.794,9.157 16.744,9.037 16.656,8.948C16.567,8.86 16.447,8.81 16.322,8.81C16.197,8.81 16.077,8.86 15.988,8.948C15.9,9.037 15.85,9.157 15.85,9.282V11.839C15.832,11.912 15.832,11.988 15.85,12.061V13.5C15.85,13.625 15.9,13.745 15.988,13.834C16.077,13.922 16.197,13.972 16.322,13.972C16.447,13.972 16.567,13.922 16.656,13.834C16.744,13.745 16.794,13.625 16.794,13.5V12.137L17.221,11.724L18.649,13.757C18.685,13.808 18.73,13.851 18.782,13.884C18.835,13.917 18.893,13.94 18.954,13.951C19.015,13.962 19.078,13.96 19.138,13.946C19.199,13.933 19.256,13.908 19.307,13.872C19.358,13.836 19.401,13.791 19.434,13.739C19.468,13.686 19.49,13.628 19.501,13.567C19.511,13.506 19.51,13.443 19.497,13.383C19.483,13.322 19.458,13.265 19.422,13.214L17.908,11.059V11.06ZM14.95,12.984H13.49V9.297C13.484,9.176 13.432,9.061 13.344,8.977C13.257,8.894 13.14,8.847 13.019,8.847C12.897,8.847 12.78,8.894 12.693,8.977C12.605,9.061 12.553,9.176 12.547,9.297V13.456C12.547,13.716 12.757,13.928 13.018,13.928H14.95C15.075,13.928 15.195,13.878 15.284,13.79C15.372,13.701 15.422,13.581 15.422,13.456C15.422,13.331 15.372,13.211 15.284,13.122C15.195,13.034 15.075,12.984 14.95,12.984ZM9.093,11.893L9.789,10.185L10.427,11.892L9.093,11.893ZM11.616,12.38L11.618,12.364C11.618,12.245 11.572,12.131 11.491,12.044L10.445,9.244C10.401,9.111 10.318,8.994 10.206,8.909C10.094,8.824 9.958,8.776 9.818,8.77C9.677,8.769 9.538,8.812 9.422,8.892C9.305,8.972 9.216,9.085 9.165,9.217L7.503,13.292C7.456,13.408 7.456,13.538 7.505,13.653C7.553,13.769 7.646,13.86 7.761,13.908C7.877,13.955 8.007,13.954 8.123,13.906C8.238,13.857 8.33,13.765 8.377,13.649L8.709,12.836H10.779L11.077,13.636C11.097,13.696 11.129,13.751 11.171,13.798C11.214,13.845 11.264,13.884 11.322,13.91C11.379,13.938 11.441,13.953 11.504,13.956C11.567,13.958 11.63,13.948 11.689,13.926C11.748,13.904 11.802,13.87 11.848,13.827C11.894,13.784 11.931,13.731 11.956,13.674C11.981,13.616 11.995,13.554 11.996,13.49C11.997,13.427 11.985,13.365 11.961,13.306L11.616,12.38ZM8.294,9.302C8.294,9.177 8.244,9.057 8.156,8.969C8.068,8.88 7.948,8.83 7.823,8.83H4.578C4.453,8.83 4.333,8.88 4.244,8.968C4.156,9.057 4.106,9.177 4.106,9.302C4.106,9.427 4.156,9.547 4.244,9.636C4.333,9.724 4.453,9.774 4.578,9.774H5.738V13.51C5.738,13.635 5.788,13.755 5.876,13.844C5.965,13.932 6.085,13.982 6.21,13.982C6.335,13.982 6.455,13.932 6.544,13.844C6.632,13.755 6.682,13.635 6.682,13.51V9.774H7.822C7.947,9.774 8.067,9.724 8.156,9.636C8.244,9.547 8.294,9.427 8.294,9.302Z"
+      android:fillColor="#32211B"/>
+</vector>

app/src/main/res/drawable/ic_umbba_logo.xml

@@ -0,0 +1,123 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="67dp"
+    android:height="60dp"
+    android:viewportWidth="67"
+    android:viewportHeight="60">
+  <group>
+    <clip-path
+        android:pathData="M0,0h67v60h-67z"/>
+    <path
+        android:pathData="M55.967,12.297V26.017H51.692V21.84C51.692,15.583 46.752,10.512 40.657,10.512V26.017H36.299V20.448C36.352,19.864 36.381,19.271 36.381,18.671C36.382,8.361 28.237,0 18.192,0C8.146,0 0.001,8.361 0.001,18.673C0.001,28.985 8.146,37.345 18.192,37.345H25.265V60H25.305L36.3,51.972V37.344H40.658V48.672L51.692,40.734V37.344H55.967L67.003,29.555V23.624C67.003,17.367 62.062,12.295 55.967,12.295V12.297ZM25.265,26.017H18.192V25.997C18.169,25.997 18.148,25.999 18.126,25.999C14.184,25.999 10.989,22.719 10.989,18.673C10.989,14.627 14.184,11.346 18.126,11.346C22.068,11.346 25.014,14.378 25.248,18.207V18.204C25.248,18.204 25.645,23.622 29.562,26.017H25.263H25.265Z">
+      <aapt:attr name="android:fillColor">
+        <gradient 
+            android:startX="-3.691"
+            android:startY="21.248"
+            android:endX="62.356"
+            android:endY="41.691"
+            android:type="linear">
+          <item android:offset="0" android:color="#FFD87E7E"/>
+          <item android:offset="0.51" android:color="#FFEBA887"/>
+          <item android:offset="1" android:color="#FFF8C9AF"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M29.562,26.016L28.885,25.546L28.183,24.922H36.3V26.016H29.562Z"
+        android:strokeAlpha="0.5"
+        android:fillAlpha="0.5">
+      <aapt:attr name="android:fillColor">
+        <gradient 
+            android:startX="32.241"
+            android:startY="24.922"
+            android:endX="32.241"
+            android:endY="26.016"
+            android:type="linear">
+          <item android:offset="0" android:color="#00B46452"/>
+          <item android:offset="1" android:color="#FFB46452"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M40.656,37.347V40.863H51.692V37.347H40.656Z"
+        android:strokeAlpha="0.5"
+        android:fillAlpha="0.5">
+      <aapt:attr name="android:fillColor">
+        <gradient 
+            android:startX="46.173"
+            android:startY="40.863"
+            android:endX="46.173"
+            android:endY="37.347"
+            android:type="linear">
+          <item android:offset="0" android:color="#00B46452"/>
+          <item android:offset="1" android:color="#FFB46452"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M25.266,37.348V46.873H36.302V37.348H25.266Z"
+        android:strokeAlpha="0.5"
+        android:fillAlpha="0.5">
+      <aapt:attr name="android:fillColor">
+        <gradient 
+            android:startX="30.783"
+            android:startY="46.871"
+            android:endX="30.783"
+            android:endY="37.347"
+            android:type="linear">
+          <item android:offset="0" android:color="#00B46452"/>
+          <item android:offset="1" android:color="#FFB46452"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M51.692,26.016V24.922H40.657V26.016H51.692Z"
+        android:strokeAlpha="0.5"
+        android:fillAlpha="0.5">
+      <aapt:attr name="android:fillColor">
+        <gradient 
+            android:startX="46.175"
+            android:startY="24.923"
+            android:endX="46.175"
+            android:endY="26.017"
+            android:type="linear">
+          <item android:offset="0" android:color="#00B46452"/>
+          <item android:offset="1" android:color="#FFB46452"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M55.966,26.016H53.385V37.344H55.966V26.016Z"
+        android:strokeAlpha="0.8"
+        android:fillAlpha="0.8">
+      <aapt:attr name="android:fillColor">
+        <gradient 
+            android:startX="53.385"
+            android:startY="31.679"
+            android:endX="55.966"
+            android:endY="31.679"
+            android:type="linear">
+          <item android:offset="0" android:color="#00B46452"/>
+          <item android:offset="1" android:color="#FFB46452"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M55.952,26.055H67.001V29.594L55.952,37.383V26.055Z"
+        android:strokeAlpha="0.5"
+        android:fillAlpha="0.5">
+      <aapt:attr name="android:fillColor">
+        <gradient 
+            android:startX="61.477"
+            android:startY="26.055"
+            android:endX="61.477"
+            android:endY="35.958"
+            android:type="linear">
+          <item android:offset="0" android:color="#00F8C9AF"/>
+          <item android:offset="0.33" android:color="#FFEBA887"/>
+          <item android:offset="1" android:color="#FFD87E7E"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+  </group>
+</vector>

app/src/main/res/drawable/ic_umbba_logo_big.xml

@@ -0,0 +1,123 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="160dp"
+    android:height="160dp"
+    android:viewportWidth="160"
+    android:viewportHeight="160">
+  <group>
+    <clip-path
+        android:pathData="M9,18h142v124h-142z"/>
+    <path
+        android:pathData="M127.61,43.42V71.78H118.54V63.14C118.54,50.21 108.07,39.73 95.16,39.73V71.78H85.92V60.28C86.03,59.07 86.09,57.86 86.09,56.59C86.11,35.27 68.86,18 47.56,18C26.26,18 9,35.27 9,56.59C9,77.91 26.26,95.18 47.56,95.18H62.54V142H62.62L85.92,125.41V95.18H95.16V118.59H95.51L118.57,102.2V95.18H127.64L151.03,79.09V66.82C151.03,53.9 140.56,43.42 127.64,43.42H127.61ZM62.54,71.78H47.56C47.56,71.78 47.47,71.75 47.42,71.75C39.07,71.75 32.3,64.98 32.3,56.62C32.3,48.26 39.07,41.49 47.42,41.49C55.77,41.49 62.01,47.76 62.51,55.68C62.51,55.68 63.36,66.88 71.66,71.83H62.56L62.54,71.78Z">
+      <aapt:attr name="android:fillColor">
+        <gradient 
+            android:startX="1.17"
+            android:startY="61.9"
+            android:endX="140.53"
+            android:endY="106.14"
+            android:type="linear">
+          <item android:offset="0" android:color="#FFD97E7F"/>
+          <item android:offset="0.51" android:color="#FFECA887"/>
+          <item android:offset="1" android:color="#FFF9C9AF"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M71.66,71.78L70.23,70.78L68.72,69.52H85.92V71.78H71.66Z"
+        android:strokeAlpha="0.5"
+        android:fillAlpha="0.5">
+      <aapt:attr name="android:fillColor">
+        <gradient 
+            android:startX="77.32"
+            android:startY="69.52"
+            android:endX="77.32"
+            android:endY="71.78"
+            android:type="linear">
+          <item android:offset="0" android:color="#00B46453"/>
+          <item android:offset="1" android:color="#FFB46453"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M95.18,95.18V102.44H118.57V95.18H95.18Z"
+        android:strokeAlpha="0.5"
+        android:fillAlpha="0.5">
+      <aapt:attr name="android:fillColor">
+        <gradient 
+            android:startX="106.86"
+            android:startY="102.44"
+            android:endX="106.86"
+            android:endY="95.18"
+            android:type="linear">
+          <item android:offset="0" android:color="#00B46453"/>
+          <item android:offset="1" android:color="#FFB46453"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M62.54,95.18V114.88H85.92V95.18H62.54Z"
+        android:strokeAlpha="0.5"
+        android:fillAlpha="0.5">
+      <aapt:attr name="android:fillColor">
+        <gradient 
+            android:startX="74.24"
+            android:startY="114.88"
+            android:endX="74.24"
+            android:endY="95.18"
+            android:type="linear">
+          <item android:offset="0" android:color="#00B46453"/>
+          <item android:offset="1" android:color="#FFB46453"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M118.57,71.78V69.52H95.18V71.78H118.57Z"
+        android:strokeAlpha="0.5"
+        android:fillAlpha="0.5">
+      <aapt:attr name="android:fillColor">
+        <gradient 
+            android:startX="106.86"
+            android:startY="69.49"
+            android:endX="106.86"
+            android:endY="71.78"
+            android:type="linear">
+          <item android:offset="0" android:color="#00B46453"/>
+          <item android:offset="1" android:color="#FFB46453"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M127.61,71.78H122.14V95.18H127.61V71.78Z"
+        android:strokeAlpha="0.8"
+        android:fillAlpha="0.8">
+      <aapt:attr name="android:fillColor">
+        <gradient 
+            android:startX="122.14"
+            android:startY="83.47"
+            android:endX="127.61"
+            android:endY="83.47"
+            android:type="linear">
+          <item android:offset="0" android:color="#00B46453"/>
+          <item android:offset="1" android:color="#FFB46453"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M127.58,71.83H151V79.15L127.58,95.24V71.83Z"
+        android:strokeAlpha="0.5"
+        android:fillAlpha="0.5">
+      <aapt:attr name="android:fillColor">
+        <gradient 
+            android:startX="139.29"
+            android:startY="71.83"
+            android:endX="139.29"
+            android:endY="92.3"
+            android:type="linear">
+          <item android:offset="0" android:color="#00F9C9AF"/>
+          <item android:offset="0.33" android:color="#FFECA887"/>
+          <item android:offset="1" android:color="#FFD97E7F"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+  </group>
+</vector>

app/src/main/res/drawable/inset_dialog_background.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <inset xmlns:android="http://schemas.android.com/apk/res/android"
-    android:drawable="@drawable/shape_grey_dialog_r16_rect"
+    android:drawable="@drawable/shape_white_dialog_r16_rect"
     android:insetLeft="16dp"
     android:insetRight="16dp">
 </inset>

app/src/main/res/drawable/progress_bar_quest.xml

@@ -3,7 +3,7 @@
     <item android:id="@android:id/background">
         <shape>
             <corners android:radius="18dp" />
-            <solid android:color="@color/grey_D2D2D2" />
+            <solid android:color="@color/grey_400" />
         </shape>
     </item>
 
@@ -16,7 +16,7 @@
         <scale android:scaleWidth="100%">
             <shape>
                 <corners android:radius="18dp"/>
-                <solid android:color="@color/grey_666666"/>
+                <solid android:color="@color/primary_600"/>
             </shape>
         </scale>
     </item>

app/src/main/res/drawable/sel_btn_answer.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/shape_gradient_btn_r50_rect" android:state_enabled="false" />
+    <item android:drawable="@drawable/shape_pri500_btn_stroke_r50_rect" android:state_enabled="true" />
+</selector>

app/src/main/res/drawable/sel_btn_next.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/shape_g300_fill_r50_rect" android:state_enabled="false" />
-    <item android:drawable="@drawable/shape_black_fill_r50_rect" android:state_enabled="true" />
+    <item android:drawable="@drawable/shape_g400_btn_r50_rect" android:state_enabled="false" />
+    <item android:drawable="@drawable/shape_gradient_btn_r50_rect" android:state_enabled="true" />
 </selector>

app/src/main/res/drawable/shape_g300_fill_r50_rect.xml → app/src/main/res/drawable/shape_g400_btn_r50_rect.xml

@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="50dp" />
-    <solid android:color="@color/grey_btn" />
+    <solid android:color="@color/grey_400" />
 </shape>

app/src/main/res/drawable/shape_gd4d4_stroke_r8_rect.xml → app/src/main/res/drawable/shape_g400_stroke_r8_rect.xml

@@ -4,5 +4,5 @@
     <corners android:radius="8dp" />
     <stroke
         android:width="1dp"
-        android:color="@color/grey_D4D4D4" />
+        android:color="@color/grey_400" />
 </shape>

app/src/main/res/drawable/shape_gradient_btn_r50_rect.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:angle="0"
+        android:centerColor="@color/gradient_center"
+        android:endColor="@color/gradient_end"
+        android:startColor="@color/gradient_start" />
+    <corners android:radius="50dp" />
+</shape>