diff --git a/app/src/main/java/com/moyerun/moyeorun_android/login/ui/LoginActivity.kt b/app/src/main/java/com/moyerun/moyeorun_android/login/ui/LoginActivity.kt index f7eab55..c418ff2 100644 --- a/app/src/main/java/com/moyerun/moyeorun_android/login/ui/LoginActivity.kt +++ b/app/src/main/java/com/moyerun/moyeorun_android/login/ui/LoginActivity.kt @@ -14,6 +14,7 @@ import com.google.android.gms.auth.api.identity.SignInClient import com.google.android.gms.common.api.ApiException import com.google.android.gms.common.api.CommonStatusCodes import com.moyerun.moyeorun_android.BuildConfig +import com.moyerun.moyeorun_android.MainActivity import com.moyerun.moyeorun_android.R import com.moyerun.moyeorun_android.common.Lg import com.moyerun.moyeorun_android.common.extension.observeEvent @@ -68,8 +69,8 @@ class LoginActivity : AppCompatActivity() { observeEvent(viewModel.loginEvent) { event -> when (event) { is LoginEvent.RegisteredUser -> { - // Todo: 메인 화면으로 이동 - Lg.d("Login!") + startActivity(Intent(this, MainActivity::class.java)) + finish() } is LoginEvent.NewUser -> { ProfileEditActivity.startActivity(this, event.signUpMetaData) diff --git a/app/src/main/java/com/moyerun/moyeorun_android/profile/ui/ProfileEditActivity.kt b/app/src/main/java/com/moyerun/moyeorun_android/profile/ui/ProfileEditActivity.kt index f1367d0..027170d 100644 --- a/app/src/main/java/com/moyerun/moyeorun_android/profile/ui/ProfileEditActivity.kt +++ b/app/src/main/java/com/moyerun/moyeorun_android/profile/ui/ProfileEditActivity.kt @@ -7,6 +7,7 @@ import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.viewModels import androidx.appcompat.app.AppCompatActivity import androidx.core.widget.doAfterTextChanged +import com.moyerun.moyeorun_android.MainActivity import com.moyerun.moyeorun_android.R import com.moyerun.moyeorun_android.common.Lg import com.moyerun.moyeorun_android.common.extension.* @@ -122,8 +123,7 @@ class ProfileEditActivity : AppCompatActivity() { observeEvent(viewModel.profileEvent) { when (it) { ProfileEvent.SUCCESS_SIGN_UP -> { - // Todo: 환영 액티비티로 이동 - Lg.d("observeEvent : Go to welcome activity!") + startActivity(Intent(this, MainActivity::class.java)) } } }