aboutsummaryrefslogtreecommitdiff
path: root/androidApp/src/main/res
diff options
context:
space:
mode:
authorIván Ávalos <avalos@disroot.org>2022-01-20 01:26:29 -0600
committerIván Ávalos <avalos@disroot.org>2022-01-20 01:26:29 -0600
commitecc818705b9b523dbd1a85f017d14ba0d017849b (patch)
tree556f1c62fb22ad0bc85720985a0fcc1137989e96 /androidApp/src/main/res
parent5472556161c2f781e7a0dabe48301f3b665641b1 (diff)
downloadetbsa-trackermap-mobile-ecc818705b9b523dbd1a85f017d14ba0d017849b.tar.gz
etbsa-trackermap-mobile-ecc818705b9b523dbd1a85f017d14ba0d017849b.tar.bz2
etbsa-trackermap-mobile-ecc818705b9b523dbd1a85f017d14ba0d017849b.zip
Properly implemented save and share report actions
Diffstat (limited to 'androidApp/src/main/res')
-rw-r--r--androidApp/src/main/res/layout/unit_details_reports.xml31
-rw-r--r--androidApp/src/main/res/values-es-rMX/strings.xml5
-rw-r--r--androidApp/src/main/res/values/strings.xml5
-rw-r--r--androidApp/src/main/res/xml/filepaths.xml4
4 files changed, 37 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 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>