Merge branch 'develop' of https://github.com/Omega-R/OmegaViews into feature/text_appearance

# Conflicts:
#	omegaviwslibs/src/main/java/com/omega_r/libs/views/OmegaTextView.kt

Author: roman_tcaregorodtcev

omegaviwslibs/src/main/java/com/omega_r/libs/views/OmegaTextView.kt

@@ -58,6 +58,7 @@ open class OmegaTextView @JvmOverloads constructor(
         }
 
     private val startTextStyle = Style()
+    private val middleTextStyle = Style()
     private val endTextStyle = Style()
 
     private var initData: Boolean = true
@@ -85,24 +86,36 @@ open class OmegaTextView @JvmOverloads constructor(
                 R.styleable.OmegaTextView_startTextSize -> {
                     startTextStyle.textSize = Size.from(a.getDimension(attr, 0f), Size.Unit.PX)
                 }
+                R.styleable.OmegaTextView_middleTextSize -> {
+                    middleTextStyle.textSize = Size.from(a.getDimension(attr, 0f), Size.Unit.PX)
+                }
                 R.styleable.OmegaTextView_endTextSize -> {
                     endTextStyle.textSize = Size.from(a.getDimension(attr, 0f), Size.Unit.PX)
                 }
                 R.styleable.OmegaTextView_startTextStyle -> {
                     startTextStyle.style = a.getInt(attr, STYLE_NONE)
                 }
+                R.styleable.OmegaTextView_middleTextStyle -> {
+                    middleTextStyle.style = a.getInt(attr, STYLE_NONE)
+                }
                 R.styleable.OmegaTextView_endTextStyle -> {
                     endTextStyle.style = a.getInt(attr, STYLE_NONE)
                 }
                 R.styleable.OmegaTextView_startTextColor -> {
                     startTextStyle.textColor = a.getColor(attr, startTextStyle.textColor)
                 }
+                R.styleable.OmegaTextView_middleTextColor -> {
+                    middleTextStyle.textColor = a.getColor(attr, middleTextStyle.textColor)
+                }
                 R.styleable.OmegaTextView_endTextColor -> {
                     endTextStyle.textColor = a.getColor(attr, endTextStyle.textColor)
                 }
                 R.styleable.OmegaTextView_startTextFontFamily -> {
                     obtainFont(intoStyle = startTextStyle, typedArray = a, attr = attr)
                 }
+                R.styleable.OmegaTextView_middleTextFontFamily -> {
+                    obtainFont(intoStyle = middleTextStyle, typedArray = a, attr = attr)
+                }
                 R.styleable.OmegaTextView_endTextFontFamily -> {
                     obtainFont(intoStyle = endTextStyle, typedArray = a, attr = attr)
                 }
@@ -166,7 +179,11 @@ open class OmegaTextView @JvmOverloads constructor(
 
     private fun updateAllText(force: Boolean = false) {
         if (initData || force) {
-            val allText = (startText + startTextStyle) + startSpaceText + text + endSpaceText + (endText + endTextStyle)
+            val allText = (startText + startTextStyle) +
+                    startSpaceText +
+                    (text + middleTextStyle) +
+                    endSpaceText +
+                    (endText + endTextStyle)
             super.setText(allText?.getCharSequence(context), BufferType.NORMAL)
         }
     }

omegaviwslibs/src/main/res/values/attrs.xml

@@ -4,31 +4,40 @@
     <declare-styleable name="OmegaTextView">
         <attr name="startText" format="string" localization="suggested"/>
         <attr name="endText" format="string" localization="suggested"/>
-        <attr name="startTextSize" format="dimension" />
-        <attr name="endTextSize" format="dimension" />
+        <attr name="startTextSize" format="dimension"/>
+        <attr name="middleTextSize" format="dimension"/>
+        <attr name="endTextSize" format="dimension"/>
 
-        <attr name="startTextStyle" format="flags" >
+        <attr name="startTextStyle" format="flags">
             <flag name="bold" value="1"/>
             <flag name="italic" value="2"/>
             <flag name="underline" value="4"/>
             <flag name="strikethrough" value="8"/>
         </attr>
 
-        <attr name="endTextStyle" format="flags" >
-            <flag name="none" value="0"/>
+        <attr name="middleTextStyle" format="flags">
+            <flag name="bold" value="1"/>
+            <flag name="italic" value="2"/>
+            <flag name="underline" value="4"/>
+            <flag name="strikethrough" value="8"/>
+        </attr>
+
+        <attr name="endTextStyle" format="flags">
             <flag name="bold" value="1"/>
             <flag name="italic" value="2"/>
             <flag name="underline" value="4"/>
             <flag name="strikethrough" value="8"/>
         </attr>
 
         <attr name="startTextColor" format="color"/>
+        <attr name="middleTextColor" format="color"/>
         <attr name="endTextColor" format="color"/>
-        <attr name="startTextFontFamily" />
-        <attr name="endTextFontFamily" />
+        <attr name="startTextFontFamily"/>
+        <attr name="middleTextFontFamily"/>
+        <attr name="endTextFontFamily"/>
 
-        <attr name="startDelimiter" format="string" />
-        <attr name="endDelimiter" format="string" />
+        <attr name="startDelimiter" format="string"/>
+        <attr name="endDelimiter" format="string"/>
 
     </declare-styleable>