Added loading state to home page.

bodybuilders-team · May 10, 2024 · 3c4725b · 3c4725b
1 parent faf8cd1
commit 3c4725b
Show file tree

Hide file tree

Showing 5 changed files with 89 additions and 56 deletions.
diff --git a/src/frontend/app/src/main/kotlin/pt/ulisboa/ist/pharmacist/ui/screens/home/HomeActivity.kt b/src/frontend/app/src/main/kotlin/pt/ulisboa/ist/pharmacist/ui/screens/home/HomeActivity.kt
@@ -34,6 +34,7 @@ class HomeActivity : PharmacistActivity() {
 
         setContent {
             HomeScreen(
+                isLoading = viewModel.isLoading,
                 loggedIn = viewModel.isLoggedIn,
                 isGuest = viewModel.isGuest,
                 username = viewModel.username,

diff --git a/src/frontend/app/src/main/kotlin/pt/ulisboa/ist/pharmacist/ui/screens/home/HomeScreen.kt b/src/frontend/app/src/main/kotlin/pt/ulisboa/ist/pharmacist/ui/screens/home/HomeScreen.kt
@@ -39,6 +39,7 @@ const val WELCOME_TEXT_WIDTH_FACTOR = 0.9f
  */
 @Composable
 fun HomeScreen(
+    isLoading: Boolean,
     loggedIn: Boolean,
     isGuest: Boolean,
     username: String?,
@@ -64,6 +65,7 @@ fun HomeScreen(
             ) {
                 HomeHeader(loggedIn, username, Modifier.weight(1f))
                 HomeButtons(
+                    isLoading,
                     loggedIn,
                     onLoginClick,
                     onRegisterClick,
@@ -85,6 +87,7 @@ fun HomeScreen(
             ) {
                 HomeHeader(loggedIn, username)
                 HomeButtons(
+                    isLoading,
                     loggedIn,
                     onLoginClick,
                     onRegisterClick,

diff --git a/src/frontend/app/src/main/kotlin/pt/ulisboa/ist/pharmacist/ui/screens/home/HomeViewModel.kt b/src/frontend/app/src/main/kotlin/pt/ulisboa/ist/pharmacist/ui/screens/home/HomeViewModel.kt
@@ -33,6 +33,9 @@ class HomeViewModel(
     val username
         get() = sessionManager.username
 
+    var isLoading: Boolean by mutableStateOf(false)
+        private set
+
     /**
      * Logs out the user.
      */
@@ -48,12 +51,14 @@ class HomeViewModel(
 
         Log.d("LOGOUT", "Logging out user")
         withTimeoutOrNull(5000) {
+            isLoading = true
             pharmacistService.usersService.logout()
         }
 
         sessionManager.clearSession()
         isLoggedIn = false
         isGuest = false
+        isLoading = false
         Log.d("LOGOUT", "User logged out")
     }
 
@@ -78,6 +83,7 @@ class HomeViewModel(
         if (isLoggedIn || isGuest) return@launch
 
         val guestUserName = "Guest${UUID.randomUUID()}"
+        isLoading = true
         val result = pharmacistService.usersService.register(
             username = guestUserName,
             password = UUID.randomUUID().toString()
@@ -93,5 +99,6 @@ class HomeViewModel(
             isLoggedIn = true
             isGuest = true
         }
+        isLoading = false
     }
 }
diff --git a/...d/app/src/main/kotlin/pt/ulisboa/ist/pharmacist/ui/screens/home/components/HomeButtons.kt b/...d/app/src/main/kotlin/pt/ulisboa/ist/pharmacist/ui/screens/home/components/HomeButtons.kt
@@ -1,5 +1,6 @@
 package pt.ulisboa.ist.pharmacist.ui.screens.home.components
 
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material.icons.Icons
@@ -17,9 +18,11 @@ import androidx.compose.ui.res.stringResource
 import pt.ulisboa.ist.pharmacist.R
 import pt.ulisboa.ist.pharmacist.ui.screens.home.BUTTON_MAX_WIDTH_FACTOR
 import pt.ulisboa.ist.pharmacist.ui.screens.shared.components.IconTextButton
+import pt.ulisboa.ist.pharmacist.ui.screens.shared.components.LoadingSpinner
 
 @Composable
 fun HomeButtons(
+    isLoading: Boolean,
     loggedIn: Boolean,
     onLoginClick: () -> Unit,
     onRegisterClick: () -> Unit,
@@ -31,72 +34,86 @@ fun HomeButtons(
     onLogoutClick: () -> Unit,
     onAboutClick: () -> Unit
 ) {
-    Column {
-        if (!loggedIn) {
-            IconTextButton(
-                onClick = onLoginClick,
-                imageVector = Icons.AutoMirrored.Rounded.Login,
-                contentDescription = stringResource(R.string.home_login_button_description),
-                text = stringResource(R.string.home_login_button_text),
-                modifier = Modifier.fillMaxWidth(BUTTON_MAX_WIDTH_FACTOR)
-            )
+    Box(
+        contentAlignment = androidx.compose.ui.Alignment.Center,
+    ) {
+        if (isLoading)
+            LoadingSpinner(showText = false)
+        Column {
+            if (!loggedIn) {
+                IconTextButton(
+                    enabled = !isLoading,
+                    onClick = onLoginClick,
+                    imageVector = Icons.AutoMirrored.Rounded.Login,
+                    contentDescription = stringResource(R.string.home_login_button_description),
+                    text = stringResource(R.string.home_login_button_text),
+                    modifier = Modifier.fillMaxWidth(BUTTON_MAX_WIDTH_FACTOR)
+                )
 
-            IconTextButton(
-                onClick = onRegisterClick,
-                imageVector = Icons.Rounded.PersonAdd,
-                contentDescription = stringResource(R.string.home_register_button_description),
-                text = stringResource(R.string.home_register_button_text),
-                modifier = Modifier.fillMaxWidth(BUTTON_MAX_WIDTH_FACTOR)
-            )
+                IconTextButton(
+                    enabled = !isLoading,
+                    onClick = onRegisterClick,
+                    imageVector = Icons.Rounded.PersonAdd,
+                    contentDescription = stringResource(R.string.home_register_button_description),
+                    text = stringResource(R.string.home_register_button_text),
+                    modifier = Modifier.fillMaxWidth(BUTTON_MAX_WIDTH_FACTOR)
+                )
 
-            IconTextButton(
-                onClick = { onContinueAsGuestClick() },
-                imageVector = Icons.Rounded.Person,
-                contentDescription = stringResource(R.string.continue_as_guest),
-                text = stringResource(R.string.continue_as_guest),
-                modifier = Modifier.fillMaxWidth(BUTTON_MAX_WIDTH_FACTOR)
-            )
-        } else {
-            IconTextButton(
-                onClick = onPharmacyMapClick,
-                imageVector = Icons.Rounded.Map,
-                contentDescription = stringResource(R.string.home_pharmacy_map_button_description),
-                text = stringResource(R.string.home_pharmacy_map_button_text),
-                modifier = Modifier.fillMaxWidth(BUTTON_MAX_WIDTH_FACTOR)
-            )
+                IconTextButton(
+                    enabled = !isLoading,
+                    onClick = { onContinueAsGuestClick() },
+                    imageVector = Icons.Rounded.Person,
+                    contentDescription = stringResource(R.string.continue_as_guest),
+                    text = stringResource(R.string.continue_as_guest),
+                    modifier = Modifier.fillMaxWidth(BUTTON_MAX_WIDTH_FACTOR)
+                )
+            } else {
+                IconTextButton(
+                    enabled = !isLoading,
+                    onClick = onPharmacyMapClick,
+                    imageVector = Icons.Rounded.Map,
+                    contentDescription = stringResource(R.string.home_pharmacy_map_button_description),
+                    text = stringResource(R.string.home_pharmacy_map_button_text),
+                    modifier = Modifier.fillMaxWidth(BUTTON_MAX_WIDTH_FACTOR)
+                )
 
-            IconTextButton(
-                onClick = onSearchMedicineClick,
-                imageVector = Icons.Rounded.Search,
-                contentDescription = stringResource(R.string.home_search_medicine_button_description),
-                text = stringResource(R.string.home_search_medicine_button_text),
-                modifier = Modifier.fillMaxWidth(BUTTON_MAX_WIDTH_FACTOR)
-            )
+                IconTextButton(
+                    enabled = !isLoading,
+                    onClick = onSearchMedicineClick,
+                    imageVector = Icons.Rounded.Search,
+                    contentDescription = stringResource(R.string.home_search_medicine_button_description),
+                    text = stringResource(R.string.home_search_medicine_button_text),
+                    modifier = Modifier.fillMaxWidth(BUTTON_MAX_WIDTH_FACTOR)
+                )
+
+                if (isGuest)
+                    IconTextButton(
+                        enabled = !isLoading,
+                        onClick = onUpgradeAccountClick,
+                        imageVector = Icons.Rounded.Upgrade,
+                        contentDescription = stringResource(R.string.upgrade_account),
+                        text = stringResource(R.string.upgrade_account),
+                        modifier = Modifier.fillMaxWidth(BUTTON_MAX_WIDTH_FACTOR)
+                    )
 
-            if (isGuest)
                 IconTextButton(
-                    onClick = onUpgradeAccountClick,
-                    imageVector = Icons.Rounded.Upgrade,
-                    contentDescription = stringResource(R.string.upgrade_account),
-                    text = stringResource(R.string.upgrade_account),
+                    enabled = !isLoading,
+                    onClick = onLogoutClick,
+                    imageVector = Icons.AutoMirrored.Rounded.Logout,
+                    contentDescription = stringResource(R.string.home_logout_button_description),
+                    text = stringResource(R.string.home_logout_button_text),
                     modifier = Modifier.fillMaxWidth(BUTTON_MAX_WIDTH_FACTOR)
                 )
+            }
 
             IconTextButton(
-                onClick = onLogoutClick,
-                imageVector = Icons.AutoMirrored.Rounded.Logout,
-                contentDescription = stringResource(R.string.home_logout_button_description),
-                text = stringResource(R.string.home_logout_button_text),
+                enabled = !isLoading,
+                onClick = onAboutClick,
+                imageVector = Icons.Rounded.Info,
+                contentDescription = stringResource(R.string.home_about_button_description),
+                text = stringResource(R.string.home_about_button_text),
                 modifier = Modifier.fillMaxWidth(BUTTON_MAX_WIDTH_FACTOR)
             )
         }
-
-        IconTextButton(
-            onClick = onAboutClick,
-            imageVector = Icons.Rounded.Info,
-            contentDescription = stringResource(R.string.home_about_button_description),
-            text = stringResource(R.string.home_about_button_text),
-            modifier = Modifier.fillMaxWidth(BUTTON_MAX_WIDTH_FACTOR)
-        )
     }
 }
diff --git a/...end/app/src/main/kotlin/pt/ulisboa/ist/pharmacist/ui/screens/shared/ImageHandlingUtils.kt b/...end/app/src/main/kotlin/pt/ulisboa/ist/pharmacist/ui/screens/shared/ImageHandlingUtils.kt
@@ -15,6 +15,7 @@ import pt.ulisboa.ist.pharmacist.service.http.PharmacistService
 import pt.ulisboa.ist.pharmacist.service.http.connection.isFailure
 import java.io.ByteArrayOutputStream
 import java.io.InputStream
+import java.net.URL
 
 object ImageHandlingUtils {
 
@@ -106,7 +107,6 @@ object ImageHandlingUtils {
 
         val signedUrl = createSignedUrlResult.data.signedUrl
 
-
         val uploadResult =
             pharmacistService.uploaderService.uploadBoxPhoto(signedUrl, boxPhotoData, mediaType)
 
@@ -141,6 +141,11 @@ object ImageHandlingUtils {
 
         return chooser
     }
+
+    fun downloadImage(url: String): ImageBitmap? {
+        val inputStream = URL(url).openStream()
+        return BitmapFactory.decodeStream(inputStream)?.asImageBitmap()
+    }
 }
 
 data class HandleImageSelectionOutputData(