Merge pull request #18 from Omega-R/develop

Add typeface support for TextStyle

Author: anton-knyazev

.idea/caches/build_file_checksums.ser

@@ -5,6 +5,7 @@ import android.graphics.BitmapFactory
 import android.os.Bundle
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.core.content.res.ResourcesCompat
 import com.omega_r.libs.omegatypes.*
 import kotlin.concurrent.thread
 
@@ -16,7 +17,16 @@ class MainActivity : BaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
-        val text = Text.from("test ") + Text.from(R.string.hello_world, Text.from(R.string.app_name), textStyle = TextStyle.bold())
+        val text = Text.from("test ") +
+                Text.from(
+                        R.string.hello_world,
+                        Text.from(R.string.app_name),
+                        textStyle = TextStyle.font(ResourcesCompat.getFont(this, R.font.noto_sans_regular)!!)
+                ) +
+                Text.from(
+                        "   SEMI BOLD",
+                        textStyle = TextStyle.font(ResourcesCompat.getFont(this, R.font.noto_sans_semi_bold)!!)
+                )
         text.applyTo(exampleTextView) // or exampleTextView.setText(text)
         val image = Image.from("https://avatars1.githubusercontent.com/u/28600571")
 

.idea/codeStyles/Project.xml

@@ -11,7 +11,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0'
+        classpath 'com.android.tools.build:gradle:3.4.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
         // NOTE: Do not place your application dependencies here; they belong

.idea/misc.xml

@@ -1,6 +1,6 @@
-#Wed Oct 03 15:12:40 MSK 2018
+#Wed May 29 11:12:26 MSK 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

app/src/main/java/omega_r/com/omegatypesexample/MainActivity.kt

@@ -0,0 +1,56 @@
+package com.omega_r.libs.omegatypes
+
+import android.graphics.Typeface
+import android.os.Parcel
+import android.os.Process
+import java.util.ArrayList
+
+object LeakyTypefaceStorageCompat {
+
+    private val lock = Any()
+
+    private val storage = ArrayList<Typeface>()
+
+    /**
+     * Write typeface to parcel.
+     *
+     * You can't transfer Typeface to a different process. [readTypefaceFromParcel] will
+     * return `null` if the [readTypefaceFromParcel] is called in a different process.
+     *
+     * @param typeface A [Typeface] to be written.
+     * @param parcel A [Parcel] object.
+     */
+    fun writeTypefaceToParcel(typeface: Typeface, parcel: Parcel) {
+        parcel.writeInt(Process.myPid())
+        synchronized(lock) {
+            val id: Int
+            val i = storage.indexOf(typeface)
+            if (i != -1) {
+                id = i
+            } else {
+                id = storage.size
+                storage.add(typeface)
+            }
+            parcel.writeInt(id)
+        }
+    }
+
+    /**
+     * Read typeface from parcel.
+     *
+     * If the [Typeface] was created in another process, this method returns null.
+     *
+     * @param parcel A [Parcel] object
+     * @return A [Typeface] object.
+     */
+    fun readTypefaceFromParcel(parcel: Parcel): Typeface? {
+        val pid = parcel.readInt()
+        val typefaceId = parcel.readInt()
+        if (pid != Process.myPid()) {
+            return null  // The Typeface was created and written in another process.
+        }
+        synchronized(lock) {
+            return storage[typefaceId]
+        }
+    }
+}

app/src/main/res/font/noto_sans_regular.ttf

@@ -42,17 +42,20 @@ abstract class TextStyle : Serializable {
         fun strikethrough(): TextStyle = strikethroughTextStyle
 
         @JvmStatic
-        fun font(fontName: Text): TextStyle = FontTextStyle(fontName)
+        fun font(fontName: Text): TextStyle = NameFontTextStyle(fontNameText = fontName)
 
         @JvmStatic
-        fun font(fontName: String): TextStyle = FontTextStyle(fontName.toText())
+        fun font(fontName: String): TextStyle = NameFontTextStyle(fontNameText = fontName.toText())
+
+        @JvmStatic
+        fun font(typeface: Typeface): TextStyle = TypefaceFontTextStyle(fontTypeface = typeface)
 
         @JvmStatic
         fun size(size: Size): TextStyle = SizeTextStyle(size)
 
     }
 
-    operator fun plus(textStyle: TextStyle?):TextStyle {
+    operator fun plus(textStyle: TextStyle?): TextStyle {
         val list = mutableListOf<TextStyle>().apply {
             addTextStyle(this@TextStyle)
             addTextStyle(textStyle)
@@ -115,12 +118,20 @@ abstract class TextStyle : Serializable {
         }
     }
 
-    private class FontTextStyle(private val fontNameText: Text) : TextStyle() {
+    private class NameFontTextStyle(private val fontNameText: Text) : TextStyle() {
+
+        override fun SpannableString.applyStyle(context: Context) {
+            fontNameText.getString(context)?.let {
+                setSpan(TypefaceSpan(it), 0, length, 0)
+            }
+        }
+
+    }
+
+    private class TypefaceFontTextStyle(private val fontTypeface: Typeface) : TextStyle() {
 
         override fun SpannableString.applyStyle(context: Context) {
-           fontNameText.getString(context)?.let {
-               setSpan(TypefaceSpan(it),0, length, 0)
-           }
+            setSpan(TypefaceSpanCompat(typeface = fontTypeface), 0, length, 0)
         }
 
     }