fixing rebase

.gradle/config.properties

@@ -1,2 +1,2 @@
-#Thu Sep 05 11:55:59 BRT 2024
+#Fri Sep 13 14:46:51 BRT 2024
 java.home=/Applications/Android Studio.app/Contents/jbr/Contents/Home

app/src/main/java/com/example/greetingcard/model/LoadListResponse.kt

@@ -5,10 +5,10 @@ data class LoadListResponse(
 )
 
 data class LoadListDataResponse(
-    val nodes: List<User>
+    val nodes: List<ListUserItem>
 )
 
-data class LoadListUserItem(
+data class ListUserItem(
     val id: String,
     val name: String,
     val email: String

app/src/main/java/com/example/greetingcard/model/LoadUserResponse.kt

@@ -11,4 +11,4 @@ data class UserDetail(
     val birthDate: String,
     val phone: String,
     val role: Roles
-)
+)

app/src/main/java/com/example/greetingcard/model/Roles.kt

@@ -2,6 +2,5 @@ package com.example.greetingcard.model
 
 enum class Roles {
     ADMIN,
-    USER,
-    NOROLE
+    USER
 }

app/src/main/java/com/example/greetingcard/model/UserPagingSource.kt

@@ -7,13 +7,13 @@ import retrofit2.await
 
 class UserPagingSource(
     private val token: String
-) : PagingSource<Int, User>() {
+) : PagingSource<Int, ListUserItem>() {
 
-    override suspend fun load(params: LoadParams<Int>): LoadResult<Int, User> {
+    override suspend fun load(params: LoadParams<Int>): LoadResult<Int, ListUserItem> {
         return try {
             val currentPage = params.key ?: 0
 
-            val response = UserRetrofitService.userRetrofitService.loadUsers(token, currentPage).await()
+            val response = UserRetrofitService.userRetrofitService.loadUsers(token, currentPage)
             val users = response.data.nodes
 
             LoadResult.Page(
@@ -26,10 +26,10 @@ class UserPagingSource(
         }
     }
 
-    override fun getRefreshKey(state: PagingState<Int, User>): Int? {
+    override fun getRefreshKey(state: PagingState<Int, ListUserItem>): Int? {
         return state.anchorPosition?.let { anchorPosition ->
             val anchorPage = state.closestPageToPosition(anchorPosition)
             anchorPage?.prevKey?.plus(1) ?: anchorPage?.nextKey?.minus(1)
         }
     }
-}
+}

app/src/main/java/com/example/greetingcard/repository/UserRepository.kt

@@ -4,13 +4,14 @@ import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.PagingData
 import com.example.greetingcard.model.AuthenticationRequestBody
+import com.example.greetingcard.model.ListUserItem
 import com.example.greetingcard.model.LoadUserResponse
 import com.example.greetingcard.model.NewUserRequest
-import com.example.greetingcard.model.User
 import com.example.greetingcard.model.UserPagingSource
 import com.example.greetingcard.rest.UserRetrofitService
 import kotlinx.coroutines.flow.Flow
-import retrofit2.await
+import retrofit2.HttpException
+import java.io.IOException
 
 class UserRepository private constructor() {
 
@@ -37,11 +38,11 @@ class UserRepository private constructor() {
             token = authToken
             Result.success(authToken)
         } catch (e: Exception) {
-            Result.failure(e)
+            throw Exception("Erro desconhecido ao autenticar usuário: ${e.message}")
         }
     }
 
-    fun loadUsers(): Flow<PagingData<User>> {
+    fun loadUsers(): Flow<PagingData<ListUserItem>> {
         return Pager(
             config = PagingConfig(
                 pageSize = 20,
@@ -54,17 +55,25 @@ class UserRepository private constructor() {
     suspend fun newUser(newUserRequest: NewUserRequest) {
         try {
             UserRetrofitService.userRetrofitService.newUser(token, newUserRequest)
+        } catch (e: IOException) {
+            throw Exception("Erro de rede ao cadastrar usuário: ${e.message}")
+        } catch (e: HttpException) {
+            throw Exception("Erro ao cadastrar usuário: ${e.message()}")
         } catch (e: Exception) {
-            throw Exception("Erro ao cadastrar usuário")
+            throw Exception("Erro desconhecido ao cadastrar usuário: ${e.message}")
         }
     }
 
+
     suspend fun loadUserDetail(userId: String): LoadUserResponse {
         try {
-            val user = UserRetrofitService.userRetrofitService.loadUserDetail(token, userId)
-            return user
+            return UserRetrofitService.userRetrofitService.loadUserDetail(token, userId)
+        } catch (e: IOException) {
+            throw Exception("Erro de rede ao carregar usuário: ${e.message}")
+        } catch (e: HttpException) {
+            throw Exception("Erro ao carregar usuário: ${e.message()}")
         } catch (e: Exception) {
-            throw Exception("Erro ao carregar usuário")
+            throw Exception("Erro desconhecido ao carregar usuário: ${e.message}")
         }
     }
 }

app/src/main/java/com/example/greetingcard/view/LoginScreen.kt

@@ -6,37 +6,26 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.Button
 import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.KeyboardType
-import androidx.compose.ui.text.input.PasswordVisualTransformation
-import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavHostController
+import com.example.greetingcard.view.component.InputFields
+import com.example.greetingcard.view.component.ShowErrors
 import com.example.greetingcard.viewModel.LoginViewModel
 
 @Composable
 fun LoginScreen(navController: NavHostController) {
     val viewModel: LoginViewModel = viewModel()
-    val emailState by viewModel.emailState
-    val passwordState by viewModel.passwordState
-    val emailErrorMessages by viewModel.emailErrorMessages
-    val passwordErrorMessages by viewModel.passwordErrorMessages
-    val authenticationErrorMessages by viewModel.authenticationErrorMessages
-    val isLoading by viewModel.isLoading
 
     Scaffold(modifier = Modifier.padding(32.dp)) { innerPadding ->
         Column(
@@ -47,32 +36,32 @@ fun LoginScreen(navController: NavHostController) {
             Title()
             Spacer(modifier = Modifier.height(48.dp))
             InputFields(
-                emailState,
+                viewModel.emailState,
                 "E-mail",
                 KeyboardType.Email,
                 onValueChange = { email -> viewModel.updateEmailInput(email) }
             )
-            ShowErrors(emailErrorMessages)
+            ShowErrors(viewModel.emailErrorMessages)
             Spacer(modifier = Modifier.height(36.dp))
             InputFields(
-                passwordState,
+                viewModel.passwordState,
                 "Senha",
                 KeyboardType.Password,
                 onValueChange = { password -> viewModel.updatePasswordInput(password) },
                 true
             )
-            ShowErrors(passwordErrorMessages)
+            ShowErrors(viewModel.passwordErrorMessages)
             Spacer(modifier = Modifier.height(36.dp))
-            if (!isLoading) {
+            if (!viewModel.isLoading) {
                 LoginButton(onClick = {
                     viewModel.validateAndSetEmailErrors()
                     viewModel.validateAndSetPasswordErrors()
-                    if (emailErrorMessages.isEmpty() && passwordErrorMessages.isEmpty()) {
+                    if (viewModel.emailErrorMessages.isEmpty() && viewModel.passwordErrorMessages.isEmpty()) {
                         viewModel.authenticateUser(navController)
                     }
                 })
             }
-            if (isLoading) {
+            if (viewModel.isLoading) {
                 Box(
                     modifier = Modifier
                         .fillMaxWidth(),
@@ -81,59 +70,21 @@ fun LoginScreen(navController: NavHostController) {
                     CircularProgressIndicator()
                 }
             }
-            ShowErrors(authenticationErrorMessages)
+            ShowErrors(viewModel.authenticationErrorMessages)
         }
     }
 }
 
 @Composable
-fun Title() {
+private fun Title() {
     Text(
         fontWeight = FontWeight.Bold, fontSize = 24.sp, text = "Bem vindo(a) à Taqtile!"
     )
 }
 
 @Composable
-fun InputFields(
-    value: String,
-    title: String,
-    type: KeyboardType,
-    onValueChange: (String) -> Unit,
-    isPassword: Boolean = false
-) {
-    Column() {
-        Text(text = title)
-        OutlinedTextField(
-            value = value,
-            onValueChange = onValueChange,
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(top = 16.dp),
-            keyboardOptions = KeyboardOptions(
-                keyboardType = type
-            ),
-            shape = RoundedCornerShape(16.dp),
-            visualTransformation = if (isPassword) PasswordVisualTransformation() else VisualTransformation.None
-        )
-    }
-}
-
-@Composable
-fun LoginButton(onClick: () -> Unit) {
+private fun LoginButton(onClick: () -> Unit) {
     Button(onClick = onClick, modifier = Modifier.fillMaxWidth()) {
         Text(fontSize = 20.sp, text = "Entrar")
     }
-}
-
-@Composable
-fun ShowErrors(errorMessages: List<String>) {
-    if (errorMessages.isNotEmpty()) {
-        for (error in errorMessages) {
-            Text(
-                text = error,
-                color = Color.Red,
-                modifier = Modifier.padding(bottom = 8.dp)
-            )
-        }
-    }
 }