Skip to content

Commit 2e26329

Browse files
committed
[#30] 로그인 기능 추가 - 로그인 및 회원가입 완료 시 MainActivity 이동
1 parent a3d2859 commit 2e26329

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

app/src/main/java/com/moyerun/moyeorun_android/login/ui/LoginActivity.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import com.google.android.gms.auth.api.identity.SignInClient
1414
import com.google.android.gms.common.api.ApiException
1515
import com.google.android.gms.common.api.CommonStatusCodes
1616
import com.moyerun.moyeorun_android.BuildConfig
17+
import com.moyerun.moyeorun_android.MainActivity
1718
import com.moyerun.moyeorun_android.R
1819
import com.moyerun.moyeorun_android.common.Lg
1920
import com.moyerun.moyeorun_android.common.extension.observeEvent
@@ -68,8 +69,8 @@ class LoginActivity : AppCompatActivity() {
6869
observeEvent(viewModel.loginEvent) { event ->
6970
when (event) {
7071
is LoginEvent.RegisteredUser -> {
71-
// Todo: 메인 화면으로 이동
72-
Lg.d("Login!")
72+
startActivity(Intent(this, MainActivity::class.java))
73+
finish()
7374
}
7475
is LoginEvent.NewUser -> {
7576
ProfileEditActivity.startActivity(this, event.signUpMetaData)

app/src/main/java/com/moyerun/moyeorun_android/profile/ui/ProfileEditActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import androidx.activity.result.contract.ActivityResultContracts
77
import androidx.activity.viewModels
88
import androidx.appcompat.app.AppCompatActivity
99
import androidx.core.widget.doAfterTextChanged
10+
import com.moyerun.moyeorun_android.MainActivity
1011
import com.moyerun.moyeorun_android.R
1112
import com.moyerun.moyeorun_android.common.Lg
1213
import com.moyerun.moyeorun_android.common.extension.*
@@ -122,8 +123,7 @@ class ProfileEditActivity : AppCompatActivity() {
122123
observeEvent(viewModel.profileEvent) {
123124
when (it) {
124125
ProfileEvent.SUCCESS_SIGN_UP -> {
125-
// Todo: 환영 액티비티로 이동
126-
Lg.d("observeEvent : Go to welcome activity!")
126+
startActivity(Intent(this, MainActivity::class.java))
127127
}
128128
}
129129
}

0 commit comments

Comments
 (0)