Merge pull request #76 from emjayMJkim/feature/#57-team-detailUI

[FEAT] 팀원 현황 뷰 수정
Team-Puzzling · Jul 21, 2023 · 520c43f · 520c43f
2 parents 471379d + b8e76b7
commit 520c43f
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 46 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -69,10 +69,6 @@
             android:name=".presentation.register.RegisterActivity"
             android:exported="true"
             android:windowSoftInputMode="adjustPan" />
-        <activity
-            android:name=".presentation.team.currentSituation.MjTestActivity"
-            android:exported="true"
-            android:windowSoftInputMode="adjustPan" />
         <activity
             android:name=".presentation.team.currentSituation.TeamRetroActivity"
             android:windowSoftInputMode="adjustPan"
@@ -83,15 +79,10 @@
         <activity android:name=".presentation.onboarding.LoginActivity"
             android:launchMode="singleTask"
             android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
         </activity>
-        <activity
-            android:name=".presentation.onboarding.ChooseJoinRegisterActivity"
-            android:exported="false" />
+        <activity android:name=".presentation.onboarding.ChooseJoinRegisterActivity"
+            android:exported="false"/>
     </application>
 
 </manifest>
diff --git a/...ain/java/com/puzzling/puzzlingaos/presentation/home/personal/PersonalDashboardFragment.kt b/...ain/java/com/puzzling/puzzlingaos/presentation/home/personal/PersonalDashboardFragment.kt
@@ -9,9 +9,6 @@ import com.puzzling.puzzlingaos.R
 import com.puzzling.puzzlingaos.base.BaseFragment
 import com.puzzling.puzzlingaos.databinding.FragmentPersonalDashboardBinding
 import com.puzzling.puzzlingaos.presentation.detailRetrospect.DetailRetroActivity
-import com.puzzling.puzzlingaos.presentation.home.personal.puzzleboard.OnePuzzleBoardActivity
-import com.puzzling.puzzlingaos.presentation.home.personal.puzzleboard.ThreePuzzleBoardActivity
-import com.puzzling.puzzlingaos.presentation.home.personal.puzzleboard.TwoPuzzleBoardActivity
 import com.puzzling.puzzlingaos.presentation.writeRetrospective.WriteRetrospectiveActivity
 import dagger.hilt.android.AndroidEntryPoint
 
@@ -29,7 +26,7 @@ class PersonalDashboardFragment :
         binding.vm = viewModel
         setActionPlanAdapter()
         clickBottomBtn()
-        clickMyPuzzleBoardBtn()
+//        clickMyPuzzleBoardBtn()
         clickPuzzlePiece()
         setBottomBtnBackgroundColor()
     }
@@ -50,33 +47,34 @@ class PersonalDashboardFragment :
         }
     }
 
-    private fun clickMyPuzzleBoardBtn() {
-        binding.clPersonalTopBackground.setOnClickListener {
-            Log.d(
-                "personal",
-                "viewModel.puzzleBoardCount.value::: ${viewModel.puzzleBoardCount.value}",
-            )
-            when (viewModel.puzzleBoardCount.value) {
-                1 -> activity?.let {
-                    val intent = Intent(context, OnePuzzleBoardActivity::class.java)
-                    startActivity(intent)
-                }
-                2 -> activity?.let {
-                    val intent = Intent(context, TwoPuzzleBoardActivity::class.java)
-                    startActivity(intent)
-                }
-                3 -> activity?.let {
-                    val intent = Intent(context, ThreePuzzleBoardActivity::class.java)
-                    startActivity(intent)
+    /*
+        private fun clickMyPuzzleBoardBtn() {
+            binding.clPersonalTopBackground.setOnClickListener {
+                Log.d(
+                    "personal",
+                    "viewModel.puzzleBoardCount.value::: ${viewModel.puzzleBoardCount.value}",
+                )
+                when (viewModel.puzzleBoardCount.value) {
+                    1 -> activity?.let {
+                        val intent = Intent(context, OnePuzzleBoardActivity::class.java)
+                        startActivity(intent)
+                    }
+                    2 -> activity?.let {
+                        val intent = Intent(context, TwoPuzzleBoardActivity::class.java)
+                        startActivity(intent)
+                    }
+                    3 -> activity?.let {
+                        val intent = Intent(context, ThreePuzzleBoardActivity::class.java)
+                        startActivity(intent)
+                    }
                 }
+    //            activity?.let {
+    //                val intent = Intent(context, MyPuzzleBoardActivity::class.java)
+    //                startActivity(intent)
+    //            }
             }
-//            activity?.let {
-//                val intent = Intent(context, MyPuzzleBoardActivity::class.java)
-//                startActivity(intent)
-//            }
         }
-    }
-
+    */
     private fun clickPuzzlePiece() {
         Log.d("personal", "review ID:::: ${viewModel.myReviewId.value}")
         //        with(binding) {

diff --git a/...ain/java/com/puzzling/puzzlingaos/presentation/team/currentSituation/TeamRetroActivity.kt b/...ain/java/com/puzzling/puzzlingaos/presentation/team/currentSituation/TeamRetroActivity.kt
@@ -30,8 +30,11 @@ class TeamRetroActivity : BaseActivity<ActivityTeamRetroBinding>(R.layout.activi
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+//        binding.tvDetailRetroTitle.text = intent.getStringExtra("Title")
+
 
         binding.viewModel = viewModel
+        binding.tvTeamProjectName.text = intent.getStringExtra("Team")
         binding.tvTeamCurrentYearmonth.text = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy년 MM월"))
 
         viewModel.getTeamRetrospectList(
@@ -67,13 +70,13 @@ class TeamRetroActivity : BaseActivity<ActivityTeamRetroBinding>(R.layout.activi
 
     private fun clickBackBtn() {
         binding.btnTeamCurrentBack.setOnClickListener {
-            setSupportActionBar(binding.tbTeamCurrent)
-            supportActionBar!!.setDisplayHomeAsUpEnabled(false)
-            supportActionBar?.setDisplayShowTitleEnabled(false)
-
-            val intent = Intent(this, MainActivity::class.java)
-            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK)
-            startActivity(intent)
+//            setSupportActionBar(binding.tbTeamCurrent)
+//            supportActionBar!!.setDisplayHomeAsUpEnabled(false)
+//            supportActionBar?.setDisplayShowTitleEnabled(false)
+//
+//            val intent = Intent(this, MainActivity::class.java)
+//            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK)
+//            startActivity(intent)
             finish()
         }
     }