diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 56e31de..fc15d69 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,6 +8,7 @@
 
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission
         android:name="android.permission.READ_EXTERNAL_STORAGE"
         android:maxSdkVersion="32" />
@@ -15,8 +16,12 @@
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="28" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
 
     <application
+
+        android:usesCleartextTraffic="true"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
@@ -25,7 +30,14 @@
         android:roundIcon="@mipmap/icone_app_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.AppCompat.Light.NoActionBar"
-        tools:targetApi="31">
+        tools:targetApi="31"
+        >
+        <activity
+            android:name=".ui.AtualizarNome"
+            android:exported="false" />
+<!--        <activity-->
+<!--            android:name=".ui.Chatbot"-->
+<!--            android:exported="false" />-->
         <activity
             android:name=".ui.Conversa"
             android:exported="false" />
@@ -94,4 +106,4 @@
             android:resource="@array/preloaded_fonts" />
     </application>
 
-</manifest>
+</manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/projetosaveit/adapter/AdapterProduto.kt b/app/src/main/java/com/example/projetosaveit/adapter/AdapterProduto.kt
index 6d7afcc..f775124 100644
--- a/app/src/main/java/com/example/projetosaveit/adapter/AdapterProduto.kt
+++ b/app/src/main/java/com/example/projetosaveit/adapter/AdapterProduto.kt
@@ -3,6 +3,7 @@ package com.example.projetosaveit.adapter
 import android.app.AlertDialog
 import android.content.Intent
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import java.util.Date
@@ -19,13 +20,13 @@ import com.example.projetosaveit.R
 import com.example.projetosaveit.adapter.recycleView.Produto
 import com.example.projetosaveit.api.repository.EstoqueRepository
 import com.example.projetosaveit.api.repository.LoteRepository
-import com.example.projetosaveit.api.repository.ProdutoRepository
 import com.example.projetosaveit.api.repository.VitrineRepository
 import com.example.projetosaveit.model.EstoqueDTO
 import com.example.projetosaveit.model.ProdutoInfoDTO
 import com.example.projetosaveit.model.VitrineDTO
 import com.example.projetosaveit.model.VitrineInsertDTO
 import com.example.projetosaveit.ui.TelaEstoque
+import com.example.projetosaveit.util.NotificaoUtils
 import com.google.android.material.appbar.MaterialToolbar
 import okhttp3.ResponseBody
 import java.text.SimpleDateFormat
@@ -38,7 +39,7 @@ class AdapterProduto : RecyclerView.Adapter<AdapterProduto.ViewHolder>() {
     var listProdutos = listOf<Produto>()
     var repository : LoteRepository = LoteRepository()
     var repositoryVitrine : VitrineRepository = VitrineRepository()
-    var produtoRepository : ProdutoRepository = ProdutoRepository()
+    var repositoryEstoque : EstoqueRepository = EstoqueRepository()
 
     override fun onCreateViewHolder(
         parent: ViewGroup,
@@ -85,7 +86,10 @@ class AdapterProduto : RecyclerView.Adapter<AdapterProduto.ViewHolder>() {
                     cancelBtn.setOnClickListener { dialog.dismiss() }
                     saveBtn.setOnClickListener {
                         val quantidade = editQuantidade.text.toString().toInt()
-                        val vitrineInsert : VitrineInsertDTO = VitrineInsertDTO("", produto.batchId, quantidade, Date())
+                        val sdf = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS", Locale.getDefault())
+                        val currentDate = sdf.format(Date())
+
+                        val vitrineInsert = VitrineInsertDTO("", produto.batchId, quantidade, currentDate)
 
                         repositoryVitrine.postVitrine(vitrineInsert).enqueue(object : retrofit2.Callback<ResponseBody> {
                             override fun onResponse(
@@ -93,29 +97,32 @@ class AdapterProduto : RecyclerView.Adapter<AdapterProduto.ViewHolder>() {
                                 response: retrofit2.Response<ResponseBody>
                             ) {
                                 if (response.isSuccessful) {
-                                    Toast.makeText(holder.itemView.context, "Produto adicionado à vitrine com sucesso!", Toast.LENGTH_LONG).show()
-                                    val updates = mapOf("quatity" to produto.quantity.toInt() - quantidade)
-                                    repository.patchProdutoId(produto.id, updates).enqueue(object : retrofit2.Callback<ResponseBody> {
+
+                                    val apenasNumero = produto.quantity.filter { it.isDigit() }
+                                    val quantidadeAtual = apenasNumero.toInt()
+
+                                    NotificaoUtils.notificarProdutoAdicionado(
+                                        holder.itemView.context,
+                                        produto.name
+                                    )
+
+                                    var estoque : EstoqueDTO = EstoqueDTO(0, 0, quantidadeAtual - quantidade, produto.batchId, produto.id, 0, "", currentDate)
+                                    repositoryEstoque.postEstoque(estoque).enqueue(object : retrofit2.Callback<ResponseBody> {
                                         override fun onResponse(
                                             call: retrofit2.Call<ResponseBody>,
                                             response: retrofit2.Response<ResponseBody>
                                         ) {
                                             if (response.isSuccessful) {
-                                                var estoque : EstoqueDTO = EstoqueDTO(0, 0, produto.quantity.toInt() - quantidade, produto.batchId, produto.id, 0, "", LocalDateTime.now())
-                                                produtoRepository.postProduto(estoque).enqueue(object : retrofit2.Callback<ResponseBody> {
-                                                    override fun onResponse(
-                                                        call: retrofit2.Call<ResponseBody>,
-                                                        response: retrofit2.Response<ResponseBody>
-                                                    ) {
-                                                        if (response.isSuccessful) {
-                                                            Toast.makeText(holder.itemView.context, "O estoque foi atualizado junto com inserção na vitrine", Toast.LENGTH_LONG).show()
-                                                        }
-                                                    }
-
-                                                    override fun onFailure(call: retrofit2.Call<ResponseBody>, t: Throwable) {
-                                                        Toast.makeText(holder.itemView.context, "Erro ao atualizar estoque: ${t.message}", Toast.LENGTH_LONG).show()
-                                                    }
-                                                })
+                                                Toast.makeText(holder.itemView.context, "O estoque foi atualizado junto com inserção na vitrine", Toast.LENGTH_LONG).show()
+                                            }else {
+                                                val errorBodyString = try {
+                                                    response.errorBody()?.string()
+                                                } catch (e: Exception) {
+                                                    "Erro desconhecido ao ler o corpo de erro"
+                                                }
+
+                                                Log.e("API_ERROR", "Erro na API: $errorBodyString")
+                                                Toast.makeText(context, errorBodyString ?: "Erro desconhecido", Toast.LENGTH_LONG).show()
                                             }
                                         }
 
@@ -123,6 +130,15 @@ class AdapterProduto : RecyclerView.Adapter<AdapterProduto.ViewHolder>() {
                                             Toast.makeText(holder.itemView.context, "Erro ao atualizar estoque: ${t.message}", Toast.LENGTH_LONG).show()
                                         }
                                     })
+                                }else {
+                                    val errorBodyString = try {
+                                        response.errorBody()?.string()
+                                    } catch (e: Exception) {
+                                        "Erro desconhecido ao ler o corpo de erro"
+                                    }
+
+                                    Log.e("API_ERROR", "Erro na API: $errorBodyString")
+                                    Toast.makeText(context, errorBodyString ?: "Erro desconhecido", Toast.LENGTH_LONG).show()
                                 }
                             }
 
@@ -140,7 +156,7 @@ class AdapterProduto : RecyclerView.Adapter<AdapterProduto.ViewHolder>() {
                 }
 
                 else -> {
-                    repository.getProdutoId(produto.id).enqueue(object : retrofit2.Callback<ProdutoInfoDTO> {
+                    repository.getProdutoId(produto.batchId).enqueue(object : retrofit2.Callback<ProdutoInfoDTO> {
                         override fun onResponse(
                             call: retrofit2.Call<ProdutoInfoDTO>,
                             response: retrofit2.Response<ProdutoInfoDTO>
@@ -174,6 +190,7 @@ class AdapterProduto : RecyclerView.Adapter<AdapterProduto.ViewHolder>() {
                                 bundle.putString("quantidadeMostrada", produto?.batchResponseDTO?.quantity.toString())
                                 bundle.putString("marcaProduto", produto?.productResponseDTO?.brand)
                                 bundle.putString("skuProduto", produto?.batchResponseDTO?.batchCode)
+                                bundle.putLong("idProduto", produto?.productResponseDTO?.id!!)
 
                                 val intent : Intent = Intent(holder.itemView.context, TelaEstoque::class.java)
                                 intent.putExtras(bundle)
diff --git a/app/src/main/java/com/example/projetosaveit/adapter/AdapterVitrine.kt b/app/src/main/java/com/example/projetosaveit/adapter/AdapterVitrine.kt
index 45b3fb6..c3ae3f7 100644
--- a/app/src/main/java/com/example/projetosaveit/adapter/AdapterVitrine.kt
+++ b/app/src/main/java/com/example/projetosaveit/adapter/AdapterVitrine.kt
@@ -49,6 +49,7 @@ class AdapterVitrine() : RecyclerView.Adapter<AdapterVitrine.ViewHolder>() {
                         val intent = Intent(context, ProdutoVitrine::class.java)
 
                         val bundle : Bundle = Bundle()
+                        bundle.putLong("idEmpresa", response.body()?.enterpriseId ?: 0L)
                         bundle.putLong("idVitrine", itemVitrine.id)
                         bundle.putString("nomeVitrine", itemVitrine.name)
                         bundle.putString("imagemVitrine", itemVitrine.image)
diff --git a/app/src/main/java/com/example/projetosaveit/adapter/recycleView/Produto.kt b/app/src/main/java/com/example/projetosaveit/adapter/recycleView/Produto.kt
index eede569..1664483 100644
--- a/app/src/main/java/com/example/projetosaveit/adapter/recycleView/Produto.kt
+++ b/app/src/main/java/com/example/projetosaveit/adapter/recycleView/Produto.kt
@@ -2,11 +2,11 @@ package com.example.projetosaveit.adapter.recycleView
 
 import java.util.Date
 
-class Produto(
+data class Produto(
     var name : String,
     var quantity : String,
     var expirationDate : Date,
     var image : String,
     var batchId : Long,
     var id : Long
-) {}
\ No newline at end of file
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/projetosaveit/api/network/ApiService.kt b/app/src/main/java/com/example/projetosaveit/api/network/ApiService.kt
index f5e9561..dc1c406 100644
--- a/app/src/main/java/com/example/projetosaveit/api/network/ApiService.kt
+++ b/app/src/main/java/com/example/projetosaveit/api/network/ApiService.kt
@@ -3,17 +3,22 @@ package com.example.projetosaveit.api.network
 import com.example.projetosaveit.adapter.recycleView.Produto
 import com.example.projetosaveit.adapter.recycleView.Vitrine
 import com.example.projetosaveit.model.ChatDTO
+import com.example.projetosaveit.model.ChatRequest
+import com.example.projetosaveit.model.ChatResponse
 import com.example.projetosaveit.model.EmpresaDTO
 import com.example.projetosaveit.model.EmpresaInsertDTO
 import com.example.projetosaveit.model.EstoqueDTO
-import com.example.projetosaveit.model.EstoqueInsertDTO
 import com.example.projetosaveit.model.FuncionarioDTO
 import com.example.projetosaveit.model.FuncionarioInsertDTO
+import com.example.projetosaveit.model.HistoricoResponse
 import com.example.projetosaveit.model.ImagemDTO
+import com.example.projetosaveit.model.IniciarChatRequest
+import com.example.projetosaveit.model.IniciarChatResponse
 import com.example.projetosaveit.model.LoteDTO
 import com.example.projetosaveit.model.LoteInsertDTO
 import com.example.projetosaveit.model.ProdutoInfoDTO
 import com.example.projetosaveit.model.RelatorioDTO
+import com.example.projetosaveit.model.RelatorioProdutoDTO
 import com.example.projetosaveit.model.VitrineDTO
 import com.example.projetosaveit.model.VitrineInsertDTO
 import okhttp3.ResponseBody
@@ -30,8 +35,18 @@ interface ApiService {
 
 //    API de SQL
 
-    @POST("api/product/inserir")
-    fun postProduto(@Body estoque : EstoqueDTO) : Call<ResponseBody>
+    @GET("api/stock/relatorioProdutoPorProduto/{enterpriseId}/{productId}")
+    fun getRelatorioProduto(@Path("enterpriseId") enterpriseId: Long, @Path("productId") productId: Long
+    ): Call<List<RelatorioProdutoDTO>>
+
+    @GET("api/stock/relatorioProduto/{enterpriseId}")
+    fun getRelatorioProdutos(@Path("enterpriseId") idEmpresa : Long): Call<List<RelatorioDTO>>
+
+    @POST("/api/stock/inserir")
+    fun postEstoque(@Body estoque : EstoqueDTO) : Call<ResponseBody>
+
+    @GET("/api/batch/selecionarSku/{sku}")
+    fun getBatchSku(@Path("sku") sku : String) : Call<LoteDTO>
 
     @GET("api/batch/listarProdutosLote/{enterpriseId}")
     fun getProdutos(@Path("enterpriseId") idEmpresa : Long): Call<List<Produto>>
@@ -81,34 +96,41 @@ interface ApiService {
     @GET("api/employee/buscarPorEmail/{email}")
     fun getFuncionarioEmail(@Path("email") email : String): Call<FuncionarioDTO>
 
-    @GET("api/stock/relatorioProduto/{enterpriseId}")
-    fun getRelatorioProdutos(@Path("enterpriseId") idEmpresa : Long): Call<List<RelatorioDTO>>
+    @GET("api/showcase/novos")
+    fun getVitrinesNovas(
+        @Query("ultimoCheck") ultimoCheck: String
+    ): Call<List<VitrineDTO>>
 
-    @GET("api/batch/selecionarSku/{sku}")
-    fun getBatchSku(@Path("sku") sku : String): Call<LoteDTO>
+//    API de Mongo/WebSocket
 
-    @POST("api/stock/inserir")
-    fun postEstoque(@Body estoque : EstoqueInsertDTO) : Call<ResponseBody>
-
-//    API de Mongo
-
-    @GET("chats/enterprise/{enterpriseId}")
+    @GET("chats/empresa/{enterpriseId}")
     fun getChatsEmpresa(
         @Path("enterpriseId") idEmpresa: Long
     ): Call<List<ChatDTO>>
 
-    @GET("chats/ultimamensagem")
+    @GET("chats/ultimaMensagemDoChat")
     fun getChatUltimaMensagem(
         @Query("chatId") idChat: Long, @Query("enterpriseId") idEmpresa: Long
     ): Call<ChatDTO>
 
-    @GET("chats/outraempresa")
+    @GET("chats/buscarOutraEmpresa")
     fun getChatOutraEmpresa(
         @Query("chatId") idChat: Long, @Query("enterpriseId") idEmpresa: Long
     ): Call<ChatDTO>
 
-    @GET("chats/buscarchatweb")
+    @GET("chats/buscarChatWebSocket")
     fun getChatsHistorico(
         @Query("chatId") idChat: Long
     ): Call<List<ChatDTO>>
+
+//    API de Chatbot
+
+    @POST("iniciar_chat")
+    fun iniciarChat(@Body request: IniciarChatRequest): Call<IniciarChatResponse>
+
+    @POST("executar_fluxo")
+    fun enviarMensagem(@Body request: ChatRequest): Call<ChatResponse>
+
+    @GET("obter_historico")
+    fun obterHistorico(@Query("session_id") sessionId: String): Call<HistoricoResponse>
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/projetosaveit/api/network/RetrofitClientSql.kt b/app/src/main/java/com/example/projetosaveit/api/network/RetrofitClientSql.kt
index e476829..66fc763 100644
--- a/app/src/main/java/com/example/projetosaveit/api/network/RetrofitClientSql.kt
+++ b/app/src/main/java/com/example/projetosaveit/api/network/RetrofitClientSql.kt
@@ -6,7 +6,7 @@ import okhttp3.OkHttpClient
 
 object RetrofitClientSql {
 
-    private const val BASE_URL = "https://apisaveit.onrender.com/"
+    private const val BASE_URL = "https://apisaveit.onrender.com"
     private const val API_TOKEN = "essentiasaveit-193812-paoea-oei"
 
     private val client = OkHttpClient.Builder()
@@ -28,4 +28,4 @@ object RetrofitClientSql {
     val instance: ApiService by lazy {
         retrofit.create(ApiService::class.java)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/example/projetosaveit/api/repository/EstoqueRepository.kt b/app/src/main/java/com/example/projetosaveit/api/repository/EstoqueRepository.kt
index 49b9a19..f0f81a1 100644
--- a/app/src/main/java/com/example/projetosaveit/api/repository/EstoqueRepository.kt
+++ b/app/src/main/java/com/example/projetosaveit/api/repository/EstoqueRepository.kt
@@ -5,6 +5,7 @@ import com.example.projetosaveit.api.network.RetrofitClientSql
 import com.example.projetosaveit.model.EstoqueDTO
 import com.example.projetosaveit.model.EstoqueInsertDTO
 import com.example.projetosaveit.model.RelatorioDTO
+import com.example.projetosaveit.model.RelatorioProdutoDTO
 import okhttp3.Response
 import okhttp3.ResponseBody
 import retrofit2.Call
@@ -15,7 +16,11 @@ class EstoqueRepository {
         return RetrofitClientSql.instance.getRelatorioProdutos(enterpriseId)
     }
 
-    fun postEstoque(estoque: EstoqueInsertDTO) : Call<ResponseBody> {
+    fun postEstoque(estoque: EstoqueDTO) : Call<ResponseBody> {
         return RetrofitClientSql.instance.postEstoque(estoque)
     }
+
+    fun getRelatorioProduto(enterpriseId : Long, productId : Long) : Call<List<RelatorioProdutoDTO>> {
+        return RetrofitClientSql.instance.getRelatorioProduto(enterpriseId, productId)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/projetosaveit/api/repository/ProdutoRepository.kt b/app/src/main/java/com/example/projetosaveit/api/repository/ProdutoRepository.kt
index 1be77e1..8717238 100644
--- a/app/src/main/java/com/example/projetosaveit/api/repository/ProdutoRepository.kt
+++ b/app/src/main/java/com/example/projetosaveit/api/repository/ProdutoRepository.kt
@@ -10,7 +10,5 @@ import retrofit2.Response
 
 
 class ProdutoRepository {
-    fun postProduto(estoque : EstoqueDTO) : Call<ResponseBody> {
-        return RetrofitClientSql.instance.postProduto(estoque)
-    }
+    // por enquanto nada...
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/projetosaveit/api/repository/VitrineRepository.kt b/app/src/main/java/com/example/projetosaveit/api/repository/VitrineRepository.kt
index 923eee3..810f6ad 100644
--- a/app/src/main/java/com/example/projetosaveit/api/repository/VitrineRepository.kt
+++ b/app/src/main/java/com/example/projetosaveit/api/repository/VitrineRepository.kt
@@ -12,4 +12,6 @@ class VitrineRepository {
     fun getVitrineEmpresa(enterpriseId : Long) = RetrofitClientSql.instance.getVitrinesEmpresa(enterpriseId)
 
     fun postVitrine(showcase : VitrineInsertDTO) = RetrofitClientSql.instance.postVitrine(showcase)
+
+    fun getVitrineNovas(ultimoCheck: String) = RetrofitClientSql.instance.getVitrinesNovas(ultimoCheck)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/projetosaveit/model/EstoqueDTO.kt b/app/src/main/java/com/example/projetosaveit/model/EstoqueDTO.kt
index 5562c63..1ad1e30 100644
--- a/app/src/main/java/com/example/projetosaveit/model/EstoqueDTO.kt
+++ b/app/src/main/java/com/example/projetosaveit/model/EstoqueDTO.kt
@@ -10,5 +10,5 @@ class EstoqueDTO (
     var productId : Long,
     var discardQuantity : Int,
     var discardReason : String,
-    var createdAt : LocalDateTime
+    var createdAt : String
 )
\ No newline at end of file
diff --git a/app/src/main/java/com/example/projetosaveit/model/RelatorioProdutoDTO.kt b/app/src/main/java/com/example/projetosaveit/model/RelatorioProdutoDTO.kt
new file mode 100644
index 0000000..b2c4d69
--- /dev/null
+++ b/app/src/main/java/com/example/projetosaveit/model/RelatorioProdutoDTO.kt
@@ -0,0 +1,7 @@
+package com.example.projetosaveit.model
+
+data class RelatorioProdutoDTO(
+    val totalOutput: Int,
+    val mouthInput: Int
+) {
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/projetosaveit/model/VitrineDTO.kt b/app/src/main/java/com/example/projetosaveit/model/VitrineDTO.kt
index 573682e..5e30156 100644
--- a/app/src/main/java/com/example/projetosaveit/model/VitrineDTO.kt
+++ b/app/src/main/java/com/example/projetosaveit/model/VitrineDTO.kt
@@ -5,13 +5,12 @@ class VitrineDTO(
     var name: String,
     var description: String,
     var image: String,
-    var price: Double,
-    var productId: Long,
     var loteId: Long,
     var tipoPeso: String,
     var quantidadeGeral: Int,
     var empresa: String,
     var localizacao: String,
-    var validade: String
+    var validade: String,
+    var enterpriseId: Long
 ) {
 }
diff --git a/app/src/main/java/com/example/projetosaveit/model/VitrineInsertDTO.kt b/app/src/main/java/com/example/projetosaveit/model/VitrineInsertDTO.kt
index e4f7749..f76929d 100644
--- a/app/src/main/java/com/example/projetosaveit/model/VitrineInsertDTO.kt
+++ b/app/src/main/java/com/example/projetosaveit/model/VitrineInsertDTO.kt
@@ -6,6 +6,6 @@ class VitrineInsertDTO(
     var description : String,
     var batchId : Long,
     var quantityShowcase : Int,
-    var entranceDate : Date
+    var entranceDate : String
 ) {
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/projetosaveit/ui/AdicionarProduto.kt b/app/src/main/java/com/example/projetosaveit/ui/AdicionarProduto.kt
index 448698d..9357986 100644
--- a/app/src/main/java/com/example/projetosaveit/ui/AdicionarProduto.kt
+++ b/app/src/main/java/com/example/projetosaveit/ui/AdicionarProduto.kt
@@ -216,6 +216,10 @@ class AdicionarProduto : AppCompatActivity() {
                 inserirProduto(lote)
             }
         }
+
+        findViewById<ImageView>(R.id.btVoltarAdicaoProduto).setOnClickListener {
+            finish()
+        }
     }
 
 
@@ -332,6 +336,7 @@ class AdicionarProduto : AppCompatActivity() {
                         },
                         onError = { e ->
                             Toast.makeText(this@AdicionarProduto, "Erro no upload: ${e.message}", Toast.LENGTH_SHORT).show()
+                            Log.d(ContentValues.TAG, "Erro no upload: ${e.message}")
                         }
                     )
                 }
@@ -410,8 +415,13 @@ class AdicionarProduto : AppCompatActivity() {
     }
 
     private fun openGallery() {
-        val intent = Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI)
-        startActivityForResult(intent, REQUEST_IMAGE_PICK)
+        if (ContextCompat.checkSelfPermission(this@AdicionarProduto, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+            requestCameraPermissionLauncher.launch(Manifest.permission.READ_EXTERNAL_STORAGE)
+            return
+        } else {
+            val intent = Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI)
+            startActivityForResult(intent, REQUEST_IMAGE_PICK)
+        }
     }
 
     private fun openCamera() {
diff --git a/app/src/main/java/com/example/projetosaveit/ui/AdicionarProdutoVitrine.kt b/app/src/main/java/com/example/projetosaveit/ui/AdicionarProdutoVitrine.kt
index ad8f318..1576013 100644
--- a/app/src/main/java/com/example/projetosaveit/ui/AdicionarProdutoVitrine.kt
+++ b/app/src/main/java/com/example/projetosaveit/ui/AdicionarProdutoVitrine.kt
@@ -1,11 +1,14 @@
 package com.example.projetosaveit.ui
 
 import android.app.AlertDialog
+import android.content.pm.PackageManager
+import android.os.Build
 import android.widget.Toast
 import android.os.Bundle
 import android.view.WindowManager
 import android.widget.Button
 import android.widget.EditText
+import android.widget.ImageView
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.ViewCompat
@@ -27,6 +30,13 @@ class AdicionarProdutoVitrine : AppCompatActivity() {
     val objAutenticar: FirebaseAuth = FirebaseAuth.getInstance()
     var idEmpresa : Long = 0
 
+    private val PERMISSION_REQUEST_CODE = 1001
+
+    override fun onStart() {
+        super.onStart()
+        pedirPermissaoNotificacao()
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
@@ -60,6 +70,10 @@ class AdicionarProdutoVitrine : AppCompatActivity() {
             }
         }
 
+        findViewById<ImageView>(R.id.btVoltarAdicaoVitrine).setOnClickListener {
+            finish()
+        }
+
     }
 
     private fun carregarProdutos(idEmpresa: Long) {
@@ -78,4 +92,30 @@ class AdicionarProdutoVitrine : AppCompatActivity() {
             }
         })
     }
+
+    private fun pedirPermissaoNotificacao() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            if (checkSelfPermission(android.Manifest.permission.POST_NOTIFICATIONS)
+                != PackageManager.PERMISSION_GRANTED
+            ) {
+                requestPermissions(
+                    arrayOf(android.Manifest.permission.POST_NOTIFICATIONS),
+                    PERMISSION_REQUEST_CODE
+                )
+            }
+        }
+    }
+
+    override fun onRequestPermissionsResult(
+        requestCode: Int, permissions: Array<out String>, grantResults: IntArray
+    ) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
+        if (requestCode == PERMISSION_REQUEST_CODE) {
+            if ((grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED)) {
+                Toast.makeText(this, "Permissão de notificações concedida", Toast.LENGTH_SHORT).show()
+            } else {
+                Toast.makeText(this, "Permissão de notificações negada", Toast.LENGTH_SHORT).show()
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/projetosaveit/ui/AtualizarNome.kt b/app/src/main/java/com/example/projetosaveit/ui/AtualizarNome.kt
new file mode 100644
index 0000000..d29c8f0
--- /dev/null
+++ b/app/src/main/java/com/example/projetosaveit/ui/AtualizarNome.kt
@@ -0,0 +1,70 @@
+package com.example.projetosaveit.ui
+
+import android.os.Bundle
+import android.util.Log
+import android.widget.Button
+import android.widget.EditText
+import android.widget.ImageView
+import android.widget.Toast
+import androidx.activity.enableEdgeToEdge
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import com.example.projetosaveit.R
+import com.example.projetosaveit.api.repository.EmpresaRepository
+import com.example.projetosaveit.util.GetEmpresa
+import okhttp3.ResponseBody
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+
+class AtualizarNome : AppCompatActivity() {
+    private val empresaRepository = EmpresaRepository()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
+        setContentView(R.layout.activity_atualizar_nome)
+        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
+            insets
+        }
+
+        findViewById<Button>(R.id.btAlterarNome).setOnClickListener {
+            val email = findViewById<EditText>(R.id.emailAtualizarN).text.toString()
+
+            GetEmpresa.pegarEmailEmpresa(email) { empresa ->
+                if (empresa != null) {
+                    mudarNome(empresa.id)
+                } else {
+                    Log.d("erro", "pegarEmailEmpresa: Empresa nao encontrada")
+                }
+            }
+        }
+
+        findViewById<ImageView>(R.id.btVoltarAtualizarNome).setOnClickListener {
+            finish()
+        }
+    }
+
+    private fun mudarNome(id: Long) {
+        empresaRepository.patchEmpresa(id, mapOf("name" to findViewById<EditText>(R.id.nomeNovo).text.toString())).enqueue(object : Callback<ResponseBody> {
+            override fun onResponse(
+                call: Call<ResponseBody>,
+                response: Response<ResponseBody>
+            ) {
+                if (response.isSuccessful) {
+                    Toast.makeText(this@AtualizarNome, "Nome atualizada com sucesso!", Toast.LENGTH_SHORT).show()
+                    finish()
+                } else {
+                    Toast.makeText(this@AtualizarNome, "Erro ao atualizar nome!", Toast.LENGTH_SHORT).show()
+                }
+            }
+
+            override fun onFailure(call: Call<ResponseBody>, t: Throwable) {
+                Log.d("erro", "Erro: ${t.message}")
+            }
+        })
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/projetosaveit/ui/AtualizarSenha.kt b/app/src/main/java/com/example/projetosaveit/ui/AtualizarSenha.kt
index cc30093..0781dff 100644
--- a/app/src/main/java/com/example/projetosaveit/ui/AtualizarSenha.kt
+++ b/app/src/main/java/com/example/projetosaveit/ui/AtualizarSenha.kt
@@ -1,6 +1,5 @@
 package com.example.projetosaveit.ui
 
-import android.media.Image
 import android.os.Bundle
 import android.view.View
 import android.widget.Button
diff --git a/app/src/main/java/com/example/projetosaveit/ui/CadastroEndereco.kt b/app/src/main/java/com/example/projetosaveit/ui/CadastroEndereco.kt
index 33ce84e..abe1dd2 100644
--- a/app/src/main/java/com/example/projetosaveit/ui/CadastroEndereco.kt
+++ b/app/src/main/java/com/example/projetosaveit/ui/CadastroEndereco.kt
@@ -54,23 +54,23 @@ class CadastroEndereco : AppCompatActivity() {
             val estadoEmpresa : String = findViewById<TextInputEditText>(R.id.estadoEmpresaInput).text.toString()
             val complementoEmpresa : String = findViewById<TextInputEditText>(R.id.complementoEmpresaInput).text.toString()
 
-            if (cepEmpresa == null) {
+            if (cepEmpresa.isEmpty()) {
                 Toast.makeText(this@CadastroEndereco, "CEP não pode ser vazio", Toast.LENGTH_LONG).show()
-            }else if(ruaEmpresa == null) {
+            }else if(ruaEmpresa.isEmpty()) {
                 Toast.makeText(this@CadastroEndereco, "A rua da empresa não pode ser vazia", Toast.LENGTH_LONG).show()
-            }else if(bairroEmpresa == null) {
+            }else if(bairroEmpresa.isEmpty()) {
                 Toast.makeText(this@CadastroEndereco, "O bairro da empresa não pode ser vazio", Toast.LENGTH_LONG).show()
-            }else if(numeroEmpresa == null) {
+            }else if(numeroEmpresa.isEmpty()) {
                 Toast.makeText(this@CadastroEndereco, "O número da empresa não pode ser vazio", Toast.LENGTH_LONG).show()
-            }else if(cidadeEmpresa == null) {
+            }else if(cidadeEmpresa.isEmpty()) {
                 Toast.makeText(this@CadastroEndereco, "A cidade da empresa não pode ser vazio", Toast.LENGTH_LONG).show()
-            }else if (estadoEmpresa == null) {
+            }else if (estadoEmpresa.isEmpty()) {
                 Toast.makeText(this@CadastroEndereco, "O estado da empresa não pode ser vazio", Toast.LENGTH_LONG).show()
-            }else if (complementoEmpresa == null) {
+            }else if (complementoEmpresa.isEmpty()) {
                 Toast.makeText(this@CadastroEndereco, "O complemento da empresa não pode ser vazio",
                     Toast.LENGTH_LONG).show()
             }else {
-                val empresaDTO : EmpresaDTO = EmpresaDTO(0,cnpjEmpresa.toString(), nomeEmpresa.toString(), emailEmpresa.toString(), planId = 2, "", telefoneEmpresa.toString(), addressId = 0, senhaEmpresa.toString())
+                val empresaDTO : EmpresaDTO = EmpresaDTO(0,cnpjEmpresa.toString(), nomeEmpresa.toString(), emailEmpresa.toString(), planId = 1, "", telefoneEmpresa.toString(), addressId = 0, senhaEmpresa.toString())
                 val enderecoDTO : EnderecoDTO = EnderecoDTO(0,estadoEmpresa.toString(), cidadeEmpresa.toString(), ruaEmpresa.toString(), cepEmpresa.toString(), bairroEmpresa.toString(), complementoEmpresa.toString(), numeroEmpresa.toInt())
                 val empresaInsertDTO : EmpresaInsertDTO = EmpresaInsertDTO(empresaDTO, enderecoDTO)
                 postEmpresa(empresaInsertDTO)
@@ -98,8 +98,9 @@ class CadastroEndereco : AppCompatActivity() {
                                         Toast.LENGTH_SHORT
                                     ).show()
                                     val intent = Intent(this, MainActivity::class.java)
-                                    intent.putExtra("plano", 0)
+                                    intent.putExtra("plano", 1)
                                     intent.putExtra("tipoFunc", false)
+                                    intent.putExtra("isEmpresa", true)
                                     startActivity(intent)
                                     finish()
                                 }
@@ -122,6 +123,15 @@ class CadastroEndereco : AppCompatActivity() {
             ) {
                 if(p1.isSuccessful) {
                     Toast.makeText(this@CadastroEndereco, "Empresa cadastrada com sucesso!", Toast.LENGTH_LONG).show()
+                }else {
+                    val errorBodyString = try {
+                        p1.errorBody()?.string()
+                    } catch (e: Exception) {
+                        "Erro desconhecido ao ler o corpo de erro"
+                    }
+
+                    Log.e("API_ERROR", "Erro na API: $errorBodyString")
+                    Toast.makeText(this@CadastroEndereco, errorBodyString ?: "Erro desconhecido", Toast.LENGTH_LONG).show()
                 }
             }
 
diff --git a/app/src/main/java/com/example/projetosaveit/ui/ConfiguracoesPerfil.kt b/app/src/main/java/com/example/projetosaveit/ui/ConfiguracoesPerfil.kt
index 8144b0f..92bb5ab 100644
--- a/app/src/main/java/com/example/projetosaveit/ui/ConfiguracoesPerfil.kt
+++ b/app/src/main/java/com/example/projetosaveit/ui/ConfiguracoesPerfil.kt
@@ -3,19 +3,23 @@ package com.example.projetosaveit.ui
 import android.content.Intent
 import android.os.Bundle
 import android.widget.Button
+import android.widget.FrameLayout
+import android.widget.ImageView
 import android.widget.TextView
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
+import com.example.projetosaveit.ui.AtualizarNome
 import com.example.projetosaveit.R
+import com.example.projetosaveit.util.GetEmpresa
+import com.example.projetosaveit.util.GetFuncionario
 import com.google.firebase.auth.FirebaseAuth
 
 class ConfiguracoesPerfil : AppCompatActivity() {
     val objAutenticar: FirebaseAuth = FirebaseAuth.getInstance()
 
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
@@ -25,10 +29,30 @@ class ConfiguracoesPerfil : AppCompatActivity() {
             v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
             insets
         }
+        val email = objAutenticar.currentUser?.email.toString()
+
+        GetEmpresa.pegarEmailEmpresa(email) { empresa ->
+            if (empresa != null) {
+                (findViewById<TextView>(R.id.emailUsuarioTxt)).text = empresa.email
+            } else {
+                GetFuncionario.pegarEmailFunc(email) { func ->
+                    if (func != null) {
+                        GetEmpresa.pegarIdEmpresa(func.enterpriseId) { empresa ->
+                            if (empresa != null) {
+                                (findViewById<TextView>(R.id.emailUsuarioTxt)).text = (empresa.email)
+                            }
+                        }
 
-        (findViewById<TextView>(R.id.emailUsuarioTxt)).setText(objAutenticar.currentUser?.email)
+                        if (func.isAdmin == false) {
+                            findViewById<FrameLayout>(R.id.FrameAlterarNome).visibility = FrameLayout.GONE
+                        }
+                    }
+                }
+            }
+        }
 
-        (findViewById<ConstraintLayout>(R.id.btAtualizarSenha)).setOnClickListener { v ->
+
+        (findViewById<ConstraintLayout>(R.id.constraintAtualizarSenha)).setOnClickListener { v ->
             val intent = Intent(this, AtualizarSenha::class.java)
             intent.putExtra("origem", "logado")
             startActivity(intent)
@@ -39,5 +63,14 @@ class ConfiguracoesPerfil : AppCompatActivity() {
             val intent = Intent(this, Login::class.java)
             startActivity(intent)
         }
+
+        findViewById<FrameLayout>(R.id.FrameAlterarNome).setOnClickListener {
+            val intent = Intent(this, AtualizarNome::class.java)
+            startActivity(intent)
+        }
+
+        findViewById<ImageView>(R.id.btVoltarConfigPerfil).setOnClickListener {
+            finish()
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/projetosaveit/ui/InserirFuncionario.kt b/app/src/main/java/com/example/projetosaveit/ui/InserirFuncionario.kt
index 0ea5aa3..ab29d0f 100644
--- a/app/src/main/java/com/example/projetosaveit/ui/InserirFuncionario.kt
+++ b/app/src/main/java/com/example/projetosaveit/ui/InserirFuncionario.kt
@@ -11,13 +11,10 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import com.example.projetosaveit.R
-import com.example.projetosaveit.api.repository.EmpresaRepository
 import com.example.projetosaveit.api.repository.FuncionarioRepository
-import com.example.projetosaveit.model.EmpresaDTO
 import com.example.projetosaveit.model.FuncionarioInsertDTO
 import com.example.projetosaveit.util.GetEmpresa
 import com.example.projetosaveit.util.GetFuncionario
-import com.google.android.gms.tasks.Task
 import com.google.android.material.textfield.TextInputEditText
 import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.auth.FirebaseUser
@@ -49,7 +46,7 @@ class InserirFuncionario : AppCompatActivity() {
 
             GetFuncionario.pegarEmailFunc(usuario.email.toString()) { func ->
                 if (func != null) {
-                    id = func!!.enterpriseId
+                    id = func.enterpriseId
                     GetEmpresa.pegarIdEmpresa(id) { empresa ->
                         if (empresa == null) {
                             Toast.makeText(
@@ -72,7 +69,7 @@ class InserirFuncionario : AppCompatActivity() {
             }
         }
 
-        findViewById<ImageView>(R.id.voltarInserirFunc).setOnClickListener {
+        findViewById<ImageView>(R.id.btVoltarInserirFunc).setOnClickListener {
             finish()
         }
     }
@@ -110,7 +107,7 @@ class InserirFuncionario : AppCompatActivity() {
                     ).show()
 
                     val intent = Intent(this@InserirFuncionario, MainActivity::class.java)
-                    intent.putExtra("plano", 1)
+                    intent.putExtra("plano", 2)
                     startActivity(intent)
                     finish()
                 } else {
diff --git a/app/src/main/java/com/example/projetosaveit/ui/Login.kt b/app/src/main/java/com/example/projetosaveit/ui/Login.kt
index 60f1226..e33ee85 100644
--- a/app/src/main/java/com/example/projetosaveit/ui/Login.kt
+++ b/app/src/main/java/com/example/projetosaveit/ui/Login.kt
@@ -64,12 +64,12 @@ class Login : AppCompatActivity() {
                             if (empresa != null) {
                                 // É empresa
                                 val plano = empresa.planId
-                                abrirMainActivity(plano = plano)
+                                abrirMainActivity(plano = plano, isEmpresa = true)
                             } else {
                                 // Não é empresa, verifica se é funcionário
                                 GetFuncionario.pegarEmailFunc(txtEmail) { func ->
                                     val tipoFunc = func?.isAdmin ?: false
-                                    abrirMainActivity(tipoFunc = tipoFunc)
+                                    abrirMainActivity(plano = 2, tipoFunc = tipoFunc, isEmpresa = false)
                                 }
                             }
                         }
@@ -98,14 +98,15 @@ class Login : AppCompatActivity() {
         }
     }
 
-    private fun abrirMainActivity(plano: Int? = null, tipoFunc: Boolean? = null) {
+    private fun abrirMainActivity(plano: Int? = null, tipoFunc: Boolean? = null, isEmpresa: Boolean) {
         val intent = Intent(this, MainActivity::class.java)
-        if (plano != null) {
+        if (plano != null)
             intent.putExtra("plano", plano)
-        }
-        if (tipoFunc != null) {
+
+        if (tipoFunc != null)
             intent.putExtra("tipoFunc", tipoFunc)
-        }
+
+        intent.putExtra("isEmpresa", isEmpresa)
         startActivity(intent)
         finish()
     }
diff --git a/app/src/main/java/com/example/projetosaveit/ui/MainActivity.kt b/app/src/main/java/com/example/projetosaveit/ui/MainActivity.kt
index 8e34760..8cd6e56 100644
--- a/app/src/main/java/com/example/projetosaveit/ui/MainActivity.kt
+++ b/app/src/main/java/com/example/projetosaveit/ui/MainActivity.kt
@@ -16,20 +16,31 @@ class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) {
+            requestPermissions(arrayOf(android.Manifest.permission.POST_NOTIFICATIONS), 1)
+        }
+
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding!!.root)
 
         val navView: BottomNavigationView = binding!!.navView
         val plano: Int? = intent.extras?.getInt("plano")
         val tipoFunc: Boolean? = intent.extras?.getBoolean("tipoFunc")
+        val isEmpresa: Boolean = intent.extras?.getBoolean("isEmpresa") ?: false
 
         Log.d("MainActivity", "plano: $plano, tipoFunc: $tipoFunc")
-//        Factory Method
-        val toolbarProvider = ToolbarFactory.criarToolbar(plano, tipoFunc)
+
+        // Factory Method
+        val toolbarProvider = ToolbarFactory.criarToolbar(plano, tipoFunc, isEmpresa)
         val appBarConfiguration = toolbarProvider.setupToolbar(navView)
 
         val navController = findNavController(this, R.id.nav_host_fragment_activity_main)
-//        setupActionBarWithNavController(this, navController, appBarConfiguration)
         setupWithNavController(navView, navController)
+
+        if (isEmpresa && plano == 1) {
+            navView.post {
+                navController.navigate(R.id.navigation_vitrine)
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/projetosaveit/ui/MinhaVitrine.kt b/app/src/main/java/com/example/projetosaveit/ui/MinhaVitrine.kt
index b8af68d..3aeda60 100644
--- a/app/src/main/java/com/example/projetosaveit/ui/MinhaVitrine.kt
+++ b/app/src/main/java/com/example/projetosaveit/ui/MinhaVitrine.kt
@@ -1,6 +1,7 @@
 package com.example.projetosaveit.ui
 
 import android.os.Bundle
+import android.widget.ImageView
 import android.widget.Toast
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
@@ -51,6 +52,10 @@ class MinhaVitrine : AppCompatActivity() {
         val recycleView = findViewById<androidx.recyclerview.widget.RecyclerView>(R.id.minhaVitrineRc)
         recycleView.adapter = adapter
 
+        findViewById<ImageView>(R.id.btVoltarMinhaVitrine).setOnClickListener {
+            finish()
+        }
+
     }
 
     fun getarVitrinePorIdEmpresa(idEmpresa : Long) {
diff --git a/app/src/main/java/com/example/projetosaveit/ui/Planos.kt b/app/src/main/java/com/example/projetosaveit/ui/Planos.kt
index 70cb2c5..ad03f15 100644
--- a/app/src/main/java/com/example/projetosaveit/ui/Planos.kt
+++ b/app/src/main/java/com/example/projetosaveit/ui/Planos.kt
@@ -36,7 +36,11 @@ class Planos : AppCompatActivity() {
         GetEmpresa.pegarEmailEmpresa(empresaLogada.email.toString()) { empresa ->
             if (empresa != null) {
                 // É empresa
-                id = empresa.id
+                if (empresa.planId == 2) {
+                    findViewById<Button>(R.id.btComprar).text = "Já sou Pro"
+                } else {
+                    id = empresa.id
+                }
             } else {
                 // É funcionário
                 findViewById<Button>(R.id.btComprar).text = "Já sou Pro"
@@ -46,7 +50,7 @@ class Planos : AppCompatActivity() {
         findViewById<Button>(R.id.btComprar).setOnClickListener {
             Toast.makeText(this, "Plano SaveIt Pro assinado!", Toast.LENGTH_SHORT).show()
 
-            empresaRepository.patchEmpresa(id, mapOf("planId" to 1)).enqueue(object : retrofit2.Callback<okhttp3.ResponseBody> {
+            empresaRepository.patchEmpresa(id, mapOf("planId" to 2)).enqueue(object : retrofit2.Callback<okhttp3.ResponseBody> {
                 override fun onResponse(
                     call: retrofit2.Call<okhttp3.ResponseBody>,
                     response: retrofit2.Response<okhttp3.ResponseBody>
diff --git a/app/src/main/java/com/example/projetosaveit/ui/ProdutoVitrine.kt b/app/src/main/java/com/example/projetosaveit/ui/ProdutoVitrine.kt
index 12e63b5..418d0dc 100644
--- a/app/src/main/java/com/example/projetosaveit/ui/ProdutoVitrine.kt
+++ b/app/src/main/java/com/example/projetosaveit/ui/ProdutoVitrine.kt
@@ -1,7 +1,10 @@
 package com.example.projetosaveit.ui
 
+import android.content.Intent
+import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.View
+import android.widget.Button
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.activity.enableEdgeToEdge
@@ -10,11 +13,17 @@ import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import com.bumptech.glide.Glide
 import com.example.projetosaveit.R
+import com.example.projetosaveit.api.repository.ProdutoRepository
+import com.example.projetosaveit.util.GetEmpresa
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
 
 class ProdutoVitrine : AppCompatActivity() {
+    @SuppressLint("SetTextI18n")
+    private var produtoRepository = ProdutoRepository()
+    private var imgEmpresa = ""
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         this.enableEdgeToEdge()
@@ -28,11 +37,12 @@ class ProdutoVitrine : AppCompatActivity() {
         }
 
         val bundle = intent.extras
+        val idEmpresa = bundle?.getLong("idEmpresa")
         val nomeProduto = bundle?.getString("nomeVitrine")
         val descricaoProduto = bundle?.getString("descricaoVitrine")
         val empresaVitrine = bundle?.getString("empresaVitrine")
         val validadeProduto = bundle?.getString("validadeVitrine")
-        val quantidadeVitreine = bundle?.getString("quantidadeVitrine")
+        val quantidadeVitrine = bundle?.getInt("quantidadeVitrine").toString()
         val pesoVitrine = bundle?.getString("pesoVitrine")
         val localizacaoVitrine = bundle?.getString("localizacaoVitrine")
         val imgProduto = bundle?.getString("imagemVitrine")
@@ -44,13 +54,25 @@ class ProdutoVitrine : AppCompatActivity() {
         (findViewById<TextView>(R.id.descricaoProdutoResult)).setText(descricaoProduto)
         (findViewById<TextView>(R.id.empresaProdutoResult)).setText(empresaVitrine)
         (findViewById<TextView>(R.id.validadeProdutoResult)).setText(validadeProduto)
-        (findViewById<TextView>(R.id.pesoProdutoResult)).setText(quantidadeVitreine + " " + pesoVitrine)
+        (findViewById<TextView>(R.id.pesoProdutoResult)).setText(quantidadeVitrine + " " + pesoVitrine)
         (findViewById<TextView>(R.id.cidadeProdutoResult)).setText(localizacaoVitrine)
 
         (findViewById<ImageView>(R.id.setaEsquerdaVoltar)).setOnClickListener {
             finish()
         }
 
+        findViewById<Button>(R.id.BotaoAcessar).setOnClickListener {
+
+            GetEmpresa.pegarIdEmpresa(idEmpresa!!.toLong()) { empresa ->
+                if (empresa != null) {
+                    imgEmpresa = empresa.enterpriseImage
+                }
+            }
 
+            val intentChat = Intent(this, Conversa::class.java)
+            intentChat.putExtra("empresaFoto", imgEmpresa)
+            intentChat.putExtra("empresaId", idEmpresa)
+            startActivity(intentChat)
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/projetosaveit/ui/SplashScreen.kt b/app/src/main/java/com/example/projetosaveit/ui/SplashScreen.kt
index 6a06fbd..76fe8eb 100644
--- a/app/src/main/java/com/example/projetosaveit/ui/SplashScreen.kt
+++ b/app/src/main/java/com/example/projetosaveit/ui/SplashScreen.kt
@@ -33,6 +33,7 @@ class SplashScreen : AppCompatActivity() {
 
                         val intent = Intent(this, MainActivity::class.java)
                         intent.putExtra("plano", plano)
+                        intent.putExtra("isEmpresa", true)
                         startActivity(intent)
                         Log.d("plano", plano.toString())
                         finish()
@@ -41,7 +42,9 @@ class SplashScreen : AppCompatActivity() {
                             val tipoFunc = func?.isAdmin ?: false
 
                             val intent = Intent(this, MainActivity::class.java)
+                            intent.putExtra("plano", 2)
                             intent.putExtra("tipoFunc", tipoFunc)
+                            intent.putExtra("isEmpresa", false)
                             startActivity(intent)
                             finish()
                         }
diff --git a/app/src/main/java/com/example/projetosaveit/ui/TelaEstoque.kt b/app/src/main/java/com/example/projetosaveit/ui/TelaEstoque.kt
index b34da81..0aa146b 100644
--- a/app/src/main/java/com/example/projetosaveit/ui/TelaEstoque.kt
+++ b/app/src/main/java/com/example/projetosaveit/ui/TelaEstoque.kt
@@ -1,16 +1,38 @@
 package com.example.projetosaveit.ui
 
 import android.os.Bundle
+import android.util.Log
 import android.widget.ProgressBar
 import android.widget.TextView
+import android.widget.Toast
+import com.github.mikephil.charting.charts.BarChart
+import com.github.mikephil.charting.data.BarDataSet
+import com.github.mikephil.charting.data.BarData
+import com.github.mikephil.charting.data.BarEntry
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import com.bumptech.glide.Glide
 import com.example.projetosaveit.R
+import com.example.projetosaveit.api.repository.EstoqueRepository
+import com.example.projetosaveit.api.repository.VitrineRepository
+import com.example.projetosaveit.model.RelatorioProdutoDTO
+import com.example.projetosaveit.ui.CadastroEndereco
+import com.example.projetosaveit.util.GetEmpresa
+import com.github.mikephil.charting.components.XAxis
+import com.google.firebase.auth.FirebaseAuth
+import retrofit2.Call
+import retrofit2.Response
+import javax.security.auth.callback.Callback
 
 class TelaEstoque : AppCompatActivity() {
+
+    val objAutenticar: FirebaseAuth = FirebaseAuth.getInstance()
+    var enterpriseId : Long = 0
+    val repository : EstoqueRepository = EstoqueRepository()
+
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
@@ -32,6 +54,8 @@ class TelaEstoque : AppCompatActivity() {
             findViewById<TextView>(R.id.textView46).text = bundle.getString("quantidadeProduto")
             findViewById<TextView>(R.id.textView25).text = bundle.getString("skuProduto")
 
+            val idProduto : Long = bundle.getLong("idProduto")
+
             val quantidadeStr = bundle.getString("quantidadeMostrada")
             val quantidadeMaxStr = bundle.getString("quantidadeMaximaProduto")
 
@@ -48,6 +72,80 @@ class TelaEstoque : AppCompatActivity() {
                     .load(imageUrl)
                     .into(findViewById(R.id.imageView28))
             }
+
+            val barChart = findViewById<BarChart>(R.id.barChart)
+            barChart.description.isEnabled = false
+            barChart.setDrawGridBackground(false)
+            barChart.setFitBars(true)
+            barChart.animateY(1500)
+
+            GetEmpresa.pegarEmailEmpresa(objAutenticar.currentUser?.email!!) { empresa ->
+                if (empresa != null) {
+                    enterpriseId  = empresa.id
+                }
+            }
+
         }
     }
+
+    private fun getRelatorioProduto(productId : Long, enterpriseId : Long) {
+        repository.getRelatorioProduto(productId, enterpriseId).enqueue(object : retrofit2.Callback<List<RelatorioProdutoDTO>> {
+            override fun onResponse(
+                p0: Call<List<RelatorioProdutoDTO>?>,
+                p1: Response<List<RelatorioProdutoDTO>?>
+            ) {
+                if (p1.isSuccessful) {
+                    mostrarGrafico(p1.body()!!)
+                }else {
+                    val errorBodyString = try {
+                        p1.errorBody()?.string()
+                    } catch (e: Exception) {
+                        "Erro desconhecido ao ler o corpo de erro"
+                    }
+
+                    Log.e("API_ERROR", "Erro na API: $errorBodyString")
+                    Toast.makeText(this@TelaEstoque, errorBodyString ?: "Erro desconhecido", Toast.LENGTH_LONG).show()                }
+            }
+
+            override fun onFailure(
+                p0: Call<List<RelatorioProdutoDTO>?>,
+                p1: Throwable
+            ) {
+                Toast.makeText(this@TelaEstoque, p1.message, Toast.LENGTH_LONG).show()
+            }
+
+        })
+    }
+
+    private fun mostrarGrafico(dados: List<RelatorioProdutoDTO>) {
+        val barChart = findViewById<BarChart>(R.id.barChart)
+
+        val entradasInput = ArrayList<BarEntry>()
+        val entradasOutput = ArrayList<BarEntry>()
+
+        for ((index, item) in dados.withIndex()) {
+            entradasInput.add(BarEntry(index.toFloat(), item.mouthInput.toFloat()))
+            entradasOutput.add(BarEntry(index.toFloat(), item.totalOutput.toFloat()))
+        }
+
+        val dataSetInput = BarDataSet(entradasInput, "Entradas")
+        dataSetInput.color = getColor(R.color.VerdeEscuro)
+
+        val dataSetOutput = BarDataSet(entradasOutput, "Saídas")
+        dataSetOutput.color = getColor(R.color.Verde)
+
+        val data = BarData(dataSetInput, dataSetOutput)
+        data.barWidth = 0.3f
+
+        barChart.data = data
+
+        val xAxis = barChart.xAxis
+        xAxis.position = XAxis.XAxisPosition.BOTTOM
+        xAxis.granularity = 1f
+        xAxis.setDrawGridLines(false)
+
+        barChart.groupBars(0f, 0.4f, 0.05f)
+        barChart.invalidate()
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/projetosaveit/ui/cadastrarRelatorio/CadastrarRelatorio.kt b/app/src/main/java/com/example/projetosaveit/ui/cadastrarRelatorio/CadastrarRelatorio.kt
index ba68949..c0cf778 100644
--- a/app/src/main/java/com/example/projetosaveit/ui/cadastrarRelatorio/CadastrarRelatorio.kt
+++ b/app/src/main/java/com/example/projetosaveit/ui/cadastrarRelatorio/CadastrarRelatorio.kt
@@ -9,11 +9,11 @@ import androidx.fragment.app.Fragment
 import com.example.projetosaveit.api.repository.EstoqueRepository
 import com.example.projetosaveit.api.repository.LoteRepository
 import com.example.projetosaveit.databinding.FragmentCadastrarRelatorioBinding
-import com.example.projetosaveit.model.EstoqueInsertDTO
+import com.example.projetosaveit.model.EstoqueDTO
 import com.example.projetosaveit.model.LoteDTO
-import com.google.firebase.auth.FirebaseAuth
 import okhttp3.ResponseBody
 import retrofit2.Call
+import retrofit2.Callback
 import retrofit2.Response
 import java.time.LocalDateTime
 
@@ -35,7 +35,11 @@ class CadastrarRelatorio : Fragment() {
             val qntdProd = binding?.qntdProd?.text.toString()
             val qntdSaida = binding?.qntdSaida?.text.toString()
             val motivoDescarte = binding?.motivoDescarte?.text.toString()
-            val qntdDescarte = binding?.qntdDescarte?.text.toString()
+            var qntdDescarte = binding?.qntdDescarte?.text.toString()
+
+            if (qntdDescarte.isNullOrEmpty()) {
+                qntdDescarte = "0"
+            }
 
             if (sku.isBlank() || qntdProd.isBlank() || qntdSaida.isBlank() || qntdDescarte.isBlank()) {
                 Toast.makeText(requireContext(), "Preencha todos os campos obrigatórios.", Toast.LENGTH_SHORT).show()
@@ -44,23 +48,24 @@ class CadastrarRelatorio : Fragment() {
 
             val createdAt = LocalDateTime.now()
 
-            loteRepository.getLoteSku(sku).enqueue(object : retrofit2.Callback<LoteDTO> {
+            loteRepository.getLoteSku(sku).enqueue(object : Callback<LoteDTO> {
                 override fun onResponse(call: Call<LoteDTO>, response: Response<LoteDTO>) {
                     if (response.isSuccessful) {
                         val lote = response.body()
                         if (lote != null) {
-                            val estoqueDto = EstoqueInsertDTO(
+                            val estoqueDto = EstoqueDTO(
                                 quantityInput = qntdProd.toInt(),
                                 quantityOutput = qntdSaida.toInt(),
                                 createdAt = createdAt.toString(),
                                 productId = lote.productId,
                                 batchId = lote.id,
                                 discardReason = motivoDescarte,
-                                discardQuantity = qntdDescarte.toInt()
+                                discardQuantity = qntdDescarte.toInt(),
+                                id = 0
                             )
 
                             estoqueRepository.postEstoque(estoqueDto)
-                                .enqueue(object : retrofit2.Callback<ResponseBody> {
+                                .enqueue(object : Callback<ResponseBody> {
                                     override fun onResponse(
                                         call: Call<ResponseBody>,
                                         response: Response<ResponseBody>
diff --git a/app/src/main/java/com/example/projetosaveit/ui/home/HomeFragment.kt b/app/src/main/java/com/example/projetosaveit/ui/home/HomeFragment.kt
index 6585893..e0431b0 100644
--- a/app/src/main/java/com/example/projetosaveit/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/example/projetosaveit/ui/home/HomeFragment.kt
@@ -88,9 +88,14 @@ class HomeFragment : Fragment() {
                     Log.d("teste", "getEmpresa body=${response.body()}")
                     onResult(response.body())
                 } else {
-                    val err = try { response.errorBody()?.string() } catch (e: Exception) { "erro lendo body" }
-                    Log.e("erro", "getEmpresa erro do servidor: code=${response.code()} body=$err")
-                    onResult(null)
+                    val errorBodyString = try {
+                        response.errorBody()?.string()
+                    } catch (e: Exception) {
+                        "Erro desconhecido ao ler o corpo de erro"
+                    }
+
+                    Log.e("API_ERROR", "Erro na API: $errorBodyString")
+                    Toast.makeText(context, errorBodyString ?: "Erro desconhecido", Toast.LENGTH_LONG).show()
                 }
             }
 
diff --git a/app/src/main/java/com/example/projetosaveit/ui/perfil/Perfil.kt b/app/src/main/java/com/example/projetosaveit/ui/perfil/Perfil.kt
index 640a2f8..1932f40 100644
--- a/app/src/main/java/com/example/projetosaveit/ui/perfil/Perfil.kt
+++ b/app/src/main/java/com/example/projetosaveit/ui/perfil/Perfil.kt
@@ -13,7 +13,9 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.FrameLayout
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
@@ -29,6 +31,7 @@ import com.cloudinary.utils.ObjectUtils
 import com.example.projetosaveit.R
 import com.example.projetosaveit.api.repository.EmpresaRepository
 import com.example.projetosaveit.api.repository.ImagemRepository
+import com.example.projetosaveit.ui.Chatbot
 import com.example.projetosaveit.ui.ConfiguracoesPerfil
 import com.example.projetosaveit.util.GetEmpresa
 import com.example.projetosaveit.ui.InserirFuncionario
@@ -86,14 +89,16 @@ class Perfil : Fragment() {
         var plano: String
         val email = objAutenticar.currentUser?.email
 
-        GetEmpresa.pegarEmailEmpresa(email.toString()) {
-            if (it != null) {
-                idEmpresa = it.id
-                view.findViewById<TextView>(R.id.nomePerfil).text = it.name
-                if (it.planId == 1) {
-                    plano = "Plano Atual: SaveIt Pro"
+        GetEmpresa.pegarEmailEmpresa(email.toString()) { empresa ->
+            if (empresa != null) {
+                idEmpresa = empresa.id
+                view.findViewById<TextView>(R.id.nomePerfil).text = empresa.name
+
+                if (empresa.planId == 1) {
+                    view.findViewById<FrameLayout>(R.id.FrameInserirFunc).visibility = View.GONE
+                    plano = "Plano Atual: Nenhum"
                 } else {
-                    plano = "Nenhum"
+                    plano = "Plano Atual: SaveIt Pro"
                 }
 
                 view.findViewById<TextView>(R.id.planoAtual).text = plano
@@ -107,9 +112,19 @@ class Perfil : Fragment() {
                             if (empresa != null) {
                                 idEmpresa = empresa.id
                                 view.findViewById<TextView>(R.id.nomePerfil).text = empresa.name
-                                val plano = if (empresa.planId == 1) "Plano Atual: SaveIt Pro" else "Nenhum"
+
+                                val plano = "Plano Atual: SaveIt Pro"
                                 view.findViewById<TextView>(R.id.planoAtual).text = plano
+
                                 pegarImagemEmpresa(idEmpresa)
+
+                                if (func.isAdmin == true) {
+                                    view.findViewById<FrameLayout>(R.id.FrameInserirFunc).visibility = View.VISIBLE
+                                } else {
+                                    view.findViewById<FrameLayout>(R.id.FrameInserirFunc).visibility = View.GONE
+                                    view.findViewById<FrameLayout>(R.id.FramePlanos).visibility = View.GONE
+                                }
+
                             } else {
                                 Toast.makeText(context, "Empresa não encontrada.", Toast.LENGTH_LONG).show()
                             }
@@ -126,8 +141,13 @@ class Perfil : Fragment() {
             showImagePickerOptions()
         }
 
+        view.findViewById<LinearLayout>(R.id.btChatbot).setOnClickListener {
+            val intent = Intent(this.activity, Chatbot::class.java)
+            startActivity(intent)
+        }
+
         view.findViewById<ConstraintLayout>(R.id.btConfiguracoes).setOnClickListener {
-            val intent = Intent(this.activity, ConfiguracoesPerfil::class.java)
+            val intent = Intent(requireContext(), ConfiguracoesPerfil::class.java)
             startActivity(intent)
         }
 
diff --git a/app/src/main/java/com/example/projetosaveit/ui/toolbar/FuncionarioToolbar.kt b/app/src/main/java/com/example/projetosaveit/ui/toolbar/FuncionarioToolbar.kt
index 7b8482e..e74147a 100644
--- a/app/src/main/java/com/example/projetosaveit/ui/toolbar/FuncionarioToolbar.kt
+++ b/app/src/main/java/com/example/projetosaveit/ui/toolbar/FuncionarioToolbar.kt
@@ -10,7 +10,7 @@ class FuncionarioToolbar : ToolbarProvider {
         navView.inflateMenu(R.menu.bottom_nav_funcionario)
         return AppBarConfiguration.Builder(
             R.id.navigation_home,
-            R.id.relatorio,
+            R.id.cadastrar_relatorio,
             R.id.perfil
         ).build()
     }
diff --git a/app/src/main/java/com/example/projetosaveit/ui/toolbar/SemPlanoToolbar.kt b/app/src/main/java/com/example/projetosaveit/ui/toolbar/SemPlanoToolbar.kt
index 0a52747..486adf3 100644
--- a/app/src/main/java/com/example/projetosaveit/ui/toolbar/SemPlanoToolbar.kt
+++ b/app/src/main/java/com/example/projetosaveit/ui/toolbar/SemPlanoToolbar.kt
@@ -9,7 +9,8 @@ class SemPlanoToolbar : ToolbarProvider {
         navView.menu.clear()
         navView.inflateMenu(R.menu.bottom_nav_admin_sp)
         return AppBarConfiguration.Builder(
-            R.id.navigation_home,
+            R.id.navigation_vitrine,
+            R.id.chat,
             R.id.perfil
         ).build()
     }
diff --git a/app/src/main/java/com/example/projetosaveit/ui/toolbar/ToolbarFactory.kt b/app/src/main/java/com/example/projetosaveit/ui/toolbar/ToolbarFactory.kt
index 001850c..521f15e 100644
--- a/app/src/main/java/com/example/projetosaveit/ui/toolbar/ToolbarFactory.kt
+++ b/app/src/main/java/com/example/projetosaveit/ui/toolbar/ToolbarFactory.kt
@@ -1,12 +1,12 @@
 package com.example.projetosaveit.ui.toolbar
 
 object ToolbarFactory {
-    fun criarToolbar(plano: Int?, tipoFunc: Boolean?): ToolbarProvider {
+    fun criarToolbar(plano: Int?, tipoFunc: Boolean?, isEmpresa: Boolean): ToolbarProvider {
         return when {
-            tipoFunc != null && tipoFunc && plano == 1 -> AdminToolbar()
-            tipoFunc != null && !tipoFunc && plano == 1 -> FuncionarioToolbar()
-            plano != null && plano == 0 -> SemPlanoToolbar()
-            plano != null && plano == 1 -> AdminToolbar()
+            isEmpresa && plano == 1 -> SemPlanoToolbar()
+            isEmpresa && plano == 2 -> AdminToolbar()
+            !isEmpresa && tipoFunc == true -> AdminToolbar()
+            !isEmpresa && tipoFunc == false -> FuncionarioToolbar()
             else -> SemPlanoToolbar()
         }
     }
diff --git a/app/src/main/java/com/example/projetosaveit/ui/vitrine/VitrineFragment.kt b/app/src/main/java/com/example/projetosaveit/ui/vitrine/VitrineFragment.kt
index f64893e..f38571d 100644
--- a/app/src/main/java/com/example/projetosaveit/ui/vitrine/VitrineFragment.kt
+++ b/app/src/main/java/com/example/projetosaveit/ui/vitrine/VitrineFragment.kt
@@ -2,6 +2,7 @@ package com.example.projetosaveit.ui.vitrine
 
 import android.content.Intent
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -14,13 +15,17 @@ import com.example.projetosaveit.adapter.AdapterVitrine
 import com.example.projetosaveit.adapter.recycleView.Vitrine
 import com.example.projetosaveit.api.repository.VitrineRepository
 import com.example.projetosaveit.databinding.FragmentVitrineBinding
-import com.example.projetosaveit.model.VitrineDTO
 import com.example.projetosaveit.ui.AdicionarProdutoVitrine
+import com.example.projetosaveit.ui.CadastroEndereco
+import com.example.projetosaveit.util.GetEmpresa
+import com.example.projetosaveit.util.GetFuncionario
+import com.google.firebase.auth.FirebaseAuth
 import retrofit2.Call
 import retrofit2.Response
 
 class VitrineFragment : Fragment() {
     private var binding: FragmentVitrineBinding? = null
+    private val objAutenticar = FirebaseAuth.getInstance()
 
     private lateinit var adapter: AdapterVitrine
     private val repository = VitrineRepository()
@@ -34,15 +39,29 @@ class VitrineFragment : Fragment() {
         binding = FragmentVitrineBinding.inflate(inflater, container, false)
         val root: View = binding!!.root
 
-        val botoes = listOf(binding!!.button9, binding!!.button15, binding!!.button14)
+        val email = objAutenticar.currentUser?.email.toString()
+
+        GetEmpresa.pegarEmailEmpresa(email) { empresa ->
+            if (empresa != null) {
+                if (empresa.planId == 1) {
+                    binding!!.botaoAdicionarVitrine?.visibility = View.GONE
+                    binding!!.botaoMinhaVitrine?.visibility = View.GONE
+                }
+            } else {
+                Log.d("VitrineFragment", "Empresa não encontrada para o email: $email")
+            }
+            carregarVitrine("Todos")
+        }
+
+        val botoes = listOf(binding!!.todosFiltro, binding!!.embutidosFiltro, binding!!.lacticiniosFiltro, binding!!.graosFIltro, binding!!.frutasFiltro, binding!!.salgadosFiltro)
 
         botoes.forEach { botao ->
-            botao.setOnClickListener {
-                botoes.forEach { it.isSelected = false }
+            botao?.setOnClickListener {
+                botoes.forEach { it?.isSelected = false }
                 botao.isSelected = true
 
-                botoes.forEach { it.setBackgroundResource(R.drawable.bt_filtro_estilizacao)
-                                it.setTextColor(resources.getColor(R.color.BrancoNaoPuro))}
+                botoes.forEach { it?.setBackgroundResource(R.drawable.bt_filtro_estilizacao)
+                                it?.setTextColor(resources.getColor(R.color.BrancoNaoPuro))}
                 botao.setBackgroundResource(R.drawable.bt_filtro_estilizacao_selecionado)
                 botao.setTextColor(resources.getColor(R.color.PretoNaoPuro))
 
@@ -56,10 +75,6 @@ class VitrineFragment : Fragment() {
             startActivity(intent)
         }
 
-
-
-
-
         adapter = AdapterVitrine()
 
         binding!!.rvVitrine.adapter = adapter
@@ -80,7 +95,14 @@ class VitrineFragment : Fragment() {
                     adapter.listVitrine = produtos ?: emptyList()
                     adapter.notifyDataSetChanged()
                 } else {
-                    Toast.makeText(context, "Falha ao carregar a vitrine", Toast.LENGTH_LONG).show()
+                    val errorBodyString = try {
+                        response.errorBody()?.string()
+                    } catch (e: Exception) {
+                        "Erro desconhecido ao ler o corpo de erro"
+                    }
+
+                    Log.e("API_ERROR", "Erro na API: $errorBodyString")
+                    Toast.makeText(context, errorBodyString ?: "Erro desconhecido", Toast.LENGTH_LONG).show()
                 }
             }
 
diff --git a/app/src/main/java/com/example/projetosaveit/util/NotificaoUtils.kt b/app/src/main/java/com/example/projetosaveit/util/NotificaoUtils.kt
new file mode 100644
index 0000000..35aa9ba
--- /dev/null
+++ b/app/src/main/java/com/example/projetosaveit/util/NotificaoUtils.kt
@@ -0,0 +1,48 @@
+package com.example.projetosaveit.util
+
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.content.Context
+import android.content.pm.PackageManager
+import android.os.Build
+import androidx.core.app.ActivityCompat
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import com.example.projetosaveit.R
+
+object NotificaoUtils {
+    private const val CANAL_ID = "canal_vitrine"
+    private const val NOTIFICATION_ID = 1001
+
+    fun notificarProdutoAdicionado(context: Context, nomeProduto: String) {
+        val notificationManager = NotificationManagerCompat.from(context)
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val canal = NotificationChannel(
+                CANAL_ID,
+                "Novos produtos na vitrine",
+                NotificationManager.IMPORTANCE_HIGH
+            ).apply {
+                description = "Notificações sobre novos produtos adicionados à vitrine"
+                enableVibration(true)
+            }
+            val manager = context.getSystemService(NotificationManager::class.java)
+            manager.createNotificationChannel(canal)
+        }
+
+        val builder = NotificationCompat.Builder(context, CANAL_ID)
+            .setSmallIcon(R.drawable.ic_notifications_black_24dp)
+            .setContentTitle("Novo produto na vitrine!")
+            .setContentText("O produto \"$nomeProduto\" foi adicionado.")
+            .setPriority(NotificationCompat.PRIORITY_HIGH)
+            .setAutoCancel(true)
+
+        if (ActivityCompat.checkSelfPermission(context, android.Manifest.permission.POST_NOTIFICATIONS)
+            != PackageManager.PERMISSION_GRANTED
+        ) {
+            return
+        }
+
+        notificationManager.notify(NOTIFICATION_ID, builder.build())
+    }
+}
diff --git a/app/src/main/res/drawable/bt_filtro_estilizacao.xml b/app/src/main/res/drawable/bt_filtro_estilizacao.xml
index a56804a..9ca53cc 100644
--- a/app/src/main/res/drawable/bt_filtro_estilizacao.xml
+++ b/app/src/main/res/drawable/bt_filtro_estilizacao.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@color/VerdeEscuro"/>
+    <solid android:color="@color/Verde50"/>
     <corners android:radius="20dp"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bt_filtro_estilizacao_selecionado.xml b/app/src/main/res/drawable/bt_filtro_estilizacao_selecionado.xml
index 9ca53cc..a56804a 100644
--- a/app/src/main/res/drawable/bt_filtro_estilizacao_selecionado.xml
+++ b/app/src/main/res/drawable/bt_filtro_estilizacao_selecionado.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@color/Verde50"/>
+    <solid android:color="@color/VerdeEscuro"/>
     <corners android:radius="20dp"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bt_filtro_estilizacao_selecionado_tablet.xml b/app/src/main/res/drawable/bt_filtro_estilizacao_selecionado_tablet.xml
index 5b770b7..8d2135a 100644
--- a/app/src/main/res/drawable/bt_filtro_estilizacao_selecionado_tablet.xml
+++ b/app/src/main/res/drawable/bt_filtro_estilizacao_selecionado_tablet.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@color/Verde50"/>
+    <solid android:color="@color/VerdeEscuro"/>
     <corners android:radius="60dp"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bt_filtro_estilizacao_tablet.xml b/app/src/main/res/drawable/bt_filtro_estilizacao_tablet.xml
index 8d2135a..5b770b7 100644
--- a/app/src/main/res/drawable/bt_filtro_estilizacao_tablet.xml
+++ b/app/src/main/res/drawable/bt_filtro_estilizacao_tablet.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@color/VerdeEscuro"/>
+    <solid android:color="@color/Verde50"/>
     <corners android:radius="60dp"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp/activity_adicionar_produto.xml b/app/src/main/res/layout-sw600dp/activity_adicionar_produto.xml
index 0f45ecb..6286134 100644
--- a/app/src/main/res/layout-sw600dp/activity_adicionar_produto.xml
+++ b/app/src/main/res/layout-sw600dp/activity_adicionar_produto.xml
@@ -267,4 +267,15 @@
         </LinearLayout>
     </ScrollView>
 
+    <ImageView
+        android:id="@+id/imageView20"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginTop="12dp"
+        app:layout_constraintEnd_toStartOf="@+id/imageView25"
+        app:layout_constraintHorizontal_bias="0.14"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/imageView24"
+        app:srcCompat="@drawable/icon_seta_esquerda_tablet_2x" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp/activity_adicionar_produto_vitrine.xml b/app/src/main/res/layout-sw600dp/activity_adicionar_produto_vitrine.xml
index df2817b..130cb2d 100644
--- a/app/src/main/res/layout-sw600dp/activity_adicionar_produto_vitrine.xml
+++ b/app/src/main/res/layout-sw600dp/activity_adicionar_produto_vitrine.xml
@@ -18,7 +18,7 @@
         app:srcCompat="@drawable/onda_verde_escura_dez" />
 
     <ImageView
-        android:id="@+id/imageView20"
+        android:id="@+id/btVoltarAdicaoVitrine"
         android:layout_width="40dp"
         android:layout_height="40dp"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout-sw600dp/activity_atualizar_nome.xml b/app/src/main/res/layout-sw600dp/activity_atualizar_nome.xml
new file mode 100644
index 0000000..9880130
--- /dev/null
+++ b/app/src/main/res/layout-sw600dp/activity_atualizar_nome.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/Branco"
+    tools:context=".ui.AtualizarNome">
+
+    <ImageView
+        android:id="@+id/onda_verde_escura"
+        android:layout_width="0dp"
+        android:layout_height="195dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.545"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/onda_verde_escura_oito" />
+
+    <ImageView
+        android:id="@+id/imageView4"
+        android:layout_width="150dp"
+        android:layout_height="150dp"
+        android:layout_marginTop="200dp"
+        app:layout_constraintBottom_toTopOf="@+id/textView10"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.0"
+        app:srcCompat="@drawable/saveitlogo"
+        tools:ignore="UnknownIdInLayout" />
+
+    <TextView
+        android:id="@+id/textView10"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:fontFamily="@font/inclusive_sans"
+        android:text="SaveIt"
+        android:textColor="@color/PretoNaoPuro"
+        android:textSize="24sp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.503"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.379" />
+
+    <ImageView
+        android:id="@+id/btVoltarAtualizarNome"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginTop="140dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.028"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/icon_seta_esquerda" />
+
+    <TextView
+        android:id="@+id/textView34"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="38dp"
+        android:layout_marginTop="32dp"
+        android:layout_marginEnd="190dp"
+        android:fontFamily="@font/plus_jakarta_sans_extralight"
+        android:text="Atualize o seu nome"
+        android:textColor="@color/PretoNaoPuro"
+        android:textSize="24sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView10" />
+
+    <com.google.android.material.textfield.TextInputEditText
+        android:id="@+id/emailAtualizarN"
+        android:layout_width="505dp"
+        android:layout_height="50dp"
+        android:layout_marginStart="50dp"
+        android:layout_marginTop="52dp"
+        android:layout_marginEnd="51dp"
+        android:background="@drawable/caixa_texto"
+        android:fontFamily="@font/inclusive_sans"
+        android:gravity="center_vertical"
+        android:hint="Digite o seu e-mail"
+        android:inputType="textEmailAddress"
+        android:paddingLeft="10dp"
+        android:textColor="@color/PretoNaoPuro"
+        android:textColorHint="@color/PlaceHolderColor"
+        android:textSize="18sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.333"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/nomeNovo" />
+
+    <com.google.android.material.textfield.TextInputEditText
+        android:id="@+id/nomeNovo"
+        android:layout_width="505dp"
+        android:layout_height="50dp"
+        android:layout_marginStart="50dp"
+        android:layout_marginTop="32dp"
+        android:layout_marginEnd="51dp"
+        android:background="@drawable/caixa_texto"
+        android:fontFamily="@font/inclusive_sans"
+        android:gravity="center_vertical"
+        android:hint="Digite o seu novo nome"
+        android:inputType="text"
+        android:paddingLeft="10dp"
+        android:textColor="@color/PretoNaoPuro"
+        android:textColorHint="@color/PlaceHolderColor"
+        android:textSize="18sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView34" />
+
+    <Button
+        android:id="@+id/btAlterarNome"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="161dp"
+        android:layout_marginTop="92dp"
+        android:layout_marginEnd="162dp"
+        android:background="@drawable/bt_cadastro_estilizacao_tablet"
+        android:fontFamily="@font/inclusive_sans"
+        android:gravity="center"
+        android:padding="20dp"
+        android:paddingStart="40dp"
+        android:paddingEnd="40dp"
+        android:text="Alterar"
+        android:textAllCaps="false"
+        android:textColor="@color/BrancoNaoPuro"
+        android:textSize="24sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.508"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/emailAtualizarN" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp/activity_atualizar_senha.xml b/app/src/main/res/layout-sw600dp/activity_atualizar_senha.xml
index e5faf2b..bf39438 100644
--- a/app/src/main/res/layout-sw600dp/activity_atualizar_senha.xml
+++ b/app/src/main/res/layout-sw600dp/activity_atualizar_senha.xml
@@ -48,7 +48,7 @@
         app:layout_constraintVertical_bias="0.348" />
 
     <ImageView
-        android:id="@+id/voltarInserirFunc"
+        android:id="@+id/btVoltarAtualizarSenha"
         android:layout_width="40dp"
         android:layout_height="40dp"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -84,6 +84,7 @@
         android:fontFamily="@font/inclusive_sans"
         android:gravity="center_vertical"
         android:hint="Digite o seu e-mail"
+        android:inputType="textEmailAddress"
         android:paddingLeft="10dp"
         android:textColor="@color/PretoNaoPuro"
         android:textColorHint="@color/PlaceHolderColor"
@@ -102,6 +103,7 @@
         android:fontFamily="@font/inclusive_sans"
         android:gravity="center_vertical"
         android:hint="Digite a nova senha"
+        android:inputType="textPassword"
         android:paddingLeft="10dp"
         android:textColor="@color/PretoNaoPuro"
         android:textColorHint="@color/PlaceHolderColor"
@@ -122,7 +124,7 @@
         android:fontFamily="@font/inclusive_sans"
         android:gravity="center_vertical"
         android:hint="Digite a senha novamente"
-        android:inputType="text"
+        android:inputType="textPassword"
         android:paddingLeft="10dp"
         android:textColor="@color/PretoNaoPuro"
         android:textColorHint="@color/PlaceHolderColor"
@@ -143,6 +145,7 @@
         android:fontFamily="@font/inclusive_sans"
         android:gravity="center_vertical"
         android:hint="Digite a senha atual"
+        android:inputType="textPassword"
         android:paddingLeft="10dp"
         android:textColor="@color/PretoNaoPuro"
         android:textColorHint="@color/PlaceHolderColor"
@@ -157,6 +160,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="@drawable/bt_cadastro_estilizacao_tablet"
+        android:fontFamily="@font/inclusive_sans"
         android:padding="20dp"
         android:paddingStart="40dp"
         android:paddingEnd="40dp"
diff --git a/app/src/main/res/layout-sw600dp/activity_configuracoes_perfil.xml b/app/src/main/res/layout-sw600dp/activity_configuracoes_perfil.xml
index 98a54b4..61f586f 100644
--- a/app/src/main/res/layout-sw600dp/activity_configuracoes_perfil.xml
+++ b/app/src/main/res/layout-sw600dp/activity_configuracoes_perfil.xml
@@ -120,7 +120,7 @@
             app:cardCornerRadius="20dp">
 
             <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/btInserirFunc"
+                android:id="@+id/constraintAlterarNome"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:paddingStart="40dp"
@@ -241,4 +241,15 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.0"
         app:srcCompat="@drawable/onda_verde_escura_cinco" />
+
+    <ImageView
+        android:id="@+id/btVoltarConfigPerfil"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginTop="40dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.045"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/imageView29"
+        app:srcCompat="@drawable/icon_seta_esquerda_tablet_2x" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp/activity_conversa.xml b/app/src/main/res/layout-sw600dp/activity_conversa.xml
index 4b14923..52ac84c 100644
--- a/app/src/main/res/layout-sw600dp/activity_conversa.xml
+++ b/app/src/main/res/layout-sw600dp/activity_conversa.xml
@@ -9,7 +9,7 @@
     tools:context=".ui.Conversa">
 
     <ImageView
-        android:id="@+id/imageView38"
+        android:id="@+id/btVoltarConversa"
         android:layout_width="wrap_content"
         android:layout_height="120dp"
         android:src="@drawable/onda_verde_escuraeclara_onze"
@@ -56,6 +56,7 @@
             android:id="@+id/escreverMsg"
             android:layout_width="355dp"
             android:layout_height="67dp"
+            android:layout_marginTop="5dp"
             android:layout_marginEnd="10dp"
             android:background="@drawable/fundo_campo_escrever_msg"
             android:fontFamily="@font/inclusive_sans"
@@ -89,7 +90,7 @@
         android:layout_height="40dp"
         android:layout_marginStart="32dp"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/imageView38"
+        app:layout_constraintTop_toBottomOf="@+id/btVoltarMinhaVitrine"
         app:srcCompat="@drawable/icon_seta_esquerda_tablet" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp/activity_inserir_funcionario.xml b/app/src/main/res/layout-sw600dp/activity_inserir_funcionario.xml
index c6e96aa..867ffd7 100644
--- a/app/src/main/res/layout-sw600dp/activity_inserir_funcionario.xml
+++ b/app/src/main/res/layout-sw600dp/activity_inserir_funcionario.xml
@@ -151,7 +151,7 @@
         app:layout_constraintVertical_bias="0.935" />
 
     <ImageView
-        android:id="@+id/voltarInserirFunc"
+        android:id="@+id/btVoltarInserirFunc"
         android:layout_width="27dp"
         android:layout_height="0dp"
         android:layout_marginTop="108dp"
diff --git a/app/src/main/res/layout-sw600dp/activity_login.xml b/app/src/main/res/layout-sw600dp/activity_login.xml
index 69e024e..9dae271 100644
--- a/app/src/main/res/layout-sw600dp/activity_login.xml
+++ b/app/src/main/res/layout-sw600dp/activity_login.xml
@@ -12,10 +12,11 @@
 
     <ImageView
         android:id="@+id/imageView3"
-        android:layout_width="150dp"
-        android:layout_height="150dp"
-        android:layout_marginTop="248dp"
+        android:layout_width="179dp"
+        android:layout_height="174dp"
+        android:layout_marginTop="84dp"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.501"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/saveitlogo" />
@@ -27,7 +28,7 @@
         android:fontFamily="@font/inclusive_sans"
         android:text="SaveIt"
         android:textColor="@color/PretoNaoPuro"
-        android:textSize="24sp"
+        android:textSize="48sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.493"
@@ -45,19 +46,20 @@
         android:textSize="24sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.198"
+        app:layout_constraintHorizontal_bias="0.197"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/senhaLogin"
-        app:layout_constraintVertical_bias="0.081" />
+        app:layout_constraintVertical_bias="0.09" />
 
     <com.google.android.material.textfield.TextInputEditText
         android:id="@+id/emailLogin"
-        android:layout_width="505dp"
+        android:layout_width="500dp"
         android:layout_height="50dp"
         android:layout_marginTop="24dp"
         android:background="@drawable/caixa_texto"
         android:fontFamily="@font/inclusive_sans"
         android:hint="Digite seu email"
+        android:inputType="textEmailAddress"
         android:paddingLeft="10dp"
         android:textColor="@color/PretoNaoPuro"
         android:textColorHint="@color/PlaceHolderColor"
@@ -77,22 +79,22 @@
         android:textSize="24sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.117"
+        app:layout_constraintHorizontal_bias="0.118"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/imageView3"
-        app:layout_constraintVertical_bias="0.305" />
+        app:layout_constraintVertical_bias="0.31" />
 
     <TextView
         android:id="@+id/textView8"
-        android:layout_width="500dp"
-        android:layout_height="wrap_content"
+        android:layout_width="372dp"
+        android:layout_height="58dp"
         android:layout_marginTop="13dp"
         android:layout_marginBottom="360dp"
         android:fontFamily="@font/inclusive_sans"
         android:text="“Bom para seu negócio e ótimo para o planeta”"
         android:textAlignment="center"
         android:textColor="@color/PretoNaoPuro"
-        android:textSize="24sp"
+        android:textSize="20sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.482"
@@ -102,19 +104,19 @@
 
     <com.google.android.material.textfield.TextInputEditText
         android:id="@+id/senhaLogin"
-        android:layout_width="505dp"
+        android:layout_width="500dp"
         android:layout_height="50dp"
-        android:layout_marginTop="20dp"
+        android:layout_marginTop="40dp"
         android:background="@drawable/caixa_texto"
         android:fontFamily="@font/inclusive_sans"
         android:gravity="center_vertical"
         android:hint="Senha"
+        android:inputType="textPassword"
         android:paddingLeft="10dp"
         android:textColor="@color/PretoNaoPuro"
         android:textColorHint="@color/PlaceHolderColor"
         android:textSize="18sp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.505"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/emailLogin" />
 
@@ -122,7 +124,6 @@
         android:id="@+id/botaoLogin"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
         android:background="@drawable/bt_cadastro_estilizacao_tablet"
         android:fontFamily="@font/inclusive_sans"
         android:gravity="center_vertical"
@@ -135,43 +136,47 @@
         android:textColorHighlight="@color/BrancoNaoPuro"
         android:textColorHint="@color/BrancoNaoPuro"
         android:textColorLink="@color/BrancoNaoPuro"
-        android:textSize="24sp"
+        android:textSize="20sp"
         app:layout_constraintBottom_toTopOf="@+id/btnCadastro"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.502"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/esqueciSenha" />
+        app:layout_constraintTop_toBottomOf="@+id/esqueciSenha"
+        app:layout_constraintVertical_bias="0.458" />
 
     <TextView
         android:id="@+id/btnCadastro"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="28dp"
-        android:fontFamily="@font/inclusive_sans"
         android:text="Não possui uma conta? Cadastre-se!"
         android:textColor="@color/PretoNaoPuro"
         android:textSize="24sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.934" />
 
     <ImageView
         android:id="@+id/imageView6"
         android:layout_width="0dp"
         android:layout_height="340dp"
+        android:layout_marginBottom="1368dp"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/onda_verde_claro_um" />
 
     <ImageView
         android:id="@+id/imageView5"
         android:layout_width="0dp"
-        android:layout_height="196dp"
+        android:layout_height="313dp"
+        android:layout_marginBottom="1436dp"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/onda_verde_escura_um" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp/activity_minha_vitrine.xml b/app/src/main/res/layout-sw600dp/activity_minha_vitrine.xml
index 587fa70..d07a593 100644
--- a/app/src/main/res/layout-sw600dp/activity_minha_vitrine.xml
+++ b/app/src/main/res/layout-sw600dp/activity_minha_vitrine.xml
@@ -5,6 +5,7 @@
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/Branco"
     tools:context=".ui.MinhaVitrine">
 
     <ImageView
@@ -20,7 +21,7 @@
         app:srcCompat="@drawable/onda_verde_escura_dez" />
 
     <ImageView
-        android:id="@+id/imageView38"
+        android:id="@+id/btVoltarMinhaVitrine"
         android:layout_width="40dp"
         android:layout_height="40dp"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout-sw600dp/activity_planos.xml b/app/src/main/res/layout-sw600dp/activity_planos.xml
index 61d3246..bd1dbf8 100644
--- a/app/src/main/res/layout-sw600dp/activity_planos.xml
+++ b/app/src/main/res/layout-sw600dp/activity_planos.xml
@@ -175,7 +175,7 @@
                 android:layout_width="160dp"
                 android:layout_height="56dp"
                 android:layout_marginTop="280dp"
-                android:background="@drawable/bt_filtro_estilizacao"
+                android:background="@drawable/bt_filtro_estilizacao_selecionado"
                 android:fontFamily="@font/inclusive_sans"
                 android:text="Assinar"
                 android:textAllCaps="false"
diff --git a/app/src/main/res/layout-sw600dp/activity_produto_vitrine.xml b/app/src/main/res/layout-sw600dp/activity_produto_vitrine.xml
index e4076ac..bd2388f 100644
--- a/app/src/main/res/layout-sw600dp/activity_produto_vitrine.xml
+++ b/app/src/main/res/layout-sw600dp/activity_produto_vitrine.xml
@@ -20,8 +20,8 @@
 
             <ImageView
                 android:id="@+id/setaEsquerdaVoltar"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
                 android:layout_gravity="start"
                 android:layout_marginBottom="20dp"
                 android:contentDescription="Voltar"
diff --git a/app/src/main/res/layout-sw600dp/fragment_chats.xml b/app/src/main/res/layout-sw600dp/fragment_chats.xml
index 44b0701..3f15c28 100644
--- a/app/src/main/res/layout-sw600dp/fragment_chats.xml
+++ b/app/src/main/res/layout-sw600dp/fragment_chats.xml
@@ -92,7 +92,7 @@
         android:layout_width="140dp"
         android:layout_height="60dp"
         android:layout_marginTop="24dp"
-        android:background="@drawable/bt_filtro_estilizacao_tablet"
+        android:background="@drawable/bt_filtro_estilizacao_selecionado_tablet"
         android:fontFamily="@font/inclusive_sans"
         android:text="Todos"
         android:textAllCaps="false"
@@ -108,7 +108,7 @@
         android:layout_width="140dp"
         android:layout_height="60dp"
         android:layout_marginTop="24dp"
-        android:background="@drawable/bt_filtro_estilizacao_tablet"
+        android:background="@drawable/bt_filtro_estilizacao_selecionado_tablet"
         android:fontFamily="@font/inclusive_sans"
         android:text="Não lidos"
         android:textAllCaps="false"
diff --git a/app/src/main/res/layout-sw600dp/fragment_perfil.xml b/app/src/main/res/layout-sw600dp/fragment_perfil.xml
index 524787e..2764492 100644
--- a/app/src/main/res/layout-sw600dp/fragment_perfil.xml
+++ b/app/src/main/res/layout-sw600dp/fragment_perfil.xml
@@ -13,7 +13,7 @@
         android:layout_height="wrap_content">
 
         <ImageView
-            android:id="@+id/setaEsquerdaVoltar"
+            android:id="@+id/onda_verde_clara"
             android:layout_width="0dp"
             android:layout_height="261dp"
             android:src="@drawable/onda_verde_clara_seis"
@@ -43,7 +43,7 @@
             app:cardElevation="4dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/setaEsquerdaVoltar">
+            app:layout_constraintTop_toTopOf="@+id/onda_verde_clara">
 
             <FrameLayout
                 android:layout_width="match_parent"
@@ -184,6 +184,7 @@
             </FrameLayout>
 
             <FrameLayout
+                android:id="@+id/FrameInserirFunc"
                 android:layout_width="match_parent"
                 android:layout_height="100dp"
                 android:layout_marginHorizontal="16dp"
@@ -229,6 +230,7 @@
             </FrameLayout>
 
             <FrameLayout
+                android:id="@+id/FramePlanos"
                 android:layout_width="match_parent"
                 android:layout_height="100dp"
                 android:layout_marginHorizontal="16dp"
@@ -281,7 +283,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="28dp"
             android:fontFamily="@font/inclusive_sans"
-            android:text="Plano Atual: Avançado"
+            android:text="Plano tual: Nenhum"
             android:textColor="@color/PretoNaoPuro"
             android:textSize="24sp"
             app:layout_constraintEnd_toEndOf="parent"
@@ -289,6 +291,7 @@
             app:layout_constraintTop_toBottomOf="@+id/linearLayout" />
 
         <LinearLayout
+            android:id="@+id/btChatbot"
             android:layout_width="176dp"
             android:layout_height="63dp"
             android:layout_marginTop="75dp"
@@ -314,7 +317,7 @@
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/inclusive_sans"
                 android:gravity="center_vertical"
-                android:text="Chatbot"
+                android:text="VitAI"
                 android:textColor="@color/BrancoNaoPuro"
                 android:textSize="24sp" />
         </LinearLayout>
diff --git a/app/src/main/res/layout-sw600dp/fragment_vitrine.xml b/app/src/main/res/layout-sw600dp/fragment_vitrine.xml
index c19fa3b..b45b9f2 100644
--- a/app/src/main/res/layout-sw600dp/fragment_vitrine.xml
+++ b/app/src/main/res/layout-sw600dp/fragment_vitrine.xml
@@ -52,11 +52,11 @@
         app:layout_constraintVertical_bias="0.213">
 
         <Button
-            android:id="@+id/button9"
+            android:id="@+id/todosFiltro"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_margin="10dp"
-            android:background="@drawable/bt_filtro_estilizacao"
+            android:background="@drawable/bt_filtro_estilizacao_selecionado"
             android:fontFamily="@font/inclusive_sans"
             android:paddingStart="20dp"
             android:paddingEnd="20dp"
@@ -66,7 +66,7 @@
             android:textSize="24sp" />
 
         <Button
-            android:id="@+id/button15"
+            android:id="@+id/embutidosFiltro"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_margin="10dp"
@@ -80,7 +80,7 @@
             android:textSize="24sp" />
 
         <Button
-            android:id="@+id/button14"
+            android:id="@+id/lacticiniosFiltro"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_margin="10dp"
diff --git a/app/src/main/res/layout/activity_adicionar_produto.xml b/app/src/main/res/layout/activity_adicionar_produto.xml
index e5f24f6..cd337fc 100644
--- a/app/src/main/res/layout/activity_adicionar_produto.xml
+++ b/app/src/main/res/layout/activity_adicionar_produto.xml
@@ -22,8 +22,8 @@
 
     <ImageView
         android:id="@+id/imageView23"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="0dp"
+        android:layout_height="69dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
@@ -190,7 +190,7 @@
                 android:layout_marginBottom="10dp"
                 android:background="@drawable/caixa_texto"
                 android:ems="10"
-                android:hint="Digite a quantidade maxima em estoque"
+                android:hint="Digite a quantidade máxima em estoque"
                 android:inputType="number"
                 android:paddingStart="10dp"
                 android:textColor="@color/PretoNaoPuro"
@@ -307,4 +307,15 @@
         </LinearLayout>
     </ScrollView>
 
+    <ImageView
+        android:id="@+id/btVoltarAdicaoProduto"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        app:layout_constraintEnd_toStartOf="@+id/imageView25"
+        app:layout_constraintHorizontal_bias="0.115"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/imageView24"
+        app:srcCompat="@drawable/icon_seta_esquerda" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_adicionar_produto_vitrine.xml b/app/src/main/res/layout/activity_adicionar_produto_vitrine.xml
index b3069f0..a389c18 100644
--- a/app/src/main/res/layout/activity_adicionar_produto_vitrine.xml
+++ b/app/src/main/res/layout/activity_adicionar_produto_vitrine.xml
@@ -19,7 +19,7 @@
         app:srcCompat="@drawable/onda_verde_escura_dez" />
 
     <ImageView
-        android:id="@+id/imageView20"
+        android:id="@+id/btVoltarAdicaoVitrine"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/activity_atualizar_nome.xml b/app/src/main/res/layout/activity_atualizar_nome.xml
new file mode 100644
index 0000000..18a8275
--- /dev/null
+++ b/app/src/main/res/layout/activity_atualizar_nome.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/Branco"
+    tools:context=".ui.AtualizarNome">
+
+    <ImageView
+        android:id="@+id/onda_verde_escura"
+        android:layout_width="0dp"
+        android:layout_height="134dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.545"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/onda_verde_escura_oito" />
+
+    <ImageView
+        android:id="@+id/imageView4"
+        android:layout_width="93dp"
+        android:layout_height="97dp"
+        android:layout_marginTop="160dp"
+        app:layout_constraintBottom_toTopOf="@+id/textView10"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="1.0"
+        app:srcCompat="@drawable/saveitlogo"
+        tools:ignore="UnknownIdInLayout" />
+
+    <TextView
+        android:id="@+id/textView10"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:fontFamily="@font/inclusive_sans"
+        android:text="SaveIt"
+        android:textColor="@color/PretoNaoPuro"
+        android:textSize="20sp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.317" />
+
+    <ImageView
+        android:id="@+id/btVoltarAtualizarNome"
+        android:layout_width="25dp"
+        android:layout_height="25dp"
+        android:layout_marginTop="100dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.098"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/icon_seta_esquerda" />
+
+    <TextView
+        android:id="@+id/textView34"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="38dp"
+        android:layout_marginTop="32dp"
+        android:layout_marginEnd="190dp"
+        android:fontFamily="@font/plus_jakarta_sans_extralight"
+        android:text="Atualize o seu nome"
+        android:textColor="@color/PretoNaoPuro"
+        android:textSize="24sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView10" />
+
+    <com.google.android.material.textfield.TextInputEditText
+        android:id="@+id/emailAtualizarN"
+        android:layout_width="0dp"
+        android:layout_height="32dp"
+        android:layout_marginStart="50dp"
+        android:layout_marginTop="28dp"
+        android:layout_marginEnd="51dp"
+        android:background="@drawable/caixa_texto"
+        android:fontFamily="@font/inclusive_sans"
+        android:gravity="center_vertical"
+        android:hint="Digite o seu e-mail"
+        android:inputType="textEmailAddress"
+        android:paddingLeft="10dp"
+        android:textColor="@color/PretoNaoPuro"
+        android:textColorHint="@color/PlaceHolderColor"
+        android:textSize="12sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/nomeNovo" />
+
+    <com.google.android.material.textfield.TextInputEditText
+        android:id="@+id/nomeNovo"
+        android:layout_width="0dp"
+        android:layout_height="32dp"
+        android:layout_marginStart="50dp"
+        android:layout_marginTop="28dp"
+        android:layout_marginEnd="51dp"
+        android:background="@drawable/caixa_texto"
+        android:fontFamily="@font/inclusive_sans"
+        android:gravity="center_vertical"
+        android:hint="Digite o seu novo nome"
+        android:inputType="text"
+        android:paddingLeft="10dp"
+        android:textColor="@color/PretoNaoPuro"
+        android:textColorHint="@color/PlaceHolderColor"
+        android:textSize="12sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView34" />
+
+    <Button
+        android:id="@+id/btAlterarNome"
+        android:layout_width="124dp"
+        android:layout_height="45dp"
+        android:layout_marginStart="161dp"
+        android:layout_marginTop="140dp"
+        android:layout_marginEnd="162dp"
+        android:background="@drawable/bt_cadastro_estilizacao"
+        android:fontFamily="@font/inclusive_sans"
+        android:gravity="center"
+        android:text="Alterar"
+        android:textAllCaps="false"
+        android:textColor="@color/BrancoNaoPuro"
+        android:textSize="24sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/emailAtualizarN" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_atualizar_senha.xml b/app/src/main/res/layout/activity_atualizar_senha.xml
index bc02642..10c78f0 100644
--- a/app/src/main/res/layout/activity_atualizar_senha.xml
+++ b/app/src/main/res/layout/activity_atualizar_senha.xml
@@ -47,7 +47,7 @@
         app:layout_constraintVertical_bias="0.317" />
 
     <ImageView
-        android:id="@+id/voltarInserirFunc"
+        android:id="@+id/btVoltarAtualizarSenha"
         android:layout_width="25dp"
         android:layout_height="25dp"
         android:layout_marginTop="100dp"
@@ -84,6 +84,7 @@
         android:fontFamily="@font/inclusive_sans"
         android:gravity="center_vertical"
         android:hint="Digite o seu e-mail"
+        android:inputType="textEmailAddress"
         android:paddingLeft="10dp"
         android:textColor="@color/PretoNaoPuro"
         android:textColorHint="@color/PlaceHolderColor"
@@ -104,6 +105,7 @@
         android:fontFamily="@font/inclusive_sans"
         android:gravity="center_vertical"
         android:hint="Digite a nova senha"
+        android:inputType="textPassword"
         android:paddingLeft="10dp"
         android:textColor="@color/PretoNaoPuro"
         android:textColorHint="@color/PlaceHolderColor"
@@ -124,6 +126,7 @@
         android:fontFamily="@font/inclusive_sans"
         android:gravity="center_vertical"
         android:hint="Digite a senha atual"
+        android:inputType="textPassword"
         android:paddingLeft="10dp"
         android:textColor="@color/PretoNaoPuro"
         android:textColorHint="@color/PlaceHolderColor"
@@ -144,7 +147,7 @@
         android:fontFamily="@font/inclusive_sans"
         android:gravity="center_vertical"
         android:hint="Digite a senha novamente"
-        android:inputType="text"
+        android:inputType="textPassword"
         android:paddingLeft="10dp"
         android:textColor="@color/PretoNaoPuro"
         android:textColorHint="@color/PlaceHolderColor"
diff --git a/app/src/main/res/layout/activity_chatbot.xml b/app/src/main/res/layout/activity_chatbot.xml
index 55bb4d2..bd99323 100644
--- a/app/src/main/res/layout/activity_chatbot.xml
+++ b/app/src/main/res/layout/activity_chatbot.xml
@@ -21,7 +21,6 @@
             android:src="@drawable/onda_verde_escuraeclara_onze"
             app:layout_constraintTop_toTopOf="parent" />
 
-
         <ImageView
             android:id="@+id/btMenu"
             android:layout_width="20dp"
@@ -46,14 +45,14 @@
             android:id="@+id/tvBoasVindas"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Olá usuário,\nComo posso te ajudar hoje?"
+            android:fontFamily="@font/inclusive_sans"
+            android:text="Olá usuário.\nComo posso te ajudar hoje?"
             android:textAlignment="center"
             android:textColor="@color/PretoNaoPuro"
             android:textSize="18sp"
-            android:fontFamily="@font/inclusive_sans"
-            app:layout_constraintTop_toBottomOf="@id/ivMascote"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
+            app:layout_constraintTop_toBottomOf="@id/ivMascote" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/chat_input_container"
@@ -92,42 +91,35 @@
                 app:layout_constraintVertical_bias="0.0" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <com.google.android.material.navigation.NavigationView
-        android:id="@+id/navView"
-        android:layout_width="250dp"
-        android:layout_height="match_parent"
-        android:background="@color/Branco"
-        android:layout_gravity="start">
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp"
+            app:layout_constraintBottom_toTopOf="@+id/chat_input_container"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvBoasVindas">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:padding="16dp">
 
-            <ScrollView
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rvMensagens"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:layout_weight="1">
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:layout_editor_absoluteX="16dp" />
 
-                <LinearLayout
-                    android:id="@+id/containerAssuntos"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
-                </LinearLayout>
-            </ScrollView>
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
-            <Button
-                android:id="@+id/btnLimpar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="Limpar chats"
-                android:backgroundTint="@color/Bordo"
-                android:textColor="@color/Branco"
-                android:fontFamily="@font/inclusive_sans" />
-        </LinearLayout>
+    <com.google.android.material.navigation.NavigationView
+        android:id="@+id/navView"
+        android:layout_width="250dp"
+        android:layout_height="match_parent"
+        android:background="@color/Branco"
+        android:layout_gravity="start"
+        app:headerLayout="@layout/chat_drawer">
     </com.google.android.material.navigation.NavigationView>
 </androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_configuracoes_perfil.xml b/app/src/main/res/layout/activity_configuracoes_perfil.xml
index ced8819..79bbe74 100644
--- a/app/src/main/res/layout/activity_configuracoes_perfil.xml
+++ b/app/src/main/res/layout/activity_configuracoes_perfil.xml
@@ -18,7 +18,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.499">
+        app:layout_constraintVertical_bias="0.42">
 
         <FrameLayout
             android:id="@+id/emailFrame"
@@ -74,7 +74,7 @@
             app:cardCornerRadius="20dp">
 
             <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/btAtualizarSenha"
+                android:id="@+id/constraintAtualizarSenha"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:paddingStart="16dp"
@@ -105,6 +105,7 @@
         </FrameLayout>
 
         <FrameLayout
+            android:id="@+id/FrameAlterarNome"
             android:layout_width="match_parent"
             android:layout_height="60dp"
             android:layout_marginHorizontal="16dp"
@@ -117,7 +118,7 @@
             app:cardCornerRadius="20dp">
 
             <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/btInserirFunc"
+                android:id="@+id/constraintAlterarNome"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:paddingStart="16dp"
@@ -231,4 +232,15 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/onda_verde_escura_cinco" />
+
+    <ImageView
+        android:id="@+id/btVoltarConfigPerfil"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="40dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.045"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/imageView29"
+        app:srcCompat="@drawable/icon_seta_esquerda" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_conversa.xml b/app/src/main/res/layout/activity_conversa.xml
index 81f079e..c29c476 100644
--- a/app/src/main/res/layout/activity_conversa.xml
+++ b/app/src/main/res/layout/activity_conversa.xml
@@ -9,9 +9,9 @@
     tools:context=".ui.Conversa">
 
     <ImageView
-        android:id="@+id/imageView38"
-        android:layout_width="413dp"
-        android:layout_height="87dp"
+        android:id="@+id/btVoltarConversa"
+        android:layout_width="0dp"
+        android:layout_height="83dp"
         android:src="@drawable/onda_verde_escuraeclara_onze"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -32,13 +32,13 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="0dp"
-        android:layout_height="520dp"
+        android:layout_height="620dp"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
         app:layout_constraintBottom_toTopOf="@id/chat_input_container"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/imageView38">
+        app:layout_constraintTop_toBottomOf="@+id/btVoltarMinhaVitrine">
 
 
         <androidx.recyclerview.widget.RecyclerView
@@ -68,6 +68,7 @@
             android:id="@+id/escreverMsg"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
             android:layout_marginEnd="10dp"
             android:background="@drawable/fundo_campo_escrever_msg"
             android:fontFamily="@font/inclusive_sans"
diff --git a/app/src/main/res/layout/activity_inserir_funcionario.xml b/app/src/main/res/layout/activity_inserir_funcionario.xml
index 5b75b6d..9679ce7 100644
--- a/app/src/main/res/layout/activity_inserir_funcionario.xml
+++ b/app/src/main/res/layout/activity_inserir_funcionario.xml
@@ -148,7 +148,7 @@
         app:layout_constraintVertical_bias="0.834" />
 
     <ImageView
-        android:id="@+id/voltarInserirFunc"
+        android:id="@+id/btVoltarInserirFunc"
         android:layout_width="25dp"
         android:layout_height="25dp"
         android:layout_marginTop="92dp"
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index e2e4b1d..c7e0da6 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -12,8 +12,8 @@
 
     <ImageView
         android:id="@+id/imageView3"
-        android:layout_width="98dp"
-        android:layout_height="99dp"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
         android:layout_marginTop="176dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.498"
@@ -60,6 +60,7 @@
         android:fontFamily="@font/inclusive_sans"
         android:gravity="center"
         android:hint="Digite seu email"
+        android:inputType="textEmailAddress"
         android:paddingLeft="10dp"
         android:textAlignment="viewStart"
         android:textColor="@color/PretoNaoPuro"
@@ -110,6 +111,7 @@
         android:background="@drawable/caixa_texto"
         android:fontFamily="@font/inclusive_sans"
         android:hint="Senha"
+        android:inputType="textPassword"
         android:paddingLeft="10dp"
         android:textAlignment="viewStart"
         android:textColor="@color/PretoNaoPuro"
diff --git a/app/src/main/res/layout/activity_minha_vitrine.xml b/app/src/main/res/layout/activity_minha_vitrine.xml
index 4b0867d..cb7c873 100644
--- a/app/src/main/res/layout/activity_minha_vitrine.xml
+++ b/app/src/main/res/layout/activity_minha_vitrine.xml
@@ -5,6 +5,7 @@
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/Branco"
     tools:context=".ui.MinhaVitrine">
 
     <ImageView
@@ -20,7 +21,7 @@
         app:srcCompat="@drawable/onda_verde_escura_dez" />
 
     <ImageView
-        android:id="@+id/imageView38"
+        android:id="@+id/btVoltarMinhaVitrine"
         android:layout_width="20dp"
         android:layout_height="wrap_content"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/activity_planos.xml b/app/src/main/res/layout/activity_planos.xml
index c66773c..831e16b 100644
--- a/app/src/main/res/layout/activity_planos.xml
+++ b/app/src/main/res/layout/activity_planos.xml
@@ -19,7 +19,7 @@
         android:id="@+id/textView33"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="80dp"
+        android:layout_marginTop="90dp"
         android:fontFamily="@font/plus_jakarta_sans_extralight"
         android:text="Plano"
         android:textColor="@color/PretoNaoPuro"
@@ -172,7 +172,7 @@
                 android:layout_width="100dp"
                 android:layout_height="40dp"
                 android:layout_marginTop="240dp"
-                android:background="@drawable/bt_filtro_estilizacao"
+                android:background="@drawable/bt_filtro_estilizacao_selecionado"
                 android:fontFamily="@font/inclusive_sans"
                 android:text="Assinar"
                 android:textAllCaps="false"
diff --git a/app/src/main/res/layout/activity_tela_cadastro2_comercio.xml b/app/src/main/res/layout/activity_tela_cadastro2_comercio.xml
index 988e994..ea5505f 100644
--- a/app/src/main/res/layout/activity_tela_cadastro2_comercio.xml
+++ b/app/src/main/res/layout/activity_tela_cadastro2_comercio.xml
@@ -71,6 +71,7 @@
         android:fontFamily="@font/inclusive_sans"
         android:gravity="center_vertical"
         android:hint="Crie uma senha"
+        android:inputType="textPassword"
         android:paddingLeft="10dp"
         android:textColor="@color/PretoNaoPuro"
         android:textColorHint="@color/PlaceHolderColor"
@@ -90,6 +91,7 @@
         android:fontFamily="@font/inclusive_sans"
         android:gravity="center_vertical"
         android:hint="Repita a senha"
+        android:inputType="textPassword"
         android:paddingLeft="10dp"
         android:textColor="@color/PretoNaoPuro"
         android:textColorHint="@color/PlaceHolderColor"
@@ -109,6 +111,7 @@
         android:fontFamily="@font/inclusive_sans"
         android:gravity="center_vertical"
         android:hint="Digite seu e-mail"
+        android:inputType="textEmailAddress"
         android:paddingLeft="10dp"
         android:textColor="@color/PretoNaoPuro"
         android:textColorHint="@color/PlaceHolderColor"
diff --git a/app/src/main/res/layout/fragment_chats.xml b/app/src/main/res/layout/fragment_chats.xml
index 01a4ba1..abc260a 100644
--- a/app/src/main/res/layout/fragment_chats.xml
+++ b/app/src/main/res/layout/fragment_chats.xml
@@ -90,7 +90,7 @@
         android:layout_width="92dp"
         android:layout_height="45dp"
         android:layout_marginTop="24dp"
-        android:background="@drawable/bt_filtro_estilizacao"
+        android:background="@drawable/bt_filtro_estilizacao_selecionado"
         android:fontFamily="@font/inclusive_sans"
         android:gravity="center"
         android:text="Todos"
diff --git a/app/src/main/res/layout/fragment_perfil.xml b/app/src/main/res/layout/fragment_perfil.xml
index a2a0b29..78dddc2 100644
--- a/app/src/main/res/layout/fragment_perfil.xml
+++ b/app/src/main/res/layout/fragment_perfil.xml
@@ -12,6 +12,7 @@
         android:layout_height="wrap_content">
 
         <LinearLayout
+            android:id="@+id/btChatbot"
             android:layout_width="120dp"
             android:layout_height="43dp"
             android:layout_marginTop="35dp"
@@ -37,13 +38,13 @@
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/inclusive_sans"
                 android:gravity="center_vertical"
-                android:text="Chatbot"
+                android:text="VitAI"
                 android:textColor="@color/BrancoNaoPuro"
                 android:textSize="16sp" />
         </LinearLayout>
 
         <ImageView
-            android:id="@+id/setaEsquerdaVoltar"
+            android:id="@+id/onda_verde_clara"
             android:layout_width="0dp"
             android:layout_height="227dp"
             android:src="@drawable/onda_verde_clara_seis"
@@ -72,7 +73,7 @@
             app:cardElevation="4dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/setaEsquerdaVoltar">
+            app:layout_constraintTop_toTopOf="@+id/onda_verde_clara">
 
             <FrameLayout
                 android:layout_width="match_parent"
@@ -208,6 +209,7 @@
             </FrameLayout>
 
             <FrameLayout
+                android:id="@+id/FrameInserirFunc"
                 android:layout_width="match_parent"
                 android:layout_height="60dp"
                 android:layout_marginHorizontal="16dp"
@@ -252,6 +254,7 @@
             </FrameLayout>
 
             <FrameLayout
+                android:id="@+id/FramePlanos"
                 android:layout_width="match_parent"
                 android:layout_height="60dp"
                 android:layout_marginHorizontal="16dp"
@@ -302,7 +305,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:fontFamily="@font/inclusive_sans"
-            android:text="Plano Atual: Avançado"
+            android:text="Plano Atual: Nenhum"
             android:textColor="@color/PretoNaoPuro"
             android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_relatorio.xml b/app/src/main/res/layout/fragment_relatorio.xml
index 19ce1cb..287df98 100644
--- a/app/src/main/res/layout/fragment_relatorio.xml
+++ b/app/src/main/res/layout/fragment_relatorio.xml
@@ -9,8 +9,8 @@
 
     <ImageView
         android:id="@+id/imageView23"
-        android:layout_width="0dp"
-        android:layout_height="145dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:src="@drawable/onda_verde_escuraeclara_sete"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -124,11 +124,457 @@
 
             <TableLayout
                 android:id="@+id/tableLayout"
-                android:layout_width="match_parent"
+                android:layout_width="370dp"
                 android:layout_height="wrap_content"
                 android:background="@android:color/transparent"
                 android:padding="8dp"
-                android:stretchColumns="1,2,3,4"></TableLayout>
+                android:stretchColumns="1,2,3,4">
+
+                <!-- Janeiro -->
+
+                <TableRow
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="Janeiro"
+                        android:textColor="@color/PretoNaoPuro" />
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="000"
+                        android:textColor="@color/PretoNaoPuro" />
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="000"
+                        android:textColor="@color/PretoNaoPuro" />
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="000"
+                        android:textColor="@color/PretoNaoPuro" />
+                </TableRow>
+
+                <TableRow
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="Fevereiro"
+                        android:textColor="@color/PretoNaoPuro" />
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="000"
+                        android:textColor="@color/PretoNaoPuro" />
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="000"
+                        android:textColor="@color/PretoNaoPuro" />
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="000"
+                        android:textColor="@color/PretoNaoPuro" />
+                </TableRow>
+
+                <TableRow
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="Março"
+                        android:textColor="@color/PretoNaoPuro" />
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="000"
+                        android:textColor="@color/PretoNaoPuro" />
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="000"
+                        android:textColor="@color/PretoNaoPuro" />
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="000"
+                        android:textColor="@color/PretoNaoPuro" />
+                </TableRow>
+
+                <TableRow
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="Abril"
+                        android:textColor="@color/PretoNaoPuro" />
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="000"
+                        android:textColor="@color/PretoNaoPuro" />
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="000"
+                        android:textColor="@color/PretoNaoPuro" />
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="000"
+                        android:textColor="@color/PretoNaoPuro" />
+                </TableRow>
+
+                <TableRow
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="Maio"
+                        android:textColor="@color/PretoNaoPuro" />
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="000"
+                        android:textColor="@color/PretoNaoPuro" />
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="000"
+                        android:textColor="@color/PretoNaoPuro" />
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="000"
+                        android:textColor="@color/PretoNaoPuro" />
+                </TableRow>
+
+                <TableRow
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="Junho"
+                        android:textColor="@color/PretoNaoPuro" />
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="000"
+                        android:textColor="@color/PretoNaoPuro" />
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="000"
+                        android:textColor="@color/PretoNaoPuro" />
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="000"
+                        android:textColor="@color/PretoNaoPuro" />
+                </TableRow>
+
+                <TableRow
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="Julho"
+                        android:textColor="@color/PretoNaoPuro" />
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="000"
+                        android:textColor="@color/PretoNaoPuro" />
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="000"
+                        android:textColor="@color/PretoNaoPuro" />
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="000"
+                        android:textColor="@color/PretoNaoPuro" />
+                </TableRow>
+
+                <TableRow
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="Agosto"
+                        android:textColor="@color/PretoNaoPuro" />
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="000"
+                        android:textColor="@color/PretoNaoPuro" />
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="000"
+                        android:textColor="@color/PretoNaoPuro" />
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="000"
+                        android:textColor="@color/PretoNaoPuro" />
+                </TableRow>
+
+                <TableRow android:layout_height="wrap_content">
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="Setembro"
+                        android:textColor="@color/PretoNaoPuro" />
+
+                    <TextView
+                        android:layout_width="10dp"
+                        android:layout_height="match_parent"
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="4dp"
+                        android:text="000"
+                        android:textColor="@color/PretoNaoPuro" />
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="000"
+                        android:textColor="@color/PretoNaoPuro" />
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="000"
+                        android:textColor="@color/PretoNaoPuro" />
+                </TableRow>
+
+                <!-- Fevereiro -->
+                <TableRow>
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="Outubro"
+                        android:textColor="@color/PretoNaoPuro" />
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="000"
+                        android:textColor="@color/PretoNaoPuro" />
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="000"
+                        android:textColor="@color/PretoNaoPuro" />
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="000"
+                        android:textColor="@color/PretoNaoPuro" />
+                </TableRow>
+
+                <!-- Março -->
+                <TableRow>
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="Novembro"
+                        android:textColor="@color/PretoNaoPuro" />
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="000"
+                        android:textColor="@color/PretoNaoPuro" />
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="000"
+                        android:textColor="@color/PretoNaoPuro" />
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="000"
+                        android:textColor="@color/PretoNaoPuro" />
+                </TableRow>
+
+                <!-- Abril -->
+                <TableRow>
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="Dezembro"
+                        android:textColor="@color/PretoNaoPuro" />
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="000"
+                        android:textColor="@color/PretoNaoPuro" />
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="000"
+                        android:textColor="@color/PretoNaoPuro" />
+
+                    <TextView
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="000"
+                        android:textColor="@color/PretoNaoPuro" />
+
+                </TableRow>
+
+            </TableLayout>
         </LinearLayout>
     </ScrollView>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_vitrine.xml b/app/src/main/res/layout/fragment_vitrine.xml
index e2c1936..7945d04 100644
--- a/app/src/main/res/layout/fragment_vitrine.xml
+++ b/app/src/main/res/layout/fragment_vitrine.xml
@@ -40,65 +40,110 @@
         app:layout_constraintTop_toBottomOf="@+id/text_dashboard"
         app:layout_constraintVertical_bias="0.009" />
 
-    <LinearLayout
-        android:id="@+id/linearLayout2"
+    <HorizontalScrollView
+        android:id="@+id/horizontalScrollView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView26"
-        app:layout_constraintVertical_bias="0.028">
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.20">
 
-        <Button
-            android:id="@+id/button9"
+        <LinearLayout
+            android:id="@+id/linearLayout2"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-            android:background="@drawable/bt_filtro_estilizacao"
-            android:fontFamily="@font/inclusive_sans"
-            android:text="Todos"
-            android:textAllCaps="false"
-            android:textColor="@color/BrancoNaoPuro" />
+            android:layout_height="match_parent"
+            android:orientation="horizontal"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/textView26"
+            app:layout_constraintVertical_bias="0.028">
 
-        <Button
-            android:id="@+id/button15"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-            android:background="@drawable/bt_filtro_estilizacao"
-            android:fontFamily="@font/inclusive_sans"
-            android:text="Embutidos"
-            android:textAllCaps="false"
-            android:textColor="@color/BrancoNaoPuro" />
+            <Button
+                android:id="@+id/todosFiltro"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:background="@drawable/bt_filtro_estilizacao_selecionado"
+                android:fontFamily="@font/inclusive_sans"
+                android:text="Todos"
+                android:textAllCaps="false"
+                android:textColor="@color/BrancoNaoPuro" />
 
-        <Button
-            android:id="@+id/button14"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-            android:background="@drawable/bt_filtro_estilizacao"
-            android:fontFamily="@font/inclusive_sans"
-            android:text="Laticínios"
-            android:textAllCaps="false"
-            android:textColor="@color/BrancoNaoPuro" />
+            <Button
+                android:id="@+id/embutidosFiltro"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:background="@drawable/bt_filtro_estilizacao"
+                android:fontFamily="@font/inclusive_sans"
+                android:text="Embutidos"
+                android:textAllCaps="false"
+                android:textColor="@color/BrancoNaoPuro" />
+
+            <Button
+                android:id="@+id/lacticiniosFiltro"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:background="@drawable/bt_filtro_estilizacao"
+                android:fontFamily="@font/inclusive_sans"
+                android:text="Laticínios"
+                android:textAllCaps="false"
+                android:textColor="@color/BrancoNaoPuro" />
+
+            <Button
+                android:id="@+id/graosFIltro"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:background="@drawable/bt_filtro_estilizacao"
+                android:fontFamily="@font/inclusive_sans"
+                android:text="Grãos"
+                android:textAllCaps="false"
+                android:textColor="@color/BrancoNaoPuro" />
+
+            <Button
+                android:id="@+id/frutasFiltro"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:background="@drawable/bt_filtro_estilizacao"
+                android:fontFamily="@font/inclusive_sans"
+                android:text="Frutas"
+                android:textAllCaps="false"
+                android:textColor="@color/BrancoNaoPuro" />
 
-    </LinearLayout>
+            <Button
+                android:id="@+id/salgadosFiltro"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:background="@drawable/bt_filtro_estilizacao"
+                android:fontFamily="@font/inclusive_sans"
+                android:text="Salgados"
+                android:textAllCaps="false"
+                android:textColor="@color/BrancoNaoPuro" />
+
+        </LinearLayout>
+    </HorizontalScrollView>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rvVitrine"
         android:layout_width="0dp"
         android:layout_height="560dp"
         android:layout_marginStart="1dp"
+        android:layout_marginTop="98dp"
         android:layout_marginEnd="1dp"
         app:layoutManager="androidx.recyclerview.widget.StaggeredGridLayoutManager"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="1.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/linearLayout2"
+        app:layout_constraintTop_toBottomOf="@+id/horizontalScrollView"
         app:spanCount="2"
         tools:listitem="@layout/item_vitrine" />
 
@@ -107,6 +152,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="@drawable/bt_cadastro_estilizacao"
+        android:fontFamily="@font/inclusive_sans"
         android:paddingStart="10dp"
         android:paddingEnd="10dp"
         android:text="Adicionar produto"
@@ -116,15 +162,14 @@
         app:layout_constraintBottom_toTopOf="@+id/rvVitrine"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.062"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/linearLayout2"
-        app:layout_constraintVertical_bias="0.423" />
+        app:layout_constraintStart_toStartOf="parent" />
 
     <Button
         android:id="@+id/botaoMinhaVitrine"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="@drawable/bt_cadastro_estilizacao"
+        android:fontFamily="@font/inclusive_sans"
         android:paddingStart="10dp"
         android:paddingEnd="10dp"
         android:text="Meus produtos"
@@ -134,8 +179,6 @@
         app:layout_constraintBottom_toTopOf="@+id/rvVitrine"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.902"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/linearLayout2"
-        app:layout_constraintVertical_bias="0.423" />
+        app:layout_constraintStart_toStartOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index bc6cdac..1f46cd3 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -21,6 +21,6 @@ dependencyResolutionManagement {
     }
 }
 
-rootProject.name = "Projeto Save It"
+rootProject.name = "Projeto SaveIt"
 include(":app")
  
\ No newline at end of file