(윌로우)Feat: [작업한 내용]

UMC-5th-Notation · Feb 5, 2024 · d9db15e · d9db15e
1 parent c8ee18f
commit d9db15e
Show file tree

Hide file tree

Showing 30 changed files with 438 additions and 98 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -5,7 +5,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
-        android:name=".GlobalApplication"
+        android:name="com.notation.campusnote.login.GlobalApplication"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
@@ -20,7 +20,7 @@
             android:exported="false"/>
 
         <activity
-            android:name=".LoginActivity"
+            android:name="com.notation.campusnote.login.LoginActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -29,6 +29,9 @@
             </intent-filter>
         </activity>
 
+        <activity android:name="com.notation.campusnote.signUp.SignUpActivity"
+            android:exported="false"/>
+
         <activity android:name="com.kakao.sdk.auth.AuthCodeHandlerActivity"
             android:exported="true">
             <intent-filter>

diff --git a/app/src/main/java/com/notation/campusnote/GlobalApplication.kt b/app/src/main/java/com/notation/campusnote/GlobalApplication.kt
diff --git a/app/src/main/java/com/notation/campusnote/LoginActivity.kt b/app/src/main/java/com/notation/campusnote/LoginActivity.kt
diff --git a/app/src/main/java/com/notation/campusnote/login/LoginActivity.kt b/app/src/main/java/com/notation/campusnote/login/LoginActivity.kt
@@ -7,6 +7,7 @@ import androidx.appcompat.app.AppCompatActivity
 import com.notation.campusnote.databinding.ActivityLoginBinding
 import com.kakao.sdk.auth.model.OAuthToken
 import com.kakao.sdk.user.UserApiClient
+import com.notation.campusnote.sharedPreference.MyPreferences
 import com.notation.campusnote.signUp.SignUpActivity
 
 class LoginActivity :AppCompatActivity(){
@@ -37,30 +38,32 @@ class LoginActivity :AppCompatActivity(){
             UserApiClient.instance.loginWithKakaoTalk(this) { token, error ->
                 if (error != null) {
                     Log.e(TAG, "카카오톡으로 로그인 실패", error)
-
                     // 특정 상황(취소 등)에 대한 처리 추가
                 } else if (token != null) {
                     Log.i(TAG, "카카오톡으로 로그인 성공 ${token.accessToken}")
                     // 성공적인 로그인 처리 추가
-                    val intent = Intent(this, SignUpActivity::class.java)
-                    startActivity(intent)
+
+                    var myPreferences = MyPreferences(this)
+
+                    UserApiClient.instance.me { user, error ->
+                        if (error != null) {
+                            Log.e(TAG, "사용자 정보 요청 실패", error)
+                        } else if (user != null) {
+                            Log.i(
+                                TAG, "사용자 정보 요청 성공" +
+                                        "\n회원번호: ${user.id}" +
+                                        "\n프로필사진: ${user.kakaoAccount?.profile?.thumbnailImageUrl}"
+                            )
+                            myPreferences.saveClientId(token.accessToken)
+                            myPreferences.saveProfilePic("user.kakaoAccount?.profile?.thumbnailImageUrl")
+
+                            startActivity(Intent(this, SignUpActivity::class.java))
+                        }
+                    }
                 }
             }
         } else {
             UserApiClient.instance.loginWithKakaoAccount(this, callback = callback)
         }
     }
-
-    private fun updateKakaoLoginUi() {
-        UserApiClient.instance.me { user, error ->
-            if (error != null) {
-                Log.e(TAG, "사용자 정보 요청 실패", error)
-            }
-            else if (user != null) {
-                Log.i(TAG, "사용자 정보 요청 성공" +
-                        "\n회원번호: ${user.id}" +
-                        "\n프로필사진: ${user.kakaoAccount?.profile?.thumbnailImageUrl}")
-            }
-        }
-    }
 }
diff --git a/app/src/main/java/com/notation/campusnote/sharedPreference/MyPreferences.kt b/app/src/main/java/com/notation/campusnote/sharedPreference/MyPreferences.kt
@@ -0,0 +1,29 @@
+package com.notation.campusnote.sharedPreference
+
+import android.content.Context
+import android.content.SharedPreferences
+
+class MyPreferences(context: Context) {
+    private val sharedPreferences: SharedPreferences = context.getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
+
+    // 클라이언트 ID 저장
+    fun saveClientId(clientId: String) {
+        sharedPreferences.edit().putString("client_id", clientId).apply()
+    }
+
+    // 클라이언트 ID 가져오기
+    fun getClientId(): String? {
+        return sharedPreferences.getString("client_id", null)
+    }
+
+    // 클라이언트 ID 저장
+    fun saveProfilePic(profilePic: String) {
+        sharedPreferences.edit().putString("profile_pic", profilePic).apply()
+    }
+
+    // 클라이언트 ID 가져오기
+    fun getProfilePic(): String? {
+        return sharedPreferences.getString("profile_pic", null)
+    }
+
+}
diff --git a/app/src/main/res/drawable/btn_chevron_left.xml b/app/src/main/res/drawable/btn_chevron_left.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <path
+      android:pathData="M29,34L19,24L29,14"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2.4"
+      android:fillColor="#00000000"
+      android:strokeColor="#4076FF"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/btn_chevron_right.xml b/app/src/main/res/drawable/btn_chevron_right.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="21dp"
+    android:height="20dp"
+    android:viewportWidth="21"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M8.014,15L13.014,10L8.014,5"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#FCFCFC"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/btn_edit_04.xml b/app/src/main/res/drawable/btn_edit_04.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M12.653,4.207C13.043,3.817 13.676,3.816 14.067,4.207L15.792,5.93C16.183,6.32 16.183,6.954 15.793,7.344L7.648,15.493C7.509,15.633 7.331,15.728 7.138,15.767L3.5,16.5L4.234,12.866C4.273,12.673 4.368,12.496 4.507,12.357L12.653,4.207Z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1.6"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#FFD150"/>
+</vector>
diff --git a/app/src/main/res/drawable/btn_share.xml b/app/src/main/res/drawable/btn_share.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="60dp"
+    android:height="60dp"
+    android:viewportWidth="60"
+    android:viewportHeight="60">
+  <path
+      android:pathData="M30,26m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0"
+      android:fillColor="#4076FF"/>
+  <path
+      android:pathData="M28,28.5L32,31.5M32,20.5L28,23.5M35,36C33.343,36 32,34.657 32,33C32,31.343 33.343,30 35,30C36.657,30 38,31.343 38,33C38,34.657 36.657,36 35,36ZM25,29C23.343,29 22,27.657 22,26C22,24.343 23.343,23 25,23C26.657,23 28,24.343 28,26C28,27.657 26.657,29 25,29ZM35,22C33.343,22 32,20.657 32,19C32,17.343 33.343,16 35,16C36.657,16 38,17.343 38,19C38,20.657 36.657,22 35,22Z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#FCFCFC"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/btn_trash_full.xml b/app/src/main/res/drawable/btn_trash_full.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="17dp"
+    android:height="16dp"
+    android:viewportWidth="17"
+    android:viewportHeight="16">
+  <path
+      android:strokeWidth="1"
+      android:pathData="M10.002,6.667V11.333M7.336,6.667V11.333M4.669,4V11.867C4.669,12.613 4.669,12.986 4.814,13.272C4.942,13.523 5.146,13.727 5.397,13.855C5.682,14 6.055,14 6.8,14H10.538C11.283,14 11.656,14 11.941,13.855C12.191,13.727 12.396,13.523 12.524,13.272C12.669,12.987 12.669,12.614 12.669,11.869V4M4.669,4H6.002M4.669,4H3.336M6.002,4H11.336M6.002,4C6.002,3.379 6.002,3.068 6.104,2.823C6.239,2.497 6.499,2.237 6.825,2.101C7.07,2 7.381,2 8.002,2H9.336C9.957,2 10.268,2 10.513,2.101C10.839,2.237 11.099,2.497 11.234,2.823C11.336,3.068 11.336,3.379 11.336,4M11.336,4H12.669M12.669,4H14.002"
+      android:strokeLineJoin="round"
+      android:fillColor="#00000000"
+      android:strokeColor="#4076FF"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/icon_calendar_days.xml b/app/src/main/res/drawable/icon_calendar_days.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M7.5,5.25H7C6.3,5.25 5.95,5.25 5.682,5.386C5.447,5.506 5.256,5.697 5.136,5.932C5,6.2 5,6.55 5,7.25V7.75M7.5,5.25H12.5M7.5,5.25V4M12.5,5.25H13C13.7,5.25 14.05,5.25 14.317,5.386C14.552,5.506 14.744,5.697 14.864,5.932C15,6.2 15,6.549 15,7.248V7.75M12.5,5.25V4M5,7.75V13.25C5,13.95 5,14.3 5.136,14.567C5.256,14.803 5.447,14.994 5.682,15.114C5.95,15.25 6.299,15.25 6.998,15.25H13.002C13.701,15.25 14.05,15.25 14.317,15.114C14.552,14.994 14.744,14.803 14.864,14.567C15,14.3 15,13.951 15,13.252V7.75M5,7.75H15M12.5,12.75H12.501L12.501,12.751L12.5,12.751V12.75ZM10,12.75H10.001L10.001,12.751L10,12.751V12.75ZM7.5,12.75H7.501L7.501,12.751L7.5,12.751V12.75ZM12.501,10.25V10.251L12.5,10.251V10.25H12.501ZM10,10.25H10.001L10.001,10.251L10,10.251V10.25ZM7.5,10.25H7.501L7.501,10.251L7.5,10.251V10.25Z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1.2"
+      android:fillColor="#00000000"
+      android:strokeColor="#B1B1B1"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/icon_clock.xml b/app/src/main/res/drawable/icon_clock.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M9.5,7.444V10.5H12.556M9.5,16C6.462,16 4,13.538 4,10.5C4,7.462 6.462,5 9.5,5C12.538,5 15,7.462 15,10.5C15,13.538 12.538,16 9.5,16Z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1.2"
+      android:fillColor="#00000000"
+      android:strokeColor="#B1B1B1"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/icon_ellipse_38.xml b/app/src/main/res/drawable/icon_ellipse_38.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <path
+      android:pathData="M16,16m-14,0a14,14 0,1 1,28 0a14,14 0,1 1,-28 0"
+      android:strokeWidth="4"
+      android:fillColor="#00000000"
+      android:strokeColor="#FF5959"/>
+</vector>
diff --git a/app/src/main/res/drawable/icon_file_check.xml b/app/src/main/res/drawable/icon_file_check.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="21dp"
+    android:height="20dp"
+    android:viewportWidth="21"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M10.177,16.944H6.132C5.239,16.944 4.514,16.219 4.514,15.326L4.514,5.618C4.514,4.724 5.239,4 6.132,4H13.413C14.307,4 15.031,4.724 15.031,5.618V10.876M11.795,14.651L13.278,16.135L16.514,12.899M7.346,7.236H12.2M7.346,9.663H12.2M7.346,12.09H10.582"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1.2"
+      android:fillColor="#00000000"
+      android:strokeColor="#FCFCFC"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/icon_file_edit_02.xml b/app/src/main/res/drawable/icon_file_edit_02.xml
@@ -0,0 +1,13 @@
+<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="M10.891,21.557H5.424C4.098,21.557 3.024,20.483 3.024,19.157L3.024,4.757C3.024,3.432 4.099,2.357 5.424,2.357H16.224C17.55,2.357 18.624,3.432 18.624,4.757V10.224M7.224,7.157H14.424M7.224,10.757H14.424M7.224,14.357H11.491M13.824,18.249L18.915,13.157L22.309,16.551L17.218,21.643H13.824V18.249Z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1.6"
+      android:fillColor="#00000000"
+      android:strokeColor="#FCFCFC"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/icon_flag.xml b/app/src/main/res/drawable/icon_flag.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M5,15.125V12.137M5,12.137C8.273,9.577 11.727,14.695 15,12.136V5.739C11.727,8.298 8.273,3.18 5,5.739V12.137Z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1.2"
+      android:fillColor="#00000000"
+      android:strokeColor="#B1B1B1"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/icon_frame_1.xml b/app/src/main/res/drawable/icon_frame_1.xml
@@ -0,0 +1,20 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="37dp"
+    android:height="38dp"
+    android:viewportWidth="37"
+    android:viewportHeight="38">
+  <path
+      android:pathData="M6.779,9.591V23.108C6.779,25.812 6.779,27.163 7.305,28.196C7.768,29.104 8.506,29.844 9.415,30.306C10.446,30.832 11.797,30.832 14.496,30.832H14.496H28.029H28.029C30.728,30.832 32.077,30.832 33.109,30.306C34.017,29.844 34.756,29.104 35.219,28.195C35.745,27.164 35.745,25.814 35.745,23.115V16.349L35.745,9.583C35.745,6.885 35.745,5.534 35.219,4.502C34.756,3.594 34.017,2.856 33.109,2.393C32.076,1.867 30.725,1.867 28.021,1.867H21.262H14.504C11.8,1.867 10.447,1.867 9.415,2.393C8.506,2.856 7.768,3.594 7.305,4.502C6.779,5.535 6.779,6.888 6.779,9.591Z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#FCFCFC"
+      android:strokeColor="#ffffff"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M1.145,14.226V27.743L1.145,27.787C1.145,29.101 1.145,30.149 1.214,30.995C1.285,31.861 1.433,32.604 1.78,33.285C2.338,34.38 3.229,35.273 4.326,35.832C5.006,36.179 5.748,36.327 6.614,36.398C7.459,36.467 8.506,36.467 9.818,36.467H9.861H9.861H23.395H23.395H23.438C24.751,36.467 25.796,36.467 26.641,36.398C27.507,36.327 28.248,36.179 28.928,35.832C30.025,35.273 30.917,34.38 31.476,33.284C31.822,32.604 31.971,31.862 32.041,30.996C32.11,30.152 32.11,29.106 32.11,27.794V27.75V20.984L32.11,14.218V14.174C32.11,12.862 32.11,11.816 32.041,10.971C31.971,10.105 31.822,9.363 31.476,8.682C30.917,7.585 30.024,6.695 28.928,6.136L28.474,7.027L28.928,6.136C28.247,5.789 27.505,5.641 26.639,5.57C25.793,5.501 24.745,5.501 23.43,5.501L23.387,5.501H16.628H9.869L9.826,5.501C8.511,5.501 7.463,5.501 6.617,5.57C5.75,5.641 5.007,5.789 4.326,6.136L4.78,7.027L4.326,6.136C3.23,6.695 2.339,7.586 1.78,8.682C1.433,9.363 1.285,10.106 1.214,10.973C1.145,11.819 1.145,12.867 1.145,14.182L1.145,14.226Z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#FCFCFC"
+      android:strokeColor="#4076FF"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/icon_image.xml b/app/src/main/res/drawable/icon_image.xml
@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="21dp"
+    android:height="20dp"
+    android:viewportWidth="21"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M6.645,16H14.383C15.128,16 15.501,16 15.786,15.855C16.037,15.727 16.241,15.523 16.369,15.272C16.451,15.11 16.487,14.921 16.502,14.652L14.592,12.264C14.334,11.942 14.205,11.781 14.047,11.715C13.907,11.658 13.752,11.649 13.607,11.691C13.442,11.738 13.296,11.884 13.005,12.176L12.673,12.507C12.387,12.794 12.244,12.937 12.081,12.985C11.938,13.027 11.785,13.021 11.647,12.966C11.49,12.904 11.36,12.748 11.103,12.44L9.322,10.303C9.044,9.969 8.905,9.803 8.738,9.741C8.592,9.687 8.431,9.685 8.284,9.738C8.117,9.797 7.976,9.962 7.694,10.291L7.693,10.292L4.514,14C4.515,14.659 4.523,15.004 4.659,15.272C4.787,15.523 4.991,15.727 5.242,15.855C5.527,16 5.9,16 6.645,16Z"
+      android:fillColor="#FCFCFC"/>
+  <path
+      android:pathData="M12.514,8C12.146,8 11.847,7.702 11.847,7.333C11.847,6.965 12.146,6.667 12.514,6.667C12.882,6.667 13.181,6.965 13.181,7.333C13.181,7.702 12.882,8 12.514,8Z"
+      android:fillColor="#FCFCFC"/>
+  <path
+      android:pathData="M4.514,14C4.514,13.957 4.514,13.913 4.514,13.867V6.133C4.514,5.387 4.514,5.013 4.659,4.728C4.787,4.477 4.991,4.273 5.242,4.145C5.527,4 5.901,4 6.648,4H14.381C15.128,4 15.501,4 15.786,4.145C16.037,4.273 16.241,4.477 16.369,4.728C16.514,5.013 16.514,5.386 16.514,6.131V13.869C16.514,14.192 16.514,14.445 16.502,14.652M4.514,14C4.515,14.659 4.523,15.004 4.659,15.272C4.787,15.523 4.991,15.727 5.242,15.855C5.527,16 5.9,16 6.645,16H14.383C15.128,16 15.501,16 15.786,15.855C16.037,15.727 16.241,15.523 16.369,15.272C16.451,15.11 16.487,14.921 16.502,14.652M4.514,14L7.693,10.292L7.694,10.291C7.976,9.962 8.117,9.797 8.284,9.738C8.431,9.685 8.592,9.687 8.738,9.741C8.905,9.803 9.044,9.969 9.322,10.303L11.103,12.44C11.36,12.748 11.49,12.904 11.647,12.966C11.785,13.021 11.938,13.027 12.081,12.985C12.244,12.937 12.387,12.794 12.673,12.507L13.005,12.176C13.296,11.884 13.442,11.738 13.607,11.691C13.752,11.649 13.907,11.658 14.047,11.715C14.205,11.781 14.334,11.942 14.592,12.264L16.502,14.652M16.502,14.652L16.514,14.666M12.514,8C12.146,8 11.847,7.702 11.847,7.333C11.847,6.965 12.146,6.667 12.514,6.667C12.882,6.667 13.181,6.965 13.181,7.333C13.181,7.702 12.882,8 12.514,8Z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1.2"
+      android:fillColor="#00000000"
+      android:strokeColor="#FCFCFC"
+      android:strokeLineCap="round"/>
+</vector>