Merge branch 'main' of https://git.sr.ht/~avalos/trackermap-mobile

4 files changed, 55 insertions, 8 deletions

diff --git a/androidApp/src/main/res/layout/unit_details_reports.xml b/androidApp/src/main/res/layout/unit_details_reports.xml
index f53ce51..903c2c3 100644
--- a/androidApp/src/main/res/layout/unit_details_reports.xml
+++ b/androidApp/src/main/res/layout/unit_details_reports.xml
@@ -106,12 +106,6 @@
                 android:textColor="@color/colorPrimaryDark"
                 app:backgroundTint="@color/darkBackground" />
 
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/exportButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/export_report" />
-
         </LinearLayout>
 
         <com.addisonelliott.segmentedbutton.SegmentedButtonGroup
@@ -159,6 +153,31 @@
 
         </com.addisonelliott.segmentedbutton.SegmentedButtonGroup>
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_marginTop="@dimen/margin">
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/exportButton"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/export_report"
+                android:layout_weight="1"
+                android:layout_marginEnd="@dimen/fields_spacing"
+                style="?android:buttonStyleSmall"/>
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/shareButton"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/share_report"
+                style="?android:buttonStyleSmall"/>
+
+        </LinearLayout>
+
     </LinearLayout>
 
     <include
diff --git a/androidApp/src/main/res/values-es-rMX/strings.xml b/androidApp/src/main/res/values-es-rMX/strings.xml
index c9bc820..28aee79 100644
--- a/androidApp/src/main/res/values-es-rMX/strings.xml
+++ b/androidApp/src/main/res/values-es-rMX/strings.xml
@@ -89,7 +89,19 @@
     <string name="stops">Paradas</string>
     <string name="period">Periodo</string>
     <string name="select_period">Seleccionar</string>
-    <string name="export_report">Exportar</string>
+
+    <string name="export_report">Guardar</string>
+    <string name="share_report">Compartir</string>
+    <string name="export_stored">El reporte ha sido descargado</string>
+    <string name="export_open_file_with">Abrir con</string>
+
+    <string name="write_rationale_title">
+        Necesitamos tu permiso
+    </string>
+    <string name="write_rationale_msg">
+        Esta aplicación requiere acceso de escritura a tus archivos.
+        Requerimos este permiso para guardar reportes en tu teléfono.
+    </string>
 
     <!-- Report periods -->
     <string name="period_today">Hoy</string>
diff --git a/androidApp/src/main/res/values/strings.xml b/androidApp/src/main/res/values/strings.xml
index 0e947be..4f5a213 100644
--- a/androidApp/src/main/res/values/strings.xml
+++ b/androidApp/src/main/res/values/strings.xml
@@ -102,7 +102,19 @@
     <string name="stops">Stops</string>
     <string name="period">Period</string>
     <string name="select_period">Select</string>
-    <string name="export_report">Export</string>
+
+    <string name="export_report">Save</string>
+    <string name="share_report">Share</string>
+    <string name="export_stored">Report has been downloaded</string>
+    <string name="export_open_file_with">Open file with</string>
+
+    <string name="write_rationale_title">
+        We need your permission
+    </string>
+    <string name="write_rationale_msg">
+        This app relies on write access to your files.
+        We require access to this permission to save reports into your phone.
+    </string>
 
     <!-- Report periods -->
     <string name="period_today">Today</string>
diff --git a/androidApp/src/main/res/xml/filepaths.xml b/androidApp/src/main/res/xml/filepaths.xml
new file mode 100644
index 0000000..f894ef4
--- /dev/null
+++ b/androidApp/src/main/res/xml/filepaths.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths>
+    <cache-path name="/" path="." />
+</paths>