diff options
author | Iván Ávalos <avalos@disroot.org> | 2022-01-14 03:02:41 -0600 |
---|---|---|
committer | Iván Ávalos <avalos@disroot.org> | 2022-01-14 03:02:41 -0600 |
commit | 81a0b6689e94b8a10ebf68dccbb94a1f11507487 (patch) | |
tree | 211a24d64df149a1bc1587b19f2d65dedba012b5 /androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/DetailsActivity.kt | |
parent | 3692d0de20a85ef7e22a31aa9f842078fb774bbe (diff) | |
download | etbsa-trackermap-mobile-81a0b6689e94b8a10ebf68dccbb94a1f11507487.tar.gz etbsa-trackermap-mobile-81a0b6689e94b8a10ebf68dccbb94a1f11507487.tar.bz2 etbsa-trackermap-mobile-81a0b6689e94b8a10ebf68dccbb94a1f11507487.zip |
Pass device name to details activity and redesigned commands fragment
Diffstat (limited to 'androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/DetailsActivity.kt')
-rw-r--r-- | androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/DetailsActivity.kt | 7 |
1 files changed, 6 insertions, 1 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 2c20c70..f66a760 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 @@ -9,19 +9,23 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.app.ActivityCompat import com.google.android.material.tabs.TabLayout import com.google.android.material.tabs.TabLayoutMediator +import kotlinx.coroutines.DelicateCoroutinesApi import mx.trackermap.TrackerMap.android.R import mx.trackermap.TrackerMap.android.databinding.DetailsActivityBinding import mx.trackermap.TrackerMap.android.devices.Action +@DelicateCoroutinesApi class DetailsActivity : AppCompatActivity() { private var _binding: DetailsActivityBinding? = null private val binding get() = _binding!! private lateinit var adapter: UnitDetailsAdapter private var deviceId: Int = 0 + private var deviceName: String = "" companion object { const val DEVICE_ID_EXTRA = "device_id" + const val DEVICE_NAME_EXTRA = "device_name" const val ACTION_EXTRA = "action" } @@ -42,11 +46,12 @@ class DetailsActivity : AppCompatActivity() { private fun initialize() { deviceId = intent.getIntExtra(DEVICE_ID_EXTRA, 0) + deviceName = intent.getStringExtra(DEVICE_NAME_EXTRA) ?: "" val initialSection = intent.getSerializableExtra(ACTION_EXTRA) as Action Log.d("DetailsActivity", "Device ID - $deviceId") Log.d("DetailsActivity", "Initial Section - $initialSection") - adapter = UnitDetailsAdapter(this, deviceId) + adapter = UnitDetailsAdapter(this, deviceId, deviceName) binding.detailsPager.adapter = adapter TabLayoutMediator(binding.detailsTabs, binding.detailsPager) { tab, position -> tab.text = when (position) { |