diff --git a/README.md b/README.md index 5e23780c..56b66223 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ ## Latest releases 🛠 -- Kotlin Next Gen | [v5.3.1](https://github.com/mikepenz/Android-Iconics/tree/v5.3.1) +- Kotlin Next Gen | [v5.3.2](https://github.com/mikepenz/Android-Iconics/tree/v5.3.2) - Kotlin | [v4.0.2](https://github.com/mikepenz/Android-Iconics/tree/v4.0.2) - Java AndroidX | [v3.2.5](https://github.com/mikepenz/Android-Iconics/tree/v3.2.5) - Java Appcompat | [v3.0.4](https://github.com/mikepenz/Android-Iconics/tree/v3.0.4) diff --git a/app/src/main/java/com/mikepenz/iconics/sample/PlaygroundActivity.kt b/app/src/main/java/com/mikepenz/iconics/sample/PlaygroundActivity.kt index ac18cd14..0edf4628 100644 --- a/app/src/main/java/com/mikepenz/iconics/sample/PlaygroundActivity.kt +++ b/app/src/main/java/com/mikepenz/iconics/sample/PlaygroundActivity.kt @@ -19,15 +19,13 @@ package com.mikepenz.iconics.sample import android.annotation.SuppressLint import android.content.Context import android.graphics.Color +import android.graphics.Typeface import android.graphics.drawable.StateListDrawable import android.os.Bundle import android.text.Spannable import android.text.SpannableString -import android.text.style.BackgroundColorSpan -import android.text.style.DynamicDrawableSpan -import android.text.style.ForegroundColorSpan -import android.text.style.ImageSpan -import android.text.style.RelativeSizeSpan +import android.text.SpannableStringBuilder +import android.text.style.* import android.view.LayoutInflater import android.view.Menu import android.view.MenuItem @@ -155,6 +153,17 @@ class PlaygroundActivity : AppCompatActivity() { ) binding.test6.setImageDrawable(iconStateListDrawable) + val span = SpannableStringBuilder(binding.test10.text) + span.setSpan( + StyleSpan(Typeface.BOLD), + 3, + 6, + Spannable.SPAN_EXCLUSIVE_EXCLUSIVE + ) + span.insert(20, "{fab-android}") + binding.test10.text = span + binding.test10.text = binding.test10.text + val iconicsDrawableBase = IconicsDrawable(this).apply { actionBar() colorInt = Color.GREEN diff --git a/app/src/main/res/layout/activity_playground.xml b/app/src/main/res/layout/activity_playground.xml index 33b94c35..ba661afe 100644 --- a/app/src/main/res/layout/activity_playground.xml +++ b/app/src/main/res/layout/activity_playground.xml @@ -261,6 +261,7 @@ app:iiv_all_size="24dp" /> - \ No newline at end of file + diff --git a/build.gradle b/build.gradle index a4e9e4a9..c8dc7c9e 100644 --- a/build.gradle +++ b/build.gradle @@ -18,8 +18,8 @@ buildscript { ext { release = [ - versionName: "5.3.1", - versionCode: 50301 + versionName: "5.3.2", + versionCode: 50302 ] setup = [ @@ -31,7 +31,7 @@ buildscript { ] versions = [ - kotlin : '1.5.21', + kotlin : '1.5.30', androidX : '1.0.0', recyclerView : '1.2.1', material : '1.4.0', @@ -44,11 +44,11 @@ buildscript { ], startup : '1.1.0', detekt : '1.18.1', - aboutLibraries : '8.9.1', - materialDrawer : '8.4.3', + aboutLibraries : '8.9.3', + materialDrawer : '8.4.4', fastAdapter : '5.5.1', // compose - compose : '1.0.2' + compose : '1.0.3' ] } @@ -61,7 +61,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.1.0-alpha12' + classpath 'com.android.tools.build:gradle:7.1.0-alpha13' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}" classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:${versions.detekt}" classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:${versions.aboutLibraries}" diff --git a/iconics-core/src/main/java/com/mikepenz/iconics/Iconics.kt b/iconics-core/src/main/java/com/mikepenz/iconics/Iconics.kt index 30bba8e8..fae98022 100644 --- a/iconics-core/src/main/java/com/mikepenz/iconics/Iconics.kt +++ b/iconics-core/src/main/java/com/mikepenz/iconics/Iconics.kt @@ -334,7 +334,7 @@ object Iconics { fun on(on: String): BuilderString = on(SpannableString(on)) /** Defines where the icons should be applied to */ - fun on(on: CharSequence): BuilderString = on(on.toString()) + fun on(on: CharSequence): BuilderString = on(SpannableString(on)) /** Defines where the icons should be applied to */ fun on(on: StringBuilder): BuilderString = on(on.toString())