From ecc818705b9b523dbd1a85f017d14ba0d017849b Mon Sep 17 00:00:00 2001
From: Iván Ávalos <avalos@disroot.org>
Date: Thu, 20 Jan 2022 01:26:29 -0600
Subject: Properly implemented save and share report actions

---
 .../src/main/res/layout/unit_details_reports.xml   | 31 +++++++++++++++++-----
 androidApp/src/main/res/values-es-rMX/strings.xml  |  5 +++-
 androidApp/src/main/res/values/strings.xml         |  5 +++-
 androidApp/src/main/res/xml/filepaths.xml          |  4 +++
 4 files changed, 37 insertions(+), 8 deletions(-)
 create mode 100644 androidApp/src/main/res/xml/filepaths.xml

(limited to 'androidApp/src/main/res')

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 739023b..7284b6c 100644
--- a/androidApp/src/main/res/values-es-rMX/strings.xml
+++ b/androidApp/src/main/res/values-es-rMX/strings.xml
@@ -88,7 +88,10 @@
     <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>
 
     <!-- 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 babb741..3e2b37a 100644
--- a/androidApp/src/main/res/values/strings.xml
+++ b/androidApp/src/main/res/values/strings.xml
@@ -101,7 +101,10 @@
     <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>
 
     <!-- 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>
-- 
cgit v1.2.3


From db0dd04682627b20df5acfc2bf01a1541cfa5696 Mon Sep 17 00:00:00 2001
From: Iván Ávalos <avalos@disroot.org>
Date: Thu, 20 Jan 2022 01:39:43 -0600
Subject: Proper handling of user permission requests

---
 .../mx/trackermap/TrackerMap/android/details/DetailsActivity.kt  | 8 ++++++++
 androidApp/src/main/res/values-es-rMX/strings.xml                | 9 +++++++++
 androidApp/src/main/res/values/strings.xml                       | 9 +++++++++
 3 files changed, 26 insertions(+)

(limited to 'androidApp/src/main/res')

diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/DetailsActivity.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/DetailsActivity.kt
index 56d5c4b..9633332 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/DetailsActivity.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/DetailsActivity.kt
@@ -5,6 +5,7 @@ import android.content.pm.PackageManager
 import android.os.Bundle
 import android.util.Log
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
 import com.google.android.material.tabs.TabLayout
@@ -108,6 +109,13 @@ class DetailsActivity : AppCompatActivity() {
             }
             ActivityCompat.shouldShowRequestPermissionRationale(this, permission) -> {
                 Log.d("DetailsActivity", "shouldShowRequestPermissionRationale")
+                AlertDialog.Builder(this)
+                    .setTitle(R.string.write_rationale_title)
+                    .setMessage(R.string.write_rationale_msg)
+                    .setPositiveButton(R.string.shared_ok) { _, _ ->
+                        launcher.launch(permission)
+                    }
+                    .create().show()
             }
             else -> {
                 Log.d("DetailsActivity", "Requesting $permission permission")
diff --git a/androidApp/src/main/res/values-es-rMX/strings.xml b/androidApp/src/main/res/values-es-rMX/strings.xml
index 7284b6c..2645205 100644
--- a/androidApp/src/main/res/values-es-rMX/strings.xml
+++ b/androidApp/src/main/res/values-es-rMX/strings.xml
@@ -88,11 +88,20 @@
     <string name="stops">Paradas</string>
     <string name="period">Periodo</string>
     <string name="select_period">Seleccionar</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>
     <string name="period_last_24">Últimas 24H</string>
diff --git a/androidApp/src/main/res/values/strings.xml b/androidApp/src/main/res/values/strings.xml
index 3e2b37a..8e59b14 100644
--- a/androidApp/src/main/res/values/strings.xml
+++ b/androidApp/src/main/res/values/strings.xml
@@ -101,11 +101,20 @@
     <string name="stops">Stops</string>
     <string name="period">Period</string>
     <string name="select_period">Select</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>
     <string name="period_last_24">Last 24H</string>
-- 
cgit v1.2.3