From d2ee6a21355c390a4aaefc6ea847060c8e47c6ae Mon Sep 17 00:00:00 2001 From: Isidro Henoch Date: Wed, 8 Dec 2021 02:09:47 -0600 Subject: WIP: Starts implementing the main activity - Removes the MainActivity and the shared code it was using - Adds the UnitsActivity - Implements the Map/List toggle functionality --- .../TrackerMap/android/session/LoginFragment.kt | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/LoginFragment.kt') diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/LoginFragment.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/LoginFragment.kt index 82d11d1..cc84f06 100644 --- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/LoginFragment.kt +++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/LoginFragment.kt @@ -1,5 +1,6 @@ package mx.trackermap.TrackerMap.android.session +import android.content.Intent import android.os.Bundle import android.util.Log import android.view.LayoutInflater @@ -10,10 +11,10 @@ import androidx.core.widget.doAfterTextChanged import androidx.fragment.app.Fragment import com.zhuinden.liveevent.observe import mx.trackermap.TrackerMap.android.databinding.LoginBinding +import mx.trackermap.TrackerMap.android.units.UnitsActivity import org.koin.androidx.viewmodel.ext.android.viewModel class LoginFragment : Fragment() { - private var _binding: LoginBinding? = null private val binding get() = _binding!! private val loginViewModel: LoginViewModel by viewModel() @@ -53,23 +54,27 @@ class LoginFragment : Fragment() { } private fun setupObservers() { - loginViewModel.loginResult.observe(this) { result -> + loginViewModel.loginState.observe(this) { result -> Log.d("LoginFragment", result.toString()) when (result) { - LoginViewModel.LoginResult.Loading -> { + LoginViewModel.LoginState.Loading -> { Toast.makeText(context, "Loading...", Toast.LENGTH_SHORT).show() } - LoginViewModel.LoginResult.EmailMissing -> { + LoginViewModel.LoginState.EmailMissing -> { Toast.makeText(context, "Email is missing", Toast.LENGTH_SHORT).show() } - LoginViewModel.LoginResult.PasswordMissing -> { + LoginViewModel.LoginState.PasswordMissing -> { Toast.makeText(context, "Password is missing", Toast.LENGTH_SHORT).show() } - LoginViewModel.LoginResult.Failure -> { + LoginViewModel.LoginState.Failure -> { Toast.makeText(context, "Failed login", Toast.LENGTH_SHORT).show() } - LoginViewModel.LoginResult.Success -> { - Toast.makeText(context, "Success", Toast.LENGTH_SHORT).show() + LoginViewModel.LoginState.Success -> { + val activity = requireActivity() + val intent = Intent(activity.applicationContext, UnitsActivity::class.java) + intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK + startActivity(intent) + activity.finish() } } } -- cgit v1.2.3