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

Alex009 · web-flow · commit a1539a464603 · 2021-04-03T23:36:13.000+07:00
Fixes from internal project
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -13,8 +13,9 @@ buildscript {
         maven { url = uri("https://dl.bintray.com/icerockdev/plugins") }
     }
     dependencies {
-        plugin(Deps.Plugins.mokoResources)
-        plugin(Deps.Plugins.mokoWidgets)
+        classpath("dev.icerock.moko:resources-generator:0.13.2")
+        classpath("dev.icerock.moko.widgets:gradle-plugin:0.1.0-dev-21")
+        classpath("gradle:moko-widgets-deps:1")
     }
 }
 
diff --git a/moko-widgets-deps/build.gradle.kts b/moko-widgets-deps/build.gradle.kts
@@ -5,10 +5,13 @@
 import java.io.ByteArrayOutputStream
 
 plugins {
-    id("org.jetbrains.kotlin.jvm") version "1.4.30-M1"
+    id("org.jetbrains.kotlin.jvm") version "1.4.21"
     id("com.github.kukuhyoniatmoko.buildconfigkotlin") version "1.0.5"
 }
 
+group = "gradle"
+version = "1"
+
 repositories {
     jcenter()
     google()
@@ -19,7 +22,7 @@ repositories {
 dependencies {
     api(gradleApi())
     api("dev.icerock:mobile-multiplatform:0.9.0")
-    api("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.30-M1")
+    api("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.21")
     api("com.android.tools.build:gradle:4.1.1")
 }
 
diff --git a/moko-widgets-deps/src/main/kotlin/Deps.kt b/moko-widgets-deps/src/main/kotlin/Deps.kt
@@ -3,7 +3,7 @@
  */
 
 object Deps {
-    private const val kotlinVersion = "1.4.30-M1"
+    private const val kotlinVersion = "1.4.21"
     private const val autoServiceVersion = "1.0-rc6"
 
     private const val androidAppCompatVersion = "1.1.0"
diff --git a/moko-widgets-deps/src/main/kotlin/dev/icerock/moko/widgets/gradle/BintrayPublishingPlugin.kt b/moko-widgets-deps/src/main/kotlin/dev/icerock/moko/widgets/gradle/BintrayPublishingPlugin.kt
diff --git a/moko-widgets-deps/src/main/kotlin/dev/icerock/moko/widgets/gradle/PublishToBintrayRepository.kt b/moko-widgets-deps/src/main/kotlin/dev/icerock/moko/widgets/gradle/PublishToBintrayRepository.kt
diff --git a/moko-widgets-deps/src/main/kotlin/org/gradle/api/publish/maven/internal/publisher/BintrayPublisher.kt b/moko-widgets-deps/src/main/kotlin/org/gradle/api/publish/maven/internal/publisher/BintrayPublisher.kt
diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
@@ -2,6 +2,21 @@
  * Copyright 2020 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
  */
 
+buildscript {
+    repositories {
+        jcenter()
+        google()
+
+        maven { url = uri("https://dl.bintray.com/kotlin/kotlin") }
+        maven { url = uri("https://kotlin.bintray.com/kotlinx") }
+        maven { url = uri("https://plugins.gradle.org/m2/") }
+        maven { url = uri("https://dl.bintray.com/icerockdev/plugins") }
+    }
+    dependencies {
+        classpath("gradle:moko-widgets-deps:1")
+    }
+}
+
 allprojects {
     repositories {
         google()
diff --git a/plugin/buildSrc/build.gradle.kts b/plugin/buildSrc/build.gradle.kts
diff --git a/plugin/buildSrc/src b/plugin/buildSrc/src
diff --git a/plugin/settings.gradle.kts b/plugin/settings.gradle.kts
@@ -2,6 +2,8 @@
  * Copyright 2020 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
  */
 
+includeBuild("../moko-widgets-deps")
+
 include(":kotlin-common-plugin")
 include(":kotlin-plugin")
 include(":kotlin-native-plugin")
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -2,6 +2,7 @@
  * Copyright 2019 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
  */
 
+includeBuild("moko-widgets-deps")
 includeBuild("plugin")
 
 include(":widgets")
diff --git a/widgets/src/androidMain/kotlin/dev/icerock/moko/widgets/core/factory/ReversedListWidgetFactory.kt b/widgets/src/androidMain/kotlin/dev/icerock/moko/widgets/core/factory/ReversedListWidgetFactory.kt
@@ -19,6 +19,7 @@ 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
+import dev.icerock.moko.widgets.core.widget.ScrollListView
 
 actual class ReversedListWidgetFactory actual constructor(
     private val background: Background<Fill.Solid>?
@@ -46,6 +47,12 @@ actual class ReversedListWidgetFactory actual constructor(
             it.id = widget.id.androidId
         }
 
+        widget.lastScrollView = object : ScrollListView {
+            override fun scrollToPosition(index: Int) {
+                recyclerView.scrollToPosition(index)
+            }
+        }
+        
         val resultView: View = recyclerView
 
         widget.items.bind(lifecycleOwner) { units ->
diff --git a/widgets/src/androidMain/kotlin/dev/icerock/moko/widgets/core/factory/StatefulViewFactory.kt b/widgets/src/androidMain/kotlin/dev/icerock/moko/widgets/core/factory/StatefulViewFactory.kt
@@ -70,7 +70,7 @@ actual class StatefulViewFactory actual constructor(
             }
 
             views.asSequence()
-                .filter { it.view.visibility != View.GONE && it.view.id != currentView.view.id }
+                .filter { it.view.visibility != View.GONE && it.view != currentView.view }
                 .forEach { it.view.visibility = View.GONE }
 
             if (currentView.view.visibility != View.VISIBLE) {
diff --git a/widgets/src/androidMain/kotlin/dev/icerock/moko/widgets/core/factory/SystemListViewFactory.kt b/widgets/src/androidMain/kotlin/dev/icerock/moko/widgets/core/factory/SystemListViewFactory.kt
@@ -24,6 +24,7 @@ import dev.icerock.moko.widgets.core.style.view.PaddingValues
 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.ScrollListView
 
 actual class SystemListViewFactory actual constructor(
     private val background: Background<Fill.Solid>?,
@@ -61,6 +62,12 @@ actual class SystemListViewFactory actual constructor(
             id = widget.id.androidId
         }
 
+        widget.lastScrollView = object : ScrollListView {
+            override fun scrollToPosition(index: Int) {
+                recyclerView.scrollToPosition(index)
+            }
+        }
+
         val resultView: View = if (haveSwipeRefreshListener) {
             val swipeRefreshLayout = SwipeRefreshLayout(context).apply {
                 clipToPadding = false
diff --git a/widgets/src/androidMain/kotlin/dev/icerock/moko/widgets/core/style/background/BackgroundExt.kt b/widgets/src/androidMain/kotlin/dev/icerock/moko/widgets/core/style/background/BackgroundExt.kt
@@ -55,7 +55,26 @@ fun Background<out Fill>.buildBackground(context: Context): Drawable {
     }
 
     if (cornerRadius != null) {
-        gradientDrawable.cornerRadius = cornerRadius * scale
+        var topLeftRadius = 0f
+        var topRightRadius = 0f
+        var bottomLeftRadius = 0f
+        var bottomRightRadius = 0f
+
+        (maskedCorners ?: Corner.values().toList()).onEach { corner ->
+            when (corner) {
+                Corner.TOP_LEFT -> topLeftRadius = cornerRadius * scale
+                Corner.TOP_RIGHT -> topRightRadius = cornerRadius * scale
+                Corner.BOTTOM_LEFT -> bottomLeftRadius = cornerRadius * scale
+                Corner.BOTTOM_RIGHT -> bottomRightRadius = cornerRadius * scale
+            }
+        }
+
+        gradientDrawable.cornerRadii = floatArrayOf(
+            topLeftRadius, topLeftRadius,
+            topRightRadius, topRightRadius,
+            bottomRightRadius, bottomRightRadius,
+            bottomLeftRadius, bottomLeftRadius
+        )
     }
 
     if (border != null) {
diff --git a/widgets/src/commonMain/kotlin/dev/icerock/moko/widgets/core/style/background/Background.kt b/widgets/src/commonMain/kotlin/dev/icerock/moko/widgets/core/style/background/Background.kt
@@ -7,5 +7,6 @@ package dev.icerock.moko.widgets.core.style.background
 data class Background<F : Fill>(
     val fill: F? = null,
     val border: Border? = null,
-    val cornerRadius: Float? = null
+    val cornerRadius: Float? = null,
+    val maskedCorners: List<Corner>? = null
 )
diff --git a/widgets/src/commonMain/kotlin/dev/icerock/moko/widgets/core/style/background/Corner.kt b/widgets/src/commonMain/kotlin/dev/icerock/moko/widgets/core/style/background/Corner.kt
@@ -0,0 +1,12 @@
+/*
+ * Copyright 2020 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.moko.widgets.core.style.background
+
+enum class Corner {
+    TOP_LEFT,
+    TOP_RIGHT,
+    BOTTOM_LEFT,
+    BOTTOM_RIGHT
+}
diff --git a/widgets/src/commonMain/kotlin/dev/icerock/moko/widgets/core/widget/ListWidget.kt b/widgets/src/commonMain/kotlin/dev/icerock/moko/widgets/core/widget/ListWidget.kt
@@ -26,6 +26,8 @@ class ListWidget<WS : WidgetSize>(
     val onRefresh: ((completion: () -> Unit) -> Unit)?
 ) : Widget<WS>(), RequireId<ListWidget.Id> {
 
+    internal var lastScrollView: ScrollListView? = null
+
     override fun buildView(viewFactoryContext: ViewFactoryContext): ViewBundle<WS> {
         return factory.build(this, size, viewFactoryContext)
     }
@@ -34,4 +36,12 @@ class ListWidget<WS : WidgetSize>(
     interface Category : Theme.Category<ListWidget<out WidgetSize>>
 
     object DefaultCategory : Category
+
+    fun scrollToPosition(index: Int) {
+        lastScrollView?.scrollToPosition(index)
+    }
+}
+
+interface ScrollListView {
+    fun scrollToPosition(index: Int)
 }
diff --git a/widgets/src/iosMain/kotlin/dev/icerock/moko/widgets/core/factory/ReversedListWidgetFactory.kt b/widgets/src/iosMain/kotlin/dev/icerock/moko/widgets/core/factory/ReversedListWidgetFactory.kt
@@ -16,16 +16,20 @@ import dev.icerock.moko.widgets.core.utils.applyBackgroundIfNeeded
 import dev.icerock.moko.widgets.core.utils.bind
 import dev.icerock.moko.widgets.core.utils.setEventHandler
 import dev.icerock.moko.widgets.core.widget.ListWidget
+import dev.icerock.moko.widgets.core.widget.ScrollListView
 import kotlinx.cinterop.readValue
 import platform.CoreGraphics.CGAffineTransformMakeRotation
 import platform.CoreGraphics.CGRectZero
+import platform.Foundation.NSIndexPath
 import platform.UIKit.UIControlEventValueChanged
 import platform.UIKit.UIRefreshControl
 import platform.UIKit.UITableView
 import platform.UIKit.UITableViewAutomaticDimension
 import platform.UIKit.UITableViewCell
 import platform.UIKit.UITableViewCellSeparatorStyle
+import platform.UIKit.UITableViewScrollPosition
 import platform.UIKit.UITableViewStyle
+import platform.UIKit.indexPathForRow
 import platform.UIKit.translatesAutoresizingMaskIntoConstraints
 
 
@@ -67,6 +71,19 @@ actual class ReversedListWidgetFactory actual constructor(
             }
         }
 
+        widget.lastScrollView = object : ScrollListView {
+            override fun scrollToPosition(index: Int) {
+                tableView.scrollToRowAtIndexPath(
+                    NSIndexPath.indexPathForRow(
+                        row = index.toLong(),
+                        inSection = 0
+                    ),
+                    animated = true,
+                    atScrollPosition = UITableViewScrollPosition.UITableViewScrollPositionBottom
+                )
+            }
+        }
+
         widget.items.bind { items ->
             val lastIndex = items.lastIndex
             val processedItems = items.mapIndexed { index: Int, tableUnitItem: TableUnitItem ->
diff --git a/widgets/src/iosMain/kotlin/dev/icerock/moko/widgets/core/factory/SystemListViewFactory.kt b/widgets/src/iosMain/kotlin/dev/icerock/moko/widgets/core/factory/SystemListViewFactory.kt
@@ -20,16 +20,20 @@ import dev.icerock.moko.widgets.core.utils.bind
 import dev.icerock.moko.widgets.core.utils.setEventHandler
 import dev.icerock.moko.widgets.core.utils.toEdgeInsets
 import dev.icerock.moko.widgets.core.widget.ListWidget
+import dev.icerock.moko.widgets.core.widget.ScrollListView
 import kotlinx.cinterop.readValue
 import kotlinx.cinterop.useContents
 import platform.CoreGraphics.CGRectZero
+import platform.Foundation.NSIndexPath
+import platform.UIKit.indexPathForRow
 import platform.UIKit.UIControlEventValueChanged
 import platform.UIKit.UIEdgeInsetsMake
 import platform.UIKit.UIRefreshControl
 import platform.UIKit.UITableView
 import platform.UIKit.UITableViewAutomaticDimension
 import platform.UIKit.UITableViewCell
 import platform.UIKit.UITableViewCellSeparatorStyle
+import platform.UIKit.UITableViewScrollPosition
 import platform.UIKit.UITableViewStyle
 import platform.UIKit.layoutMargins
 import platform.UIKit.translatesAutoresizingMaskIntoConstraints
@@ -95,6 +99,19 @@ actual class SystemListViewFactory actual constructor(
                 }
             }
 
+            widget.lastScrollView = object : ScrollListView {
+                override fun scrollToPosition(index: Int) {
+                    scrollToRowAtIndexPath(
+                        NSIndexPath.indexPathForRow(
+                            row = index.toLong(),
+                            inSection = 0
+                        ),
+                        animated = true,
+                        atScrollPosition = UITableViewScrollPosition.UITableViewScrollPositionBottom
+                    )
+                }
+            }
+
             if (dividerEnabled == false) {
                 separatorStyle = UITableViewCellSeparatorStyle.UITableViewCellSeparatorStyleNone
             }
diff --git a/widgets/src/iosMain/kotlin/dev/icerock/moko/widgets/core/utils/BackgroundExt.kt b/widgets/src/iosMain/kotlin/dev/icerock/moko/widgets/core/utils/BackgroundExt.kt
@@ -10,6 +10,7 @@ import dev.icerock.moko.widgets.core.style.background.Direction
 import dev.icerock.moko.widgets.core.style.background.Fill
 import dev.icerock.moko.widgets.core.style.state.PressableState
 import dev.icerock.moko.widgets.core.objc.cgColors
+import dev.icerock.moko.widgets.core.style.background.Corner
 import kotlinx.cinterop.useContents
 import platform.CoreGraphics.CGPointMake
 import platform.CoreGraphics.CGRectMake
@@ -65,6 +66,10 @@ fun Background<out Fill>.caLayer(): CALayer {
         backgroundLayer.cornerRadius = it.toDouble()
     }
 
+    maskedCorners?.also { cornersList ->
+        backgroundLayer.maskedCorners = cornersList.toCACornerMask()
+    }
+
     return backgroundLayer
 }
 
@@ -130,6 +135,9 @@ fun UIView.applyBackgroundIfNeeded(background: Background<Fill.Solid>?) {
         layer.borderColor = it.color.toUIColor().CGColor
     }
     background.cornerRadius?.also { layer.cornerRadius = it.toDouble() }
+    background.maskedCorners?.also { cornersList ->
+        layer.maskedCorners = cornersList.toCACornerMask()
+    }
 }
 
 fun UIView.applyBackgroundIfNeeded(background: Background<out Fill>?) {
diff --git a/widgets/src/iosMain/kotlin/dev/icerock/moko/widgets/core/utils/CornerExt.kt b/widgets/src/iosMain/kotlin/dev/icerock/moko/widgets/core/utils/CornerExt.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2020 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.moko.widgets.core.utils
+
+import dev.icerock.moko.widgets.core.style.background.Corner
+import platform.QuartzCore.CACornerMask
+import platform.QuartzCore.kCALayerMaxXMaxYCorner
+import platform.QuartzCore.kCALayerMaxXMinYCorner
+import platform.QuartzCore.kCALayerMinXMaxYCorner
+import platform.QuartzCore.kCALayerMinXMinYCorner
+
+fun List<Corner>.toCACornerMask(): CACornerMask {
+    var corners: CACornerMask = 0u
+    this.forEach {
+        when (it) {
+            Corner.TOP_LEFT -> corners = corners + kCALayerMinXMinYCorner
+            Corner.TOP_RIGHT -> corners = corners + kCALayerMaxXMinYCorner
+            Corner.BOTTOM_LEFT -> corners = corners + kCALayerMinXMaxYCorner
+            Corner.BOTTOM_RIGHT -> corners = corners + kCALayerMaxXMaxYCorner
+        }
+    }
+    return corners
+}

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,9 @@ buildscript {`
`13`	`13`	`maven { url = uri("https://dl.bintray.com/icerockdev/plugins") }`
`14`	`14`	`}`
`15`	`15`	`dependencies {`
`16`		`- plugin(Deps.Plugins.mokoResources)`
`17`		`- plugin(Deps.Plugins.mokoWidgets)`
	`16`	`+ classpath("dev.icerock.moko:resources-generator:0.13.2")`
	`17`	`+ classpath("dev.icerock.moko.widgets:gradle-plugin:0.1.0-dev-21")`
	`18`	`+ classpath("gradle:moko-widgets-deps:1")`
`18`	`19`	`}`
`19`	`20`	`}`
`20`	`21`