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

TOP-67 fix 회원가입 이후 Splash 아이콘이 표시되었다가 메인으로 이동되는 현상 수정 #101

Merged
merged 3 commits into from
Oct 2, 2023
Merged

TOP-67 fix 회원가입 이후 Splash 아이콘이 표시되었다가 메인으로 이동되는 현상 수정 #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea4c374
fix:TOP-67 회원가입 이후 Splash Icon이 보였다가 메인화면으로 이동되는 문제 수정
cwj-c Sep 13, 2023
c8bd55d
fox:TOP-67 Topic Select Idx값 계신이 잘못되어 있는 문제 수정
cwj-c Sep 13, 2023
ec00a33
remove:TOP-67 remove debug log
cwj-c Oct 2, 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
4 changes: 2 additions & 2 deletions app/src/main/java/com/tht/tht/SplashActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package com.tht.tht
import android.animation.Animator
import android.annotation.SuppressLint
import android.os.Bundle
import android.util.Log
import androidx.activity.result.contract.ActivityResultContracts
import androidx.activity.viewModels
import androidx.appcompat.app.AppCompatActivity
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
import androidx.core.view.isVisible
import androidx.lifecycle.lifecycleScope
import com.tht.tht.databinding.ActivitySplashBinding
import dagger.hilt.android.AndroidEntryPoint
Expand Down Expand Up @@ -47,7 +47,7 @@ class SplashActivity : AppCompatActivity() {

private fun observeViewModel() {
val signupResult = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
Log.d("TAG", "signupResult => $it")
binding.lottieView.isVisible = false
when (it.resultCode) {
RESULT_OK -> viewModel.signupSuccessEvent()
else -> viewModel.signupCancelEvent()
Expand Down
3 changes: 3 additions & 0 deletions domain/src/main/java/com/tht/tht/domain/topic/SelectTopicUseCase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package com.tht.tht.domain.topic

/**
* Topic 의 idx 값을 보내야 함(keywordIdx 가 아닌 그냥 idx)
*/
class SelectTopicUseCase(
private val repository: DailyTopicRepository
) {
Expand Down
2 changes: 1 addition & 1 deletion feature/signin/src/main/java/tht/feature/signin/prelogin/PreloginActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class PreloginActivity : BaseStateActivity<PreloginViewModel, ActivityPreloginBi

override fun onNewIntent(intent: Intent?) {
super.onNewIntent(intent)
Log.d("TAG", "onNewIntent PreloginActivity")
Log.d("TAG", "onNewIntent PreLoginActivity")
setResult(RESULT_OK)
finish()
}
Expand Down
4 changes: 2 additions & 2 deletions feature/tohot/src/main/java/tht/feature/tohot/tohot/viewmodel/ToHotViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,8 +331,8 @@ class ToHotViewModel @Inject constructor(

fun topicSelectFinishEvent() {
val selectTopicIdx = with(store.state.value) {
topicList.list.indexOfFirst { it.key == selectTopicKey }
}
topicList.list.find { it.key == selectTopicKey }
}?.idx ?: -1
if (selectTopicIdx < 0) return

intent {
Expand Down