Merge branch 'develop'

Author: lauriskr

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). This project does not use semantic versioning.
 
-## [UNRELEASED]
+## 0.0.12 [UNRELEASED]
 
 ### Added
 
@@ -28,6 +28,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 - ..
 
+
+## 0.0.11 - 2024.02.02
+
+### Changed
+
+- LabTextField.`setCursorColorOverride` replaced with `setCursorColor` and `setCursorErrorColor` from MaterialTextInputLayout.
+- Updated Material dependency to version 1.11.0
+
 ## 0.0.10 - 2023.10.18
 
 ### Changed

build.gradle

@@ -10,7 +10,7 @@ plugins {
 
 ext {
     // Current version of the library
-    libraryVersion = "0.0.10"
+    libraryVersion = "0.0.11"
 }
 
 subprojects {

gradle/libs.versions.toml

@@ -3,9 +3,9 @@ android-sdk-min = "23"
 android-sdk-target = "34"
 android-sdk-compile = "android-34"
 
-android-gradle-plugin = "8.1.2"
-kotlin = "1.9.10"
-navigation = "2.7.3"
+android-gradle-plugin = "8.2.2"
+kotlin = "1.9.22"
+navigation = "2.7.6"
 
 [plugins]
 # Gradle plugin
@@ -16,16 +16,16 @@ kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref =
 # NB! Make sure to update the kltint version set in the root build.gradle file. subprojects / ktlint / version
 # NB! ktlint-gradle doesn"t always depend on the latest ktlint version, but since it is a thin wrapper around ktlint
 # NB! it can be usefult to use a newer version of ktlint to get ruleset updates, etc.
-ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "11.6.0" }
+ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "12.1.0" }
 gradleVersions = { id = "com.github.ben-manes.versions", version = "0.48.0" }
-detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.23.1" }
+detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.23.5" }
 
 [libraries]
 # Language
 kotlin = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
 
 # Android + UI
-material = "com.google.android.material:material:1.10.0-rc01"
+material = "com.google.android.material:material:1.11.0"
 constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.4"
 androidx-navigation-fragment = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "navigation" }
 androidx-navigation-ui = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "navigation" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

lib/java/mobi/lab/components/color/res/values/colors.xml

@@ -304,7 +304,7 @@
     <color name="lab_internal_ref_palette_neutral_variant90">#DEE2ED</color>
 
     <!-- Debug colors for development -->
-    <color name="lab_internal_todo">#50FF00FF</color>
+    <color name="lab_internal_todo">#FF00FF</color>
     <color name="lab_internal_todo2">#00FFFF</color>
     <color name="lab_internal_todo3">#FFFF00</color>
 </resources>

lib/java/mobi/lab/components/shared/DrawableUtil.kt

@@ -2,14 +2,13 @@ package mobi.lab.components.shared
 
 import android.content.res.ColorStateList
 import android.graphics.drawable.Drawable
-import androidx.annotation.ColorInt
 import androidx.core.graphics.drawable.DrawableCompat
 
 internal object DrawableUtil {
 
-    fun setDrawableColor(drawable: Drawable?, @ColorInt color: Int) {
+    fun setTintList(drawable: Drawable?, tint: ColorStateList) {
         if (drawable != null) {
-            DrawableCompat.setTintList(drawable, ColorStateList.valueOf(color))
+            DrawableCompat.setTintList(drawable, tint)
         }
     }
 }

lib/java/mobi/lab/components/textfield/LabTextField.kt

@@ -12,7 +12,6 @@ import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
-import androidx.annotation.ColorInt
 import androidx.annotation.Dimension
 import androidx.annotation.Px
 import androidx.annotation.RequiresApi
@@ -71,7 +70,8 @@ public open class LabTextField @JvmOverloads constructor(
     private var textPaddingHorizontal: Int = NO_VALUE_INT
 
     // A temporary solution to update the cursor color until the Material lib's support for this becomes available
-    private var cursorColorOverride: Int = NO_VALUE_INT
+    private var cursorColorOverride: ColorStateList? = null
+    private var cursorErrorColorOverride: ColorStateList? = null
 
     init {
         attrs?.let {
@@ -90,6 +90,11 @@ public open class LabTextField @JvmOverloads constructor(
         }
 
         boxHelper = LabTextFieldBoxBackgroundHelper(this, attrs, defStyleAttr)
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            cursorColorOverride = cursorColor
+            cursorErrorColorOverride = cursorErrorColor
+        }
     }
 
     override fun addView(child: View, index: Int, params: ViewGroup.LayoutParams) {
@@ -256,11 +261,31 @@ public open class LabTextField @JvmOverloads constructor(
      * Set a color for the cursor and text select handles. This overrides the default color from colorControlActivated value.
      * NB! Only supported on API 29+
      *
-     * @param color The new color override
+     * We want to modify the default behaviour here because the material lib's cursorColor does not override the select handle colors.
+     *
+     * @param cursorColor The new color override
+     * TODO: material 1.12.0: Check if select handles are added
      */
     @RequiresApi(Build.VERSION_CODES.Q)
-    public fun setCursorColorOverride(@ColorInt color: Int) {
-        cursorColorOverride = color
+    override fun setCursorColor(cursorColor: ColorStateList?) {
+        super.setCursorColor(cursorColor)
+        cursorColorOverride = cursorColor
+        updateCursorColor()
+    }
+
+    /**
+     * Set a color for the cursor and text select handles in error mode. This overrides the default color from colorControlActivated value.
+     * NB! Only supported on API 29+
+     *
+     * We want to modify the default behaviour here because the material lib's cursorErrorColor does not override the select handle colors.
+     *
+     * @param cursorErrorColor The new color override
+     * TODO: material 1.12.0: Check if select handles are added
+     */
+    @RequiresApi(Build.VERSION_CODES.Q)
+    override fun setCursorErrorColor(cursorErrorColor: ColorStateList?) {
+        super.setCursorErrorColor(cursorErrorColor)
+        cursorErrorColorOverride = cursorErrorColor
         updateCursorColor()
     }
 
@@ -390,7 +415,7 @@ public open class LabTextField @JvmOverloads constructor(
     }
 
     private fun updateCursorColor() {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q || cursorColorOverride == NO_VALUE_INT) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
             // Not supported.
             return
         }
@@ -401,10 +426,19 @@ public open class LabTextField @JvmOverloads constructor(
             return
         }
 
-        DrawableUtil.setDrawableColor(editText.textSelectHandleLeft, cursorColorOverride)
-        DrawableUtil.setDrawableColor(editText.textSelectHandleRight, cursorColorOverride)
-        DrawableUtil.setDrawableColor(editText.textSelectHandle, cursorColorOverride)
-        DrawableUtil.setDrawableColor(editText.textCursorDrawable, cursorColorOverride)
+        val color = if (isOnError()) cursorErrorColorOverride else cursorColorOverride
+        if (color == null) {
+            return
+        }
+
+        DrawableUtil.setTintList(editText.textSelectHandleLeft, color)
+        DrawableUtil.setTintList(editText.textSelectHandleRight, color)
+        DrawableUtil.setTintList(editText.textSelectHandle, color)
+        DrawableUtil.setTintList(editText.textCursorDrawable, color)
+    }
+
+    private fun isOnError(): Boolean {
+        return errorState
     }
 
     internal companion object {