Clicking on devices within the device navigation bar does not consider alias #1237

Author: klassm

app/src/inapp/play/de-DE/whatsnew

@@ -1,3 +1,4 @@
 * Beachte selbst-signierte Zertifikate beim Laden von devStateIcons
 * Füge Hinweis für "column" Attribut bei der Konfiguration der Gerätetyp-Reihenfolge hinzu
-* Migriere als generische Geräte: OWDevice, Remotecontrol
+* Migriere als generische Geräte: OWDevice, Remotecontrol
+* Beachte alias beim Klicken auf Geräte in der Navigationsleiste (nur Tablets)

app/src/inapp/play/en-US/whatsnew

@@ -1,3 +1,4 @@
 * Consider self-signed certificates when loading devStateIcons
 * Add note for "column" attribute in device functionality order preference
-* Migrate as generic devices: OWDevice, remotecontrol
+* Migrate as generic devices: OWDevice, remotecontrol
+* Consider alias when clicking on devices within the navigation bar (tables only)

app/src/main/java/li/klass/fhem/devices/detail/ui/DeviceDetailFragment.kt

@@ -158,13 +158,9 @@ class DeviceDetailFragment : BaseFragment() {
 
     private fun findScrollView(): ScrollView? = view!!.findViewById(R.id.deviceDetailView)
 
-    override fun getTitle(context: Context): CharSequence? {
-        var name = arguments?.getString(DEVICE_DISPLAY_NAME)
-        if (name == null) {
-            name = arguments?.getString(DEVICE_NAME)
-        }
-        return name
-    }
+    override fun getTitle(context: Context): CharSequence? =
+            arguments?.getString(DEVICE_DISPLAY_NAME)
+                    ?: arguments?.getString(DEVICE_NAME)
 
     override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
         super.onCreateOptionsMenu(menu, inflater)

app/src/main/java/li/klass/fhem/domain/core/FhemDevice.java

@@ -133,10 +133,6 @@ private void parseEventMap(String content) {
         eventMap = EventMapParser.INSTANCE.parseEventMap(content);
     }
 
-    protected void putEventToEventMap(String key, String value) {
-        eventMap = eventMap.put(key, value);
-    }
-
     @ShowField(description = ResourceIdMapper.deviceName, showAfter = ShowField.FIRST)
     public String getAliasOrName() {
         String andFHEMAlias = getAndFHEMAlias();

app/src/main/java/li/klass/fhem/fragments/device/DeviceNameListFragment.kt

@@ -137,7 +137,7 @@ abstract class DeviceNameListFragment : BaseFragment() {
         }
     }
 
-    protected fun deviceListReceived(elements: List<ViewableElementsCalculator.Element>) {
+    private fun deviceListReceived(elements: List<ViewableElementsCalculator.Element>) {
         val devicesView = view?.devices ?: return
         devicesView.adapter = DeviceGroupAdapter(elements, DeviceGroupAdapter.Configuration(
                 deviceResourceId = if (isNavigation) R.layout.device_name_selection_navigation else R.layout.device_name_selection,
@@ -148,11 +148,18 @@ abstract class DeviceNameListFragment : BaseFragment() {
                         true -> R.color.android_green
                         else -> android.R.color.transparent
                     })
+                    view.tag = device.name
                 }
         ))
         devicesView.layoutManager = StaggeredGridLayoutManager(getNumberOfColumns(), StaggeredGridLayoutManager.VERTICAL)
         view?.invalidate()
 
+        val childViewToSelect = elements.indexOfFirst {
+            it is ViewableElementsCalculator.Element.Device
+                    && it.device.name == deviceName
+        }
+        devicesView.scrollToPosition(childViewToSelect)
+
         if (elements.isNotEmpty()) {
             hideEmptyView()
         } else {

app/src/main/java/li/klass/fhem/fragments/device/DeviceNameListNavigationFragment.kt

@@ -48,6 +48,7 @@ class DeviceNameListNavigationFragment : DeviceNameListFragment() {
         activity?.sendBroadcast(Intent(Actions.SHOW_FRAGMENT)
                 .putExtra(FRAGMENT, FragmentType.DEVICE_DETAIL)
                 .putExtra(DEVICE_NAME, child.name)
+                .putExtra(DEVICE_DISPLAY_NAME, child.aliasOrName)
                 .putExtra(CALLING_FRAGMENT, arguments?.getSerializable(CALLING_FRAGMENT))
                 .putExtra(ROOM_NAME, roomName))
     }