aboutsummaryrefslogtreecommitdiff
path: root/androidApp/src/main/res/layout
diff options
context:
space:
mode:
authorIván Ávalos <avalos@disroot.org>2022-01-16 18:21:12 -0600
committerIván Ávalos <avalos@disroot.org>2022-01-16 18:21:12 -0600
commitc7b28c25b032a1b82b782ef5ff8dd5e703d5a8ad (patch)
tree4095a6c4c64442277081e58fff72829ac01c7d11 /androidApp/src/main/res/layout
parentf47c9f6b62dd1949cd2f926348a7e057c3ae221c (diff)
parent21e16e27f047053582d8b0c722feedf3c8badebe (diff)
downloadetbsa-trackermap-mobile-c7b28c25b032a1b82b782ef5ff8dd5e703d5a8ad.tar.gz
etbsa-trackermap-mobile-c7b28c25b032a1b82b782ef5ff8dd5e703d5a8ad.tar.bz2
etbsa-trackermap-mobile-c7b28c25b032a1b82b782ef5ff8dd5e703d5a8ad.zip
Merge branch 'main' of https://git.sr.ht/~avalos/trackermap-mobile
Diffstat (limited to 'androidApp/src/main/res/layout')
-rw-r--r--androidApp/src/main/res/layout/details_activity.xml26
-rw-r--r--androidApp/src/main/res/layout/login.xml2
-rw-r--r--androidApp/src/main/res/layout/unit_map_fragment.xml45
-rw-r--r--androidApp/src/main/res/layout/user_information_activity.xml8
4 files changed, 59 insertions, 22 deletions
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/login.xml b/androidApp/src/main/res/layout/login.xml
index 35c9410..7c79e5c 100644
--- a/androidApp/src/main/res/layout/login.xml
+++ b/androidApp/src/main/res/layout/login.xml
@@ -91,7 +91,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_bias="0.5"
- android:layout_marginTop="40dp"
+ android:layout_marginTop="24dp"
android:text="@string/login_login"/>
</androidx.constraintlayout.widget.ConstraintLayout>
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/layout/user_information_activity.xml b/androidApp/src/main/res/layout/user_information_activity.xml
index df0a59f..7dae0d5 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">