From 55560a1bfb7b57f2fbac57c716a4db6ce598bce8 Mon Sep 17 00:00:00 2001
From: 230415 <230415@epvc.pt>
Date: Thu, 18 Jun 2026 11:15:49 +0100
Subject: [PATCH] antes do ollama

---
 .idea/deploymentTargetSelector.xml            |  4 ++--
 .../lifegrid/InvoiceScannerHelper.java        | 22 ++++++++++++-------
 app/src/main/res/layout/fragment_ativos.xml   |  2 +-
 app/src/main/res/layout/item_ativo.xml        |  6 +++--
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 0a9a275..ad9a02b 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2026-06-03T14:39:06.554406Z">
+        <DropdownSelection timestamp="2026-06-18T10:01:02.387533Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=/Users/230415/.android/avd/Pixel_9a.avd" />
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=RZCX40Q6DDY" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/app/src/main/java/com/example/lifegrid/InvoiceScannerHelper.java b/app/src/main/java/com/example/lifegrid/InvoiceScannerHelper.java
index da39f89..7dd0054 100644
--- a/app/src/main/java/com/example/lifegrid/InvoiceScannerHelper.java
+++ b/app/src/main/java/com/example/lifegrid/InvoiceScannerHelper.java
@@ -47,7 +47,7 @@ public class InvoiceScannerHelper {
             }
 
             GenerativeModel gm = new GenerativeModel(
-                    "gemini-2.5-flash",
+                    "gemini-1.5-flash",
                     API_KEY
             );
             GenerativeModelFutures model = GenerativeModelFutures.from(gm);
@@ -65,13 +65,19 @@ public class InvoiceScannerHelper {
                     try {
                         String textResponse = result.getText();
                         if (textResponse != null) {
-                            textResponse = textResponse.replace("```json", "").replace("```", "").trim();
-                            JSONObject json = new JSONObject(textResponse);
-                            double valor = json.optDouble("valor", 0.0);
-                            String descricao = json.optString("descricao", "");
-                            String categoria = json.optString("categoria", "Outros");
-                            String data = json.optString("data", "");
-                            callback.onSuccess(valor, descricao, categoria, data);
+                            int start = textResponse.indexOf("{");
+                            int end = textResponse.lastIndexOf("}");
+                            if (start != -1 && end != -1 && end > start) {
+                                String jsonContent = textResponse.substring(start, end + 1);
+                                JSONObject json = new JSONObject(jsonContent);
+                                double valor = json.optDouble("valor", 0.0);
+                                String descricao = json.optString("descricao", "");
+                                String categoria = json.optString("categoria", "Outros");
+                                String data = json.optString("data", "");
+                                callback.onSuccess(valor, descricao, categoria, data);
+                            } else {
+                                callback.onError("Não foi possível extrair os dados formatados em JSON.");
+                            }
                         } else {
                             callback.onError("Resposta vazia da IA.");
                         }
diff --git a/app/src/main/res/layout/fragment_ativos.xml b/app/src/main/res/layout/fragment_ativos.xml
index 9fa3b09..e0a2c34 100644
--- a/app/src/main/res/layout/fragment_ativos.xml
+++ b/app/src/main/res/layout/fragment_ativos.xml
@@ -7,7 +7,7 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/adicionarCardView"
-        android:layout_width="364dp"
+        android:layout_width="391dp"
         android:layout_height="match_parent"
         android:layout_marginTop="544dp"
         android:background="@drawable/cardview_background"
diff --git a/app/src/main/res/layout/item_ativo.xml b/app/src/main/res/layout/item_ativo.xml
index 0d6e96c..bd764cb 100644
--- a/app/src/main/res/layout/item_ativo.xml
+++ b/app/src/main/res/layout/item_ativo.xml
@@ -54,18 +54,19 @@
         tools:text="Criptomoedas" />
 
     <!-- Quantity and Purchase Price -->
+
+    <!-- Delete Button -->
     <TextView
         android:id="@+id/tvInfo"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
+        android:layout_marginTop="12dp"
         android:textColor="#6b7280"
         android:textSize="14sp"
         app:layout_constraintStart_toStartOf="@id/tvNome"
         app:layout_constraintTop_toBottomOf="@id/tvTipo"
         tools:text="12 unidades x 16.10€" />
 
-    <!-- Delete Button -->
     <ImageView
         android:id="@+id/btnDelete"
         android:layout_width="28dp"
@@ -111,6 +112,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
+        android:layout_marginEnd="8dp"
         android:textColor="#16a34a"
         android:textSize="14sp"
         app:layout_constraintBottom_toBottomOf="parent"