From 16b614d6f3fcc88924e79ac3a1bffef538b09e8b Mon Sep 17 00:00:00 2001
From: Iván Ávalos <avalos@disroot.org>
Date: Sun, 16 Jan 2022 16:11:47 -0600
Subject: Added hourmeter field

---
 androidApp/src/main/res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/androidApp/src/main/res/values/strings.xml b/androidApp/src/main/res/values/strings.xml
index 11c914f..60547d3 100644
--- a/androidApp/src/main/res/values/strings.xml
+++ b/androidApp/src/main/res/values/strings.xml
@@ -44,6 +44,7 @@
     <string name="unit_driver_name">Driver name</string>
     <string name="unit_speed">Speed</string>
     <string name="unit_last_address">Last position address</string>
+    <string name="unit_hourmeter">Hourmeter</string>
     <string name="unit_last_date">Last position datetime</string>
 
     <string name="unit_category_animal">Animal</string>
-- 
cgit v1.2.3


From e2a836e7a82892c13d67f0767070c99007394186 Mon Sep 17 00:00:00 2001
From: Iván Ávalos <avalos@disroot.org>
Date: Sun, 16 Jan 2022 16:28:24 -0600
Subject: Added fake close button to unit_map_fragment.xml

---
 androidApp/src/main/res/drawable/icon_close.xml    | 10 +++++
 .../src/main/res/layout/unit_map_fragment.xml      | 45 ++++++++++++++++------
 androidApp/src/main/res/values-es-rMX/strings.xml  |  3 +-
 androidApp/src/main/res/values/strings.xml         |  1 +
 4 files changed, 46 insertions(+), 13 deletions(-)
 create mode 100644 androidApp/src/main/res/drawable/icon_close.xml

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

diff --git a/androidApp/src/main/res/drawable/icon_close.xml b/androidApp/src/main/res/drawable/icon_close.xml
new file mode 100644
index 0000000..16d6d37
--- /dev/null
+++ b/androidApp/src/main/res/drawable/icon_close.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>
diff --git a/androidApp/src/main/res/layout/unit_map_fragment.xml b/androidApp/src/main/res/layout/unit_map_fragment.xml
index 8395013..e2bee95 100644
--- a/androidApp/src/main/res/layout/unit_map_fragment.xml
+++ b/androidApp/src/main/res/layout/unit_map_fragment.xml
@@ -30,20 +30,25 @@
         app:contentPaddingTop="@dimen/card_padding"
         app:contentPaddingLeft="@dimen/card_padding"
         app:contentPaddingRight="@dimen/card_padding"
-        android:visibility="gone">
+        android:animateLayoutChanges="true"
+        android:visibility="gone"
+        tools:visibility="visible">
 
-        <LinearLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/mainContent"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:animateLayoutChanges="true">
+            android:orientation="vertical">
 
             <LinearLayout
-                android:layout_width="match_parent"
+                android:id="@+id/titleLayout"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
-                android:orientation="horizontal">
+                android:orientation="horizontal"
+                app:layout_constraintEnd_toStartOf="@+id/closeButton"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
 
                 <ImageView
                     android:id="@+id/statusIcon"
@@ -58,24 +63,36 @@
                     android:id="@+id/engineStopIcon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:visibility="gone"
                     android:layout_marginEnd="5dp"
                     android:src="@drawable/device_unlocked"
+                    android:visibility="gone"
                     tools:ignore="ContentDescription" />
 
                 <TextView
                     android:id="@+id/unitName"
+                    style="@style/TextAppearance.AppCompat.Body2"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    style="@style/TextAppearance.AppCompat.Body2"
                     tools:text="1AAUTO" />
 
             </LinearLayout>
 
+            <ImageView
+                android:id="@+id/closeButton"
+                android:layout_width="14sp"
+                android:layout_height="14sp"
+                android:contentDescription="@string/shared_close"
+                android:src="@drawable/icon_close"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
             <GridLayout
                 android:id="@+id/gridLayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                app:layout_constraintTop_toBottomOf="@id/titleLayout"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
 
             <LinearLayout
                 android:id="@+id/itemOptions"
@@ -84,7 +101,11 @@
                 android:layout_marginVertical="@dimen/padding"
                 android:gravity="center"
                 android:orientation="horizontal"
-                android:visibility="visible">
+                android:visibility="visible"
+                app:layout_constraintTop_toBottomOf="@id/gridLayout"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent">
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/detailsButton"
@@ -118,7 +139,7 @@
 
             </LinearLayout>
 
-        </LinearLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
     </androidx.cardview.widget.CardView>
 
diff --git a/androidApp/src/main/res/values-es-rMX/strings.xml b/androidApp/src/main/res/values-es-rMX/strings.xml
index f843c29..d228c28 100644
--- a/androidApp/src/main/res/values-es-rMX/strings.xml
+++ b/androidApp/src/main/res/values-es-rMX/strings.xml
@@ -2,7 +2,8 @@
 <resources>
     <!-- Shared strings -->
     <string name="shared_ok">OK</string>
-    <string name="shared_cancel">Cancel</string>
+    <string name="shared_cancel">Cancelar</string>
+    <string name="shared_close">Cerrar</string>
 
     <!-- LoginActivity -->
     <string name="login_username">Nombre de usuario</string>
diff --git a/androidApp/src/main/res/values/strings.xml b/androidApp/src/main/res/values/strings.xml
index 60547d3..d2c6148 100644
--- a/androidApp/src/main/res/values/strings.xml
+++ b/androidApp/src/main/res/values/strings.xml
@@ -16,6 +16,7 @@
     <!-- Shared strings -->
     <string name="shared_ok">OK</string>
     <string name="shared_cancel">Cancel</string>
+    <string name="shared_close">Close</string>
 
     <!-- LoginActivity -->
     <string name="login_username">Username</string>
-- 
cgit v1.2.3


From 41e222e22f6cf67248ae40161f69cc1d2753f6a2 Mon Sep 17 00:00:00 2001
From: Iván Ávalos <avalos@disroot.org>
Date: Sun, 16 Jan 2022 17:18:22 -0600
Subject: Added close button to DetailsActivity, updated strings and layouts

---
 .../TrackerMap/android/details/DetailsActivity.kt  |  3 +++
 .../details/commands/UnitCommandsFragment.kt       |  2 +-
 .../android/session/UserInformationActivity.kt     |  2 +-
 .../src/main/res/layout/details_activity.xml       | 26 +++++++++++++++++-----
 .../main/res/layout/user_information_activity.xml  |  8 +++----
 androidApp/src/main/res/values-es-rMX/strings.xml  |  3 ++-
 androidApp/src/main/res/values/strings.xml         |  3 ++-
 androidApp/src/main/res/values/styles.xml          |  6 +++++
 8 files changed, 40 insertions(+), 13 deletions(-)

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

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 aaf7ecb..c6d260b 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
@@ -84,6 +84,9 @@ class DetailsActivity : AppCompatActivity() {
             override fun onTabUnselected(tab: TabLayout.Tab?) {}
             override fun onTabReselected(tab: TabLayout.Tab?) {}
         })
+        binding.closeButton.setOnClickListener {
+            finish()
+        }
 
         requestPermission {}
     }
diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/commands/UnitCommandsFragment.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/commands/UnitCommandsFragment.kt
index b56a403..822d351 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/commands/UnitCommandsFragment.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/commands/UnitCommandsFragment.kt
@@ -75,7 +75,7 @@ class UnitCommandsFragment: Fragment() {
                     setPositiveButton(R.string.shared_cancel) { dialogInterface, _ ->
                         dialogInterface.dismiss()
                     }
-                    setNegativeButton(R.string.send_command) { dialogInterface, _ ->
+                    setNegativeButton(R.string.shared_send) { dialogInterface, _ ->
                         unitCommandsViewModel.sendCommand()
                         dialogInterface.dismiss()
                     }
diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/UserInformationActivity.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/UserInformationActivity.kt
index b0a4482..13deed0 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/UserInformationActivity.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/UserInformationActivity.kt
@@ -69,7 +69,7 @@ class UserInformationActivity : AppCompatActivity() {
     }
 
     private fun setupEvents() {
-        binding.backButton.setOnClickListener { onBackPressed() }
+        binding.closeButton.setOnClickListener { onBackPressed() }
         binding.signoutButton.setOnClickListener {
             userInformationViewModel.signOut(PreferenceManager
                 .getDefaultSharedPreferences(this)
diff --git a/androidApp/src/main/res/layout/details_activity.xml b/androidApp/src/main/res/layout/details_activity.xml
index f79ea69..37d3b15 100644
--- a/androidApp/src/main/res/layout/details_activity.xml
+++ b/androidApp/src/main/res/layout/details_activity.xml
@@ -5,13 +5,28 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/closeButton"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:contentDescription="@string/shared_close"
+        android:src="@drawable/icon_close"
+        app:fabSize="mini"
+        app:backgroundTint="@android:color/white"
+        android:layout_margin="@dimen/fab_margin"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/detailsTabs"/>
+
     <com.google.android.material.tabs.TabLayout
         android:id="@+id/detailsTabs"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toEndOf="@id/closeButton"
+        app:layout_constraintBottom_toTopOf="@id/detailsPager"
+        app:tabTextAppearance="@style/SmallTabText" />
 
     <androidx.viewpager2.widget.ViewPager2
         android:id="@+id/detailsPager"
@@ -20,6 +35,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/detailsTabs" />
+        android:layout_marginTop="@dimen/fab_margin"
+        app:layout_constraintTop_toBottomOf="@id/closeButton" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/androidApp/src/main/res/layout/user_information_activity.xml b/androidApp/src/main/res/layout/user_information_activity.xml
index c409e98..bc81b20 100644
--- a/androidApp/src/main/res/layout/user_information_activity.xml
+++ b/androidApp/src/main/res/layout/user_information_activity.xml
@@ -7,13 +7,13 @@
     android:layout_height="match_parent">
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/backButton"
+        android:id="@+id/closeButton"
         android:layout_width="wrap_content"
         android:layout_height="0dp"
         android:layout_margin="@dimen/fab_margin"
         android:backgroundTint="@android:color/white"
-        android:contentDescription="@string/open_profile"
-        android:src="@drawable/icon_back"
+        android:contentDescription="@string/shared_close"
+        android:src="@drawable/icon_close"
         app:borderWidth="0dp"
         app:elevation="@dimen/fab_elevation"
         app:fabSize="mini"
@@ -24,7 +24,7 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_marginTop="@dimen/fab_margin"
-        app:layout_constraintTop_toBottomOf="@id/backButton"
+        app:layout_constraintTop_toBottomOf="@id/closeButton"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toBottomOf="parent">
diff --git a/androidApp/src/main/res/values-es-rMX/strings.xml b/androidApp/src/main/res/values-es-rMX/strings.xml
index d228c28..835f342 100644
--- a/androidApp/src/main/res/values-es-rMX/strings.xml
+++ b/androidApp/src/main/res/values-es-rMX/strings.xml
@@ -4,6 +4,7 @@
     <string name="shared_ok">OK</string>
     <string name="shared_cancel">Cancelar</string>
     <string name="shared_close">Cerrar</string>
+    <string name="shared_send">Enviar</string>
 
     <!-- LoginActivity -->
     <string name="login_username">Nombre de usuario</string>
@@ -76,7 +77,7 @@
     <!-- Commands -->
     <string name="send_command">Enviar comando</string>
     <string name="send_command_confirmation_text">
-        ¿Está seguro de que desea enviar el comando a la unidad %1$s?
+        El comando se enviará a la unidad %1$s. ¿Continuar?
     </string>
 
     <!-- Reports -->
diff --git a/androidApp/src/main/res/values/strings.xml b/androidApp/src/main/res/values/strings.xml
index d2c6148..62963fa 100644
--- a/androidApp/src/main/res/values/strings.xml
+++ b/androidApp/src/main/res/values/strings.xml
@@ -17,6 +17,7 @@
     <string name="shared_ok">OK</string>
     <string name="shared_cancel">Cancel</string>
     <string name="shared_close">Close</string>
+    <string name="shared_send">Send</string>
 
     <!-- LoginActivity -->
     <string name="login_username">Username</string>
@@ -89,7 +90,7 @@
     <!-- Commands -->
     <string name="send_command">Send Command</string>
     <string name="send_command_confirmation_text">
-        Are you sure you want to send the command to device %1$s?
+        Command will be sent to device %1$s. Continue?
     </string>
 
     <!-- Reports -->
diff --git a/androidApp/src/main/res/values/styles.xml b/androidApp/src/main/res/values/styles.xml
index 4a51239..dc40450 100644
--- a/androidApp/src/main/res/values/styles.xml
+++ b/androidApp/src/main/res/values/styles.xml
@@ -6,4 +6,10 @@
         <item name="colorAccent">@color/colorAccent</item>
     </style>
 
+    <style name="SmallTabText" parent="Widget.MaterialComponents.TabLayout">
+        <item name="textAllCaps">true</item>
+        <item name="android:textSize">11sp</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3