Merge pull request #288 from icerockdev/fixes-for-chat

Fixes implemented in project development

Author: Alex009

widgets/src/androidMain/kotlin/dev/icerock/moko/widgets/core/factory/InputLengthViewFactory.kt

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2020 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.moko.widgets.core.factory
+
+import android.text.InputFilter.LengthFilter
+import android.view.View
+import android.view.ViewGroup
+import android.widget.EditText
+import dev.icerock.moko.widgets.core.ViewBundle
+import dev.icerock.moko.widgets.core.ViewFactory
+import dev.icerock.moko.widgets.core.ViewFactoryContext
+import dev.icerock.moko.widgets.core.style.view.WidgetSize
+import dev.icerock.moko.widgets.core.utils.bind
+import dev.icerock.moko.widgets.core.widget.InputLengthWidget
+
+actual open class InputLengthViewFactory actual constructor() : ViewFactory<InputLengthWidget<out WidgetSize>> {
+    override fun <WS : WidgetSize> build(
+        widget: InputLengthWidget<out WidgetSize>,
+        size: WS,
+        viewFactoryContext: ViewFactoryContext
+    ): ViewBundle<WS> {
+        val bundle = widget.child.buildView(viewFactoryContext) as ViewBundle<WS>
+        val editText: EditText = getEditText(bundle.view)
+            ?: throw IllegalArgumentException("EditText not found in child widget result view")
+
+        widget.maxLength.bind(viewFactoryContext.lifecycleOwner) { maxLength ->
+            val filtersWithoutLength = editText.filters.filter { it !is LengthFilter }.toTypedArray()
+            if (maxLength == null) {
+                editText.filters = filtersWithoutLength
+            } else {
+                editText.filters = filtersWithoutLength.plus(LengthFilter(maxLength))
+            }
+        }
+
+        return bundle
+    }
+
+    protected open fun getEditText(view: View): EditText? {
+        when (view) {
+            is EditText -> return view
+            is ViewGroup -> {
+                for (i in 0 until view.childCount) {
+                    val child = view.getChildAt(i)
+                    val editText = getEditText(child)
+                    if (editText != null) return editText
+                }
+                return null
+            }
+            else -> return null
+        }
+    }
+}

widgets/src/androidMain/kotlin/dev/icerock/moko/widgets/core/factory/ReversedListWidgetFactory.kt

@@ -0,0 +1,90 @@
+/*
+ * Copyright 2020 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.moko.widgets.core.factory
+
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import dev.icerock.moko.units.TableUnitItem
+import dev.icerock.moko.units.adapter.UnitsRecyclerViewAdapter
+import dev.icerock.moko.widgets.core.View
+import dev.icerock.moko.widgets.core.ViewBundle
+import dev.icerock.moko.widgets.core.ViewFactory
+import dev.icerock.moko.widgets.core.ViewFactoryContext
+import dev.icerock.moko.widgets.core.style.applyBackgroundIfNeeded
+import dev.icerock.moko.widgets.core.style.background.Background
+import dev.icerock.moko.widgets.core.style.background.Fill
+import dev.icerock.moko.widgets.core.style.view.WidgetSize
+import dev.icerock.moko.widgets.core.utils.androidId
+import dev.icerock.moko.widgets.core.utils.bind
+import dev.icerock.moko.widgets.core.widget.ListWidget
+
+actual class ReversedListWidgetFactory actual constructor(
+    private val background: Background<Fill.Solid>?
+) : ViewFactory<ListWidget<out WidgetSize>> {
+
+    override fun <WS : WidgetSize> build(
+        widget: ListWidget<out WidgetSize>,
+        size: WS,
+        viewFactoryContext: ViewFactoryContext
+    ): ViewBundle<WS> {
+        val context = viewFactoryContext.androidContext
+        val lifecycleOwner = viewFactoryContext.lifecycleOwner
+
+        val layoutManager = LinearLayoutManager(
+            context,
+            RecyclerView.VERTICAL,
+            true
+        )
+        val unitsAdapter = UnitsRecyclerViewAdapter(lifecycleOwner)
+        val recyclerView = RecyclerView(context).also {
+            it.layoutManager = layoutManager
+            it.adapter = unitsAdapter
+            it.setHasFixedSize(true)
+
+            it.id = widget.id.androidId
+        }
+
+        val resultView: View = recyclerView
+
+        widget.items.bind(lifecycleOwner) { units ->
+            val list = units.orEmpty()
+            val onReachEnd = widget.onReachEnd
+            unitsAdapter.units = when (onReachEnd) {
+                null -> list
+                else -> list.observedEnd(onReachEnd)
+            }
+        }
+
+        with(resultView) {
+            applyBackgroundIfNeeded(this@ReversedListWidgetFactory.background)
+        }
+
+        return ViewBundle(
+            view = resultView,
+            size = size,
+            margins = null
+        )
+    }
+
+    private fun List<TableUnitItem>.observedEnd(onReachEnd: () -> Unit): List<TableUnitItem> {
+        if (this.isEmpty()) return this
+
+        val lastWrapped = TableUnitItemWrapper(
+            item = this.last(),
+            onBind = onReachEnd
+        )
+        return this.dropLast(1).plus(lastWrapped)
+    }
+
+    private class TableUnitItemWrapper(
+        private val item: TableUnitItem,
+        private val onBind: () -> Unit
+    ) : TableUnitItem by item {
+        override fun bindViewHolder(viewHolder: RecyclerView.ViewHolder) {
+            item.bindViewHolder(viewHolder)
+            onBind()
+        }
+    }
+}

widgets/src/androidMain/kotlin/dev/icerock/moko/widgets/core/factory/StatefulViewFactory.kt

@@ -69,8 +69,13 @@ actual class StatefulViewFactory actual constructor(
                 is State.Error -> errorView
             }
 
-            views.forEach { it.view.visibility = View.GONE }
-            currentView.view.visibility = View.VISIBLE
+            views.asSequence()
+                .filter { it.view.visibility != View.GONE && it.view.id != currentView.view.id }
+                .forEach { it.view.visibility = View.GONE }
+
+            if (currentView.view.visibility != View.VISIBLE) {
+                currentView.view.visibility = View.VISIBLE
+            }
         }
 
         return ViewBundle(

widgets/src/androidMain/kotlin/dev/icerock/moko/widgets/core/factory/VerticalPageViewFactory.kt

@@ -0,0 +1,57 @@
+/*
+ * Copyright 2020 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.moko.widgets.core.factory
+
+import android.widget.LinearLayout
+import dev.icerock.moko.widgets.core.ViewBundle
+import dev.icerock.moko.widgets.core.ViewFactory
+import dev.icerock.moko.widgets.core.ViewFactoryContext
+import dev.icerock.moko.widgets.core.style.ext.applyMargin
+import dev.icerock.moko.widgets.core.style.view.WidgetSize
+import dev.icerock.moko.widgets.core.widget.VerticalPageWidget
+
+actual open class VerticalPageViewFactory actual constructor() :
+    ViewFactory<VerticalPageWidget<out WidgetSize>> {
+
+    override fun <WS : WidgetSize> build(
+        widget: VerticalPageWidget<out WidgetSize>,
+        size: WS,
+        viewFactoryContext: ViewFactoryContext
+    ): ViewBundle<WS> {
+        val context = viewFactoryContext.androidContext
+
+        val container = LinearLayout(context).apply {
+            orientation = LinearLayout.VERTICAL
+        }
+
+        val childContext = viewFactoryContext.copy(parent = container)
+
+        widget.header?.let { header ->
+            val childBundle = header.buildView(childContext)
+            container.addView(childBundle.view)
+        }
+
+        val bodyBundle = widget.body.buildView(childContext)
+        val layoutParams = LinearLayout.LayoutParams(
+            LinearLayout.LayoutParams.MATCH_PARENT,
+            0,
+            1f
+        ).apply {
+            bodyBundle.margins?.let { applyMargin(context, it) }
+        }
+        container.addView(bodyBundle.view, layoutParams)
+
+        widget.footer?.let { footer ->
+            val childBundle = footer.buildView(childContext)
+            container.addView(childBundle.view)
+        }
+
+        return ViewBundle(
+            view = container,
+            size = size,
+            margins = null
+        )
+    }
+}

widgets/src/commonMain/kotlin/dev/icerock/moko/widgets/core/factory/InputLengthViewFactory.kt

@@ -0,0 +1,11 @@
+/*
+ * Copyright 2020 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.moko.widgets.core.factory
+
+import dev.icerock.moko.widgets.core.ViewFactory
+import dev.icerock.moko.widgets.core.style.view.WidgetSize
+import dev.icerock.moko.widgets.core.widget.InputLengthWidget
+
+expect open class InputLengthViewFactory() : ViewFactory<InputLengthWidget<out WidgetSize>>

widgets/src/commonMain/kotlin/dev/icerock/moko/widgets/core/factory/ReversedListWidgetFactory.kt

@@ -0,0 +1,15 @@
+/*
+ * Copyright 2020 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.moko.widgets.core.factory
+
+import dev.icerock.moko.widgets.core.ViewFactory
+import dev.icerock.moko.widgets.core.style.background.Background
+import dev.icerock.moko.widgets.core.style.background.Fill
+import dev.icerock.moko.widgets.core.style.view.WidgetSize
+import dev.icerock.moko.widgets.core.widget.ListWidget
+
+expect class ReversedListWidgetFactory(
+    background: Background<Fill.Solid>?
+) : ViewFactory<ListWidget<out WidgetSize>>

widgets/src/commonMain/kotlin/dev/icerock/moko/widgets/core/factory/VerticalPageViewFactory.kt

@@ -0,0 +1,11 @@
+/*
+ * Copyright 2020 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.moko.widgets.core.factory
+
+import dev.icerock.moko.widgets.core.ViewFactory
+import dev.icerock.moko.widgets.core.style.view.WidgetSize
+import dev.icerock.moko.widgets.core.widget.VerticalPageWidget
+
+expect open class VerticalPageViewFactory() : ViewFactory<VerticalPageWidget<out WidgetSize>>

widgets/src/commonMain/kotlin/dev/icerock/moko/widgets/core/widget/InputLengthWidget.kt

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2020 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.moko.widgets.core.widget
+
+import dev.icerock.moko.mvvm.livedata.LiveData
+import dev.icerock.moko.widgets.core.OptionalId
+import dev.icerock.moko.widgets.core.Theme
+import dev.icerock.moko.widgets.core.ViewBundle
+import dev.icerock.moko.widgets.core.ViewFactory
+import dev.icerock.moko.widgets.core.ViewFactoryContext
+import dev.icerock.moko.widgets.core.Widget
+import dev.icerock.moko.widgets.core.WidgetDef
+import dev.icerock.moko.widgets.core.factory.InputLengthViewFactory
+import dev.icerock.moko.widgets.core.style.view.WidgetSize
+
+@WidgetDef(InputLengthViewFactory::class)
+class InputLengthWidget<WS : WidgetSize>(
+    private val factory: ViewFactory<InputLengthWidget<out WidgetSize>>,
+    override val id: Id?,
+    val child: InputWidget<WS>,
+    val maxLength: LiveData<Int?>
+) : Widget<WS>(), OptionalId<InputLengthWidget.Id> {
+    override val size: WS = child.size
+
+    override fun buildView(viewFactoryContext: ViewFactoryContext): ViewBundle<WS> {
+        return factory.build(this, size, viewFactoryContext)
+    }
+
+    interface Id : Theme.Id<InputLengthWidget<out WidgetSize>>
+    interface Category : Theme.Category<InputLengthWidget<out WidgetSize>>
+
+    object DefaultCategory : Category
+}

widgets/src/commonMain/kotlin/dev/icerock/moko/widgets/core/widget/VerticalPageWidget.kt

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2020 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.moko.widgets.core.widget
+
+import dev.icerock.moko.widgets.core.OptionalId
+import dev.icerock.moko.widgets.core.Theme
+import dev.icerock.moko.widgets.core.ViewBundle
+import dev.icerock.moko.widgets.core.ViewFactory
+import dev.icerock.moko.widgets.core.ViewFactoryContext
+import dev.icerock.moko.widgets.core.Widget
+import dev.icerock.moko.widgets.core.WidgetDef
+import dev.icerock.moko.widgets.core.factory.VerticalPageViewFactory
+import dev.icerock.moko.widgets.core.style.view.SizeSpec
+import dev.icerock.moko.widgets.core.style.view.WidgetSize
+
+@WidgetDef(VerticalPageViewFactory::class)
+class VerticalPageWidget<WS : WidgetSize>(
+    private val factory: ViewFactory<VerticalPageWidget<out WidgetSize>>,
+    override val size: WS,
+    override val id: Id?,
+    val header: Widget<out WidgetSize>? = null,
+    val body: Widget<WidgetSize.Const<SizeSpec.AsParent, SizeSpec.MatchConstraint>>,
+    val footer: Widget<out WidgetSize>? = null
+) : Widget<WS>(), OptionalId<VerticalPageWidget.Id> {
+
+    override fun buildView(viewFactoryContext: ViewFactoryContext): ViewBundle<WS> {
+        return factory.build(this, size, viewFactoryContext)
+    }
+
+    interface Id : Theme.Id<VerticalPageWidget<out WidgetSize>>
+    interface Category : Theme.Category<VerticalPageWidget<out WidgetSize>>
+
+    object DefaultCategory : Category
+}

widgets/src/iosMain/kotlin/dev/icerock/moko/widgets/core/factory/InputLengthViewFactory.kt

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2020 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.moko.widgets.core.factory
+
+import dev.icerock.moko.mvvm.livedata.mergeWith
+import dev.icerock.moko.widgets.core.ViewBundle
+import dev.icerock.moko.widgets.core.ViewFactory
+import dev.icerock.moko.widgets.core.ViewFactoryContext
+import dev.icerock.moko.widgets.core.style.view.WidgetSize
+import dev.icerock.moko.widgets.core.widget.InputLengthWidget
+
+actual open class InputLengthViewFactory actual constructor() :
+    ViewFactory<InputLengthWidget<out WidgetSize>> {
+    override fun <WS : WidgetSize> build(
+        widget: InputLengthWidget<out WidgetSize>,
+        size: WS,
+        viewFactoryContext: ViewFactoryContext
+    ): ViewBundle<WS> {
+        val bundle = widget.child.buildView(viewFactoryContext) as ViewBundle<WS>
+
+        widget.maxLength.mergeWith(widget.child.field.data) { maxLength, userInput ->
+            if (maxLength != null && userInput.length > maxLength) {
+                widget.child.field.data.value = userInput.take(maxLength)
+            }
+        }
+
+        return bundle
+    }
+}