diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 5219fd1..d13263d 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,7 +4,7 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-10-24T14:58:18.790721700Z">
+        <DropdownSelection timestamp="2025-10-31T13:55:12.625883800Z">
           <Target type="DEFAULT_BOOT">
             <handle>
               <DeviceId pluginId="PhysicalDevice" identifier="serial=R9XT106XF5N" />
@@ -13,9 +13,6 @@
         </DropdownSelection>
         <DialogSelection />
       </SelectionState>
-      <SelectionState runConfigName="Projeto_SaveIt.app">
-        <option name="selectionMode" value="DROPDOWN" />
-      </SelectionState>
     </selectionStates>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fc15d69..b85dc8e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -38,6 +38,9 @@
 <!--        <activity-->
 <!--            android:name=".ui.Chatbot"-->
 <!--            android:exported="false" />-->
+        <activity
+            android:name=".ui.VisaoGeralEstoque"
+            android:exported="false" />
         <activity
             android:name=".ui.Conversa"
             android:exported="false" />
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 f775124..73a5193 100644
--- a/app/src/main/java/com/example/projetosaveit/adapter/AdapterProduto.kt
+++ b/app/src/main/java/com/example/projetosaveit/adapter/AdapterProduto.kt
@@ -2,6 +2,8 @@ package com.example.projetosaveit.adapter
 
 import android.app.AlertDialog
 import android.content.Intent
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
@@ -79,6 +81,9 @@ class AdapterProduto : RecyclerView.Adapter<AdapterProduto.ViewHolder>() {
                     val builder = AlertDialog.Builder(activity).setView(dialogView)
                     val dialog = builder.create()
 
+                    dialog.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+
+
                     val cancelBtn = dialogView!!.findViewById<Button>(R.id.button)
                     val saveBtn = dialogView.findViewById<Button>(R.id.button3)
                     val editQuantidade = dialogView.findViewById<EditText>(R.id.editTextNumber)
@@ -106,7 +111,7 @@ class AdapterProduto : RecyclerView.Adapter<AdapterProduto.ViewHolder>() {
                                         produto.name
                                     )
 
-                                    var estoque : EstoqueDTO = EstoqueDTO(0, 0, quantidadeAtual - quantidade, produto.batchId, produto.id, 0, "", currentDate)
+                                    var estoque : EstoqueDTO = EstoqueDTO(0, 0, quantidade, produto.batchId, produto.id, 0, "", currentDate)
                                     repositoryEstoque.postEstoque(estoque).enqueue(object : retrofit2.Callback<ResponseBody> {
                                         override fun onResponse(
                                             call: retrofit2.Call<ResponseBody>,
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 c3ae3f7..d082270 100644
--- a/app/src/main/java/com/example/projetosaveit/adapter/AdapterVitrine.kt
+++ b/app/src/main/java/com/example/projetosaveit/adapter/AdapterVitrine.kt
@@ -17,6 +17,8 @@ import com.example.projetosaveit.api.repository.VitrineRepository
 import com.example.projetosaveit.model.VitrineDTO
 import com.example.projetosaveit.ui.ProdutoVitrine
 import java.text.SimpleDateFormat
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
 import java.util.Locale
 
 class AdapterVitrine() : RecyclerView.Adapter<AdapterVitrine.ViewHolder>() {
@@ -58,14 +60,20 @@ class AdapterVitrine() : RecyclerView.Adapter<AdapterVitrine.ViewHolder>() {
                         bundle.putString("empresaVitrine", response.body()?.empresa)
                         bundle.putInt("quantidadeVitrine", response.body()?.quantidadeGeral ?: 0)
                         val validadeOriginal = response.body()?.validade
-                        val sdfEntrada = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault())
-                        val sdfSaida = SimpleDateFormat("dd/MM/yyyy", Locale.getDefault())
                         val validadeFormatada = try {
-                            validadeOriginal?.let { sdfSaida.format(sdfEntrada.parse(it)!!) }
+                            val formatoEntrada = if (validadeOriginal?.contains("T") == true) {
+                                SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.getDefault())
+                            } else {
+                                SimpleDateFormat("yyyy-MM-dd", Locale.getDefault())
+                            }
+                            val formatoSaida = SimpleDateFormat("dd/MM/yyyy", Locale.getDefault())
+                            validadeOriginal?.let { formatoSaida.format(formatoEntrada.parse(it)!!) }
                         } catch (e: Exception) {
-                            null
+                            "Data inválida"
                         }
 
+
+
                         bundle.putString("validadeVitrine", validadeFormatada ?: "Data inválida")
                         bundle.putString("pesoVitrine", response.body()?.tipoPeso)
                         intent.putExtras(bundle)
diff --git a/app/src/main/java/com/example/projetosaveit/adapter/recycleView/ProdutoEstoqueRelatorio.kt b/app/src/main/java/com/example/projetosaveit/adapter/recycleView/ProdutoEstoqueRelatorio.kt
new file mode 100644
index 0000000..6fa35e2
--- /dev/null
+++ b/app/src/main/java/com/example/projetosaveit/adapter/recycleView/ProdutoEstoqueRelatorio.kt
@@ -0,0 +1,8 @@
+package com.example.projetosaveit.adapter.recycleView
+
+class ProdutoEstoqueRelatorio(
+    val productName: String,
+    val quantity: Long,
+    val maxQuantity: Long
+) {
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/projetosaveit/adapter/recycleView/Venda.kt b/app/src/main/java/com/example/projetosaveit/adapter/recycleView/Venda.kt
new file mode 100644
index 0000000..3bd8715
--- /dev/null
+++ b/app/src/main/java/com/example/projetosaveit/adapter/recycleView/Venda.kt
@@ -0,0 +1,6 @@
+package com.example.projetosaveit.adapter.recycleView
+
+class Venda(
+    val productName: String,
+    val quantityOutput: String
+) {}
\ 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 dc1c406..c1abb1c 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
@@ -1,19 +1,21 @@
 package com.example.projetosaveit.api.network
 
+import com.example.projetosaveit.adapter.recycleView.ProdutoEstoqueRelatorio
+import com.example.projetosaveit.adapter.recycleView.Venda
 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.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.FuncionarioDTO
 import com.example.projetosaveit.model.FuncionarioInsertDTO
-import com.example.projetosaveit.model.HistoricoResponse
+//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.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
@@ -27,7 +29,6 @@ import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.PATCH
 import retrofit2.http.POST
-import retrofit2.http.PUT
 import retrofit2.http.Path
 import retrofit2.http.Query
 
@@ -54,6 +55,12 @@ interface ApiService {
     @GET("api/image/showcase-images/{showcaseId}")
     fun getVitrine(@Path("showcaseId") showcaseId : Long): Call<VitrineDTO>
 
+    @GET("/api/stock/listarQuantidadesProduto/{enterpriseId}")
+    fun getQuantidadesProduto(@Path("enterpriseId") enterpriseId: Long): Call<List<ProdutoEstoqueRelatorio>>
+
+    @GET("/api/stock/listarMovimentacoesEstoque/{enterpriseId}")
+    fun getListaMovimentacoesEstoque(@Path("enterpriseId") enterpriseId: Long) : Call<List<Venda>>
+
     @GET("api/batch/informacoesProduto/{batchId}")
     fun getProdutoId(@Path("batchId") idProduto : Long): Call<ProdutoInfoDTO>
 
@@ -125,12 +132,12 @@ interface ApiService {
 
 //    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>
+//    @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/repository/EstoqueRepository.kt b/app/src/main/java/com/example/projetosaveit/api/repository/EstoqueRepository.kt
index f0f81a1..d355247 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
@@ -1,12 +1,11 @@
 package com.example.projetosaveit.api.repository
 
-import com.example.projetosaveit.api.network.ApiService
+import com.example.projetosaveit.adapter.recycleView.ProdutoEstoqueRelatorio
+import com.example.projetosaveit.adapter.recycleView.Venda
 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
 
@@ -23,4 +22,12 @@ class EstoqueRepository {
     fun getRelatorioProduto(enterpriseId : Long, productId : Long) : Call<List<RelatorioProdutoDTO>> {
         return RetrofitClientSql.instance.getRelatorioProduto(enterpriseId, productId)
     }
+
+    fun getQuantidadesProduto(enterpriseId : Long) : Call<List<ProdutoEstoqueRelatorio>> {
+        return RetrofitClientSql.instance.getQuantidadesProduto(enterpriseId)
+    }
+
+    fun getMovimentacoesProduto(enterpriseId: Long) : Call<List<Venda>> {
+        return RetrofitClientSql.instance.getListaMovimentacoesEstoque(enterpriseId)
+    }
 }
\ 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 9357986..171cea0 100644
--- a/app/src/main/java/com/example/projetosaveit/ui/AdicionarProduto.kt
+++ b/app/src/main/java/com/example/projetosaveit/ui/AdicionarProduto.kt
@@ -1,6 +1,7 @@
 package com.example.projetosaveit.ui
 
 import android.Manifest
+import android.app.Activity
 import android.app.DatePickerDialog
 import android.content.ContentValues
 import android.content.Context
@@ -8,6 +9,7 @@ import android.content.Intent
 import android.content.pm.PackageManager
 import android.graphics.Bitmap
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
 import android.os.Environment
 import android.provider.MediaStore
@@ -36,6 +38,8 @@ import com.example.projetosaveit.model.ImagemDTO
 import com.example.projetosaveit.model.LoteDTO
 import com.example.projetosaveit.model.LoteInsertDTO
 import com.example.projetosaveit.model.ProdutoDTO
+import com.example.projetosaveit.ui.CadastroEndereco
+import com.example.projetosaveit.util.GetFuncionario
 import com.google.android.material.datepicker.MaterialDatePicker
 import com.google.android.material.textfield.TextInputEditText
 import com.google.firebase.auth.FirebaseAuth
@@ -54,13 +58,39 @@ class AdicionarProduto : AppCompatActivity() {
     private val REQUEST_IMAGE_PICK = 2
     private val CAMERA_REQUEST_CODE = 100
     private var photoUri: Uri? = null
-    var imageUrl : String = ""
-    var publicIdImage : String = ""
+    private var selectedImageFile: File? = null
+    private var selectedImageUri: Uri? = null
+
+    var imageUrl: String = ""
+    var publicIdImage: String = ""
     var isInsert = false
     val objAutenticar: FirebaseAuth = FirebaseAuth.getInstance()
-    val repositoryEmp : EmpresaRepository = EmpresaRepository()
-    val repositoryLote : LoteRepository = LoteRepository()
-    var idEmpresa : Long = 0
+    val repositoryEmp: EmpresaRepository = EmpresaRepository()
+    val repositoryLote: LoteRepository = LoteRepository()
+    var idEmpresa: Long = 0
+
+
+    val pickImageLauncher = registerForActivityResult(
+    ActivityResultContracts.StartActivityForResult()
+    ) { result ->
+        if (result.resultCode == Activity.RESULT_OK) {
+            val imageUri = result.data?.data
+            if (imageUri != null) {
+                Toast.makeText(this@AdicionarProduto, "Imagem selecionada!", Toast.LENGTH_SHORT).show()
+                // binding.imageView.setImageURI(imageUri)
+            }
+        }
+    }
+
+    val permissionLauncher = registerForActivityResult(
+    ActivityResultContracts.RequestPermission()
+    ) { granted ->
+        if (granted) {
+            openGallery()
+        } else {
+            Toast.makeText(this@AdicionarProduto, "Permissão negada!", Toast.LENGTH_SHORT).show()
+        }
+    }
 
 
     private val requestCameraPermissionLauncher =
@@ -68,7 +98,11 @@ class AdicionarProduto : AppCompatActivity() {
             if (isGranted) {
                 openCamera()
             } else {
-                Toast.makeText(this@AdicionarProduto, "Permissão de câmera é necessária para tirar fotos.", Toast.LENGTH_SHORT).show()
+                Toast.makeText(
+                    this@AdicionarProduto,
+                    "Permissão de câmera é necessária para tirar fotos.",
+                    Toast.LENGTH_SHORT
+                ).show()
             }
         }
 
@@ -100,11 +134,19 @@ class AdicionarProduto : AppCompatActivity() {
         }
 
         val activityContext: Context = this
-        var emailEmpresa : String  = objAutenticar.currentUser?.email.toString()
+        var emailEmpresa: String = objAutenticar.currentUser?.email.toString()
 
         pegarEmailEmpresa(emailEmpresa) { empresa ->
-            if (empresa != null) {
-              idEmpresa = empresa.id
+            if ((empresa != null)&&(empresa.id.toInt() != 0)) {
+                idEmpresa = empresa.id
+            }else {
+                GetFuncionario.pegarEmailFunc(emailEmpresa) { funcionario ->
+                    if ((funcionario != null )&&(funcionario!!.id.toInt() != 0)) {
+                        idEmpresa = funcionario!!.enterpriseId
+                    }else {
+                        Toast.makeText(this@AdicionarProduto, "não foi possivel pegar o id do usuario", Toast.LENGTH_LONG).show()
+                    }
+                }
             }
         }
 
@@ -112,12 +154,26 @@ class AdicionarProduto : AppCompatActivity() {
             showImagePickerOptions()
         }
 
+        (findViewById<ImageView>(R.id.setaEsquerdaVoltarInserirProduto)).setOnClickListener { v ->
+            finish()
+        }
+
+
         val entradaProdutoDate = findViewById<EditText>(R.id.entradaProdutoInput)
         val validadeProdutoDate = findViewById<EditText>(R.id.validadeProdutoInput)
         val unidadeMedidaProduto = findViewById<TextInputEditText>(R.id.unidadeMedidaProdutoInput)
         val categoriaProduto = findViewById<TextInputEditText>(R.id.categoriaProduto)
-        val optionsCategory = arrayOf("Embutidos", "Laticínios", "Grãos", "Frutas", "Salgados", "Doces", "Bebidas", "Outros")
-        val options = arrayOf("ML", "L", "KG","G")
+        val optionsCategory = arrayOf(
+            "Embutidos",
+            "Laticínios",
+            "Grãos",
+            "Frutas",
+            "Salgados",
+            "Doces",
+            "Bebidas",
+            "Outros"
+        )
+        val options = arrayOf("L", "KG")
 
 
         unidadeMedidaProduto.setOnClickListener {
@@ -147,7 +203,6 @@ class AdicionarProduto : AppCompatActivity() {
             val datePicker = DatePickerDialog(
                 this,
                 { _, year, month, dayOfMonth ->
-                    // mês começa do zero, então soma +1
                     val dataSelecionada = String.format(
                         "%04d-%02d-%02dT%02d:%02d:%02d",
                         year, month + 1, dayOfMonth, 0, 0, 0
@@ -181,75 +236,137 @@ class AdicionarProduto : AppCompatActivity() {
         }
         (findViewById<Button>(R.id.botaoCadastrarProduto)).setOnClickListener { v ->
 
-            var nomeProduto : String = findViewById<TextInputEditText>(R.id.nomeProdutoInput).text.toString()
-            var marcaProduto : String = findViewById<TextInputEditText>(R.id.marcaProdutoInput).text.toString()
-            var skuProduto : String = findViewById<TextInputEditText>(R.id.skuProdutoInput).text.toString()
-            var descricaoProduto : String = findViewById<TextInputEditText>(R.id.descricaoProdutoInput).text.toString()
-            var dataEntradaProduto : String = findViewById<EditText>(R.id.entradaProdutoInput).text.toString()
-            var dataValidadeProduto : String = findViewById<EditText>(R.id.validadeProdutoInput).text.toString()
-            var quantidadeProduto : String = findViewById<EditText>(R.id.quantidadeProdutoInput).text.toString()
-            var unidadeMedidaProduto : String = findViewById<TextInputEditText>(R.id.unidadeMedidaProdutoInput).text.toString()
-            var quantidadeMaximaProduto : String = findViewById<EditText>(R.id.quantidadeMaximaProdutoInput).text.toString()
-            var categoriaProduto : String = findViewById<TextInputEditText>(R.id.categoriaProduto).text.toString()
-
-
-            if (nomeProduto.isEmpty()) {
-                Toast.makeText(this@AdicionarProduto, "O nome do produto não pode ser vazio!!", Toast.LENGTH_SHORT).show()
-            }else if(marcaProduto.isEmpty()) {
-                Toast.makeText(this@AdicionarProduto, "A marca do produto não pode ser vazia", Toast.LENGTH_SHORT).show()
-            }else if(skuProduto.isEmpty()) {
-                Toast.makeText(this@AdicionarProduto, "A SKU do produto não pode ser vazia!!", Toast.LENGTH_SHORT).show()
-            }else if(dataEntradaProduto.isEmpty()) {
-                Toast.makeText(this@AdicionarProduto, "A data de entrada não pode ser vazia!!", Toast.LENGTH_SHORT).show()
-            }else if(dataValidadeProduto.isEmpty()) {
-                Toast.makeText(this@AdicionarProduto, "A data de validade não pode ser vazia!!", Toast.LENGTH_SHORT).show()
-            }else if(imageUrl.isEmpty()) {
-                Toast.makeText(this@AdicionarProduto, "A imagem não pode ser vazia!!", Toast.LENGTH_SHORT).show()
-            }else if(quantidadeProduto.isEmpty()) {
-                Toast.makeText(this@AdicionarProduto, "a quantidade de produso não pode ser vazia!!", Toast.LENGTH_SHORT).show()
-            }
-            else {
-                var produtoInserir : ProdutoDTO = ProdutoDTO(0,nomeProduto, marcaProduto,categoriaProduto, descricaoProduto, idEmpresa.toLong())
-                var loteInserir : LoteDTO = LoteDTO(0,unidadeMedidaProduto,dataEntradaProduto,skuProduto, dataValidadeProduto,quantidadeMaximaProduto.toInt(), quantidadeProduto.toInt(), 1)
-                var imageInserir : ImagemDTO = ImagemDTO(0,imageUrl, 1)
-                var lote : LoteInsertDTO = LoteInsertDTO(loteInserir, produtoInserir, imageInserir)
-                inserirProduto(lote)
+            if (selectedImageFile != null) {
+                // Faz o upload APENAS AGORA
+                uploadToCloudinary(
+                    selectedImageFile!!,
+                    onSuccess = { url ->
+                        imageUrl = url
+                        inserirProdutoCampos()
+                    },
+                    onError = { e ->
+                        Toast.makeText(this, "Erro no upload: ${e.message}", Toast.LENGTH_SHORT).show()
+                    }
+                )
+            } else {
+                Toast.makeText(this, "Selecione uma imagem primeiro!", Toast.LENGTH_SHORT).show()
             }
         }
-
-        findViewById<ImageView>(R.id.btVoltarAdicaoProduto).setOnClickListener {
-            finish()
-        }
     }
 
-
-
-    override fun onStop() {
-        super.onStop()
-
-        if ((!imageUrl.isEmpty())&&(!isInsert)) {
-            destroyFromCloudinary(publicIdImage)
-        }
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-
-        if ((!imageUrl.isEmpty())&&(!isInsert)) {
-            destroyFromCloudinary(publicIdImage)
+    private fun inserirProdutoCampos() {
+        var nomeProduto: String =
+            findViewById<TextInputEditText>(R.id.nomeProdutoInput).text.toString()
+        var marcaProduto: String =
+            findViewById<TextInputEditText>(R.id.marcaProdutoInput).text.toString()
+        var skuProduto: String =
+            findViewById<TextInputEditText>(R.id.skuProdutoInput).text.toString()
+        var descricaoProduto: String =
+            findViewById<TextInputEditText>(R.id.descricaoProdutoInput).text.toString()
+        var dataEntradaProduto: String =
+            findViewById<EditText>(R.id.entradaProdutoInput).text.toString()
+        var dataValidadeProduto: String =
+            findViewById<EditText>(R.id.validadeProdutoInput).text.toString()
+        var quantidadeProduto: String =
+            findViewById<EditText>(R.id.quantidadeProdutoInput).text.toString()
+        var unidadeMedidaProduto: String =
+            findViewById<TextInputEditText>(R.id.unidadeMedidaProdutoInput).text.toString()
+        var quantidadeMaximaProduto: String =
+            findViewById<EditText>(R.id.quantidadeMaximaProdutoInput).text.toString()
+        var categoriaProduto: String =
+            findViewById<TextInputEditText>(R.id.categoriaProduto).text.toString()
+
+
+
+        if (nomeProduto.isEmpty()) {
+            Toast.makeText(
+                this@AdicionarProduto,
+                "O nome do produto não pode ser vazio!!",
+                Toast.LENGTH_SHORT
+            ).show()
+        } else if (marcaProduto.isEmpty()) {
+            Toast.makeText(
+                this@AdicionarProduto,
+                "A marca do produto não pode ser vazia",
+                Toast.LENGTH_SHORT
+            ).show()
+        } else if (skuProduto.isEmpty()) {
+            Toast.makeText(
+                this@AdicionarProduto,
+                "A SKU do produto não pode ser vazia!!",
+                Toast.LENGTH_SHORT
+            ).show()
+        } else if (dataEntradaProduto.isEmpty()) {
+            Toast.makeText(
+                this@AdicionarProduto,
+                "A data de entrada não pode ser vazia!!",
+                Toast.LENGTH_SHORT
+            ).show()
+        } else if (dataValidadeProduto.isEmpty()) {
+            Toast.makeText(
+                this@AdicionarProduto,
+                "A data de validade não pode ser vazia!!",
+                Toast.LENGTH_SHORT
+            ).show()
+        } else if (imageUrl.isEmpty()) {
+            Toast.makeText(
+                this@AdicionarProduto,
+                "A imagem não pode ser vazia!!",
+                Toast.LENGTH_SHORT
+            ).show()
+        } else if (quantidadeProduto.isEmpty()) {
+            Toast.makeText(
+                this@AdicionarProduto,
+                "a quantidade de produso não pode ser vazia!!",
+                Toast.LENGTH_SHORT
+            ).show()
+        } else {
+            var produtoInserir: ProdutoDTO = ProdutoDTO(
+                0,
+                nomeProduto,
+                marcaProduto,
+                categoriaProduto,
+                descricaoProduto,
+                idEmpresa.toLong()
+            )
+            var loteInserir: LoteDTO = LoteDTO(
+                0,
+                unidadeMedidaProduto,
+                dataEntradaProduto,
+                skuProduto,
+                dataValidadeProduto,
+                quantidadeMaximaProduto.toInt(),
+                quantidadeProduto.toInt(),
+                1
+            )
+            var imageInserir: ImagemDTO = ImagemDTO(0, imageUrl, 1)
+            var lote: LoteInsertDTO = LoteInsertDTO(loteInserir, produtoInserir, imageInserir)
+            inserirProduto(lote)
         }
     }
 
-    private fun inserirProduto(lote : LoteInsertDTO) {
+    private fun inserirProduto(lote: LoteInsertDTO) {
         repositoryLote.postLote(lote).enqueue(object : retrofit2.Callback<ResponseBody> {
             override fun onResponse(
                 p0: Call<ResponseBody?>,
                 p1: Response<ResponseBody?>
             ) {
-                if(p1.isSuccessful) {
-                    Toast.makeText(this@AdicionarProduto, "Inserido com sucesso. Resultado: " + p1.body(), Toast.LENGTH_SHORT).show()
-                }else {
-                    Log.i("ERROR", "erro na api: " + p1.errorBody().toString())
+                if (p1.isSuccessful) {
+                    Toast.makeText(
+                        this@AdicionarProduto,
+                        "Inserido com sucesso. Resultado: " + p1.body(),
+                        Toast.LENGTH_SHORT
+                    ).show()
+                    finish()
+                } 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@AdicionarProduto, errorBodyString ?: "Erro desconhecido", Toast.LENGTH_LONG).show()
                 }
             }
 
@@ -257,7 +374,11 @@ class AdicionarProduto : AppCompatActivity() {
                 p0: Call<ResponseBody?>,
                 p1: Throwable
             ) {
-                Toast.makeText(this@AdicionarProduto, "Api não funcionou: " + p1.message, Toast.LENGTH_SHORT).show()
+                Toast.makeText(
+                    this@AdicionarProduto,
+                    "Api não funcionou: " + p1.message,
+                    Toast.LENGTH_SHORT
+                ).show()
             }
 
         })
@@ -273,7 +394,11 @@ class AdicionarProduto : AppCompatActivity() {
             }
 
             override fun onFailure(call: Call<EmpresaDTO>, t: Throwable) {
-                Toast.makeText(this@AdicionarProduto, "Erro na API: ${t.message}", Toast.LENGTH_SHORT).show()
+                Toast.makeText(
+                    this@AdicionarProduto,
+                    "Erro na API: ${t.message}",
+                    Toast.LENGTH_SHORT
+                ).show()
                 onResult(null)
             }
         })
@@ -291,54 +416,26 @@ class AdicionarProduto : AppCompatActivity() {
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
 
-        if (resultCode == AppCompatActivity.RESULT_OK) {
+        if (resultCode == Activity.RESULT_OK) {
             val avatar = findViewById<ImageView>(R.id.imagemProdutoInput)
 
             when (requestCode) {
-                REQUEST_IMAGE_CAPTURE -> {
-                    if (data?.extras?.get("data") != null) {
-
-                        val bitmap = data.extras?.get("data") as Bitmap
-                        avatar?.setImageBitmap(bitmap)
-
-                        val tempFile = File(this@AdicionarProduto.cacheDir, "temp.jpg")
-                        FileOutputStream(tempFile).use {
-                            bitmap.compress(Bitmap.CompressFormat.JPEG, 100, it)
-                        }
-                        uploadToCloudinary(tempFile,
-                            onSuccess = { url ->
-                                Glide.with(this)
-                                    .load(url)
-                                    .circleCrop()
-                                    .into(avatar!!)
-                            },
-                            onError = { e ->
-                                Toast.makeText(this@AdicionarProduto, "${e.message}", Toast.LENGTH_SHORT).show()
-                                Log.d(ContentValues.TAG, "${e.message}")
-                            }
-                        )
-                    } else {
-                        Toast.makeText(this@AdicionarProduto, "Erro: Nenhuma imagem recebida", Toast.LENGTH_SHORT).show()
+                REQUEST_IMAGE_PICK -> {
+                    selectedImageUri = data?.data
+                    if (selectedImageUri != null) {
+                        selectedImageFile = getFileFromUri(selectedImageUri!!)
+                        Glide.with(this).load(selectedImageUri).circleCrop().into(avatar)
                     }
                 }
 
-
-                REQUEST_IMAGE_PICK -> {
-                    val selectedImageUri = data?.data
-                    val file = File(getRealPathFromUri(selectedImageUri!!))
-                    uploadToCloudinary(file,
-                        onSuccess = { url ->
-                            Glide.with(this)
-                                .load(url)
-                                .circleCrop()
-                                .into(avatar!!)
-                            Toast.makeText(this@AdicionarProduto, "Foi inserido com sucesso!", Toast.LENGTH_SHORT).show()
-                        },
-                        onError = { e ->
-                            Toast.makeText(this@AdicionarProduto, "Erro no upload: ${e.message}", Toast.LENGTH_SHORT).show()
-                            Log.d(ContentValues.TAG, "Erro no upload: ${e.message}")
-                        }
-                    )
+                REQUEST_IMAGE_CAPTURE -> {
+                    val bitmap = data?.extras?.get("data") as? Bitmap
+                    if (bitmap != null) {
+                        val tempFile = File(cacheDir, "temp_${System.currentTimeMillis()}.jpg")
+                        FileOutputStream(tempFile).use { bitmap.compress(Bitmap.CompressFormat.JPEG, 100, it) }
+                        selectedImageFile = tempFile
+                        Glide.with(this).load(tempFile).circleCrop().into(avatar)
+                    }
                 }
             }
         }
@@ -347,64 +444,32 @@ class AdicionarProduto : AppCompatActivity() {
     private fun uploadToCloudinary(file: File, onSuccess: (String) -> Unit, onError: (Exception) -> Unit) {
         Thread {
             try {
-                val result = cloudinary.uploader().upload(file, ObjectUtils.emptyMap());
-                var url = result["secure_url"] as String
-                imageUrl = url
+                val result = cloudinary.uploader().upload(file, ObjectUtils.emptyMap())
+                val url = result["secure_url"] as String
                 publicIdImage = result["public_id"] as String
-                this@AdicionarProduto.runOnUiThread {
-                    onSuccess(url)
-
-                }
-            } catch (e: Exception) {
-                this@AdicionarProduto.runOnUiThread {
-                    onError(e)
-                }
-            }
-        }.start()
-    }
-
-    private fun destroyFromCloudinary(publicId: String) {
-        Thread {
-            try {
-                val result = cloudinary.uploader().destroy(publicId, ObjectUtils.emptyMap())
-                Log.d("Cloudinary", "Delete result: $result")
-                runOnUiThread {
-                    Toast.makeText(
-                        this@AdicionarProduto,
-                        "Resultado: ${result["result"]}",
-                        Toast.LENGTH_SHORT
-                    ).show()
-                }
+                runOnUiThread { onSuccess(url) }
             } catch (e: Exception) {
-                runOnUiThread {
-                    Toast.makeText(
-                        this@AdicionarProduto,
-                        "Não foi possível excluir a imagem: ${e.message}",
-                        Toast.LENGTH_SHORT
-                    ).show()
-                }
+                runOnUiThread { onError(e) }
             }
         }.start()
     }
 
-    private fun getRealPathFromUri(uri: Uri): String {
-        var filePath = ""
-        val cursor = this@AdicionarProduto.contentResolver.query(uri, null, null, null, null)
-        if (cursor != null) {
-            cursor.moveToFirst()
-            val idx = cursor.getColumnIndex(MediaStore.Images.ImageColumns.DATA)
-            filePath = cursor.getString(idx)
-            cursor.close()
+    private fun getFileFromUri(uri: Uri): File? {
+        return try {
+            val inputStream = contentResolver.openInputStream(uri)
+            val tempFile = File.createTempFile("gallery_image_", ".jpg", cacheDir)
+            inputStream?.use { input -> FileOutputStream(tempFile).use { output -> input.copyTo(output) } }
+            tempFile
+        } catch (e: Exception) {
+            e.printStackTrace()
+            null
         }
-        return filePath
     }
 
-
     private fun showImagePickerOptions() {
         val options = arrayOf("Tirar foto", "Escolher da galeria")
-
-        AlertDialog.Builder(this@AdicionarProduto)
-            .setTitle("Alterar foto de perfil")
+        AlertDialog.Builder(this)
+            .setTitle("Selecione uma opção")
             .setItems(options) { _, which ->
                 when (which) {
                     0 -> openCamera()
@@ -415,39 +480,12 @@ class AdicionarProduto : AppCompatActivity() {
     }
 
     private fun openGallery() {
-        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)
-        }
+        val intent = Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI)
+        startActivityForResult(intent, REQUEST_IMAGE_PICK)
     }
 
     private fun openCamera() {
-        if (ContextCompat.checkSelfPermission(this@AdicionarProduto, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED) {
-            val storageDir: File? = this@AdicionarProduto.getExternalFilesDir(Environment.DIRECTORY_PICTURES)
-            if (storageDir != null && !storageDir.exists()) {
-                storageDir.mkdirs()
-            }
-
-            val photoFile = File.createTempFile(
-                "profile_",
-                ".jpg",
-                storageDir
-            )
-
-            val photoURI: Uri = FileProvider.getUriForFile(
-                this@AdicionarProduto,
-                "${this@AdicionarProduto.packageName}.provider",
-                photoFile
-            )
-
-            val takePictureIntent = Intent(MediaStore.ACTION_IMAGE_CAPTURE)
-            takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, photoUri)
-            startActivityForResult(takePictureIntent, REQUEST_IMAGE_CAPTURE)
-        } else {
-            requestCameraPermissionLauncher.launch(Manifest.permission.CAMERA)
-        }
+        val takePictureIntent = Intent(MediaStore.ACTION_IMAGE_CAPTURE)
+        startActivityForResult(takePictureIntent, REQUEST_IMAGE_CAPTURE)
     }
 }
\ No newline at end of file
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 abe1dd2..8564449 100644
--- a/app/src/main/java/com/example/projetosaveit/ui/CadastroEndereco.kt
+++ b/app/src/main/java/com/example/projetosaveit/ui/CadastroEndereco.kt
@@ -98,9 +98,8 @@ class CadastroEndereco : AppCompatActivity() {
                                         Toast.LENGTH_SHORT
                                     ).show()
                                     val intent = Intent(this, MainActivity::class.java)
-                                    intent.putExtra("plano", 1)
+                                    intent.putExtra("plano", 0)
                                     intent.putExtra("tipoFunc", false)
-                                    intent.putExtra("isEmpresa", true)
                                     startActivity(intent)
                                     finish()
                                 }
diff --git a/app/src/main/java/com/example/projetosaveit/ui/Chatbot.kt b/app/src/main/java/com/example/projetosaveit/ui/Chatbot.kt
index e0f7179..174076a 100644
--- a/app/src/main/java/com/example/projetosaveit/ui/Chatbot.kt
+++ b/app/src/main/java/com/example/projetosaveit/ui/Chatbot.kt
@@ -25,10 +25,7 @@ class Chatbot : AppCompatActivity() {
 
         drawerLayout = findViewById(R.id.drawerLayout)
 
-        val btMenu = findViewById<ImageButton>(R.id.btMenu)
-        btMenu.setOnClickListener {
-            drawerLayout.openDrawer(GravityCompat.START)
-        }
+//ac
     }
 
     override fun onBackPressed() {
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 8cd6e56..b9e448a 100644
--- a/app/src/main/java/com/example/projetosaveit/ui/MainActivity.kt
+++ b/app/src/main/java/com/example/projetosaveit/ui/MainActivity.kt
@@ -1,17 +1,21 @@
 package com.example.projetosaveit.ui
 
+import android.content.Intent
 import android.os.Bundle
 import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
 import androidx.navigation.Navigation.findNavController
 import androidx.navigation.ui.NavigationUI.setupWithNavController
 import com.example.projetosaveit.R
+import com.example.projetosaveit.api.repository.VitrineRepository
 import com.example.projetosaveit.databinding.ActivityMainBinding
+//import com.example.projetosaveit.service.VitrineForegroundService
 import com.example.projetosaveit.ui.toolbar.ToolbarFactory
 import com.google.android.material.bottomnavigation.BottomNavigationView
 
 class MainActivity : AppCompatActivity() {
     private var binding: ActivityMainBinding? = null
+    private val repositoryVitrine = VitrineRepository()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -42,5 +46,12 @@ class MainActivity : AppCompatActivity() {
                 navController.navigate(R.id.navigation_vitrine)
             }
         }
+//
+//        val serviceIntent = Intent(this, VitrineForegroundService::class.java)
+//        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+//            startForegroundService(serviceIntent)
+//        } else {
+//            startService(serviceIntent)
+//        }
     }
 }
\ 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 3aeda60..c280bee 100644
--- a/app/src/main/java/com/example/projetosaveit/ui/MinhaVitrine.kt
+++ b/app/src/main/java/com/example/projetosaveit/ui/MinhaVitrine.kt
@@ -50,8 +50,10 @@ class MinhaVitrine : AppCompatActivity() {
         }
 
         val recycleView = findViewById<androidx.recyclerview.widget.RecyclerView>(R.id.minhaVitrineRc)
+        recycleView.layoutManager = androidx.recyclerview.widget.GridLayoutManager(this, 2)
         recycleView.adapter = adapter
 
+
         findViewById<ImageView>(R.id.btVoltarMinhaVitrine).setOnClickListener {
             finish()
         }
@@ -65,12 +67,14 @@ class MinhaVitrine : AppCompatActivity() {
                 response: retrofit2.Response<List<Vitrine>>
             ) {
                 if (response.isSuccessful) {
-                    val produtos = response.body()
-                    adapter.listVitrine = produtos ?: emptyList()
-                    if (adapter.listVitrine.isEmpty()) {
-                        Toast.makeText(this@MinhaVitrine, "Vitrine vazia.", Toast.LENGTH_SHORT).show()
+                    val produtos = response.body() ?: emptyList()
+                    runOnUiThread {
+                        adapter.listVitrine = produtos
+                        adapter.notifyDataSetChanged()
+                        if (produtos.isEmpty()) {
+                            Toast.makeText(this@MinhaVitrine, "Vitrine vazia.", Toast.LENGTH_SHORT).show()
+                        }
                     }
-                    adapter.notifyDataSetChanged()
                 } else {
                     Toast.makeText(this@MinhaVitrine, "Erro ao obter vitrine.", Toast.LENGTH_SHORT).show()
                 }
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 0aa146b..db133f7 100644
--- a/app/src/main/java/com/example/projetosaveit/ui/TelaEstoque.kt
+++ b/app/src/main/java/com/example/projetosaveit/ui/TelaEstoque.kt
@@ -1,5 +1,6 @@
 package com.example.projetosaveit.ui
 
+import android.media.Image
 import android.os.Bundle
 import android.util.Log
 import android.widget.ProgressBar
@@ -15,12 +16,14 @@ import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import com.bumptech.glide.Glide
 import com.example.projetosaveit.R
+import android.widget.ImageView
 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.github.mikephil.charting.formatter.IndexAxisValueFormatter
 import com.google.firebase.auth.FirebaseAuth
 import retrofit2.Call
 import retrofit2.Response
@@ -82,14 +85,18 @@ class TelaEstoque : AppCompatActivity() {
             GetEmpresa.pegarEmailEmpresa(objAutenticar.currentUser?.email!!) { empresa ->
                 if (empresa != null) {
                     enterpriseId  = empresa.id
+                    getRelatorioProduto(idProduto, empresa.id)
                 }
             }
 
+            (findViewById<ImageView>(R.id.imgSetaVoltarEstoque)).setOnClickListener { v->
+                finish()
+            }
         }
     }
 
     private fun getRelatorioProduto(productId : Long, enterpriseId : Long) {
-        repository.getRelatorioProduto(productId, enterpriseId).enqueue(object : retrofit2.Callback<List<RelatorioProdutoDTO>> {
+        repository.getRelatorioProduto(enterpriseId, productId).enqueue(object : retrofit2.Callback<List<RelatorioProdutoDTO>> {
             override fun onResponse(
                 p0: Call<List<RelatorioProdutoDTO>?>,
                 p1: Response<List<RelatorioProdutoDTO>?>
@@ -120,32 +127,44 @@ class TelaEstoque : AppCompatActivity() {
     private fun mostrarGrafico(dados: List<RelatorioProdutoDTO>) {
         val barChart = findViewById<BarChart>(R.id.barChart)
 
-        val entradasInput = ArrayList<BarEntry>()
-        val entradasOutput = ArrayList<BarEntry>()
+        // Converte os dados da API em entradas para o gráfico
+        val entradas = ArrayList<BarEntry>()
+        val labels = ArrayList<String>()
 
         for ((index, item) in dados.withIndex()) {
-            entradasInput.add(BarEntry(index.toFloat(), item.mouthInput.toFloat()))
-            entradasOutput.add(BarEntry(index.toFloat(), item.totalOutput.toFloat()))
+            // item.mouthInput é o eixo X (mês)
+            // item.totalOutput é o valor Y (quantidade)
+            entradas.add(BarEntry(index.toFloat(), item.totalOutput.toFloat()))
+            labels.add(item.mouthInput.toString()) // usado como rótulo do eixo X
         }
 
-        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
+        // Cria o dataset (conjunto de barras)
+        val dataSet = BarDataSet(entradas, "Saída de Produtos")
+        dataSet.color = getColor(R.color.VerdeEscuro)
+        dataSet.valueTextSize = 12f
 
+        val data = BarData(dataSet)
         barChart.data = data
 
+        // Configurações visuais do gráfico
+        barChart.description.isEnabled = false
+        barChart.axisRight.isEnabled = false
+        barChart.setDrawGridBackground(false)
+        barChart.animateY(1500)
+        barChart.setFitBars(true)
+
+        // Configuração do eixo X
         val xAxis = barChart.xAxis
         xAxis.position = XAxis.XAxisPosition.BOTTOM
         xAxis.granularity = 1f
         xAxis.setDrawGridLines(false)
+        xAxis.valueFormatter = IndexAxisValueFormatter(labels)
+
+        // Configuração do eixo Y
+        barChart.axisLeft.axisMinimum = 0f
 
-        barChart.groupBars(0f, 0.4f, 0.05f)
-        barChart.invalidate()
+        barChart.invalidate() // atualiza o gráfico
     }
 
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/projetosaveit/ui/VisaoGeralEstoque.kt b/app/src/main/java/com/example/projetosaveit/ui/VisaoGeralEstoque.kt
new file mode 100644
index 0000000..f65e091
--- /dev/null
+++ b/app/src/main/java/com/example/projetosaveit/ui/VisaoGeralEstoque.kt
@@ -0,0 +1,204 @@
+package com.example.projetosaveit.ui
+
+import android.os.Bundle
+import android.util.Log
+import android.view.LayoutInflater
+import android.widget.LinearLayout
+import android.widget.ProgressBar
+import android.widget.TextView
+import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import com.example.projetosaveit.R
+import com.example.projetosaveit.adapter.recycleView.ProdutoEstoqueRelatorio
+import com.example.projetosaveit.adapter.recycleView.Venda
+import com.example.projetosaveit.api.repository.EstoqueRepository
+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 VisaoGeralEstoque : AppCompatActivity() {
+
+    private lateinit var containerProdutos: LinearLayout
+    private lateinit var containerTabela: LinearLayout
+    val objAutenticar: FirebaseAuth = FirebaseAuth.getInstance()
+    var idEmpresa: Long = 0
+    val repository : EstoqueRepository = EstoqueRepository()
+
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val emailEmpresa = objAutenticar.currentUser!!.email.toString()
+
+
+        setContentView(R.layout.activity_visao_geral_estoque)
+
+        containerProdutos = findViewById(R.id.containerProdutos)
+
+        containerTabela = findViewById(R.id.containerTabela)
+
+
+        GetEmpresa.pegarEmailEmpresa(emailEmpresa) { empresa ->
+            if ((empresa != null)&&(empresa.id.toInt() != 0)) {
+                idEmpresa = empresa.id
+                pegarProdutosPorEmpresa(idEmpresa)
+                getMovimentacoesProduto(idEmpresa)
+            }else {
+                GetFuncionario.pegarEmailFunc(emailEmpresa) { funcionario ->
+                    if ((funcionario != null )&&(funcionario!!.id.toInt() != 0)) {
+                        idEmpresa = funcionario!!.enterpriseId
+                        pegarProdutosPorEmpresa(idEmpresa)
+                        getMovimentacoesProduto(idEmpresa)
+                    }else {
+                        Toast.makeText(this@VisaoGeralEstoque, "não foi possivel pegar o id do usuario", Toast.LENGTH_LONG).show()
+                    }
+                }
+            }
+        }
+
+    }
+
+
+    private fun atualizarProgresso(produtos: List<ProdutoEstoqueRelatorio>?) {
+        val inflater = LayoutInflater.from(this)
+        containerProdutos.removeAllViews()
+
+        produtos?.forEach { produto ->
+            val view = inflater.inflate(R.layout.item_progress_bar, containerProdutos, false)
+
+            val nome = view.findViewById<TextView>(R.id.txtNomeProduto)
+            val percentual = view.findViewById<TextView>(R.id.txtPercentual)
+            val progress = view.findViewById<ProgressBar>(R.id.progressBar)
+
+            nome.text = produto.productName
+            val porcentagem = (produto.quantity.toDouble() / produto.maxQuantity * 100)
+            percentual.text = String.format("%.1f%%", porcentagem)
+            progress.progress = produto.quantity.toInt()
+            progress.max = produto.maxQuantity.toInt()
+
+            containerProdutos.addView(view)
+        }
+    }
+
+
+
+    private fun montarTabela(vendas: List<Venda>) {
+        val inflater = LayoutInflater.from(this)
+
+        val header = LinearLayout(this).apply {
+            orientation = LinearLayout.HORIZONTAL
+            setBackgroundColor(0xFF3E5C42.toInt())
+            setPadding(16, 12, 16, 12)
+        }
+
+
+        val headerParams = LinearLayout.LayoutParams(
+            LinearLayout.LayoutParams.MATCH_PARENT,
+            LinearLayout.LayoutParams.WRAP_CONTENT
+        )
+        val scale = resources.displayMetrics.density
+        val marginTopInPx = (24 * scale + 0.5f).toInt()
+        val marginLeftRightPx = (60 * scale + 0.5f).toInt()
+        headerParams.setMargins(marginLeftRightPx, marginTopInPx, marginLeftRightPx, 0)
+        header.layoutParams = headerParams
+
+        val txtNomeHeader = TextView(this).apply {
+            text = "Nome"
+            setTextColor(0xFFFFFFFF.toInt())
+            textSize = 16f
+            layoutParams = LinearLayout.LayoutParams(0, LinearLayout.LayoutParams.WRAP_CONTENT, 1f)
+        }
+
+        val txtVendasHeader = TextView(this).apply {
+            text = "Vendas"
+            setTextColor(0xFFFFFFFF.toInt())
+            textSize = 16f
+        }
+
+        header.addView(txtNomeHeader)
+        header.addView(txtVendasHeader)
+        containerTabela.addView(header)
+
+        vendas.forEachIndexed { index, venda ->
+            val linha = inflater.inflate(R.layout.item_tabela_venda, containerTabela, false)
+            val nome = linha.findViewById<TextView>(R.id.txtNomeProduto)
+            val qtd = linha.findViewById<TextView>(R.id.txtVendas)
+
+            nome.text = venda.productName
+            qtd.text = venda.quantityOutput
+
+            if (index % 2 == 0) {
+                linha.setBackgroundResource(R.color.Verde)
+            } else {
+                linha.setBackgroundResource(R.color.Verde50)
+            }
+
+            containerTabela.addView(linha)
+        }
+
+    }
+
+    private fun pegarProdutosPorEmpresa(idEmpresa : Long) {
+        repository.getQuantidadesProduto(idEmpresa).enqueue(object : retrofit2.Callback<List<ProdutoEstoqueRelatorio>>{
+            override fun onResponse(
+                p0: Call<List<ProdutoEstoqueRelatorio>?>,
+                p1: Response<List<ProdutoEstoqueRelatorio>?>
+            ) {
+                if (p1.isSuccessful) {
+                    atualizarProgresso(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@VisaoGeralEstoque, errorBodyString ?: "Erro desconhecido", Toast.LENGTH_LONG).show()
+                }
+            }
+
+            override fun onFailure(
+                p0: Call<List<ProdutoEstoqueRelatorio>?>,
+                p1: Throwable
+            ) {
+                Toast.makeText(this@VisaoGeralEstoque, "Erro na requisição: " + p1.message, Toast.LENGTH_LONG).show()
+            }
+
+
+        })
+    }
+
+    fun getMovimentacoesProduto(idEmprea : Long) {
+        repository.getMovimentacoesProduto(idEmprea).enqueue(object : retrofit2.Callback<List<Venda>>{
+            override fun onResponse(
+                p0: Call<List<Venda>?>,
+                p1: Response<List<Venda>?>
+            ) {
+                if(p1.isSuccessful) {
+                    montarTabela(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@VisaoGeralEstoque, errorBodyString ?: "Erro desconhecido", Toast.LENGTH_LONG).show()
+                }
+            }
+
+            override fun onFailure(
+                p0: Call<List<Venda>?>,
+                p1: Throwable
+            ) {
+                Toast.makeText(this@VisaoGeralEstoque, "Erro na requisição: " + p1.message, Toast.LENGTH_LONG).show()
+            }
+
+        })
+    }
+
+}
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 e0431b0..c87c612 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
@@ -16,6 +16,8 @@ import com.example.projetosaveit.api.repository.LoteRepository
 import com.example.projetosaveit.databinding.FragmentHomeBinding
 import com.example.projetosaveit.model.EmpresaDTO
 import com.example.projetosaveit.ui.AdicionarProduto
+import com.example.projetosaveit.ui.VisaoGeralEstoque
+import com.example.projetosaveit.util.GetFuncionario
 import com.google.firebase.auth.FirebaseAuth
 import retrofit2.Call
 import retrofit2.Response
@@ -49,7 +51,13 @@ class HomeFragment : Fragment() {
                 idEmpresa = empresa.id
                 carregarProdutos(idEmpresa)
             }else {
-                Toast.makeText(context, "não conseguiu pegar o id da empresa", Toast.LENGTH_LONG).show()
+                GetFuncionario.pegarEmailFunc(emailEmp) { funcionario ->
+                    if ((funcionario != null )&&(funcionario!!.id.toInt() != 0)) {
+                        idEmpresa = funcionario!!.enterpriseId
+                    }else {
+                        Toast.makeText(context, "não foi possivel pegar o id do usuario", Toast.LENGTH_LONG).show()
+                    }
+                }
             }
         }
 
@@ -58,6 +66,11 @@ class HomeFragment : Fragment() {
             startActivity(intent)
         }
 
+        binding!!.button7.setOnClickListener { v->
+            val intent : Intent = Intent(context, VisaoGeralEstoque::class.java)
+            startActivity(intent)
+        }
+
 
         return root
     }
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 1932f40..ea18680 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
@@ -1,11 +1,13 @@
 package com.example.projetosaveit.ui.perfil
 
 import android.Manifest
+import android.app.Activity
 import android.content.ContentValues
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.graphics.Bitmap
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
 import android.os.Environment
 import android.provider.MediaStore
@@ -18,6 +20,7 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
 import android.widget.Toast
+import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
@@ -31,6 +34,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.AdicionarProduto
 import com.example.projetosaveit.ui.Chatbot
 import com.example.projetosaveit.ui.ConfiguracoesPerfil
 import com.example.projetosaveit.util.GetEmpresa
@@ -50,9 +54,13 @@ class Perfil : Fragment() {
     val repository : ImagemRepository = ImagemRepository()
     val repositoryEmpresa : EmpresaRepository = EmpresaRepository()
     var idEmpresa : Long = 0
+    var imagemAtual : String = ""
+
+    private lateinit var pickImageLauncher: ActivityResultLauncher<Intent>
+    private lateinit var permissionLauncher: ActivityResultLauncher<String>
+    private val REQUEST_IMAGE_PICK = 1001
 
     private val REQUEST_IMAGE_CAPTURE = 1
-    private val REQUEST_IMAGE_PICK = 2
     private val CAMERA_REQUEST_CODE = 100
     private var photoUri: Uri? = null
     private val requestCameraPermissionLauncher =
@@ -76,6 +84,28 @@ class Perfil : Fragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+
+        pickImageLauncher = registerForActivityResult(
+            ActivityResultContracts.StartActivityForResult()
+        ) { result ->
+            if (result.resultCode == Activity.RESULT_OK) {
+                val imageUri = result.data?.data
+                if (imageUri != null) {
+                    Toast.makeText(requireContext(), "Imagem selecionada!", Toast.LENGTH_SHORT).show()
+                }
+            }
+        }
+
+        // Configura o launcher de permissão
+        permissionLauncher = registerForActivityResult(
+            ActivityResultContracts.RequestPermission()
+        ) { granted ->
+            if (granted) {
+                openGallery()
+            } else {
+                Toast.makeText(requireContext(), "Permissão negada!", Toast.LENGTH_SHORT).show()
+            }
+        }
     }
 
 
@@ -215,21 +245,29 @@ class Perfil : Fragment() {
 
                 REQUEST_IMAGE_PICK -> {
                     val selectedImageUri = data?.data
-                    val file = File(getRealPathFromUri(selectedImageUri!!))
-                    uploadToCloudinary(file,
-                        onSuccess = { url ->
-                            Glide.with(this)
-                                .load(url)
-                                .circleCrop()
-                                .into(avatar!!)
-
-                            Toast.makeText(requireContext(), "Foi inserido com sucesso!", Toast.LENGTH_SHORT).show()
-                        },
-                        onError = { e ->
-                            Toast.makeText(requireContext(), "Erro no upload: ${e.message}", Toast.LENGTH_SHORT).show()
+                    if (selectedImageUri != null) {
+                        val file = getFileFromUri(selectedImageUri)
+                        if (file != null) {
+                            uploadToCloudinary(file,
+                                onSuccess = { url ->
+                                    val avatar = view?.findViewById<ImageView>(R.id.imagemPerfil)
+                                    Glide.with(this)
+                                        .load(url)
+                                        .circleCrop()
+                                        .into(avatar!!)
+
+                                    Toast.makeText(requireContext(), "Imagem enviada com sucesso!", Toast.LENGTH_SHORT).show()
+                                },
+                                onError = { e ->
+                                    Toast.makeText(requireContext(), "Erro no upload: ${e.message}", Toast.LENGTH_SHORT).show()
+                                }
+                            )
+                        } else {
+                            Toast.makeText(requireContext(), "Erro ao processar imagem", Toast.LENGTH_SHORT).show()
                         }
-                    )
+                    }
                 }
+
             }
         }
     }
@@ -238,6 +276,7 @@ class Perfil : Fragment() {
         Thread {
             try {
                 Log.d(ContentValues.TAG, "inserindo")
+                destroyFromCloudinary(imagemAtual)
                 val result = cloudinary.uploader().upload(file, ObjectUtils.emptyMap());
                 var url = result["secure_url"] as String
                 imagePublicId = result["public_id"] as String
@@ -274,12 +313,37 @@ class Perfil : Fragment() {
             .setItems(options) { _, which ->
                 when (which) {
                     0 -> openCamera()
-                    1 -> openGallery()
+                    1 -> requestGalleryPermission()
                 }
             }
             .show()
     }
 
+    private fun getFileFromUri(uri: Uri): File? {
+        return try {
+            val inputStream = requireContext().contentResolver.openInputStream(uri)
+            val tempFile = File.createTempFile("selectedImage_", ".jpg", requireContext().cacheDir)
+            inputStream?.use { input ->
+                tempFile.outputStream().use { output ->
+                    input.copyTo(output)
+                }
+            }
+            tempFile
+        } catch (e: Exception) {
+            e.printStackTrace()
+            null
+        }
+    }
+
+
+    private fun requestGalleryPermission() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            permissionLauncher.launch(Manifest.permission.READ_MEDIA_IMAGES)
+        } else {
+            permissionLauncher.launch(Manifest.permission.READ_EXTERNAL_STORAGE)
+        }
+    }
+
     private fun openGallery() {
         val intent = Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI)
         startActivityForResult(intent, REQUEST_IMAGE_PICK)
@@ -319,11 +383,11 @@ class Perfil : Fragment() {
                 response: retrofit2.Response<com.example.projetosaveit.model.EmpresaDTO>
             ) {
                 if (response.isSuccessful) {
-                    val imagemUrl = response.body()?.enterpriseImage
+                    imagemAtual = response.body()!!.enterpriseImage
                     val avatar = view?.findViewById<ImageView>(R.id.imagemPerfil)
-                    if (!imagemUrl.isNullOrEmpty()) {
+                    if (!imagemAtual.isNullOrEmpty()) {
                         Glide.with(requireContext())
-                            .load(imagemUrl)
+                            .load(imagemAtual)
                             .circleCrop()
                             .into(avatar!!)
                     }
@@ -356,19 +420,31 @@ class Perfil : Fragment() {
         })
     }
 
-    fun deleteImageFromCloudinary(publicId: String, onSuccess: () -> Unit, onError: (Exception) -> Unit) {
+    private fun destroyFromCloudinary(publicId: String) {
         Thread {
             try {
                 val result = cloudinary.uploader().destroy(publicId, ObjectUtils.emptyMap())
+                Log.d("Cloudinary", "Delete result: $result")
+
                 requireActivity().runOnUiThread {
-                    onSuccess()
+                    Toast.makeText(
+                        requireContext(),
+                        "Resultado: ${result["result"]}",
+                        Toast.LENGTH_SHORT
+                    ).show()
                 }
+
             } catch (e: Exception) {
                 requireActivity().runOnUiThread {
-                    onError(e)
+                    Toast.makeText(
+                        requireContext(),
+                        "Não foi possível excluir a imagem: ${e.message}",
+                        Toast.LENGTH_SHORT
+                    ).show()
                 }
             }
         }.start()
     }
 
+
 }
\ No newline at end of file
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 f38571d..c79c697 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
@@ -17,6 +17,7 @@ import com.example.projetosaveit.api.repository.VitrineRepository
 import com.example.projetosaveit.databinding.FragmentVitrineBinding
 import com.example.projetosaveit.ui.AdicionarProdutoVitrine
 import com.example.projetosaveit.ui.CadastroEndereco
+import com.example.projetosaveit.ui.MinhaVitrine
 import com.example.projetosaveit.util.GetEmpresa
 import com.example.projetosaveit.util.GetFuncionario
 import com.google.firebase.auth.FirebaseAuth
@@ -53,7 +54,7 @@ class VitrineFragment : Fragment() {
             carregarVitrine("Todos")
         }
 
-        val botoes = listOf(binding!!.todosFiltro, binding!!.embutidosFiltro, binding!!.lacticiniosFiltro, binding!!.graosFIltro, binding!!.frutasFiltro, binding!!.salgadosFiltro)
+        val botoes = listOf(binding!!.todosFiltro, binding!!.embutidosFiltro, binding!!.lacticiniosFiltro, binding!!.graosFIltro, binding!!.frutasFiltro, binding!!.salgadosFiltro, binding!!.docesFiltro, binding!!.bebidasFiltro)
 
         botoes.forEach { botao ->
             botao?.setOnClickListener {
@@ -75,6 +76,11 @@ class VitrineFragment : Fragment() {
             startActivity(intent)
         }
 
+        binding!!.botaoMinhaVitrine?.setOnClickListener { v ->
+            val intent : Intent = Intent(v.context, MinhaVitrine::class.java)
+            startActivity(intent)
+        }
+
         adapter = AdapterVitrine()
 
         binding!!.rvVitrine.adapter = adapter
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 6286134..b724d5b 100644
--- a/app/src/main/res/layout-sw600dp/activity_adicionar_produto.xml
+++ b/app/src/main/res/layout-sw600dp/activity_adicionar_produto.xml
@@ -99,22 +99,34 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:layout_marginLeft="100dp"
+                    android:layout_marginLeft="40dp"
                     android:fontFamily="@font/inclusive_sans"
                     android:text="Insira a imagem aqui"
                     android:textColor="@color/PretoNaoPuro"
                     android:textSize="24sp" />
 
-                <ImageView
-                    android:id="@+id/imagemProdutoInput"
-                    android:layout_width="275dp"
-                    android:layout_height="175dp"
-                    android:layout_gravity="end"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginRight="100dp"
-                    android:layout_weight="1"
-                    android:scaleType="fitEnd"
-                    tools:srcCompat="@android:drawable/ic_menu_add" />
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <ImageView
+                        android:id="@+id/imageView14"
+                        android:layout_width="234dp"
+                        android:layout_height="162dp"
+                        tools:srcCompat="@android:drawable/ic_menu_add" />
+
+                    <ImageView
+                        android:id="@+id/imagemProdutoInput"
+                        android:layout_width="200dp"
+                        android:layout_height="160dp"
+                        android:layout_gravity="end"
+                        android:layout_marginLeft="20dp"
+                        android:layout_marginRight="40dp"
+                        android:layout_weight="1"
+                        android:scaleType="fitEnd"
+                        app:srcCompat="@android:drawable/ic_menu_add" />
+                </FrameLayout>
+
             </LinearLayout>
 
             <com.google.android.material.textfield.TextInputEditText
@@ -126,28 +138,29 @@
                 android:layout_marginBottom="10dp"
                 android:background="@drawable/caixa_texto"
                 android:fontFamily="@font/inclusive_sans"
+                android:gravity="center_vertical"
                 android:hint="Digite o nome do produto"
                 android:paddingLeft="10dp"
                 android:textColor="@color/PretoNaoPuro"
                 android:textColorHint="@color/PlaceHolderColor"
-                android:textSize="18sp" />
+                android:textSize="20sp" />
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/descricaoProdutoInput"
-                android:layout_width="505dp"
-                android:layout_height="247dp"
+                android:layout_width="500dp"
+                android:layout_height="200dp"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginTop="10dp"
                 android:layout_marginBottom="10dp"
                 android:background="@drawable/caixa_texto"
                 android:fontFamily="@font/inclusive_sans"
-                android:gravity="top"
+                android:gravity="clip_horizontal"
                 android:hint="Digite a descrição do produto"
                 android:paddingLeft="10dp"
                 android:paddingTop="5dp"
                 android:textColor="@color/PretoNaoPuro"
                 android:textColorHint="@color/PlaceHolderColor"
-                android:textSize="18sp" />
+                android:textSize="20sp" />
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/marcaProdutoInput"
@@ -158,13 +171,14 @@
                 android:layout_marginBottom="10dp"
                 android:background="@drawable/caixa_texto"
                 android:fontFamily="@font/inclusive_sans"
+                android:gravity="center_vertical"
                 android:hint="Digite a marca do produto"
                 android:paddingLeft="10dp"
                 android:textColor="@color/PretoNaoPuro"
                 android:textColorHint="@color/PlaceHolderColor"
-                android:textSize="18sp" />
+                android:textSize="20sp" />
 
-            <com.google.android.material.textfield.TextInputEditText
+            <EditText
                 android:id="@+id/quantidadeProdutoInput"
                 android:layout_width="505dp"
                 android:layout_height="50dp"
@@ -172,12 +186,48 @@
                 android:layout_marginTop="10dp"
                 android:layout_marginBottom="10dp"
                 android:background="@drawable/caixa_texto"
-                android:fontFamily="@font/inclusive_sans"
+                android:ems="10"
                 android:hint="Digite a quantidade em estoque"
+                android:inputType="number"
+                android:paddingStart="10dp"
+                android:textColor="@color/PretoNaoPuro"
+                android:textColorHighlight="@color/PretoNaoPuro"
+                android:textColorHint="@color/PlaceHolderColor"
+                android:textSize="20sp" />
+
+            <EditText
+                android:id="@+id/quantidadeMaximaProdutoInput"
+                android:layout_width="505dp"
+                android:layout_height="50dp"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="10dp"
+                android:background="@drawable/caixa_texto"
+                android:ems="10"
+                android:hint="Digite a quantidade maxima em estoque"
+                android:inputType="number"
+                android:paddingStart="10dp"
+                android:textColor="@color/PretoNaoPuro"
+                android:textColorHighlight="@color/PretoNaoPuro"
+                android:textColorHint="@color/PlaceHolderColor"
+                android:textSize="20sp" />
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/categoriaProduto"
+                android:layout_width="505dp"
+                android:layout_height="50dp"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="10dp"
+                android:background="@drawable/caixa_texto"
+                android:focusable="false"
+                android:focusableInTouchMode="false"
+                android:fontFamily="@font/inclusive_sans"
+                android:hint="Digite a categoria do produto"
                 android:paddingLeft="10dp"
                 android:textColor="@color/PretoNaoPuro"
                 android:textColorHint="@color/PlaceHolderColor"
-                android:textSize="18sp" />
+                android:textSize="20sp" />
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/unidadeMedidaProdutoInput"
@@ -190,11 +240,12 @@
                 android:focusable="false"
                 android:focusableInTouchMode="false"
                 android:fontFamily="@font/inclusive_sans"
+                android:gravity="center_vertical"
                 android:hint="Digite a unidade de medida do produto"
                 android:paddingLeft="10dp"
                 android:textColor="@color/PretoNaoPuro"
                 android:textColorHint="@color/PlaceHolderColor"
-                android:textSize="18sp" />
+                android:textSize="20sp" />
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/skuProdutoInput"
@@ -205,14 +256,15 @@
                 android:layout_marginBottom="10dp"
                 android:background="@drawable/caixa_texto"
                 android:fontFamily="@font/inclusive_sans"
+                android:gravity="center_vertical"
                 android:hint="Digite a SKU do poduto"
                 android:paddingLeft="10dp"
                 android:textColor="@color/PretoNaoPuro"
                 android:textColorHint="@color/PlaceHolderColor"
-                android:textSize="18sp" />
+                android:textSize="20sp" />
 
             <EditText
-                android:id="@+id/validadeProdutoInput"
+                android:id="@+id/entradaProdutoInput"
                 android:layout_width="505dp"
                 android:layout_height="50dp"
                 android:layout_gravity="center_horizontal"
@@ -221,18 +273,18 @@
                 android:background="@drawable/caixa_texto"
                 android:clickable="true"
                 android:ems="10"
-                android:focusable="false"
                 android:focusableInTouchMode="false"
                 android:fontFamily="@font/inclusive_sans"
-                android:hint="Digite a data de validade do produto"
+                android:gravity="center_vertical"
+                android:hint="Digite a data de entrada do produto"
                 android:inputType="none"
                 android:paddingLeft="10dp"
                 android:textColor="@color/PretoNaoPuro"
                 android:textColorHint="@color/PlaceHolderColor"
-                android:textSize="18sp" />
+                android:textSize="20sp" />
 
             <EditText
-                android:id="@+id/entradaProdutoInput"
+                android:id="@+id/validadeProdutoInput"
                 android:layout_width="505dp"
                 android:layout_height="50dp"
                 android:layout_gravity="center_horizontal"
@@ -241,34 +293,36 @@
                 android:background="@drawable/caixa_texto"
                 android:clickable="true"
                 android:ems="10"
+                android:focusable="false"
                 android:focusableInTouchMode="false"
                 android:fontFamily="@font/inclusive_sans"
-                android:hint="Digite a data de entrada do produto"
+                android:gravity="center_vertical"
+                android:hint="Digite a data de validade do produto"
                 android:inputType="none"
                 android:paddingLeft="10dp"
                 android:textColor="@color/PretoNaoPuro"
                 android:textColorHint="@color/PlaceHolderColor"
-                android:textSize="18sp" />
+                android:textSize="20sp" />
 
             <Button
                 android:id="@+id/botaoCadastrarProduto"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="124dp"
+                android:layout_height="37dp"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginTop="10dp"
                 android:layout_marginBottom="20dp"
-                android:background="@drawable/bt_cadastro_estilizacao_tablet"
+                android:background="@drawable/bt_cadastro_estilizacao"
                 android:fontFamily="@font/inclusive_sans"
-                android:padding="20dp"
+                android:gravity="center"
                 android:text="Cadastrar"
                 android:textAllCaps="false"
                 android:textColor="@color/BrancoNaoPuro"
-                android:textSize="24sp" />
+                android:textSize="20sp" />
         </LinearLayout>
     </ScrollView>
 
     <ImageView
-        android:id="@+id/imageView20"
+        android:id="@+id/setaEsquerdaVoltarInserirProduto"
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_marginTop="12dp"
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 130cb2d..2a249e2 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
@@ -57,6 +57,7 @@
         app:layout_constraintVertical_bias="0.399" />
 
     <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rcProds"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_marginStart="1dp"
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 61f586f..fbde0fa 100644
--- a/app/src/main/res/layout-sw600dp/activity_configuracoes_perfil.xml
+++ b/app/src/main/res/layout-sw600dp/activity_configuracoes_perfil.xml
@@ -77,7 +77,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="40dp"
@@ -108,6 +108,7 @@
         </FrameLayout>
 
         <FrameLayout
+            android:id="@+id/FrameAlterarNome"
             android:layout_width="match_parent"
             android:layout_height="90dp"
             android:layout_marginHorizontal="16dp"
diff --git a/app/src/main/res/layout-sw600dp/activity_conversa.xml b/app/src/main/res/layout-sw600dp/activity_conversa.xml
index 52ac84c..aacb214 100644
--- a/app/src/main/res/layout-sw600dp/activity_conversa.xml
+++ b/app/src/main/res/layout-sw600dp/activity_conversa.xml
@@ -19,23 +19,28 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:layout_height="720dp"
         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/imageView14">
+        app:layout_constraintTop_toBottomOf="@+id/btVoltar"
+        app:layout_constraintVertical_bias="0.62">
 
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rvMensagens"
             android:layout_width="match_parent"
             android:layout_height="0dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="64dp"
+            android:layout_marginEnd="16dp"
             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.407"
-            tools:layout_editor_absoluteX="25dp" />
+            app:layout_constraintVertical_bias="0.407" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -85,12 +90,16 @@
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <ImageView
-        android:id="@+id/imageView14"
+        android:id="@+id/btVoltar"
         android:layout_width="40dp"
         android:layout_height="40dp"
-        android:layout_marginStart="32dp"
+        android:layout_marginTop="30dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.053"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/btVoltarMinhaVitrine"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.04000002"
         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_minha_vitrine.xml b/app/src/main/res/layout-sw600dp/activity_minha_vitrine.xml
index d07a593..6254501 100644
--- a/app/src/main/res/layout-sw600dp/activity_minha_vitrine.xml
+++ b/app/src/main/res/layout-sw600dp/activity_minha_vitrine.xml
@@ -43,18 +43,19 @@
         android:textSize="28sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.102"
+        app:layout_constraintHorizontal_bias="0.46"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/imageView37"
-        app:layout_constraintVertical_bias="0.052" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.356" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/minhaVitrineRc"
-        android:layout_width="391dp"
-        android:layout_height="582dp"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
         android:layout_marginStart="1dp"
-        android:layout_marginTop="1dp"
+        android:layout_marginTop="8dp"
         android:layout_marginEnd="1dp"
+        android:layout_marginBottom="50dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.502"
@@ -65,13 +66,13 @@
 
     <ImageView
         android:id="@+id/imageView39"
-        android:layout_width="150dp"
-        android:layout_height="150dp"
+        android:layout_width="167dp"
+        android:layout_height="164dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.471"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.218"
+        app:layout_constraintVertical_bias="0.204"
         app:srcCompat="@drawable/saveitlogo" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
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 bd2388f..5a424eb 100644
--- a/app/src/main/res/layout-sw600dp/activity_produto_vitrine.xml
+++ b/app/src/main/res/layout-sw600dp/activity_produto_vitrine.xml
@@ -37,7 +37,7 @@
                 tools:srcCompat="@tools:sample/backgrounds/scenic" />
 
             <TextView
-                android:id="@+id/nomeProdutoVitrine"
+                android:id="@+id/nomeProdutoVItrine"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="20dp"
diff --git a/app/src/main/res/layout-sw600dp/activity_tela_estoque.xml b/app/src/main/res/layout-sw600dp/activity_tela_estoque.xml
index bb8afa3..bb3d019 100644
--- a/app/src/main/res/layout-sw600dp/activity_tela_estoque.xml
+++ b/app/src/main/res/layout-sw600dp/activity_tela_estoque.xml
@@ -34,7 +34,7 @@
             </FrameLayout>
 
             <ImageView
-                android:id="@+id/imageView27"
+                android:id="@+id/imgSetaVoltarEstoque"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
                 android:layout_marginStart="20dp"
@@ -207,6 +207,7 @@
                 android:textSize="24sp" />
 
             <TextView
+                android:id="@+id/textView30"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="20dp"
diff --git a/app/src/main/res/layout-sw600dp/activity_visao_geral_estoque.xml b/app/src/main/res/layout-sw600dp/activity_visao_geral_estoque.xml
new file mode 100644
index 0000000..197578e
--- /dev/null
+++ b/app/src/main/res/layout-sw600dp/activity_visao_geral_estoque.xml
@@ -0,0 +1,82 @@
+<?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"
+    tools:context=".ui.VisaoGeralEstoque">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" >
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="240dp">
+
+                <ImageView
+                    android:id="@+id/imageView27"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center_horizontal"
+                    app:srcCompat="@drawable/onda_verde_claro_cinco" />
+
+                <ImageView
+                    android:id="@+id/imageView33"
+                    android:layout_width="match_parent"
+                    android:layout_height="156dp"
+                    android:layout_gravity="center_horizontal"
+                    app:srcCompat="@drawable/onda_verde_escura_cinco" />
+            </FrameLayout>
+
+            <ImageView
+                android:id="@+id/imageView22"
+                android:layout_width="34dp"
+                android:layout_height="34dp"
+                android:layout_margin="30dp"
+                app:srcCompat="@drawable/icon_seta_esquerda" />
+
+            <ImageView
+                android:id="@+id/imageView34"
+                android:layout_width="194dp"
+                android:layout_height="179dp"
+                android:layout_gravity="center_horizontal"
+                app:srcCompat="@drawable/saveitlogo" />
+
+            <TextView
+                android:id="@+id/textView11"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="8dp"
+                android:fontFamily="@font/plus_jakarta_sans_extralight"
+                android:text="Relatórios Gerais"
+                android:textSize="34sp" />
+
+
+            <LinearLayout
+                android:id="@+id/containerProdutos"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:layout_marginBottom="40dp"
+                android:orientation="vertical" />
+
+            <LinearLayout
+                android:id="@+id/containerTabela"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="50dp"
+                android:orientation="vertical" />
+
+        </LinearLayout>
+    </ScrollView>
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp/fragment_home.xml b/app/src/main/res/layout-sw600dp/fragment_home.xml
index 9af7038..08ecfe6 100644
--- a/app/src/main/res/layout-sw600dp/fragment_home.xml
+++ b/app/src/main/res/layout-sw600dp/fragment_home.xml
@@ -67,6 +67,7 @@
         android:layout_marginStart="1dp"
         android:layout_marginTop="10dp"
         android:layout_marginEnd="1dp"
+        android:layout_marginBottom="70dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="1.0"
diff --git a/app/src/main/res/layout-sw600dp/fragment_relatorio.xml b/app/src/main/res/layout-sw600dp/fragment_relatorio.xml
index 881d3c6..800f1b1 100644
--- a/app/src/main/res/layout-sw600dp/fragment_relatorio.xml
+++ b/app/src/main/res/layout-sw600dp/fragment_relatorio.xml
@@ -110,25 +110,573 @@
     <ScrollView
         android:layout_width="0dp"
         android:layout_height="0dp"
+        app:layout_constraintTop_toBottomOf="@+id/cardView2"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/cardView2">
+        app:layout_constraintEnd_toEndOf="parent">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center|top"
-            android:orientation="vertical">
+            android:gravity="center_horizontal"
+            android:orientation="vertical"
+            android:padding="8dp">
 
             <TableLayout
                 android:id="@+id/tableLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
                 android:background="@android:color/transparent"
-                android:padding="8dp"
-                android:stretchColumns="1,2,3,4"></TableLayout>
+                android:padding="4dp"
+                android:stretchColumns="1,2,3">
+
+                <!-- Janeiro -->
+                <TableRow
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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>
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        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:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/borda_cell"
+                        android:fontFamily="@font/inclusive_sans"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:text="000"
+                        android:textColor="@color/PretoNaoPuro" />
+                </TableRow>
+
+                <!-- Repita as TableRows abaixo, mantendo o mesmo padrão -->
+                <!-- Fevereiro, Março, Abril, etc. -->
+
+            </TableLayout>
         </LinearLayout>
     </ScrollView>
 
+
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-sw600dp/fragment_vitrine.xml b/app/src/main/res/layout-sw600dp/fragment_vitrine.xml
index b45b9f2..b0711b0 100644
--- a/app/src/main/res/layout-sw600dp/fragment_vitrine.xml
+++ b/app/src/main/res/layout-sw600dp/fragment_vitrine.xml
@@ -7,6 +7,176 @@
     android:background="@color/Branco"
     tools:context=".ui.vitrine.VitrineFragment">
 
+    <Button
+        android:id="@+id/botaoAdicionarVitrine"
+        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"
+        android:textAllCaps="false"
+        android:textColor="@color/BrancoNaoPuro"
+        android:textColorHighlight="@color/BrancoNaoPuro"
+        android:textSize="20sp"
+        app:layout_constraintBottom_toTopOf="@+id/rvVitrine"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.119"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.948" />
+
+    <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"
+        android:textAllCaps="false"
+        android:textColor="@color/BrancoNaoPuro"
+        android:textColorHighlight="@color/BrancoNaoPuro"
+        android:textSize="20sp"
+        app:layout_constraintBottom_toTopOf="@+id/rvVitrine"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.86"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.948" />
+
+    <HorizontalScrollView
+        android:id="@+id/horizontalScrollView"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        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.16000003">
+
+        <LinearLayout
+            android:id="@+id/linearLayout2"
+            android:layout_width="wrap_content"
+            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/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:padding="10dp"
+                android:text="Todos"
+                android:textAllCaps="false"
+                android:textColor="@color/BrancoNaoPuro"
+                android:textSize="24sp" />
+
+            <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:padding="10dp"
+                android:text="Embutidos"
+                android:textAllCaps="false"
+                android:textColor="@color/BrancoNaoPuro"
+                android:textSize="24sp" />
+
+            <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:padding="10dp"
+                android:text="Laticínios"
+                android:textAllCaps="false"
+                android:textColor="@color/BrancoNaoPuro"
+                android:textSize="24sp" />
+
+            <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:padding="10dp"
+                android:text="Grãos"
+                android:textAllCaps="false"
+                android:textColor="@color/BrancoNaoPuro"
+                android:textSize="24sp" />
+
+            <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:padding="10dp"
+                android:text="Frutas"
+                android:textAllCaps="false"
+                android:textColor="@color/BrancoNaoPuro"
+                android:textSize="24sp" />
+
+            <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:padding="10dp"
+                android:text="Salgados"
+                android:textAllCaps="false"
+                android:textColor="@color/BrancoNaoPuro"
+                android:textSize="24sp" />
+
+            <Button
+                android:id="@+id/docesFiltro"
+                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:padding="10dp"
+                android:text="Doces"
+                android:textAllCaps="false"
+                android:textColor="@color/BrancoNaoPuro"
+                android:textSize="24sp" />
+
+            <Button
+                android:id="@+id/bebidasFiltro"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:layout_weight="1"
+                android:background="@drawable/bt_filtro_estilizacao"
+                android:fontFamily="@font/inclusive_sans"
+                android:padding="10dp"
+                android:text="Bebidas"
+                android:textAllCaps="false"
+                android:textColor="@color/BrancoNaoPuro"
+                android:textSize="24sp" />
+
+        </LinearLayout>
+    </HorizontalScrollView>
+
     <TextView
         android:id="@+id/text_dashboard"
         android:layout_width="wrap_content"
@@ -16,13 +186,13 @@
         android:text="Vitrine Virtual"
         android:textAlignment="center"
         android:textColor="@color/PretoNaoPuro"
-        android:textSize="48sp"
+        android:textSize="34sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.081"
+        app:layout_constraintHorizontal_bias="0.068"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.041" />
+        app:layout_constraintVertical_bias="0.008" />
 
     <TextView
         android:id="@+id/textView26"
@@ -31,86 +201,29 @@
         android:fontFamily="@font/inclusive_sans"
         android:text="Categorias"
         android:textColor="@color/PretoNaoPuro"
-        android:textSize="34sp"
-        app:layout_constraintBottom_toTopOf="@+id/linearLayout2"
+        android:textSize="20sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.06"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text_dashboard"
-        app:layout_constraintVertical_bias="0.384" />
-
-    <LinearLayout
-        android:id="@+id/linearLayout2"
-        android:layout_width="0dp"
-        android:layout_height="100dp"
-        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_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.213">
-
-        <Button
-            android:id="@+id/todosFiltro"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_margin="10dp"
-            android:background="@drawable/bt_filtro_estilizacao_selecionado"
-            android:fontFamily="@font/inclusive_sans"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:text="Todos"
-            android:textAllCaps="false"
-            android:textColor="@color/BrancoNaoPuro"
-            android:textSize="24sp" />
-
-        <Button
-            android:id="@+id/embutidosFiltro"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_margin="10dp"
-            android:background="@drawable/bt_filtro_estilizacao"
-            android:fontFamily="@font/inclusive_sans"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:text="Embutidos"
-            android:textAllCaps="false"
-            android:textColor="@color/BrancoNaoPuro"
-            android:textSize="24sp" />
-
-        <Button
-            android:id="@+id/lacticiniosFiltro"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_margin="10dp"
-            android:background="@drawable/bt_filtro_estilizacao"
-            android:fontFamily="@font/inclusive_sans"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:text="Laticínios"
-            android:textAllCaps="false"
-            android:textColor="@color/BrancoNaoPuro"
-            android:textSize="24sp" />
-
-    </LinearLayout>
+        app:layout_constraintTop_toBottomOf="@+id/text_dashboard" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rvVitrine"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_marginStart="1dp"
-        android:layout_marginTop="5dp"
+        android:layout_marginTop="70dp"
         android:layout_marginEnd="1dp"
-        android:layout_marginBottom="1dp"
+        android:layout_marginBottom="60dp"
         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_constraintVertical_bias="0.0"
+        app:layout_constraintTop_toBottomOf="@+id/horizontalScrollView"
         app:spanCount="2"
-        tools:listitem="@layout/item_vitrine" />
+        tools:listitem="@layout/item_vitrine">
+
+    </androidx.recyclerview.widget.RecyclerView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp/item_progress_bar.xml b/app/src/main/res/layout-sw600dp/item_progress_bar.xml
new file mode 100644
index 0000000..dbd5b02
--- /dev/null
+++ b/app/src/main/res/layout-sw600dp/item_progress_bar.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginVertical="4dp"
+    android:layout_marginLeft="20dp"
+    android:layout_marginRight="20dp"
+    android:background="@android:color/transparent"
+    app:cardBackgroundColor="@android:color/transparent"
+    app:cardElevation="0dp"
+    app:useCompatPadding="false">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@android:color/transparent"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingVertical="8dp">
+
+        <TextView
+            android:id="@+id/txtNomeProduto"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="10dp"
+            android:layout_weight="1"
+            android:fontFamily="@font/inclusive_sans"
+            android:text="Produto"
+            android:textColor="#333333"
+            android:textSize="24sp" />
+
+        <TextView
+            android:id="@+id/txtPercentual"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="10dp"
+            android:text="80%"
+            android:textColor="#333333"
+            android:textSize="24sp" />
+
+        <ProgressBar
+            android:id="@+id/progressBar"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="320dp"
+            android:layout_height="24dp"
+            android:indeterminate="false"
+            android:max="100"
+            android:progressBackgroundTint="#303030"
+            android:progressDrawable="@drawable/progress_bar_rounded"
+            android:progressTint="@color/Verde" />
+    </LinearLayout>
+
+</androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout-sw600dp/item_tabela_venda.xml b/app/src/main/res/layout-sw600dp/item_tabela_venda.xml
new file mode 100644
index 0000000..1288ecd
--- /dev/null
+++ b/app/src/main/res/layout-sw600dp/item_tabela_venda.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="60dp"
+    android:layout_marginEnd="60dp"
+    android:background="@color/Verde"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    android:paddingHorizontal="16dp"
+    android:paddingVertical="10dp">
+
+    <TextView
+        android:id="@+id/txtNomeProduto"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:ellipsize="end"
+        android:fontFamily="@font/inclusive_sans"
+        android:singleLine="true"
+        android:text="Arroz"
+        android:textColor="#333333"
+        android:textSize="24sp" />
+
+    <TextView
+        android:id="@+id/txtVendas"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:fontFamily="@font/inclusive_sans"
+        android:text="25Kg"
+        android:textColor="#333333"
+        android:textSize="24sp" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/activity_adicionar_produto.xml b/app/src/main/res/layout/activity_adicionar_produto.xml
index cd337fc..3ca9bb5 100644
--- a/app/src/main/res/layout/activity_adicionar_produto.xml
+++ b/app/src/main/res/layout/activity_adicionar_produto.xml
@@ -72,6 +72,7 @@
         app:layout_constraintVertical_bias="0.335" />
 
     <ScrollView
+        android:id="@+id/scrollView2"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_marginStart="1dp"
@@ -103,16 +104,28 @@
                     android:textColor="@color/PretoNaoPuro"
                     android:textSize="16sp" />
 
-                <ImageView
-                    android:id="@+id/imagemProdutoInput"
-                    android:layout_width="191dp"
-                    android:layout_height="100dp"
-                    android:layout_gravity="end"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginRight="40dp"
-                    android:layout_weight="1"
-                    android:scaleType="fitEnd"
-                    tools:srcCompat="@android:drawable/ic_menu_add" />
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <ImageView
+                        android:id="@+id/imageView14"
+                        android:layout_width="191dp"
+                        android:layout_height="100dp"
+                        tools:srcCompat="@android:drawable/ic_menu_add" />
+
+                    <ImageView
+                        android:id="@+id/imagemProdutoInput"
+                        android:layout_width="191dp"
+                        android:layout_height="100dp"
+                        android:layout_gravity="end"
+                        android:layout_marginLeft="20dp"
+                        android:layout_marginRight="40dp"
+                        android:layout_weight="1"
+                        android:scaleType="fitEnd"
+                        app:srcCompat="@android:drawable/ic_menu_add" />
+                </FrameLayout>
+
             </LinearLayout>
 
             <com.google.android.material.textfield.TextInputEditText
@@ -308,14 +321,15 @@
     </ScrollView>
 
     <ImageView
-        android:id="@+id/btVoltarAdicaoProduto"
+        android:id="@+id/setaEsquerdaVoltarInserirProduto"
         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_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.042"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/imageView24"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.162"
         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_chatbot.xml b/app/src/main/res/layout/activity_chatbot.xml
index bd99323..0bcb621 100644
--- a/app/src/main/res/layout/activity_chatbot.xml
+++ b/app/src/main/res/layout/activity_chatbot.xml
@@ -114,12 +114,12 @@
         </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"
-        app:headerLayout="@layout/chat_drawer">
-    </com.google.android.material.navigation.NavigationView>
+<!--    <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_tela_estoque.xml b/app/src/main/res/layout/activity_tela_estoque.xml
index 20e1759..e1f6df7 100644
--- a/app/src/main/res/layout/activity_tela_estoque.xml
+++ b/app/src/main/res/layout/activity_tela_estoque.xml
@@ -39,7 +39,7 @@
             </FrameLayout>
 
             <ImageView
-                android:id="@+id/imageView27"
+                android:id="@+id/imgSetaVoltarEstoque"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="20dp"
@@ -225,8 +225,8 @@
                 android:textSize="14sp" />
 
             <TextView
-                android:id="@+id/textView17"
-                android:layout_width="wrap_content"
+                android:id="@+id/textView6"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="20dp"
                 android:layout_marginTop="20dp"
@@ -268,6 +268,17 @@
 
             </LinearLayout>
 
+            <TextView
+                android:id="@+id/textView17"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="20dp"
+                android:layout_marginTop="20dp"
+                android:fontFamily="@font/inclusive_sans"
+                android:text="Quantidade que saiu por mês"
+                android:textColor="@color/PlaceHolderColor"
+                android:textSize="14sp" />
+
             <com.github.mikephil.charting.charts.BarChart
                 android:id="@+id/barChart"
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_visao_geral_estoque.xml b/app/src/main/res/layout/activity_visao_geral_estoque.xml
new file mode 100644
index 0000000..4c8a1d5
--- /dev/null
+++ b/app/src/main/res/layout/activity_visao_geral_estoque.xml
@@ -0,0 +1,82 @@
+<?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"
+    tools:context=".ui.VisaoGeralEstoque">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" >
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <ImageView
+                    android:id="@+id/imageView27"
+                    android:layout_width="match_parent"
+                    android:layout_height="165dp"
+                    android:layout_gravity="center_horizontal"
+                    app:srcCompat="@drawable/onda_verde_claro_cinco" />
+
+                <ImageView
+                    android:id="@+id/imageView33"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    app:srcCompat="@drawable/onda_verde_escura_cinco" />
+            </FrameLayout>
+
+            <ImageView
+                android:id="@+id/imageView22"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="30dp"
+                app:srcCompat="@drawable/icon_seta_esquerda" />
+
+            <ImageView
+                android:id="@+id/imageView34"
+                android:layout_width="120dp"
+                android:layout_height="120dp"
+                android:layout_gravity="center_horizontal"
+                app:srcCompat="@drawable/saveitlogo" />
+
+            <TextView
+                android:id="@+id/textView11"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="8dp"
+                android:fontFamily="@font/plus_jakarta_sans_extralight"
+                android:text="Relatórios Gerais"
+                android:textSize="24sp" />
+
+
+            <LinearLayout
+                android:id="@+id/containerProdutos"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:layout_marginBottom="20dp"
+                android:orientation="vertical" />
+
+            <LinearLayout
+                android:id="@+id/containerTabela"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="50dp"
+                android:orientation="vertical" />
+
+        </LinearLayout>
+    </ScrollView>
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_card_view.xml b/app/src/main/res/layout/dialog_card_view.xml
index a543b0c..02f1b34 100644
--- a/app/src/main/res/layout/dialog_card_view.xml
+++ b/app/src/main/res/layout/dialog_card_view.xml
@@ -2,13 +2,16 @@
 <androidx.cardview.widget.CardView 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:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    app:cardCornerRadius="13dp">
+    android:layout_marginLeft="40dp"
+    android:layout_marginRight="40dp"
+    app:cardElevation="8dp"
+    app:cardCornerRadius="14dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="300dp"
-        android:layout_height="200dp"
+        android:layout_width="match_parent"
+        android:layout_height="150dp"
         android:background="@drawable/borda_dialog">
 
         <TextView
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index f0aa59f..28b7efd 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -68,6 +68,7 @@
         android:layout_marginStart="1dp"
         android:layout_marginTop="10dp"
         android:layout_marginEnd="1dp"
+        android:layout_marginBottom="40dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="1.0"
diff --git a/app/src/main/res/layout/fragment_vitrine.xml b/app/src/main/res/layout/fragment_vitrine.xml
index 7945d04..2e6c60b 100644
--- a/app/src/main/res/layout/fragment_vitrine.xml
+++ b/app/src/main/res/layout/fragment_vitrine.xml
@@ -7,6 +7,44 @@
     android:background="@color/Branco"
     tools:context=".ui.vitrine.VitrineFragment">
 
+    <Button
+        android:id="@+id/botaoAdicionarVitrine"
+        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"
+        android:textAllCaps="false"
+        android:textColor="@color/BrancoNaoPuro"
+        android:textColorHighlight="@color/BrancoNaoPuro"
+        app:layout_constraintBottom_toTopOf="@+id/rvVitrine"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.114"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.918" />
+
+    <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"
+        android:textAllCaps="false"
+        android:textColor="@color/BrancoNaoPuro"
+        android:textColorHighlight="@color/BrancoNaoPuro"
+        app:layout_constraintBottom_toTopOf="@+id/rvVitrine"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.855"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.918" />
+
     <TextView
         android:id="@+id/text_dashboard"
         android:layout_width="wrap_content"
@@ -128,57 +166,48 @@
                 android:textAllCaps="false"
                 android:textColor="@color/BrancoNaoPuro" />
 
+            <Button
+                android:id="@+id/docesFiltro"
+                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="Doces"
+                android:textAllCaps="false"
+                android:textColor="@color/BrancoNaoPuro" />
+
+            <Button
+                android:id="@+id/bebidasFiltro"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:layout_weight="1"
+                android:background="@drawable/bt_filtro_estilizacao"
+                android:fontFamily="@font/inclusive_sans"
+                android:text="Bebidas"
+                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_height="0dp"
         android:layout_marginStart="1dp"
-        android:layout_marginTop="98dp"
+        android:layout_marginTop="85dp"
         android:layout_marginEnd="1dp"
+        android:layout_marginBottom="64dp"
         app:layoutManager="androidx.recyclerview.widget.StaggeredGridLayoutManager"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/horizontalScrollView"
+        app:layout_constraintVertical_bias="0.0"
         app:spanCount="2"
         tools:listitem="@layout/item_vitrine" />
 
-    <Button
-        android:id="@+id/botaoAdicionarVitrine"
-        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"
-        android:textAllCaps="false"
-        android:textColor="@color/BrancoNaoPuro"
-        android:textColorHighlight="@color/BrancoNaoPuro"
-        app:layout_constraintBottom_toTopOf="@+id/rvVitrine"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.062"
-        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"
-        android:textAllCaps="false"
-        android:textColor="@color/BrancoNaoPuro"
-        android:textColorHighlight="@color/BrancoNaoPuro"
-        app:layout_constraintBottom_toTopOf="@+id/rvVitrine"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.902"
-        app:layout_constraintStart_toStartOf="parent" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_progress_bar.xml b/app/src/main/res/layout/item_progress_bar.xml
new file mode 100644
index 0000000..2d2fcb4
--- /dev/null
+++ b/app/src/main/res/layout/item_progress_bar.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginVertical="4dp"
+    android:layout_marginLeft="60dp"
+    android:layout_marginRight="60dp"
+    android:background="@android:color/transparent"
+    app:cardBackgroundColor="@android:color/transparent"
+    app:cardElevation="0dp"
+    app:useCompatPadding="false">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@android:color/transparent"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingVertical="8dp">
+
+        <TextView
+            android:id="@+id/txtNomeProduto"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="10dp"
+            android:layout_weight="1"
+            android:fontFamily="@font/inclusive_sans"
+            android:text="Produto"
+            android:textColor="#333333"
+            android:textSize="16sp" />
+
+        <TextView
+            android:id="@+id/txtPercentual"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="10dp"
+            android:text="80%"
+            android:textColor="#333333"
+            android:textSize="14sp" />
+
+        <ProgressBar
+            android:id="@+id/progressBar"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="150dp"
+            android:layout_height="12dp"
+            android:indeterminate="false"
+            android:max="100"
+            android:progressBackgroundTint="#303030"
+            android:progressDrawable="@drawable/progress_bar_rounded"
+            android:progressTint="@color/Verde" />
+    </LinearLayout>
+
+</androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/item_tabela_venda.xml b/app/src/main/res/layout/item_tabela_venda.xml
new file mode 100644
index 0000000..fc12603
--- /dev/null
+++ b/app/src/main/res/layout/item_tabela_venda.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="60dp"
+    android:layout_marginEnd="60dp"
+    android:background="@color/Verde"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    android:paddingHorizontal="16dp"
+    android:paddingVertical="10dp">
+
+    <TextView
+        android:id="@+id/txtNomeProduto"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:ellipsize="end"
+        android:fontFamily="@font/inclusive_sans"
+        android:singleLine="true"
+        android:text="Arroz"
+        android:textColor="#333333"
+        android:textSize="15sp" />
+
+    <TextView
+        android:id="@+id/txtVendas"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:fontFamily="@font/inclusive_sans"
+        android:text="25Kg"
+        android:textColor="#333333"
+        android:textSize="15sp" />
+</LinearLayout>