Merge pull request #37 from EAT-SSU/35-feat-nickname-input-logic

[FEAT] 초기 소셜로그인시에 닉네임 입력받는 로직 구현
EAT-SSU · Jul 31, 2023 · da9cefe · da9cefe
2 parents 37c9d91 + 4e2d161
commit da9cefe
Show file tree

Hide file tree

Showing 9 changed files with 78 additions and 20 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/java/com/eatssu/android/data/MySharedPreferences.kt b/app/src/main/java/com/eatssu/android/data/MySharedPreferences.kt
@@ -36,6 +36,48 @@ object MySharedPreferences {
         return prefs.getString("MY_PW", "").toString()
     }
 
+    fun setUserEmail(context: Context, input: String) {
+        val prefs: SharedPreferences =
+            context.getSharedPreferences(MY_ACCOUNT, Context.MODE_PRIVATE)
+        val editor: SharedPreferences.Editor = prefs.edit()
+        editor.putString("MY_EMAIL", input)
+        editor.commit()
+    }
+
+    fun getUserEmail(context: Context): String {
+        val prefs: SharedPreferences =
+            context.getSharedPreferences(MY_ACCOUNT, Context.MODE_PRIVATE)
+        return prefs.getString("MY_EMAIL", "").toString()
+    }
+
+    fun setUserPlatform(context: Context, input: String) {
+        val prefs: SharedPreferences =
+            context.getSharedPreferences(MY_ACCOUNT, Context.MODE_PRIVATE)
+        val editor: SharedPreferences.Editor = prefs.edit()
+        editor.putString("MY_PLATFORM", input)
+        editor.commit()
+    }
+
+    fun getUserPlatform(context: Context): String {
+        val prefs: SharedPreferences =
+            context.getSharedPreferences(MY_ACCOUNT, Context.MODE_PRIVATE)
+        return prefs.getString("MY_PLATFORM", "").toString()
+    }
+
+    fun setUserName(context: Context, input: String) {
+        val prefs: SharedPreferences =
+            context.getSharedPreferences(MY_ACCOUNT, Context.MODE_PRIVATE)
+        val editor: SharedPreferences.Editor = prefs.edit()
+        editor.putString("MY_NAME", input)
+        editor.commit()
+    }
+
+    fun getUserName(context: Context): String {
+        val prefs: SharedPreferences =
+            context.getSharedPreferences(MY_ACCOUNT, Context.MODE_PRIVATE)
+        return prefs.getString("MY_NAME", "").toString()
+    }
+
     fun clearUser(context: Context) {
         val prefs: SharedPreferences =
             context.getSharedPreferences(MY_ACCOUNT, Context.MODE_PRIVATE)

diff --git a/app/src/main/java/com/eatssu/android/ui/login/SocialLoginActivity.kt b/app/src/main/java/com/eatssu/android/ui/login/SocialLoginActivity.kt
@@ -17,6 +17,7 @@ import com.eatssu.android.data.model.response.TokenResponse
 import com.eatssu.android.data.service.OauthService
 import com.eatssu.android.databinding.ActivitySocialLoginBinding
 import com.eatssu.android.ui.main.MainActivity
+import com.eatssu.android.ui.mypage.ChangeNicknameActivity
 import com.kakao.sdk.common.model.ClientError
 import com.kakao.sdk.common.model.ClientErrorCause
 import com.kakao.sdk.user.UserApiClient
@@ -141,6 +142,9 @@ class SocialLoginActivity : AppCompatActivity() {
                                     Log.d("post", "onResponse 성공: " + response.body().toString());
 //                                MySharedPreferences.setUserId(this@LoginActivity, email)
 //                                MySharedPreferences.setUserPw(this@LoginActivity, providerID)//자동로그인 구현
+                                    MySharedPreferences.setUserEmail(this@SocialLoginActivity,email)
+                                    MySharedPreferences.setUserPlatform(this@SocialLoginActivity,"KAKAO")
+
 
                                     App.token_prefs.accessToken = response.body()!!.accessToken
                                     App.token_prefs.refreshToken =

diff --git a/app/src/main/java/com/eatssu/android/ui/main/MainActivity.kt b/app/src/main/java/com/eatssu/android/ui/main/MainActivity.kt
@@ -18,11 +18,13 @@ import android.view.MenuItem
 import android.widget.FrameLayout
 import androidx.annotation.RequiresApi
 import androidx.viewpager2.widget.ViewPager2
+import com.eatssu.android.data.MySharedPreferences
 import com.eatssu.android.databinding.ActivityMainBinding
 import com.eatssu.android.ui.calendar.CalendarFragment
 import com.eatssu.android.ui.BaseActivity
 import com.eatssu.android.ui.calendar.CalendarActivity
 import com.eatssu.android.ui.main.ViewPager2Adapter
+import com.eatssu.android.ui.mypage.ChangeNicknameActivity
 import com.eatssu.android.ui.mypage.MyPageActivity
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
@@ -52,6 +54,14 @@ class MainActivity : AppCompatActivity() {
         binding = ActivityMainBinding.inflate(layoutInflater)
 
         setContentView(binding.root)
+
+        val intentNick = Intent(this,ChangeNicknameActivity::class.java)
+        // SharedPreferences 안에 값이 저장되어 있지 않을 때 -> Login
+        if (MySharedPreferences.getUserName(this@MainActivity).isBlank()) {
+            startActivity(intentNick)
+        }
+
+
         supportActionBar?.title = "EAT-SSU"
 
         // 1) ViewPager2 참조

diff --git a/app/src/main/java/com/eatssu/android/ui/mypage/ChangeNicknameActivity.kt b/app/src/main/java/com/eatssu/android/ui/mypage/ChangeNicknameActivity.kt
@@ -8,6 +8,7 @@ import android.view.LayoutInflater
 import android.widget.FrameLayout
 import android.widget.Toast
 import com.eatssu.android.R
+import com.eatssu.android.data.MySharedPreferences
 import com.eatssu.android.data.model.request.ChangeNickname
 import com.eatssu.android.data.service.UserService
 import com.eatssu.android.databinding.ActivityChangeNicknameBinding
@@ -29,7 +30,7 @@ class ChangeNicknameActivity : BaseActivity() {
         inflater.inflate(R.layout.activity_change_nickname, findViewById(R.id.frame_layout), true)
         findViewById<FrameLayout>(R.id.frame_layout).addView(binding.root)
 
-        supportActionBar?.title = "닉네임 변경"
+        supportActionBar?.title = "닉네임 설정"
 
         binding.etChNickname.addTextChangedListener(object : TextWatcher {
             override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {}
@@ -56,8 +57,8 @@ class ChangeNicknameActivity : BaseActivity() {
                             Toast.makeText(
                                 this@ChangeNicknameActivity, "닉네임 변경에 성공했습니다.", Toast.LENGTH_SHORT
                             ).show()
+                            MySharedPreferences.setUserName(this@ChangeNicknameActivity,chNick)
                             finish()
-
                         } else {
                             Toast.makeText(
                                 this@ChangeNicknameActivity, "닉네임 변경에 실패했습니다.\"", Toast.LENGTH_SHORT

diff --git a/app/src/main/java/com/eatssu/android/ui/mypage/MyPageActivity.kt b/app/src/main/java/com/eatssu/android/ui/mypage/MyPageActivity.kt
@@ -5,9 +5,9 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.widget.FrameLayout
-import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import com.eatssu.android.R
+import com.eatssu.android.data.MySharedPreferences
 import com.eatssu.android.databinding.ActivityMyPageBinding
 import com.eatssu.android.ui.BaseActivity
 
@@ -25,6 +25,9 @@ class MyPageActivity : BaseActivity() {
 
         supportActionBar?.title = "마이페이지"
 
+        binding.tvNickname.text = MySharedPreferences.getUserName(this)
+        binding.tvEmail.text = MySharedPreferences.getUserEmail(this)
+
         binding.clNickname.setOnClickListener{
             val intent = Intent(this, ChangeNicknameActivity::class.java)
             startActivity(intent)
@@ -51,7 +54,7 @@ class MyPageActivity : BaseActivity() {
                 .setMessage("로그아웃 하시겠습니까?")
                 .setPositiveButton("로그아웃",
                     DialogInterface.OnClickListener { dialog, id ->
-                        //탈퇴처리
+                        //로그아웃
                     })
                 .setNegativeButton("취소",
                     DialogInterface.OnClickListener { dialog, id ->

diff --git a/app/src/main/res/layout/activity_change_nickname.xml b/app/src/main/res/layout/activity_change_nickname.xml
@@ -13,7 +13,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:fontFamily="@font/noto_black"
-        android:text="새로운 닉네임"
+        android:text="닉네임"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 

diff --git a/app/src/main/res/layout/activity_my_page.xml b/app/src/main/res/layout/activity_my_page.xml
@@ -33,29 +33,28 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:fontFamily="@font/noto_bold"
-            android:text="닉네임"
+            android:text=""
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <ImageButton
-            android:id="@+id/ic_nickname_change"
-            android:layout_width="20dp"
-            android:layout_height="10dp"
-            android:background="@android:color/transparent"
-            android:paddingLeft="10dp"
-            android:scaleType="fitEnd"
-            android:src="@drawable/ic_next"
-            app:layout_constraintBottom_toBottomOf="@+id/tv_nickname"
-            app:layout_constraintStart_toEndOf="@+id/tv_nickname"
-            app:layout_constraintTop_toTopOf="@+id/tv_nickname" />
+<!--        <TextView-->
+<!--            android:id="@+id/tv_nickname_change_btn"-->
+<!--            android:layout_width="wrap_content"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:fontFamily="@font/noto_bold"-->
+<!--            app:layout_constraintStart_toEndOf="@id/tv_nickname"-->
+<!--            android:text=">"-->
+<!--            app:layout_constraintEnd_toEndOf="parent"-->
+<!--            app:layout_constraintTop_toTopOf="parent" />-->
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <TextView
         android:id="@+id/tv_email"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="[email protected]"
+        android:text=""
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/cl_nickname" />

diff --git a/app/src/main/res/layout/include_actionbar.xml b/app/src/main/res/layout/include_actionbar.xml
@@ -4,12 +4,12 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
+    <!--        android:background="@drawable/shape_toolbar_background"-->
 
     <TextView
         android:id="@+id/action_Bar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:background="@drawable/shape_toolbar_background"
         android:text="리뷰"
         android:gravity="center"
         android:textSize="17dp"