From 40b9a03ecb0d0f191934fb2e6102c6e7e05aef5e Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Thu, 13 Jan 2022 18:46:43 -0600 Subject: Full screen map/devices fragment on UnitsActivity --- .../trackermap/TrackerMap/android/devices/DevicesAdapter.kt | 11 +++++++++++ androidApp/src/main/res/layout/units_activity.xml | 3 +-- androidApp/src/main/res/values/dimen.xml | 3 +++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/devices/DevicesAdapter.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/devices/DevicesAdapter.kt index 175e908..42e30d9 100644 --- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/devices/DevicesAdapter.kt +++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/devices/DevicesAdapter.kt @@ -1,8 +1,12 @@ package mx.trackermap.TrackerMap.android.devices +import android.util.TypedValue import android.view.LayoutInflater import android.view.ViewGroup +import android.widget.FrameLayout +import androidx.core.view.updateLayoutParams import androidx.recyclerview.widget.RecyclerView +import mx.trackermap.TrackerMap.android.R import mx.trackermap.TrackerMap.android.databinding.UnitItemBinding import mx.trackermap.TrackerMap.client.models.UnitInformation @@ -24,7 +28,14 @@ class DevicesAdapter( override fun onBindViewHolder(holder: ViewHolder, position: Int) { val unit = units[position] val context = holder.itemView.context + val metrics = context.resources.displayMetrics holder.binding.apply { + if (position == 0) { + swipeLayout.updateLayoutParams { + this.topMargin = + context.resources.getDimensionPixelSize(R.dimen.nav_height) + } + } UnitRenderData.render( UnitRenderData.UnitRenderViewHolder( unitName = unitName, diff --git a/androidApp/src/main/res/layout/units_activity.xml b/androidApp/src/main/res/layout/units_activity.xml index 08d1cd0..86fd99c 100644 --- a/androidApp/src/main/res/layout/units_activity.xml +++ b/androidApp/src/main/res/layout/units_activity.xml @@ -11,11 +11,10 @@ android:id="@+id/displayContainer" android:layout_width="0dp" android:layout_height="0dp" - android:layout_marginTop="@dimen/fab_margin" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/displayModeToggle" /> + app:layout_constraintTop_toTopOf="parent" /> 12dp 8dp + + 64dp + 11sp 11sp -- cgit v1.2.3