Fixed map zoom animation when the user comes from the permission scre…

…en to the map.
bodybuilders-team · May 14, 2024 · 901c523 · 901c523
1 parent 2c76c75
commit 901c523
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 15 deletions.
diff --git a/src/frontend/app/src/main/kotlin/pt/ulisboa/ist/pharmacist/PharmacistApplication.kt b/src/frontend/app/src/main/kotlin/pt/ulisboa/ist/pharmacist/PharmacistApplication.kt
@@ -84,7 +84,7 @@ class PharmacistApplication : DependenciesContainer, Application() {
     companion object {
         const val MEDICINE_NOTIFICATION_CHANNEL = "MedicineNotifications"
 
-        private const val API_ENDPOINT_TYPE = "localhost"
+        private const val API_ENDPOINT_TYPE = "render"
         val API_ENDPOINT = when (API_ENDPOINT_TYPE) {
             "localhost" -> "http://10.0.2.2:8080"
             "ngrok" -> "https://2b02-2001-818-e871-b700-c937-8172-33bf-a88.ngrok-free.app"

diff --git a/...p/src/main/kotlin/pt/ulisboa/ist/pharmacist/ui/screens/pharmacyMap/PharmacyMapActivity.kt b/...p/src/main/kotlin/pt/ulisboa/ist/pharmacist/ui/screens/pharmacyMap/PharmacyMapActivity.kt
@@ -6,6 +6,7 @@ import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.activity.result.ActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.runtime.LaunchedEffect
 import androidx.lifecycle.lifecycleScope
 import com.google.android.libraries.places.api.Places
 import kotlinx.coroutines.launch
@@ -61,16 +62,17 @@ class PharmacyMapActivity : PharmacistActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        lifecycleScope.launch {
-            viewModel.getCurrentLocation(this@PharmacyMapActivity)
-        }
-
         viewModel.hasLocationPermission = hasLocationPermission()
         viewModel.hasCameraPermission = hasCameraPermission()
         viewModel.listenForRealTimeUpdates()
         viewModel.loadPharmacyList()
 
         setContent {
+            LaunchedEffect(key1 = viewModel.hasLocationPermission) {
+                if (viewModel.hasLocationPermission)
+                    viewModel.getCurrentLocation(this@PharmacyMapActivity)
+            }
+
             PharmacyMapScreen(
                 followMyLocation = viewModel.followMyLocation,
                 zoomedInMyLocation = viewModel.zoomedInMyLocation,

diff --git a/...in/kotlin/pt/ulisboa/ist/pharmacist/ui/screens/pharmacyMap/components/PermissionScreen.kt b/...in/kotlin/pt/ulisboa/ist/pharmacist/ui/screens/pharmacyMap/components/PermissionScreen.kt
@@ -11,7 +11,8 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Button
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.Settings
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -26,6 +27,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import pt.ulisboa.ist.pharmacist.R
+import pt.ulisboa.ist.pharmacist.ui.screens.shared.components.IconTextButton
 
 /**
  * Screen to request permissions
@@ -82,23 +84,25 @@ fun PermissionScreen(
                 fontSize = 16.sp
             )
             Spacer(modifier = Modifier.height(16.dp))
-            Button(
+            IconTextButton(
+                text = settingsPermissionNoteButtonText,
+                imageVector = Icons.Rounded.Settings,
+                contentDescription = settingsPermissionNoteButtonText,
                 onClick = {
                     val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
                     val uri = Uri.fromParts("package", context.packageName, null)
                     intent.data = uri
                     context.startActivity(intent)
                 }
-            ) {
-                Text(text = settingsPermissionNoteButtonText)
-            }
+            )
         } else
-            Button(
+            IconTextButton(
                 onClick = {
                     permissionLauncher.launch(permissionRequests.toTypedArray())
-                }
-            ) {
-                Text(text = stringResource(R.string.grant_permission_button))
-            }
+                },
+                text = stringResource(R.string.grant_permission_button),
+                imageVector = Icons.Rounded.Settings,
+                contentDescription = stringResource(R.string.grant_permission_button)
+            )
     }
 }