Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FEAT] 팀원 현황 뷰 수정 #76

Merged
merged 7 commits into from
Jul 21, 2023
Merged

[FEAT] 팀원 현황 뷰 수정 #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b8a2c66
[MOD] manifest 파일
emjayMJkim Jul 20, 2023
6e64d34
[FIX] Merge conflict 해결
emjayMJkim Jul 20, 2023
65d1cd6
Merge branch 'develop' of https://github.com/emjayMJkim/Puzzling_Andr…
emjayMJkim Jul 21, 2023
f7a1162
[FIX] build conflict 해결
emjayMJkim Jul 21, 2023
4460759
[ADD] 팀원 현황 뷰 toolbar 프로젝트 이름 추가
emjayMJkim Jul 21, 2023
4e84b13
Merge branch 'develop' of https://github.com/emjayMJkim/Puzzling_Andr…
emjayMJkim Jul 21, 2023
b8e76b7
Merge branch 'develop' of https://github.com/emjayMJkim/Puzzling_Andr…
emjayMJkim Jul 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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>
54 changes: 26 additions & 28 deletions ...ain/java/com/puzzling/puzzlingaos/presentation/home/personal/PersonalDashboardFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -29,7 +26,7 @@ class PersonalDashboardFragment :
binding.vm = viewModel
setActionPlanAdapter()
clickBottomBtn()
clickMyPuzzleBoardBtn()
// clickMyPuzzleBoardBtn()
clickPuzzlePiece()
setBottomBtnBackgroundColor()
}
Expand All @@ -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) {
Expand Down
17 changes: 10 additions & 7 deletions ...ain/java/com/puzzling/puzzlingaos/presentation/team/currentSituation/TeamRetroActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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()
}
}
Expand Down
Loading