aboutsummaryrefslogtreecommitdiff
path: root/androidApp/src/main/res/layout
diff options
context:
space:
mode:
authorIsidro Henoch <imhenoch@protonmail.com>2022-01-03 15:15:50 -0600
committerIsidro Henoch <imhenoch@protonmail.com>2022-01-03 15:15:50 -0600
commit1bcf0941e1174d0b119abd4e3523d53ef90d4f87 (patch)
tree5f081adfee15732c2d72e25d122b06034eb14ae0 /androidApp/src/main/res/layout
parent35b24e898717bffcb76d42528b453d949e663ba9 (diff)
downloadetbsa-trackermap-mobile-1bcf0941e1174d0b119abd4e3523d53ef90d4f87.tar.gz
etbsa-trackermap-mobile-1bcf0941e1174d0b119abd4e3523d53ef90d4f87.tar.bz2
etbsa-trackermap-mobile-1bcf0941e1174d0b119abd4e3523d53ef90d4f87.zip
Splits the MapFragment funcionality
- Now there's MapFragment, which is the map and is responsible for displaying markers and focusing on a particular point. This functionality will be extended. - UnitMapFragment is the entity in charge of the subscriptions and converts UnitInformation entities to something MapFragment can handle.
Diffstat (limited to 'androidApp/src/main/res/layout')
-rw-r--r--androidApp/src/main/res/layout/map_fragment.xml17
-rw-r--r--androidApp/src/main/res/layout/unit_map_fragment.xml46
2 files changed, 46 insertions, 17 deletions
diff --git a/androidApp/src/main/res/layout/map_fragment.xml b/androidApp/src/main/res/layout/map_fragment.xml
deleted file mode 100644
index 8d36fc1..0000000
--- a/androidApp/src/main/res/layout/map_fragment.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- xmlns:app="http://schemas.android.com/apk/res-auto">
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="MAP"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintBottom_toBottomOf="parent"/>
-
-</androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file
diff --git a/androidApp/src/main/res/layout/unit_map_fragment.xml b/androidApp/src/main/res/layout/unit_map_fragment.xml
new file mode 100644
index 0000000..914558a
--- /dev/null
+++ b/androidApp/src/main/res/layout/unit_map_fragment.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
+
+ <fragment
+ android:id="@+id/unitsMap"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ android:name="mx.trackermap.TrackerMap.android.map.MapFragment"/>
+
+ <androidx.cardview.widget.CardView
+ android:id="@+id/mapUnitCard"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:cardUseCompatPadding="true"
+ app:cardElevation="@dimen/card_elevation"
+ app:cardCornerRadius="@dimen/card_border_radius"
+ app:contentPadding="@dimen/card_padding"
+ android:visibility="gone">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="SELECTED UNIT"
+ android:gravity="center"/>
+
+ </LinearLayout>
+
+ </androidx.cardview.widget.CardView>
+
+</androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file