aboutsummaryrefslogtreecommitdiff
path: root/androidApp
diff options
context:
space:
mode:
Diffstat (limited to 'androidApp')
-rw-r--r--androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/DetailsActivity.kt19
-rw-r--r--androidApp/src/main/res/layout/details_activity.xml14
-rw-r--r--androidApp/src/main/res/layout/unit_details_reports.xml19
3 files changed, 29 insertions, 23 deletions
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 12ab79e..07a7b05 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
@@ -7,13 +7,15 @@ import com.google.android.material.tabs.TabLayoutMediator
import mx.trackermap.TrackerMap.android.databinding.DetailsActivityBinding
import mx.trackermap.TrackerMap.android.devices.Action
-class DetailsActivity: AppCompatActivity() {
+class DetailsActivity : AppCompatActivity() {
+
private var _binding: DetailsActivityBinding? = null
private val binding get() = _binding!!
private lateinit var adapter: UnitDetailsAdapter
private var deviceId: Int = 0
companion object {
+
val DEVICE_ID_EXTRA = "device_id"
val ACTION_EXTRA = "action"
}
@@ -42,16 +44,19 @@ class DetailsActivity: AppCompatActivity() {
adapter = UnitDetailsAdapter(this, deviceId)
binding.detailsPager.adapter = adapter
TabLayoutMediator(binding.detailsTabs, binding.detailsPager) { tab, position ->
- tab.text = when(position) {
+ tab.text = when (position) {
0 -> "Details"
1 -> "Reports"
else -> "Commands"
}
}.attach()
- binding.detailsPager.setCurrentItem(when(initialSection) {
- Action.DETAILS -> 0
- Action.REPORTS -> 1
- else -> 2
- }, false)
+ binding.detailsPager.setCurrentItem(
+ when (initialSection) {
+ Action.DETAILS -> 0
+ Action.REPORTS -> 1
+ else -> 2
+ }, false
+ )
+ binding.detailsPager.isUserInputEnabled = false
}
} \ No newline at end of file
diff --git a/androidApp/src/main/res/layout/details_activity.xml b/androidApp/src/main/res/layout/details_activity.xml
index 00ebdbf..f79ea69 100644
--- a/androidApp/src/main/res/layout/details_activity.xml
+++ b/androidApp/src/main/res/layout/details_activity.xml
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- xmlns:app="http://schemas.android.com/apk/res-auto">
+ android:layout_height="match_parent">
<com.google.android.material.tabs.TabLayout
android:id="@+id/detailsTabs"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintEnd_toEndOf="parent"/>
+ app:layout_constraintTop_toTopOf="parent" />
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/detailsPager"
android:layout_width="match_parent"
android:layout_height="0dp"
- app:layout_constraintTop_toBottomOf="@id/detailsTabs"
- app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintBottom_toBottomOf="parent"/>
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/detailsTabs" />
</androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file
diff --git a/androidApp/src/main/res/layout/unit_details_reports.xml b/androidApp/src/main/res/layout/unit_details_reports.xml
index e39f279..cf3c7b2 100644
--- a/androidApp/src/main/res/layout/unit_details_reports.xml
+++ b/androidApp/src/main/res/layout/unit_details_reports.xml
@@ -9,31 +9,32 @@
android:id="@+id/reportMap"
android:layout_width="0dp"
android:layout_height="0dp"
+ android:layout_margin="@dimen/margin"
+ android:background="@color/darkBackground"
+ android:visibility="gone"
app:layout_constraintBottom_toTopOf="@id/periodSection"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- android:layout_margin="@dimen/margin"
- android:visibility="gone"
- android:background="@color/darkBackground"/>
+ app:layout_constraintTop_toTopOf="parent" />
<ScrollView
android:id="@+id/eventsScroll"
android:layout_width="0dp"
android:layout_height="0dp"
+ android:layout_margin="@dimen/margin"
+ android:visibility="gone"
app:layout_constraintBottom_toTopOf="@id/periodSection"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- android:layout_margin="@dimen/margin"
- android:visibility="gone">
+ app:layout_constraintTop_toTopOf="parent">
+
<TableLayout
android:id="@+id/eventsTable"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:stretchColumns="*"
+ android:isScrollContainer="true"
android:scrollbars="vertical"
- android:isScrollContainer="true">
+ android:stretchColumns="*">
<TableRow android:background="@color/colorPrimary">