[refactor] - 마이페이지 디자인 완성

app/build.gradle

@@ -43,6 +43,8 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.1'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
+    implementation "com.squareup.retrofit2:retrofit:2.9.0"
+    implementation "com.squareup.retrofit2:converter-gson:2.9.0"
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'

app/src/main/AndroidManifest.xml

@@ -19,27 +19,23 @@
         </activity>
         <activity
             android:name=".keyword.UserStyleActivity"
-            android:exported="false">
-        </activity>
+            android:exported="false"></activity>
         <activity
             android:name=".keyword.UserKeywordActivity"
-            android:exported="false">
-        </activity>
+            android:exported="false"></activity>
         <activity
             android:name=".login.SignUpActivity"
             android:exported="false" />
         <activity
             android:name=".login.LoginActivity"
-            android:parentActivityName=".login.StartActivity"
-            android:exported="false">
-        </activity>
+            android:exported="false"
+            android:parentActivityName=".login.StartActivity"></activity>
 
         <activity
             android:name=".login.StartActivity"
-            android:exported="false">
-        </activity>
+            android:exported="false"></activity>
         <activity
-            android:name=".mypage.ChangePwActivity"
+            android:name=".mypage.ChangePasswordActivity"
             android:exported="false" />
         <activity
             android:name=".mypage.MyAccountActivity"
@@ -56,16 +52,19 @@
         <activity
             android:name=".mypage.SettingActivity"
             android:exported="false" />
+        <activity
+            android:name=".mypage.ChangeNicknameActivity"
+            android:exported="false" />
         <activity
             android:name=".mypage.AddAlcoholActivity"
             android:exported="false" />
-        <activity android:name=".allalcohol.AllAlcoholSearchActivity"/>
-        <activity android:name=".common.AlcoholDetailActivity"/>
-        <activity android:name=".feed.FeedDetailActivity"/>
+        <activity android:name=".allalcohol.AllAlcoholSearchActivity" />
+        <activity android:name=".common.AlcoholDetailActivity" />
+        <activity android:name=".feed.FeedDetailActivity" />
         <activity
-            android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
-            android:name=".common.AlcoholDetailWriteReviewActivity"/>
-        <activity android:name=".feed.WriteFeedActivity"/>
+            android:name=".common.AlcoholDetailWriteReviewActivity"
+            android:theme="@style/Theme.AppCompat.Light.DarkActionBar" />
+        <activity android:name=".feed.WriteFeedActivity" />
 
     </application>
 

app/src/main/java/com/example/a_level/mypage/AddAlcoholActivity.kt

@@ -15,22 +15,21 @@ class AddAlcoholActivity : AppCompatActivity() {
         binding = ActivityAddalcoholBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        val summit = binding.summit
-        summit.setOnClickListener {
-            val builder = AlertDialog.Builder(this)
-            builder.setTitle("등록 완료")
-                .setMessage("제보해주셔서 감사합니다!")
-                .setPositiveButton("확인",
-                    DialogInterface.OnClickListener { dialog, id ->
-                        finish()
-                    })
-            builder.show()
+        val summitDialog = binding.buttonAddalcoholSummit
+        summitDialog.setOnClickListener {
+            val dialog = AddAlcoholDialog(this@AddAlcoholActivity)
+            dialog.listener = object: AddAlcoholDialog.SummitDialogClickedListener {
+                override fun onSummitClicked() {
+                    finish()
+                }
+            }
+            dialog.start()
         }
 
         setSupportActionBar(binding.toolbar)
-        val tb = supportActionBar!!
-        tb.setDisplayShowTitleEnabled(false)
-        tb.setDisplayHomeAsUpEnabled(true)
+        val toolbar = supportActionBar!!
+        toolbar.setDisplayShowTitleEnabled(false)
+        toolbar.setDisplayHomeAsUpEnabled(true)
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {

app/src/main/java/com/example/a_level/mypage/AddAlcoholDialog.kt

@@ -0,0 +1,38 @@
+package com.example.a_level.mypage
+
+import android.app.Dialog
+import android.content.Context
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.view.Window
+import android.widget.Button
+import com.example.a_level.R
+import com.example.a_level.databinding.DialogAddalcoholBinding
+
+class AddAlcoholDialog(context: Context) {
+    lateinit var listener: SummitDialogClickedListener
+    lateinit var btnSummit: Button
+
+    interface SummitDialogClickedListener {
+        fun onSummitClicked()
+    }
+
+    private val dialog = Dialog(context)
+
+    fun start() {
+        /*타이틀바 제거*/
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
+        /*커스텀 다이얼로그 radius 적용*/
+        dialog.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+
+        dialog.setContentView(R.layout.dialog_addalcohol)
+
+        btnSummit = dialog.findViewById(R.id.button_dialog_summit)
+        btnSummit.setOnClickListener {
+            listener.onSummitClicked()
+            dialog.dismiss()
+        }
+
+        dialog.show()
+    }
+}

app/src/main/java/com/example/a_level/mypage/ChangePwActivity.kt → app/src/main/java/com/example/a_level/mypage/ChangeNicknameActivity.kt

@@ -1,22 +1,21 @@
 package com.example.a_level.mypage
 
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.view.MenuItem
-import com.example.a_level.databinding.ActivityChangepwBinding
-import com.example.a_level.databinding.ActivityScrapBinding
+import androidx.appcompat.app.AppCompatActivity
+import com.example.a_level.databinding.ActivityChangenicknameBinding
 
-class ChangePwActivity : AppCompatActivity() {
-    private lateinit var binding: ActivityChangepwBinding
+class ChangeNicknameActivity : AppCompatActivity() {
+    private lateinit var binding: ActivityChangenicknameBinding
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding = ActivityChangepwBinding.inflate(layoutInflater)
+        binding = ActivityChangenicknameBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
         setSupportActionBar(binding.toolbar)
-        val tb = supportActionBar!!
-        tb.setDisplayShowTitleEnabled(false)
-        tb.setDisplayHomeAsUpEnabled(true)
+        val toolbar = supportActionBar!!
+        toolbar.setDisplayShowTitleEnabled(false)
+        toolbar.setDisplayHomeAsUpEnabled(true)
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {