[modify] 코드 수정

Author: kkk5474096

.idea/misc.xml

@@ -37,6 +37,10 @@ class MissionActivity : AppCompatActivity() {
             dialog.isCancelable = false
             dialog.show(supportFragmentManager, "dialog")
         }
+
+        binding.ivBack.setOnClickListener {
+            finish()
+        }
     }
 
     companion object {

app/src/main/java/org/sopt/whatcolorandroid/ui/jeongwon/MissionActivity.kt

@@ -24,6 +24,9 @@ class MissionDialog: BaseDialogFragment<DialogMissionBinding>() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
             setupDialogBackground()
         binding.tvMissionDetailDes.text = mission
+        binding.btnMissionCheck.setOnClickListener {
+            dismiss()
+        }
     }
 
     private fun setupDialogBackground() {

app/src/main/java/org/sopt/whatcolorandroid/ui/jeongwon/MissionDialog.kt

@@ -16,23 +16,31 @@ import retrofit2.Call
 
 class MainActivity : AppCompatActivity() {
     private lateinit var binding: ActivityMainBinding
+    private lateinit var content: String
     private val sharedPreferences = MyApplication.mySharedPreferences
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
+
         binding.btnCheck.setOnClickListener{
             val intent = Intent(this, MissionActivity::class.java) // 확인 버튼 시 미션뷰로이동
-            startActivity(intent)
+            startActivityForResult(intent, 200)
         }
-
-        
         setContentView(binding.root)
     }
 
-    override fun onStart(){
-        super.onStart()
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if (requestCode == 200) {
+            binding.tvMission.text = content
+        }
+
+    }
+
+    override fun onResume(){
+        super.onResume()
         initNetwork()
         binding.tvMission3.visibility = View.VISIBLE
     }
@@ -56,7 +64,7 @@ class MainActivity : AppCompatActivity() {
                 } else if (color == "yellow") {
                     binding.ivColor.setImageDrawable(ResourcesCompat.getDrawable(resources, R.drawable.icon_yellow_small, null))
                 }
-                binding.tvMission.text = it.data.content
+                content = it.data.content
             }
         )
     }

app/src/main/java/org/sopt/whatcolorandroid/ui/sehun/MainActivity.kt

@@ -41,14 +41,15 @@
 
     <Button
         android:id="@+id/btn_mission_check"
-        android:layout_width="80dp"
-        android:layout_height="35dp"
+        android:layout_width="100dp"
+        android:layout_height="40dp"
         android:backgroundTint="#23C882"
         app:layout_constraintTop_toBottomOf="@id/tv_mission_detail_des"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         android:layout_marginTop="20dp"
+        android:background="@drawable/btn_mission_rectangle"
         android:layout_marginBottom="20dp"
         android:text="확인"
         android:textSize="15sp"