address review comments

Author: epicadk

app/src/main/java/org/systers/mentorship/view/activities/LoginActivity.kt

@@ -13,8 +13,6 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.Button
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Scaffold
@@ -79,8 +77,7 @@ class LoginActivity : BaseActivity() {
         try {
             val tokenExpiredVal = intent.extras!!.getInt(Constants.TOKEN_EXPIRED_EXTRA)
             if (tokenExpiredVal == 0)
-                Toast.makeText(this, "Session Token expired, please login again", Toast.LENGTH_LONG)
-                    .show()
+                loginViewModel.message.value = "Session Token expired, please login again"
         } catch (exception: Exception) {
         }
     }
@@ -138,9 +135,7 @@ fun LoginContent(
 
     Box {
         Column(
-            Modifier
-                .fillMaxSize()
-                .verticalScroll(rememberScrollState()),
+            Modifier.fillMaxSize(),
             verticalArrangement = Arrangement.SpaceAround,
             horizontalAlignment = Alignment.CenterHorizontally
         ) {

app/src/main/java/org/systers/mentorship/viewmodels/LoginViewModel.kt

@@ -42,8 +42,7 @@ class LoginViewModel : ViewModel() {
     private val _successful = MutableLiveData(false)
     val successful: LiveData<Boolean> = _successful
 
-    private val _message = MutableLiveData<String>()
-    val message: LiveData<String> = _message
+    val message = MutableLiveData<String>()
 
     /**
      * Will be used to run the login method of the AuthService
@@ -64,18 +63,18 @@ class LoginViewModel : ViewModel() {
                     override fun onError(throwable: Throwable) {
                         when (throwable) {
                             is IOException -> {
-                                _message.value = MentorshipApplication.getContext()
+                                message.value = MentorshipApplication.getContext()
                                         .getString(R.string.error_please_check_internet)
                             }
                             is TimeoutException -> {
-                                _message.value = MentorshipApplication.getContext()
+                                message.value = MentorshipApplication.getContext()
                                         .getString(R.string.error_request_timed_out)
                             }
                             is HttpException -> {
-                                _message.value = CommonUtils.getErrorResponse(throwable).message
+                                message.value = CommonUtils.getErrorResponse(throwable).message
                             }
                             else -> {
-                                _message.value = MentorshipApplication.getContext()
+                                message.value = MentorshipApplication.getContext()
                                         .getString(R.string.error_something_went_wrong)
                                 Log.e(tag, throwable.localizedMessage)
                             }
@@ -101,7 +100,7 @@ class LoginViewModel : ViewModel() {
     }
 
     fun onButtonClick() {
-        _message.value = ""
+        message.value = ""
         login(Login(username.value!!, password.value!!))
     }
 }