Improved loading indicators, improved layout semantics, added translations and changed default view to MAP

2 files changed, 12 insertions, 5 deletions

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 1cac5bd..f48eb93 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
@@ -13,6 +13,7 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import androidx.preference.PreferenceManager
 import com.zhuinden.liveevent.observe
 import kotlinx.coroutines.DelicateCoroutinesApi
+import mx.trackermap.TrackerMap.android.R
 import mx.trackermap.TrackerMap.android.databinding.LoginBinding
 import mx.trackermap.TrackerMap.android.units.UnitsActivity
 import mx.trackermap.TrackerMap.controllers.SessionController
@@ -75,17 +76,23 @@ class LoginFragment : Fragment() {
         loginViewModel.loginState.observe(viewLifecycleOwner) { result ->
             Log.d("LoginFragment", result.toString())
             when (result) {
+                SessionController.LoginState.Nothing -> {
+                    binding.infoLoading.root.visibility = View.GONE
+                }
                 SessionController.LoginState.Loading -> {
-                    Toast.makeText(context, "Loading...", Toast.LENGTH_SHORT).show()
+                    binding.infoLoading.root.visibility = View.VISIBLE
                 }
                 SessionController.LoginState.EmailMissing -> {
-                    Toast.makeText(context, "Email is missing", Toast.LENGTH_SHORT).show()
+                    binding.infoLoading.root.visibility = View.GONE
+                    Toast.makeText(context, getString(R.string.login_username_missing), Toast.LENGTH_SHORT).show()
                 }
                 SessionController.LoginState.PasswordMissing -> {
-                    Toast.makeText(context, "Password is missing", Toast.LENGTH_SHORT).show()
+                    binding.infoLoading.root.visibility = View.GONE
+                    Toast.makeText(context, getString(R.string.login_password_missing), Toast.LENGTH_SHORT).show()
                 }
                 SessionController.LoginState.Failure -> {
-                    Toast.makeText(context, "Failed login", Toast.LENGTH_SHORT).show()
+                    binding.infoLoading.root.visibility = View.GONE
+                    Toast.makeText(context, getString(R.string.login_login_failed), Toast.LENGTH_SHORT).show()
                 }
                 SessionController.LoginState.Success -> {
                     broadcastManager.sendBroadcast(Intent(EVENT_LOGIN))
diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/UserInformationActivity.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/UserInformationActivity.kt
index 5ae8c75..b0a4482 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/UserInformationActivity.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/UserInformationActivity.kt
@@ -84,7 +84,7 @@ class UserInformationActivity : AppCompatActivity() {
     }
 
     private fun setLoading(isLoading: Boolean) {
-        binding.infoLoading.visibility = if (isLoading) View.VISIBLE else View.GONE
+        binding.infoLoading.root.visibility = if (isLoading) View.VISIBLE else View.GONE
         binding.userInfoCard.visibility = if (isLoading) View.GONE else View.VISIBLE
     }