#48 / 로고 변경 반영

U-is-Ni-in-Korea · Jul 18, 2023 · 156ac05 · 156ac05
1 parent 8cd9963
commit 156ac05
Show file tree

Hide file tree

Showing 6 changed files with 94 additions and 7 deletions.
diff --git a/app/src/main/java/sopt/uni/data/repository/onboarding/OnBoardingRepository.kt b/app/src/main/java/sopt/uni/data/repository/onboarding/OnBoardingRepository.kt
@@ -3,4 +3,4 @@ package sopt.uni.data.repository.onboarding
 interface OnBoardingRepository {
 
     suspend fun patchNickName(nickname: String)
-}
+}
diff --git a/app/src/main/res/drawable/bg_enter_edit_text_empty.xml b/app/src/main/res/drawable/bg_enter_edit_text_empty.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">
+    <corners android:radius="10dp" />
+    <stroke
+        android:width="1dp"
+        android:color="@color/Gray_200" />
+    <solid android:color="@color/white" />
+
+</shape>
diff --git a/app/src/main/res/drawable/sparkle_logo.xml b/app/src/main/res/drawable/sparkle_logo.xml
@@ -0,0 +1,51 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="220dp"
+    android:height="208dp"
+    android:viewportWidth="220"
+    android:viewportHeight="208">
+  <group>
+    <clip-path
+        android:pathData="M0,168.11h220v39.89h-220z"/>
+    <path
+        android:pathData="M10.15,208C7.23,208 4.8,207.5 2.81,206.46C1.27,205.63 0,204.36 0,202.54C0,200.56 1.38,198.96 3.59,198.96C4.8,198.96 6.01,199.57 7.89,200.07C9.99,200.62 11.53,200.78 12.64,200.78C14.46,200.78 15.89,200.45 16.66,200.12C17.16,199.29 17.44,198.36 17.44,197.48C17.44,195.33 15.51,193.4 10.15,190.09C5.41,187.17 2.7,185.08 2.7,180.34C2.7,173.51 9.1,168.11 17.16,168.11C19.92,168.11 23.12,168.66 25.05,170.09C26.27,170.98 26.76,172.19 26.76,173.4C26.76,175.55 25.11,177.15 23.07,177.15C21.8,177.15 20.86,176.71 19.7,176.32C18.26,175.82 16.61,175.38 14.68,175.38C13.41,175.38 12.08,175.66 11.53,175.93C11.09,176.54 10.82,177.53 10.82,178.41C10.82,180.73 12.31,182.05 16.06,184.14C22.68,187.89 25.27,190.7 25.27,195.27C25.27,202.93 18.15,208 10.15,208Z"
+        android:fillColor="#222222"/>
+    <path
+        android:pathData="M43.65,195.38H40.45L39.51,203.65C39.23,206.24 37.41,207.73 35.2,207.73C33,207.73 31.51,206.24 31.78,203.59L35.09,174.72C35.59,170.53 37.96,168.72 42.16,168.72H47.12C55.79,168.72 60.42,173.56 60.42,180.67C60.42,188.66 54.19,195.38 43.65,195.38ZM46.35,188.33C48.39,188.33 49.72,188.16 50.49,187.83C51.7,186.24 52.48,184.14 52.48,181.77C52.48,178.19 50.54,175.82 46.52,175.82H42.71L41.22,188.33H46.35Z"
+        android:fillColor="#222222"/>
+    <path
+        android:pathData="M61.03,200.95L75.21,169.82C76.42,168.94 78.3,168.38 80.07,168.38C83.43,168.38 84.65,170.15 85.25,173.07L91.38,200.84C91.6,201.94 91.87,203.26 91.87,204.03C91.87,206.18 90.27,207.73 87.96,207.73C85.8,207.73 84.65,206.57 84.26,204.2L82.99,197.04H70.68L67.65,204.69C66.93,206.51 65.61,207.73 63.62,207.73C61.64,207.73 60.09,206.4 60.09,204.31C60.09,203.21 60.53,201.99 61.03,200.95ZM79.02,176.15L73.33,190.42H81.78L79.18,176.15H79.02Z"
+        android:fillColor="#222222"/>
+    <path
+        android:pathData="M120.07,191.42L124.15,201.55C124.43,202.27 124.71,203.04 124.71,203.81C124.71,206.02 123,207.73 120.73,207.73C118.64,207.73 117.48,206.51 116.93,204.86L113.23,193.95H107.27L106.17,203.65C105.89,206.24 104.07,207.73 101.86,207.73C99.65,207.73 98.16,206.24 98.44,203.7L101.86,173.95C102.3,170.15 104.01,168.72 108.15,168.72H114.28C122.33,168.72 126.8,173.23 126.8,179.74C126.8,184.53 124.26,188.66 120.07,191.42ZM112.62,187.23C113.28,187.23 115.71,187.23 116.87,186.79C118.03,185.24 118.8,183.1 118.8,180.95C118.8,178.3 117.48,175.82 113.56,175.82H109.36L108.04,187.23H112.62Z"
+        android:fillColor="#222222"/>
+    <path
+        android:pathData="M135.96,207.73C133.76,207.73 132.26,206.24 132.54,203.92L136.13,172.24C136.4,170.09 138.11,168.38 140.43,168.38C142.75,168.38 144.13,169.87 143.85,172.3L142.31,185.63C144.51,185.3 146.23,184.09 147.6,182.71C149.54,180.73 150.97,178.91 157.04,170.81C158.48,168.88 159.52,168.38 161.01,168.38C163.05,168.38 164.43,169.87 164.43,171.8C164.43,173.45 163.61,174.67 162.28,176.37C159.91,179.29 157.21,182.43 153.67,185.69C152.96,186.35 152.18,187.01 151.41,187.56L159.3,200.23C160.02,201.39 160.57,202.49 160.57,203.81C160.57,206.07 158.92,207.73 156.65,207.73C154.78,207.73 153.73,206.79 152.63,204.69L145.23,190.76C144.13,191.14 142.91,191.42 141.65,191.58L140.21,203.98C139.99,206.02 138.28,207.73 135.96,207.73Z"
+        android:fillColor="#222222"/>
+    <path
+        android:pathData="M212.44,207.39H199.47C195.17,207.39 193.35,205.24 193.74,201.61L196.88,174.56C197.27,170.92 199.58,168.72 203.89,168.72H216.52C218.51,168.72 220,169.87 220,172.08C220,174.61 218.12,176.1 215.59,176.1H204.38L203.39,184.64H213.76C216.03,184.64 217.07,186.02 217.07,187.61C217.07,189.43 215.59,191.58 212.99,191.58H202.62L201.63,200.01H213.38C215.48,200.01 216.85,201.28 216.85,203.37C216.85,205.69 215.31,207.39 212.44,207.39Z"
+        android:fillColor="#222222"/>
+    <path
+        android:pathData="M186.95,185.92C185.1,185.92 183.69,185.32 182.65,184.09C180.6,181.65 180.04,176.95 181.09,170.83C181.3,169.65 180.5,168.53 179.32,168.32C179.19,168.3 179.07,168.29 178.95,168.29C177.91,168.29 176.99,169.04 176.81,170.09C175.13,179.86 170.56,185.92 164.88,185.92C163.68,185.92 162.71,186.89 162.71,188.09C162.71,189.29 163.68,190.26 164.88,190.26C166.74,190.26 168.14,190.87 169.18,192.1C171.24,194.53 171.79,199.24 170.74,205.35C170.54,206.54 171.33,207.66 172.52,207.86C172.65,207.88 172.77,207.9 172.89,207.9C173.93,207.9 174.85,207.15 175.03,206.09C176.71,196.33 181.27,190.26 186.95,190.26C188.16,190.26 189.13,189.29 189.13,188.09C189.13,186.89 188.16,185.92 186.95,185.92Z"
+        android:fillColor="#01C1F8"/>
+  </group>
+  <path
+      android:pathData="M156.39,39.28L140.99,50.03C160.34,55.95 170.11,73.82 170.11,91.37C170.11,118.01 146.62,139.62 117.65,139.62H79.14C57.82,139.62 47.14,115.91 62.22,102.05L79.48,89.58C61.4,84.33 50.37,65.79 50.37,48.25C50.37,21.6 73.86,0 102.83,0H138.7C160.99,0 172.16,24.78 156.39,39.28ZM124.18,69.11C123.44,76.05 127.79,84.76 136.43,93.64H136.43C136.83,94.06 137.03,94.6 137.03,95.14C137.03,95.7 136.82,96.26 136.38,96.68C135.96,97.09 135.44,97.29 134.88,97.29C134.32,97.29 133.76,97.07 133.34,96.64C118.9,81.8 102.93,77.23 91.66,84.71C90.67,85.36 89.33,85.09 88.67,84.1C88.43,83.74 88.32,83.33 88.32,82.92C88.32,82.22 88.66,81.54 89.28,81.13C93.46,78.35 95.82,74.78 96.28,70.51C97.02,63.57 92.67,54.86 84.03,45.98C83.63,45.56 83.42,45.02 83.42,44.48C83.42,43.92 83.64,43.37 84.07,42.94C84.93,42.11 86.29,42.13 87.12,42.99C101.56,57.82 117.53,62.39 128.81,54.92C129.8,54.26 131.13,54.53 131.79,55.52C132.03,55.88 132.15,56.29 132.15,56.7C132.15,57.4 131.81,58.09 131.19,58.5C127,61.27 124.64,64.85 124.18,69.11Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M156.39,39.28L140.99,50.03C160.34,55.95 170.11,73.82 170.11,91.37C170.11,118.01 146.62,139.62 117.65,139.62H79.14C57.82,139.62 47.14,115.91 62.22,102.05L79.48,89.58C61.4,84.33 50.37,65.79 50.37,48.25C50.37,21.6 73.86,0 102.83,0H138.7C160.99,0 172.16,24.78 156.39,39.28ZM124.18,69.11C123.44,76.05 127.79,84.76 136.43,93.64H136.43C136.83,94.06 137.03,94.6 137.03,95.14C137.03,95.7 136.82,96.26 136.38,96.68C135.96,97.09 135.44,97.29 134.88,97.29C134.32,97.29 133.76,97.07 133.34,96.64C118.9,81.8 102.93,77.23 91.66,84.71C90.67,85.36 89.33,85.09 88.67,84.1C88.43,83.74 88.32,83.33 88.32,82.92C88.32,82.22 88.66,81.54 89.28,81.13C93.46,78.35 95.82,74.78 96.28,70.51C97.02,63.57 92.67,54.86 84.03,45.98C83.63,45.56 83.42,45.02 83.42,44.48C83.42,43.92 83.64,43.37 84.07,42.94C84.93,42.11 86.29,42.13 87.12,42.99C101.56,57.82 117.53,62.39 128.81,54.92C129.8,54.26 131.13,54.53 131.79,55.52C132.03,55.88 132.15,56.29 132.15,56.7C132.15,57.4 131.81,58.09 131.19,58.5C127,61.27 124.64,64.85 124.18,69.11Z"
+      android:fillType="evenOdd">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="110.24"
+          android:startY="0"
+          android:endX="110.24"
+          android:endY="139.62"
+          android:type="linear">
+        <item android:offset="0" android:color="#7F01C1F8"/>
+        <item android:offset="1" android:color="#FF01C1F8"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>
diff --git a/app/src/main/res/drawable/sparkle_simbol.xml b/app/src/main/res/drawable/sparkle_simbol.xml
@@ -0,0 +1,26 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="120dp"
+    android:height="140dp"
+    android:viewportWidth="120"
+    android:viewportHeight="140">
+  <path
+      android:pathData="M106.25,39.39L90.82,50.17C110.21,56.11 120,74.03 120,91.62C120,118.34 96.46,140 67.43,140H28.83C7.47,140 -3.24,116.23 11.87,102.33L29.18,89.83C11.05,84.56 0,65.97 0,48.38C0,21.66 23.54,0 52.57,0H88.52C110.86,0 122.05,24.85 106.25,39.39ZM73.98,69.3C73.23,76.26 77.59,84.99 86.25,93.9H86.24C86.65,94.32 86.85,94.86 86.85,95.4C86.85,95.96 86.64,96.52 86.2,96.95C85.78,97.35 85.26,97.56 84.7,97.56C84.14,97.56 83.58,97.34 83.15,96.9C68.68,82.03 52.67,77.44 41.38,84.94C40.39,85.6 39.05,85.33 38.39,84.33C38.15,83.97 38.03,83.56 38.03,83.15C38.03,82.44 38.37,81.76 38.99,81.35C43.19,78.57 45.55,74.98 46.01,70.7C46.76,63.74 42.4,55.01 33.74,46.11C33.33,45.69 33.13,45.15 33.13,44.61C33.13,44.05 33.34,43.49 33.78,43.06C34.64,42.23 36,42.25 36.83,43.1C51.31,57.98 67.31,62.56 78.61,55.07C79.6,54.41 80.94,54.68 81.6,55.67C81.84,56.03 81.96,56.45 81.96,56.86C81.96,57.56 81.62,58.25 80.99,58.66C76.8,61.44 74.44,65.02 73.98,69.3Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M106.25,39.39L90.82,50.17C110.21,56.11 120,74.03 120,91.62C120,118.34 96.46,140 67.43,140H28.83C7.47,140 -3.24,116.23 11.87,102.33L29.18,89.83C11.05,84.56 0,65.97 0,48.38C0,21.66 23.54,0 52.57,0H88.52C110.86,0 122.05,24.85 106.25,39.39ZM73.98,69.3C73.23,76.26 77.59,84.99 86.25,93.9H86.24C86.65,94.32 86.85,94.86 86.85,95.4C86.85,95.96 86.64,96.52 86.2,96.95C85.78,97.35 85.26,97.56 84.7,97.56C84.14,97.56 83.58,97.34 83.15,96.9C68.68,82.03 52.67,77.44 41.38,84.94C40.39,85.6 39.05,85.33 38.39,84.33C38.15,83.97 38.03,83.56 38.03,83.15C38.03,82.44 38.37,81.76 38.99,81.35C43.19,78.57 45.55,74.98 46.01,70.7C46.76,63.74 42.4,55.01 33.74,46.11C33.33,45.69 33.13,45.15 33.13,44.61C33.13,44.05 33.34,43.49 33.78,43.06C34.64,42.23 36,42.25 36.83,43.1C51.31,57.98 67.31,62.56 78.61,55.07C79.6,54.41 80.94,54.68 81.6,55.67C81.84,56.03 81.96,56.45 81.96,56.86C81.96,57.56 81.62,58.25 80.99,58.66C76.8,61.44 74.44,65.02 73.98,69.3Z"
+      android:fillType="evenOdd">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="60"
+          android:startY="0"
+          android:endX="60"
+          android:endY="140"
+          android:type="linear">
+        <item android:offset="0" android:color="#7F01C1F8"/>
+        <item android:offset="1" android:color="#FF01C1F8"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>
diff --git a/app/src/main/res/layout/activity_invite_hub.xml b/app/src/main/res/layout/activity_invite_hub.xml
@@ -22,11 +22,11 @@
             app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
-            android:layout_width="160dp"
-            android:layout_height="0dp"
-            android:layout_marginTop="206dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="182dp"
             android:contentDescription="@string/invite_logo"
-            android:src="@drawable/ic_onboarding"
+            android:src="@drawable/sparkle_logo"
             app:layout_constraintDimensionRatio="1"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/main/res/layout/activity_share_invite_code.xml b/app/src/main/res/layout/activity_share_invite_code.xml
@@ -25,9 +25,9 @@
             android:id="@+id/iv_share_card"
             android:layout_width="160dp"
             android:layout_height="0dp"
-            android:layout_marginTop="206dp"
+            android:layout_marginTop="216dp"
             android:contentDescription="@string/invite_logo"
-            android:src="@drawable/ic_onboarding"
+            android:src="@drawable/sparkle_simbol"
             app:layout_constraintDimensionRatio="1"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"