From 7da841d2de9ac0526c3863e85d7d603facabb95c Mon Sep 17 00:00:00 2001
From: Iván Ávalos <avalos@disroot.org>
Date: Thu, 20 Jan 2022 20:43:14 -0600
Subject: Implemented feature to switch to different Traccar servers by URL and
 removed annoying auto-generated redundant qualifiers

---
 androidApp/src/main/res/layout/login.xml           | 29 +++++++++++++++++++---
 .../main/res/layout/user_information_activity.xml  | 14 +++++++++++
 2 files changed, 39 insertions(+), 4 deletions(-)

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

diff --git a/androidApp/src/main/res/layout/login.xml b/androidApp/src/main/res/layout/login.xml
index 7c79e5c..78c3e46 100644
--- a/androidApp/src/main/res/layout/login.xml
+++ b/androidApp/src/main/res/layout/login.xml
@@ -70,8 +70,8 @@
                     app:layout_constraintHorizontal_bias="0.5"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/usernameInputLayout"
-                    app:layout_constraintBottom_toTopOf="@id/signinButton"
-                    android:layout_marginTop="24dp">
+                    app:layout_constraintBottom_toTopOf="@id/urlInputLayout"
+                    android:layout_marginTop="@dimen/fields_spacing">
 
                     <com.google.android.material.textfield.TextInputEditText
                         android:id="@+id/passwordEditText"
@@ -81,17 +81,38 @@
 
                 </com.google.android.material.textfield.TextInputLayout>
 
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/urlInputLayout"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/login_url"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.5"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/passwordInputLayout"
+                    app:layout_constraintBottom_toTopOf="@id/signinButton"
+                    android:layout_marginTop="@dimen/fields_spacing">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/urlEditText"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:inputType="textUri"/>
+
+                </com.google.android.material.textfield.TextInputLayout>
+
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/signinButton"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     app:layout_constraintWidth_percent="0.5"
-                    app:layout_constraintTop_toBottomOf="@id/passwordInputLayout"
+                    app:layout_constraintTop_toBottomOf="@id/urlInputLayout"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintHorizontal_bias="0.5"
-                    android:layout_marginTop="24dp"
+                    android:layout_marginTop="@dimen/fields_large_spacing"
                     android:text="@string/login_login"/>
 
             </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/androidApp/src/main/res/layout/user_information_activity.xml b/androidApp/src/main/res/layout/user_information_activity.xml
index 45e747c..f223522 100644
--- a/androidApp/src/main/res/layout/user_information_activity.xml
+++ b/androidApp/src/main/res/layout/user_information_activity.xml
@@ -131,6 +131,20 @@
                             android:layout_marginBottom="@dimen/fields_spacing"
                             tools:text="Admin" />
 
+                        <TextView
+                            android:id="@+id/serverInfoLabel"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="@string/login_url"
+                            android:textAppearance="@style/TextAppearance.AppCompat.Body2"/>
+
+                        <TextView
+                            android:id="@+id/serverInfo"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginBottom="@dimen/fields_spacing"
+                            tools:text="@string/default_server_url" />
+
                         <com.google.android.material.button.MaterialButton
                             android:id="@+id/signoutButton"
                             android:layout_width="match_parent"
-- 
cgit v1.2.3


From a5961100aad3c1bc8f05f458186208a763dd095e Mon Sep 17 00:00:00 2001
From: Iván Ávalos <avalos@disroot.org>
Date: Sat, 22 Jan 2022 00:37:49 -0600
Subject: Fixed spacing between units_activity top bar items

---
 androidApp/src/main/res/layout/units_activity.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/androidApp/src/main/res/layout/units_activity.xml b/androidApp/src/main/res/layout/units_activity.xml
index 5abb95b..e87077f 100644
--- a/androidApp/src/main/res/layout/units_activity.xml
+++ b/androidApp/src/main/res/layout/units_activity.xml
@@ -74,7 +74,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/fab_margin"
-        android:layout_marginEnd="@dimen/fab_margin"
+        android:layout_marginEnd="@dimen/search_horizontal_margin"
         android:backgroundTint="@android:color/white"
         android:contentDescription="@string/switch_layer"
         android:src="@drawable/icon_layers"
-- 
cgit v1.2.3


From cba1221d2c94646d2987b0993325e82d3b88792f Mon Sep 17 00:00:00 2001
From: Iván Ávalos <avalos@disroot.org>
Date: Sat, 22 Jan 2022 00:39:38 -0600
Subject: Super cool map/list layout change animation

---
 androidApp/src/main/res/layout/units_activity.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/androidApp/src/main/res/layout/units_activity.xml b/androidApp/src/main/res/layout/units_activity.xml
index e87077f..60a77db 100644
--- a/androidApp/src/main/res/layout/units_activity.xml
+++ b/androidApp/src/main/res/layout/units_activity.xml
@@ -5,7 +5,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/drawerLayout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:animateLayoutChanges="true">
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/displayContainer"
-- 
cgit v1.2.3


From 7f1388bc554a3ee68a1865d2a219395805a79575 Mon Sep 17 00:00:00 2001
From: Iván Ávalos <avalos@disroot.org>
Date: Mon, 24 Jan 2022 14:51:58 -0600
Subject: Set color background to devices_fragment.xml to avoid showing map on
 background in certain occasions

---
 androidApp/src/main/res/layout/devices_fragment.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/androidApp/src/main/res/layout/devices_fragment.xml b/androidApp/src/main/res/layout/devices_fragment.xml
index 1dd1690..6e4db3f 100644
--- a/androidApp/src/main/res/layout/devices_fragment.xml
+++ b/androidApp/src/main/res/layout/devices_fragment.xml
@@ -2,7 +2,8 @@
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@color/background">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/devicesList"
-- 
cgit v1.2.3