Faster loading for device detail view

klassm · klassm · commit 5b8427364a37 · 2018-12-23T13:50:53.000+01:00
diff --git a/app/src/main/java/li/klass/fhem/adapter/devices/core/OverviewDeviceAdapter.kt b/app/src/main/java/li/klass/fhem/adapter/devices/core/OverviewDeviceAdapter.kt
@@ -89,7 +89,7 @@ abstract class OverviewDeviceAdapter : DeviceAdapter() {
         throw IllegalStateException("no overview strategy found, default should always be present")
     }
 
-    suspend fun createOverviewView(convertView: View?, rawDevice: FhemDevice, context: Context): View {
+    fun createOverviewView(convertView: View?, rawDevice: FhemDevice, context: Context): View {
         val stopWatch = StopWatch()
         stopWatch.start()
         val viewStrategy = getMostSpecificOverviewStrategy(rawDevice)
diff --git a/app/src/main/java/li/klass/fhem/adapter/devices/genericui/HolderActionRow.kt b/app/src/main/java/li/klass/fhem/adapter/devices/genericui/HolderActionRow.kt
@@ -36,7 +36,7 @@ import org.apmem.tools.layouts.FlowLayout
 
 abstract class HolderActionRow<I>(private val description: String, private val layout: Int) {
 
-    suspend fun createRow(context: Context, viewGroup: ViewGroup, device: FhemDevice, connectionId: String?): TableRow {
+    fun createRow(context: Context, viewGroup: ViewGroup, device: FhemDevice, connectionId: String?): TableRow {
         val inflater = LayoutInflater.from(context)
         val row = inflater.inflate(layout, viewGroup, false) as TableRow
 
@@ -59,7 +59,7 @@ abstract class HolderActionRow<I>(private val description: String, private val l
 
     abstract fun getItems(device: FhemDevice): List<I>
 
-    abstract suspend fun viewFor(item: I, device: FhemDevice, inflater: LayoutInflater, context: Context, viewGroup: ViewGroup, connectionId: String?): View?
+    abstract fun viewFor(item: I, device: FhemDevice, inflater: LayoutInflater, context: Context, viewGroup: ViewGroup, connectionId: String?): View?
 
     companion object {
 
diff --git a/app/src/main/java/li/klass/fhem/adapter/devices/genericui/WebCmdActionRow.kt b/app/src/main/java/li/klass/fhem/adapter/devices/genericui/WebCmdActionRow.kt
@@ -45,8 +45,8 @@ open class WebCmdActionRow(
 ) : HolderActionRow<String>(description, layout) {
     override fun getItems(device: FhemDevice): List<String> = device.webCmd
 
-    override suspend fun viewFor(item: String, device: FhemDevice, inflater: LayoutInflater,
-                                 context: Context, viewGroup: ViewGroup, connectionId: String?): View {
+    override fun viewFor(item: String, device: FhemDevice, inflater: LayoutInflater,
+                         context: Context, viewGroup: ViewGroup, connectionId: String?): View {
 
         val container = inflater.inflate(R.layout.webcmd_row_element, viewGroup, false)
         val button = container.findViewById<ToggleButton>(R.id.toggleButton)!!
diff --git a/app/src/main/java/li/klass/fhem/adapter/devices/strategy/DefaultViewStrategy.kt b/app/src/main/java/li/klass/fhem/adapter/devices/strategy/DefaultViewStrategy.kt
@@ -47,7 +47,7 @@ constructor(
 ) : ViewStrategy() {
 
 
-    override suspend fun createOverviewView(layoutInflater: LayoutInflater, convertView: View?, rawDevice: FhemDevice, deviceItems: List<XmlDeviceViewItem>, connectionId: String?): View {
+    override fun createOverviewView(layoutInflater: LayoutInflater, convertView: View?, rawDevice: FhemDevice, deviceItems: List<XmlDeviceViewItem>, connectionId: String?): View {
         var myView = convertView
         val stopWatch = StopWatch()
         stopWatch.start()
diff --git a/app/src/main/java/li/klass/fhem/adapter/devices/strategy/DimmableStrategy.kt b/app/src/main/java/li/klass/fhem/adapter/devices/strategy/DimmableStrategy.kt
@@ -50,7 +50,7 @@ constructor(
         val applicationProperties: ApplicationProperties
 ) : ViewStrategy() {
 
-    override suspend fun createOverviewView(layoutInflater: LayoutInflater, convertView: View?, rawDevice: FhemDevice, deviceItems: List<XmlDeviceViewItem>, connectionId: String?): View {
+    override fun createOverviewView(layoutInflater: LayoutInflater, convertView: View?, rawDevice: FhemDevice, deviceItems: List<XmlDeviceViewItem>, connectionId: String?): View {
         val myView = when {
             convertView == null || convertView.tag == null -> {
                 val v = layoutInflater.inflate(R.layout.device_overview_generic, null)
diff --git a/app/src/main/java/li/klass/fhem/adapter/devices/strategy/LightSceneDeviceViewStrategy.kt b/app/src/main/java/li/klass/fhem/adapter/devices/strategy/LightSceneDeviceViewStrategy.kt
@@ -47,7 +47,7 @@ class LightSceneDeviceViewStrategy @Inject constructor(
         val stateUiService: StateUiService
 ) : ViewStrategy() {
 
-    override suspend fun createOverviewView(layoutInflater: LayoutInflater, convertView: View?, rawDevice: FhemDevice, deviceItems: List<XmlDeviceViewItem>, connectionId: String?): View {
+    override fun createOverviewView(layoutInflater: LayoutInflater, convertView: View?, rawDevice: FhemDevice, deviceItems: List<XmlDeviceViewItem>, connectionId: String?): View {
         val layout = layoutInflater.inflate(R.layout.device_overview_generic, null) as TableLayout
         layout.removeAllViews()
 
@@ -62,7 +62,7 @@ class LightSceneDeviceViewStrategy @Inject constructor(
                 }
             }
 
-            override suspend fun viewFor(item: String, device: FhemDevice, inflater: LayoutInflater, context: Context, viewGroup: ViewGroup, connectionId: String?): View {
+            override fun viewFor(item: String, device: FhemDevice, inflater: LayoutInflater, context: Context, viewGroup: ViewGroup, connectionId: String?): View {
                 val button = inflater.inflate(R.layout.lightscene_button, viewGroup, false) as Button
                 setSceneButtonProperties(device, item, button, context)
                 return button
diff --git a/app/src/main/java/li/klass/fhem/adapter/devices/strategy/ToggleableStrategy.kt b/app/src/main/java/li/klass/fhem/adapter/devices/strategy/ToggleableStrategy.kt
@@ -52,7 +52,7 @@ class ToggleableStrategy
                     private val toggleableService: ToggleableService,
                     private val stateUiService: StateUiService) : ViewStrategy() {
 
-    override suspend fun createOverviewView(layoutInflater: LayoutInflater, convertView: View?, rawDevice: FhemDevice, deviceItems: List<XmlDeviceViewItem>, connectionId: String?): View {
+    override fun createOverviewView(layoutInflater: LayoutInflater, convertView: View?, rawDevice: FhemDevice, deviceItems: List<XmlDeviceViewItem>, connectionId: String?): View {
         var myView = convertView
         val stopWatch = StopWatch()
         stopWatch.start()
diff --git a/app/src/main/java/li/klass/fhem/adapter/devices/strategy/ViewStrategy.kt b/app/src/main/java/li/klass/fhem/adapter/devices/strategy/ViewStrategy.kt
@@ -33,7 +33,7 @@ import li.klass.fhem.adapter.devices.core.deviceItems.XmlDeviceViewItem
 import li.klass.fhem.domain.core.FhemDevice
 
 abstract class ViewStrategy {
-    abstract suspend fun createOverviewView(layoutInflater: LayoutInflater, convertView: View?, rawDevice: FhemDevice, deviceItems: List<XmlDeviceViewItem>, connectionId: String?): View
+    abstract fun createOverviewView(layoutInflater: LayoutInflater, convertView: View?, rawDevice: FhemDevice, deviceItems: List<XmlDeviceViewItem>, connectionId: String?): View
 
     protected fun setTextView(textView: TextView?, value: String?) {
         val myValue = if (value == null) "" else value
diff --git a/app/src/main/java/li/klass/fhem/adapter/devices/strategy/WeatherDeviceViewStrategy.kt b/app/src/main/java/li/klass/fhem/adapter/devices/strategy/WeatherDeviceViewStrategy.kt
@@ -29,9 +29,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.widget.ImageView
 import kotlinx.android.synthetic.main.device_overview_weather.view.*
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.coroutineScope
-import kotlinx.coroutines.withContext
 import li.klass.fhem.GlideApp
 import li.klass.fhem.R
 import li.klass.fhem.adapter.devices.core.GenericDeviceOverviewViewHolder
@@ -48,16 +45,12 @@ class WeatherDeviceViewStrategy @Inject constructor(
 ) : ViewStrategy() {
 
     @SuppressLint("InflateParams")
-    override suspend fun createOverviewView(layoutInflater: LayoutInflater, convertView: View?, rawDevice: FhemDevice, deviceItems: List<XmlDeviceViewItem>, connectionId: String?): View {
+    override fun createOverviewView(layoutInflater: LayoutInflater, convertView: View?, rawDevice: FhemDevice, deviceItems: List<XmlDeviceViewItem>, connectionId: String?): View {
         val view = layoutInflater.inflate(R.layout.device_overview_weather, null)
         defaultViewStrategy.fillDeviceOverviewView(view, rawDevice, GenericDeviceOverviewViewHolder(view), deviceItems, layoutInflater)
 
-        coroutineScope {
-            val url = withContext(Dispatchers.IO) {
-                weatherService.iconFor(rawDevice)
-            }
-            setWeatherIconIn(view.weatherImage, url)
-        }
+        val url = weatherService.iconFor(rawDevice)
+        setWeatherIconIn(view.weatherImage, url)
         return view
     }
 
diff --git a/app/src/main/java/li/klass/fhem/adapter/devices/strategy/WebcmdStrategy.kt b/app/src/main/java/li/klass/fhem/adapter/devices/strategy/WebcmdStrategy.kt
@@ -44,7 +44,7 @@ import javax.inject.Singleton
 class WebcmdStrategy @Inject
 constructor(val hookProvider: DeviceHookProvider, val stateUiService: StateUiService) : ViewStrategy() {
 
-    override suspend fun createOverviewView(layoutInflater: LayoutInflater, convertView: View?, rawDevice: FhemDevice, deviceItems: List<XmlDeviceViewItem>, connectionId: String?): View {
+    override fun createOverviewView(layoutInflater: LayoutInflater, convertView: View?, rawDevice: FhemDevice, deviceItems: List<XmlDeviceViewItem>, connectionId: String?): View {
         var myView = convertView
         if (myView == null || myView.tag == null) {
             myView = layoutInflater.inflate(R.layout.device_overview_generic, null)
@@ -61,13 +61,13 @@ constructor(val hookProvider: DeviceHookProvider, val stateUiService: StateUiSer
     override fun supports(fhemDevice: FhemDevice): Boolean =
             hookProvider.buttonHookFor(fhemDevice) == WEBCMD_DEVICE
 
-    private suspend fun addOverviewSwitchActionRow(holder: GenericDeviceOverviewViewHolder, device: FhemDevice, connectionId: String?) {
+    private fun addOverviewSwitchActionRow(holder: GenericDeviceOverviewViewHolder, device: FhemDevice, connectionId: String?) {
         val layout = holder.tableLayout
         addWebCmdOverviewActionRow(layout.context, device, layout, connectionId)
     }
 
-    private suspend fun addWebCmdOverviewActionRow(context: Context, device: FhemDevice,
-                                                   tableLayout: TableLayout, connectionId: String?) {
+    private fun addWebCmdOverviewActionRow(context: Context, device: FhemDevice,
+                                           tableLayout: TableLayout, connectionId: String?) {
         tableLayout.addView(WebCmdActionRow(stateUiService, context, HolderActionRow.LAYOUT_OVERVIEW, device.aliasOrName)
                 .createRow(context, tableLayout, device, connectionId))
     }
diff --git a/app/src/main/java/li/klass/fhem/devices/list/ui/DeviceListFragment.kt b/app/src/main/java/li/klass/fhem/devices/list/ui/DeviceListFragment.kt
@@ -207,32 +207,32 @@ abstract class DeviceListFragment : BaseFragment() {
         LOGGER.debug("updateWith - update dummyConnectionNotification, time=${stopWatch.time}")
     }
 
+    private fun firstChildOf(layout: CardView) = when (layout.childCount) {
+        0 -> null
+        else -> layout.getChildAt(0)
+    }
+
     private fun createDeviceView(device: FhemDevice, view: View) {
-        GlobalScope.launch(Dispatchers.Main) {
-            fun firstChildOf(layout: CardView) = when (layout.childCount) {
-                0 -> null
-                else -> layout.getChildAt(0)
-            }
+        LOGGER.info("createDeviceView(name=${device.name})")
 
-            val stopWatch = StopWatch()
-            stopWatch.start()
+        val stopWatch = StopWatch()
+        stopWatch.start()
 
-            LOGGER.debug("bind - getAdapterFor device=${device.name}, time=${stopWatch.time}")
+        LOGGER.debug("bind - getAdapterFor device=${device.name}, time=${stopWatch.time}")
 
-            val contentView = genericOverviewDetailDeviceAdapter.createOverviewView(firstChildOf(view.card), device, view.context)
+        val contentView = genericOverviewDetailDeviceAdapter.createOverviewView(firstChildOf(view.card), device, view.context)
 
-            LOGGER.debug("bind - creating view for device=${device.name}, time=${stopWatch.time}")
+        LOGGER.debug("bind - creating view for device=${device.name}, time=${stopWatch.time}")
 
-            view.card.removeAllViews()
-            view.card.addView(contentView)
+        view.card.removeAllViews()
+        view.card.addView(contentView)
 
-            LOGGER.debug("bind - adding content view device=${device.name}, time=${stopWatch.time}")
+        LOGGER.debug("bind - adding content view device=${device.name}, time=${stopWatch.time}")
 
-            view.setOnClickListener { onClick(device) }
-            view.setOnLongClickListener { onLongClick(device) }
+        view.setOnClickListener { onClick(device) }
+        view.setOnLongClickListener { onLongClick(device) }
 
-            LOGGER.debug("bind - finished device=${device.name}, time=${stopWatch.time}")
-        }
+        LOGGER.debug("bind - finished device=${device.name}, time=${stopWatch.time}")
     }
 
     private fun onClick(device: FhemDevice) {
@@ -257,6 +257,6 @@ abstract class DeviceListFragment : BaseFragment() {
 
     companion object {
         private val LOGGER = LoggerFactory.getLogger(DeviceListFragment::class.java)
-        val DEFAULT_COLUMN_WIDTH = 350
+        const val DEFAULT_COLUMN_WIDTH = 350
     }
 }
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -217,7 +217,7 @@
 
     <style name="deviceOverviewTable">
         <item name="android:background">?backgroundColorSecondary</item>
-        <item name="android:layout_width">fill_parent</item>
+        <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
 
         <item name="android:layout_marginLeft">10dp</item>

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ abstract class OverviewDeviceAdapter : DeviceAdapter() {`
`89`	`89`	`throw IllegalStateException("no overview strategy found, default should always be present")`
`90`	`90`	`}`
`91`	`91`
`92`		`- suspend fun createOverviewView(convertView: View?, rawDevice: FhemDevice, context: Context): View {`
	`92`	`+ fun createOverviewView(convertView: View?, rawDevice: FhemDevice, context: Context): View {`
`93`	`93`	`val stopWatch = StopWatch()`
`94`	`94`	`stopWatch.start()`
`95`	`95`	`val viewStrategy = getMostSpecificOverviewStrategy(rawDevice)`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ class LightSceneDeviceViewStrategy @Inject constructor(`
`47`	`47`	`val stateUiService: StateUiService`
`48`	`48`	`) : ViewStrategy() {`
`49`	`49`
`50`		`- override suspend fun createOverviewView(layoutInflater: LayoutInflater, convertView: View?, rawDevice: FhemDevice, deviceItems: List<XmlDeviceViewItem>, connectionId: String?): View {`
	`50`	`+ override fun createOverviewView(layoutInflater: LayoutInflater, convertView: View?, rawDevice: FhemDevice, deviceItems: List<XmlDeviceViewItem>, connectionId: String?): View {`
`51`	`51`	`val layout = layoutInflater.inflate(R.layout.device_overview_generic, null) as TableLayout`
`52`	`52`	`layout.removeAllViews()`
`53`	`53`
`@@ -62,7 +62,7 @@ class LightSceneDeviceViewStrategy @Inject constructor(`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`
`65`		`- override suspend fun viewFor(item: String, device: FhemDevice, inflater: LayoutInflater, context: Context, viewGroup: ViewGroup, connectionId: String?): View {`
	`65`	`+ override fun viewFor(item: String, device: FhemDevice, inflater: LayoutInflater, context: Context, viewGroup: ViewGroup, connectionId: String?): View {`
`66`	`66`	`val button = inflater.inflate(R.layout.lightscene_button, viewGroup, false) as Button`
`67`	`67`	`setSceneButtonProperties(device, item, button, context)`
`68`	`68`	`return button`