#86 fix : 다크모드 대응

Co-authored-by: plashdof <[email protected]> Co-authored-by: yy0ung <[email protected]>
BENDENG1 · Dec 11, 2023 · 1cef734 · 1cef734
1 parent bbb9ddc
commit 1cef734
Show file tree

Hide file tree

Showing 34 changed files with 101 additions and 47 deletions.
diff --git a/Aos/app/src/main/res/drawable/ic_add_photo.xml b/Aos/app/src/main/res/drawable/ic_add_photo.xml
@@ -5,11 +5,11 @@
     android:viewportHeight="100">
   <path
       android:pathData="M72.92,45.83C64.08,45.83 59.66,45.83 56.91,43.09C54.17,40.34 54.17,35.92 54.17,27.08C54.17,18.25 54.17,13.82 56.91,11.08C59.66,8.33 64.08,8.33 72.92,8.33C81.75,8.33 86.18,8.33 88.92,11.08C91.67,13.82 91.67,18.25 91.67,27.08C91.67,35.92 91.67,40.34 88.92,43.09C86.18,45.83 81.75,45.83 72.92,45.83ZM76.04,18.75C76.04,17.92 75.71,17.13 75.13,16.54C74.54,15.95 73.75,15.62 72.92,15.62C72.09,15.62 71.29,15.95 70.71,16.54C70.12,17.13 69.79,17.92 69.79,18.75V23.96H64.58C63.75,23.96 62.96,24.29 62.37,24.87C61.79,25.46 61.46,26.25 61.46,27.08C61.46,27.91 61.79,28.71 62.37,29.29C62.96,29.88 63.75,30.21 64.58,30.21H69.79V35.42C69.79,36.25 70.12,37.04 70.71,37.63C71.29,38.21 72.09,38.54 72.92,38.54C73.75,38.54 74.54,38.21 75.13,37.63C75.71,37.04 76.04,36.25 76.04,35.42V30.21H81.25C82.08,30.21 82.87,29.88 83.46,29.29C84.05,28.71 84.38,27.91 84.38,27.08C84.38,26.25 84.05,25.46 83.46,24.87C82.87,24.29 82.08,23.96 81.25,23.96H76.04V18.75Z"
-      android:fillColor="#000000"
+      android:fillColor="@color/black"
       android:fillType="evenOdd"/>
   <path
       android:pathData="M91.67,52.91C91.66,59.03 91.61,64.23 91.27,68.5C90.86,73.46 90.03,77.6 88.18,81.04C87.38,82.55 86.35,83.93 85.14,85.14C81.67,88.61 77.25,90.18 71.65,90.93C66.18,91.67 59.17,91.67 50.22,91.67H49.78C40.83,91.67 33.82,91.67 28.35,90.93C22.75,90.18 18.33,88.61 14.86,85.14C11.79,82.06 10.2,78.24 9.35,73.49C8.52,68.82 8.37,63.02 8.34,55.82C8.33,53.99 8.33,52.05 8.33,50V49.77C8.33,40.82 8.33,33.82 9.07,28.34C9.82,22.75 11.39,18.32 14.86,14.86C18.33,11.39 22.75,9.82 28.35,9.07C33.21,8.41 39.47,8.34 47.09,8.33C47.86,8.33 48.6,8.64 49.15,9.18C49.69,9.73 50,10.47 50,11.24C50,12.01 49.69,12.75 49.15,13.29C48.6,13.84 47.86,14.15 47.09,14.15C39.36,14.15 33.62,14.22 29.12,14.82C24.17,15.49 21.18,16.76 18.97,18.97C16.76,21.17 15.5,24.17 14.83,29.12C14.15,34.17 14.15,40.78 14.15,50V53.27L18.03,49.87C19.73,48.39 21.94,47.6 24.2,47.67C26.46,47.75 28.6,48.68 30.2,50.28L46.83,66.9C48.12,68.19 49.82,68.99 51.64,69.15C53.46,69.3 55.27,68.82 56.77,67.77L57.92,66.95C60.08,65.44 62.68,64.7 65.31,64.86C67.94,65.02 70.43,66.06 72.39,67.82L83.36,77.7C84.46,75.38 85.12,72.33 85.47,68.03C85.8,63.98 85.85,59.07 85.85,52.91C85.85,52.14 86.16,51.4 86.7,50.85C87.25,50.31 87.99,50 88.76,50C89.53,50 90.27,50.31 90.81,50.85C91.36,51.4 91.67,52.14 91.67,52.91Z"
       android:strokeAlpha="0.5"
-      android:fillColor="#000000"
+      android:fillColor="@color/black"
       android:fillAlpha="0.5"/>
 </vector>
diff --git a/Aos/app/src/main/res/drawable/ic_add_review_photo.xml b/Aos/app/src/main/res/drawable/ic_add_review_photo.xml
@@ -6,12 +6,12 @@
   <path
       android:pathData="M10,0.66L304,0.66A9.75,9.75 0,0 1,313.75 10.41L313.75,164A9.75,9.75 0,0 1,304 173.75L10,173.75A9.75,9.75 0,0 1,0.25 164L0.25,10.41A9.75,9.75 0,0 1,10 0.66z"
       android:strokeWidth="0.5"
-      android:fillColor="#F4F5F6"
-      android:strokeColor="#D9D9D9"/>
+      android:fillColor="@color/nn_dark7"
+      android:strokeColor="@color/nn_primary2"/>
   <path
       android:pathData="M96.37,113.06H97.45V124.83H96.37V113.06ZM88.5,121.1H89.47C91.43,121.1 93.19,121.03 95.27,120.69L95.39,121.57C93.25,121.92 91.49,122 89.47,122H88.5V121.1ZM88.47,114.16H93.9V118.36H89.58V121.44H88.5V117.48H92.81V115.05H88.47V114.16ZM102.44,120.08H103.52V124.82H102.44V120.08ZM106.64,120.08H107.74V124.82H106.64V120.08ZM99.77,119.93H110.43V120.82H99.77V119.93ZM101.11,113.53H102.18V115.1H108V113.53H109.06V118.56H101.11V113.53ZM102.18,115.98V117.66H108V115.98H102.18ZM118.17,114.08H119.05V116.19C119.05,118.79 117.65,121.32 115.79,122.31L115.13,121.46C116.83,120.6 118.17,118.33 118.17,116.19V114.08ZM118.36,114.08H119.23V116.19C119.23,118.26 120.55,120.4 122.21,121.23L121.55,122.09C119.73,121.12 118.36,118.71 118.36,116.19V114.08ZM123.24,113.07H124.33V124.82H123.24V113.07ZM124.07,117.83H126.25V118.74H124.07V117.83ZM130.37,114.36H131.27V115.55C131.27,117.71 129.94,119.52 127.97,120.23L127.41,119.38C129.18,118.75 130.37,117.23 130.37,115.55V114.36ZM130.58,114.36H131.48V115.55C131.48,117.14 132.7,118.57 134.44,119.15L133.88,120C131.93,119.34 130.58,117.62 130.58,115.55V114.36ZM127.69,114.04H134.13V114.92H127.69V114.04ZM135.79,113.08H136.89V121.68H135.79V113.08ZM129.33,123.68H137.24V124.56H129.33V123.68ZM129.33,120.87H130.4V124.07H129.33V120.87ZM144.52,113.26C147.1,113.26 148.65,113.99 148.65,115.31C148.65,116.62 147.1,117.35 144.52,117.35C141.92,117.35 140.38,116.62 140.38,115.31C140.38,113.99 141.92,113.26 144.52,113.26ZM144.52,114.08C142.59,114.08 141.49,114.53 141.49,115.31C141.49,116.09 142.59,116.53 144.52,116.53C146.43,116.53 147.53,116.09 147.53,115.31C147.53,114.53 146.43,114.08 144.52,114.08ZM139.2,118.13H149.82V119H139.2V118.13ZM140.49,120H148.47V122.65H141.58V124.08H140.51V121.87H147.4V120.83H140.49V120ZM140.51,123.85H148.82V124.69H140.51V123.85ZM154.73,118.66H165.35V119.56H154.73V118.66ZM156.06,116.67H164.11V117.54H156.06V116.67ZM156.06,113.54H164.02V114.42H157.13V117.09H156.06V113.54ZM160.02,120.57C162.52,120.57 164.05,121.34 164.05,122.69C164.05,124.04 162.52,124.8 160.02,124.8C157.51,124.8 155.99,124.04 155.99,122.69C155.99,121.34 157.51,120.57 160.02,120.57ZM160.02,121.4C158.18,121.4 157.08,121.87 157.08,122.69C157.08,123.5 158.18,123.95 160.02,123.95C161.86,123.95 162.95,123.5 162.95,122.69C162.95,121.87 161.86,121.4 160.02,121.4ZM166.67,119.53H177.33V120.42H166.67V119.53ZM168.02,113.37H175.95V116.22H169.12V117.8H168.05V115.42H174.9V114.21H168.02V113.37ZM168.05,117.45H176.21V118.3H168.05V117.45ZM171.46,117.89H172.53V119.97H171.46V117.89ZM167.85,121.31H176.03V124.72H174.95V122.2H167.85V121.31ZM178.62,115.07H184.44V115.96H178.62V115.07ZM181.53,116.74C183,116.74 184.06,117.84 184.06,119.43C184.06,121 183,122.11 181.53,122.11C180.07,122.11 179.01,121 179.01,119.43C179.01,117.84 180.07,116.74 181.53,116.74ZM181.53,117.66C180.63,117.66 179.98,118.39 179.98,119.43C179.98,120.47 180.63,121.19 181.53,121.19C182.44,121.19 183.1,120.47 183.1,119.43C183.1,118.39 182.44,117.66 181.53,117.66ZM187.55,113.07H188.59V124.82H187.55V113.07ZM185.68,118.01H187.9V118.91H185.68V118.01ZM185.04,113.33H186.05V124.25H185.04V113.33ZM181.01,113.41H182.07V115.62H181.01V113.41ZM195.31,114.23H196.24V114.72C196.24,116.83 194.01,118.37 191.64,118.78L191.23,117.92C193.29,117.62 195.31,116.27 195.31,114.72V114.23ZM195.58,114.23H196.5V114.72C196.5,116.27 198.53,117.62 200.59,117.92L200.18,118.78C197.8,118.37 195.58,116.83 195.58,114.72V114.23ZM195.35,120.34H196.41V124.82H195.35V120.34ZM190.6,119.76H201.22V120.65H190.6V119.76ZM191.59,113.8H200.2V114.67H191.59V113.8ZM207.19,117.27H209.44V118.17H207.19V117.27ZM204.99,114.18H205.84V116.41C205.84,118.87 204.81,121.25 203.09,122.3L202.42,121.48C204.03,120.53 204.99,118.43 204.99,116.41V114.18ZM205.2,114.18H206.03V116.37C206.03,118.26 206.92,120.26 208.46,121.19L207.84,122.04C206.15,121 205.2,118.66 205.2,116.37V114.18ZM211.51,113.07H212.54V124.82H211.51V113.07ZM209.13,113.32H210.14V124.24H209.13V113.32ZM217.12,119.11H218.19V122.64H217.12V119.11ZM221.46,119.11H222.54V122.64H221.46V119.11ZM214.52,122.43H225.17V123.33H214.52V122.43ZM219.82,113.81C222.31,113.81 224.09,114.99 224.09,116.84C224.09,118.67 222.31,119.86 219.82,119.86C217.33,119.86 215.55,118.67 215.55,116.84C215.55,114.99 217.33,113.81 219.82,113.81ZM219.82,114.67C217.94,114.67 216.59,115.53 216.59,116.84C216.59,118.14 217.94,119 219.82,119C221.71,119 223.05,118.14 223.05,116.84C223.05,115.53 221.71,114.67 219.82,114.67Z"
-      android:fillColor="#2F4858"/>
+      android:fillColor="@color/nn_primary6"/>
   <path
       android:pathData="M147.89,91C147.09,91 146.41,90.78 145.85,90.35C145.28,89.91 145,89.39 145,88.78V73.22C145,72.61 145.28,72.09 145.85,71.65C146.42,71.22 147.1,71 147.89,71H168.11C168.91,71 169.59,71.22 170.15,71.65C170.72,72.09 171,72.61 171,73.22V88.78C171,89.39 170.72,89.91 170.15,90.35C169.58,90.78 168.9,91 168.11,91H147.89ZM147.89,88.78H168.11V73.22H147.89V88.78ZM149.33,86.56H166.67L161.25,81L156.92,85.44L153.67,82.11L149.33,86.56Z"
-      android:fillColor="#2F4858"/>
+      android:fillColor="@color/nn_primary6"/>
 </vector>
diff --git a/Aos/app/src/main/res/drawable/ic_back.xml b/Aos/app/src/main/res/drawable/ic_back.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
   <path
       android:pathData="M20,11H7.83L13.42,5.41L12,4L4,12L12,20L13.41,18.59L7.83,13H20V11Z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/black"/>
 </vector>
diff --git a/Aos/app/src/main/res/drawable/ic_calendar.xml b/Aos/app/src/main/res/drawable/ic_calendar.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="40">
   <path
       android:pathData="M27,12H26V10H24V12H16V10H14V12H13C11.89,12 11,12.9 11,14V28C11,29.1 11.89,30 13,30H27C28.1,30 29,29.1 29,28V14C29,12.9 28.1,12 27,12ZM27,28H13V17H27V28ZM14.5,21C14.5,19.62 15.62,18.5 17,18.5C18.38,18.5 19.5,19.62 19.5,21C19.5,22.38 18.38,23.5 17,23.5C15.62,23.5 14.5,22.38 14.5,21Z"
-      android:fillColor="#49454F"
+      android:fillColor="@color/nn_dark4"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/Aos/app/src/main/res/drawable/ic_check.xml b/Aos/app/src/main/res/drawable/ic_check.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="11">
   <path
       android:pathData="M4.193,7.935L1.065,4.807L0,5.865L4.193,10.057L13.193,1.058L12.135,0L4.193,7.935Z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/black"/>
 </vector>
diff --git a/Aos/app/src/main/res/drawable/ic_close.xml b/Aos/app/src/main/res/drawable/ic_close.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="11">
   <path
       android:pathData="M10.5,1.058L9.443,0L5.25,4.193L1.058,0L0,1.058L4.193,5.25L0,9.443L1.058,10.5L5.25,6.307L9.443,10.5L10.5,9.443L6.307,5.25L10.5,1.058Z"
-      android:fillColor="#1D192B"/>
+      android:fillColor="@color/black"/>
 </vector>
diff --git a/Aos/app/src/main/res/drawable/ic_drop_down.xml b/Aos/app/src/main/res/drawable/ic_drop_down.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="10">
   <path
       android:pathData="M6.494,9.351C6.408,9.352 6.324,9.33 6.246,9.286C6.167,9.242 6.097,9.177 6.039,9.096L0.195,1.459C-0.065,1.12 -0.065,0.594 0.195,0.255C0.455,-0.085 0.857,-0.085 1.117,0.255L6.506,7.297L11.883,0.272C12.143,-0.068 12.545,-0.068 12.805,0.272C13.065,0.611 13.065,1.137 12.805,1.476L6.961,9.113C6.831,9.283 6.662,9.368 6.506,9.368L6.494,9.351Z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/black"/>
 </vector>
diff --git a/Aos/app/src/main/res/drawable/ic_edit.xml b/Aos/app/src/main/res/drawable/ic_edit.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="18">
   <path
       android:pathData="M16,0C16.53,0 17.039,0.211 17.414,0.586C17.789,0.961 18,1.47 18,2V16C18,16.53 17.789,17.039 17.414,17.414C17.039,17.789 16.53,18 16,18H2C1.47,18 0.961,17.789 0.586,17.414C0.211,17.039 0,16.53 0,16V2C0,1.47 0.211,0.961 0.586,0.586C0.961,0.211 1.47,0 2,0H16ZM13.7,6.35C13.92,6.14 13.92,5.79 13.7,5.58L12.42,4.3C12.37,4.248 12.311,4.206 12.244,4.178C12.178,4.15 12.107,4.135 12.035,4.135C11.963,4.135 11.892,4.15 11.826,4.178C11.759,4.206 11.7,4.248 11.65,4.3L10.65,5.3L12.7,7.35L13.7,6.35ZM4,11.94V14H6.06L12.12,7.94L10.06,5.88L4,11.94Z"
-      android:fillColor="#2F4858"/>
+      android:fillColor="@color/nn_primary6"/>
 </vector>
diff --git a/Aos/app/src/main/res/drawable/ic_enter.xml b/Aos/app/src/main/res/drawable/ic_enter.xml
@@ -7,5 +7,5 @@
       android:strokeWidth="1"
       android:pathData="M1,1L5.671,6L1,11"
       android:fillColor="#00000000"
-      android:strokeColor="#262626"/>
+      android:strokeColor="@color/black"/>
 </vector>
diff --git a/Aos/app/src/main/res/drawable/ic_filter.xml b/Aos/app/src/main/res/drawable/ic_filter.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="10">
   <path
       android:pathData="M0,0H14.063V1.688H0V0ZM2.344,3.938H11.719V5.625H2.344V3.938ZM5.156,7.875H8.906V9.563H5.156V7.875Z"
-      android:fillColor="#28324C"/>
+      android:fillColor="@color/nn_dark1"/>
 </vector>
diff --git a/Aos/app/src/main/res/drawable/ic_following.xml b/Aos/app/src/main/res/drawable/ic_following.xml
@@ -5,8 +5,8 @@
     android:viewportHeight="24">
   <path
       android:pathData="M11.987,0C5.365,0.007 0,5.377 0,12C0.002,18.562 5.275,23.905 11.836,23.994C11.117,22.171 11.505,19.935 12.6,18.293V17.791H12.964C13.34,17.344 13.868,16.95 14.496,16.591H12.6V12.6H13.69C13.714,12.196 13.791,11.792 13.914,11.4H12.6V7.409H17.207C17.269,7.648 17.326,7.894 17.378,8.142C17.824,8.07 18.227,8.067 18.599,8.114C18.552,7.878 18.501,7.643 18.445,7.409H21.779C22.302,8.523 22.63,9.719 22.748,10.944C22.851,12.13 22.849,13.197 22.483,14.602C22.333,15.202 22.132,15.789 21.882,16.355C22.153,16.64 22.481,16.909 22.811,17.184C23.59,15.567 23.996,13.795 24,12C24,5.373 18.627,0 12,0H11.987ZM12.6,1.364C13.864,1.579 15.073,2.62 16.024,4.349C16.331,4.906 16.605,5.531 16.842,6.209H12.6V1.364ZM11.4,1.411V6.209H7.38C7.617,5.531 7.891,4.906 8.198,4.349C9.094,2.722 10.217,1.704 11.4,1.411ZM8.635,1.736C8.077,2.3 7.577,2.988 7.146,3.77C6.743,4.502 6.396,5.322 6.112,6.209H2.882C4.211,4.119 6.236,2.52 8.635,1.736ZM15.694,1.847C17.949,2.666 19.85,4.215 21.118,6.209H18.109C17.825,5.322 17.479,4.502 17.076,3.77C16.673,3.039 16.208,2.39 15.694,1.847ZM2.222,7.409H5.776C5.477,8.648 5.294,9.991 5.247,11.4H1.217C1.292,10.018 1.633,8.662 2.221,7.409L2.222,7.409ZM7.015,7.409H11.4V11.4H6.448C6.499,9.976 6.698,8.627 7.015,7.409H7.015ZM1.217,12.6H5.24C5.271,14.005 5.437,15.349 5.719,16.591H2.221C1.633,15.338 1.292,13.983 1.217,12.6ZM6.44,12.6H11.4V16.591H6.955C6.656,15.367 6.474,14.02 6.44,12.6ZM2.882,17.791H6.035C6.333,18.772 6.707,19.673 7.146,20.471C7.492,21.097 7.883,21.663 8.311,22.155C6.054,21.337 4.151,19.786 2.882,17.791ZM7.297,17.791H11.4V22.783C11.326,22.779 11.253,22.771 11.18,22.766C10.078,22.406 9.038,21.417 8.198,19.892C7.855,19.269 7.552,18.563 7.297,17.791Z"
-      android:fillColor="#E1D6CC"/>
+      android:fillColor="@color/nn_primary1"/>
   <path
       android:pathData="M17.76,9C15.772,9 14.16,10.612 14.16,12.6C14.16,14.588 15.772,16.2 17.76,16.2C19.748,16.2 21.36,14.588 21.36,12.6C21.36,10.612 19.748,9 17.76,9ZM17.76,16.733C13.783,16.733 12,18.517 12,22.493V22.973C12.018,23.919 12.436,23.947 13.32,23.934H22.2C23.327,23.933 23.528,23.935 23.52,22.973V22.493C23.52,18.517 21.736,16.733 17.76,16.733Z"
-      android:fillColor="#E1D6CC"/>
+      android:fillColor="@color/nn_primary1"/>
 </vector>
diff --git a/Aos/app/src/main/res/drawable/ic_home.xml b/Aos/app/src/main/res/drawable/ic_home.xml
@@ -8,6 +8,6 @@
       android:strokeLineJoin="round"
       android:strokeWidth="3"
       android:fillColor="#00000000"
-      android:strokeColor="#E1D6CC"
+      android:strokeColor="@color/nn_primary1"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/Aos/app/src/main/res/drawable/ic_location_circle.xml b/Aos/app/src/main/res/drawable/ic_location_circle.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
   <path
       android:pathData="M12,2.286C15.3,2.286 18,4.343 18,6.857C18,9.257 14.85,13.143 12,15.886C9.15,13.029 6,9.257 6,6.857C6,4.343 8.7,2.286 12,2.286ZM12,0C7.05,0 3,3.086 3,6.857C3,12 12,19.429 12,19.429C12,19.429 21,11.886 21,6.857C21,3.086 16.95,0 12,0ZM12,4.571C10.35,4.571 9,5.6 9,6.857C9,8.114 10.35,9.143 12,9.143C13.65,9.143 15,8.114 15,6.857C15,5.6 13.65,4.571 12,4.571ZM24,19.429C24,21.943 18.6,24 12,24C5.4,24 0,21.943 0,19.429C0,17.943 1.8,16.686 4.65,15.771L5.55,16.8C4.05,17.371 3,18.057 3,18.857C3,20.457 7.05,21.714 12,21.714C16.95,21.714 21,20.457 21,18.857C21,18.057 19.95,17.371 18.3,16.8L19.2,15.771C22.2,16.686 24,17.943 24,19.429Z"
-      android:fillColor="#46656A"/>
+      android:fillColor="@color/nn_primary5"/>
 </vector>
diff --git a/Aos/app/src/main/res/drawable/ic_location_off.xml b/Aos/app/src/main/res/drawable/ic_location_off.xml
@@ -7,8 +7,8 @@
       android:strokeWidth="1"
       android:pathData="M17,17m-16.5,0a16.5,16.5 0,1 1,33 0a16.5,16.5 0,1 1,-33 0"
       android:fillColor="#ffffff"
-      android:strokeColor="#C8CBD0"/>
+      android:strokeColor="@color/nn_dark6"/>
   <path
       android:pathData="M17,8C19.122,8 21.157,8.867 22.657,10.411C24.157,11.955 25,14.048 25,16.231C25,19.709 22.625,23.5 17.935,27.643C17.675,27.874 17.342,28 16.999,28C16.655,28 16.323,27.872 16.062,27.642L15.752,27.365C11.27,23.329 9,19.632 9,16.231C9,14.048 9.843,11.955 11.343,10.411C12.843,8.867 14.878,8 17,8ZM17,13.065C16.184,13.065 15.401,13.399 14.824,13.993C14.247,14.586 13.923,15.392 13.923,16.231C13.923,17.071 14.247,17.876 14.824,18.47C15.401,19.063 16.184,19.397 17,19.397C17.816,19.397 18.599,19.063 19.176,18.47C19.753,17.876 20.077,17.071 20.077,16.231C20.077,15.392 19.753,14.586 19.176,13.993C18.599,13.399 17.816,13.065 17,13.065Z"
-      android:fillColor="#C8CBD0"/>
+      android:fillColor="@color/nn_dark6"/>
 </vector>
diff --git a/Aos/app/src/main/res/drawable/ic_location_on.xml b/Aos/app/src/main/res/drawable/ic_location_on.xml
@@ -7,8 +7,8 @@
       android:strokeWidth="1"
       android:pathData="M17,17m-16.5,0a16.5,16.5 0,1 1,33 0a16.5,16.5 0,1 1,-33 0"
       android:fillColor="#ffffff"
-      android:strokeColor="#643E71"/>
+      android:strokeColor="@color/nn_rainbow_purple"/>
   <path
       android:pathData="M17,8C19.122,8 21.157,8.867 22.657,10.411C24.157,11.955 25,14.048 25,16.231C25,19.709 22.625,23.5 17.935,27.643C17.675,27.874 17.342,28 16.999,28C16.655,28 16.323,27.872 16.062,27.642L15.752,27.365C11.27,23.329 9,19.632 9,16.231C9,14.048 9.843,11.955 11.343,10.411C12.843,8.867 14.878,8 17,8ZM17,13.065C16.184,13.065 15.401,13.399 14.824,13.993C14.247,14.586 13.923,15.392 13.923,16.231C13.923,17.071 14.247,17.876 14.824,18.47C15.401,19.063 16.184,19.397 17,19.397C17.816,19.397 18.599,19.063 19.176,18.47C19.753,17.876 20.077,17.071 20.077,16.231C20.077,15.392 19.753,14.586 19.176,13.993C18.599,13.399 17.816,13.065 17,13.065Z"
-      android:fillColor="#643E71"/>
+      android:fillColor="@color/nn_rainbow_purple"/>
 </vector>
diff --git a/Aos/app/src/main/res/drawable/ic_logo.xml b/Aos/app/src/main/res/drawable/ic_logo.xml
@@ -5,8 +5,8 @@
     android:viewportHeight="150">
   <path
       android:pathData="M75,75m-75,0a75,75 0,1 1,150 0a75,75 0,1 1,-150 0"
-      android:fillColor="#2F4858"/>
+      android:fillColor="@color/nn_primary6"/>
   <path
       android:pathData="M121.15,65.38H117.13C116.16,54.89 111.31,45.14 103.51,38.04C95.72,30.94 85.55,27 75,27C64.45,27 54.28,30.94 46.49,38.04C38.69,45.14 33.84,54.89 32.87,65.38H28.85C27.83,65.38 26.85,65.79 26.13,66.51C25.41,67.23 25,68.2 25,69.22C25.02,78.36 27.53,87.31 32.28,95.12C37.02,102.93 43.82,109.3 51.92,113.53V115.32C51.92,117.36 52.73,119.31 54.18,120.75C55.62,122.19 57.58,123 59.62,123H90.38C92.42,123 94.38,122.19 95.82,120.75C97.27,119.31 98.08,117.36 98.08,115.32V113.53C106.18,109.3 112.97,102.93 117.72,95.12C122.47,87.31 124.98,78.36 125,69.22C125,68.2 124.6,67.23 123.87,66.51C123.15,65.79 122.17,65.38 121.15,65.38ZM109.39,65.38H84.67C89.34,58.4 96.39,53.35 104.51,51.18C107.17,55.5 108.84,60.35 109.39,65.38ZM96.87,42.45C97.75,43.17 98.59,43.93 99.4,44.73C89.16,48.32 80.7,55.72 75.77,65.37H61.59C63.99,58.64 68.42,52.82 74.26,48.7C80.1,44.57 87.08,42.35 94.23,42.34C95.11,42.34 95.99,42.38 96.87,42.45ZM75,34.65C78.09,34.65 81.16,35.07 84.13,35.89C76.89,37.68 70.24,41.35 64.87,46.53C59.49,51.71 55.58,58.21 53.52,65.38H40.61C41.56,56.94 45.59,49.14 51.94,43.47C58.28,37.8 66.49,34.66 75,34.65ZM92.63,107.64C91.95,107.94 91.39,108.44 90.99,109.06C90.59,109.68 90.38,110.4 90.38,111.14V115.32H59.62V111.14C59.62,110.4 59.41,109.68 59.01,109.06C58.61,108.44 58.05,107.94 57.38,107.64C50.61,104.53 44.78,99.7 40.48,93.63C36.18,87.56 33.55,80.47 32.86,73.06H117.13C116.44,80.47 113.81,87.56 109.51,93.63C105.21,99.69 99.39,104.53 92.63,107.64Z"
-      android:fillColor="#9CA1AA"/>
+      android:fillColor="@color/nn_dark6"/>
 </vector>
diff --git a/Aos/app/src/main/res/drawable/ic_logo_big.xml b/Aos/app/src/main/res/drawable/ic_logo_big.xml
@@ -5,8 +5,8 @@
     android:viewportHeight="150">
     <path
         android:pathData="M75,75m-75,0a75,75 0,1 1,150 0a75,75 0,1 1,-150 0"
-        android:fillColor="#2F4858"/>
+        android:fillColor="@color/nn_primary6"/>
     <path
         android:pathData="M121.15,65.38H117.13C116.16,54.89 111.31,45.14 103.51,38.04C95.72,30.94 85.55,27 75,27C64.45,27 54.28,30.94 46.49,38.04C38.69,45.14 33.84,54.89 32.87,65.38H28.85C27.83,65.38 26.85,65.79 26.13,66.51C25.41,67.23 25,68.2 25,69.22C25.02,78.36 27.53,87.31 32.28,95.12C37.02,102.93 43.82,109.3 51.92,113.53V115.32C51.92,117.36 52.73,119.31 54.18,120.75C55.62,122.19 57.58,123 59.62,123H90.38C92.42,123 94.38,122.19 95.82,120.75C97.27,119.31 98.08,117.36 98.08,115.32V113.53C106.18,109.3 112.97,102.93 117.72,95.12C122.47,87.31 124.98,78.36 125,69.22C125,68.2 124.6,67.23 123.87,66.51C123.15,65.79 122.17,65.38 121.15,65.38ZM109.39,65.38H84.67C89.34,58.4 96.39,53.35 104.51,51.18C107.17,55.5 108.84,60.35 109.39,65.38ZM96.87,42.45C97.75,43.17 98.59,43.93 99.4,44.73C89.16,48.32 80.7,55.72 75.77,65.37H61.59C63.99,58.64 68.42,52.82 74.26,48.7C80.1,44.57 87.08,42.35 94.23,42.34C95.11,42.34 95.99,42.38 96.87,42.45ZM75,34.65C78.09,34.65 81.16,35.07 84.13,35.89C76.89,37.68 70.24,41.35 64.87,46.53C59.49,51.71 55.58,58.21 53.52,65.38H40.61C41.56,56.94 45.59,49.14 51.94,43.47C58.28,37.8 66.49,34.66 75,34.65ZM92.63,107.64C91.95,107.94 91.39,108.44 90.99,109.06C90.59,109.68 90.38,110.4 90.38,111.14V115.32H59.62V111.14C59.62,110.4 59.41,109.68 59.01,109.06C58.61,108.44 58.05,107.94 57.38,107.64C50.61,104.53 44.78,99.7 40.48,93.63C36.18,87.56 33.55,80.47 32.86,73.06H117.13C116.44,80.47 113.81,87.56 109.51,93.63C105.21,99.69 99.39,104.53 92.63,107.64Z"
-        android:fillColor="#9CA1AA"/>
+        android:fillColor="@color/nn_dark6"/>
 </vector>