Text. Style, Image entities added

roman_tcaregorodtcev · roman_tcaregorodtcev · commit 67e84b6bf65c · 2020-02-05T08:24:20.000+03:00
diff --git a/examples/android/src/main/java/com/omega_r/entities/MainActivity.kt b/examples/android/src/main/java/com/omega_r/entities/MainActivity.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.graphics.drawable.Drawable
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import com.omega_r.libs.entities.images.Image
 
 class MainActivity : AppCompatActivity() {
 
diff --git a/library/src/androidMain/kotlin/com/omega_r/entities/Image.kt b/library/src/androidMain/kotlin/com/omega_r/entities/Image.kt
diff --git a/library/src/androidMain/kotlin/com/omega_r/entities/images/UriImage.kt b/library/src/androidMain/kotlin/com/omega_r/entities/images/UriImage.kt
diff --git a/library/src/androidMain/kotlin/com/omega_r/entities/images/UrlImage.kt b/library/src/androidMain/kotlin/com/omega_r/entities/images/UrlImage.kt
diff --git a/library/src/androidMain/kotlin/com/omega_r/libs/entities/images/ResourceImage.kt b/library/src/androidMain/kotlin/com/omega_r/libs/entities/images/ResourceImage.kt
@@ -1,6 +1,5 @@
-package com.omega_r.entities.images
+package com.omega_r.libs.entities.images
 
 import android.annotation.DrawableRes
-import com.omega_r.entities.Image
 
 class ResourceImage(@DrawableRes private val drawRes: Int) : Image
diff --git a/library/src/androidMain/kotlin/com/omega_r/libs/entities/images/UriImage.kt b/library/src/androidMain/kotlin/com/omega_r/libs/entities/images/UriImage.kt
@@ -0,0 +1,5 @@
+package com.omega_r.libs.entities.images
+
+import android.net.Uri
+
+data class UriImage(val uri: Uri) : Image
diff --git a/library/src/commonMain/kotlin/com/omega_r/entities/Image.kt b/library/src/commonMain/kotlin/com/omega_r/entities/Image.kt
diff --git a/library/src/commonMain/kotlin/com/omega_r/entities/Text.kt b/library/src/commonMain/kotlin/com/omega_r/entities/Text.kt
diff --git a/library/src/commonMain/kotlin/com/omega_r/libs/entities/Identifiable.kt b/library/src/commonMain/kotlin/com/omega_r/libs/entities/Identifiable.kt
@@ -1,4 +1,4 @@
-package com.omega_r.entities
+package com.omega_r.libs.entities
 
 interface Identifiable<T> {
 
diff --git a/library/src/commonMain/kotlin/com/omega_r/libs/entities/Size.kt b/library/src/commonMain/kotlin/com/omega_r/libs/entities/Size.kt
@@ -0,0 +1,3 @@
+package com.omega_r.libs.entities
+
+interface Size
diff --git a/library/src/commonMain/kotlin/com/omega_r/libs/entities/files/File.kt b/library/src/commonMain/kotlin/com/omega_r/libs/entities/files/File.kt
@@ -0,0 +1,9 @@
+package com.omega_r.libs.entities.files
+
+interface File {
+
+    val name: String
+
+    val mimeType: String
+
+}
diff --git a/library/src/commonMain/kotlin/com/omega_r/libs/entities/images/Image.kt b/library/src/commonMain/kotlin/com/omega_r/libs/entities/images/Image.kt
@@ -0,0 +1,3 @@
+package com.omega_r.libs.entities.images
+
+interface Image
diff --git a/library/src/commonMain/kotlin/com/omega_r/libs/entities/images/UrlImage.kt b/library/src/commonMain/kotlin/com/omega_r/libs/entities/images/UrlImage.kt
@@ -0,0 +1,3 @@
+package com.omega_r.libs.entities.images
+
+data class UrlImage(val url: String): Image
diff --git a/library/src/commonMain/kotlin/com/omega_r/libs/entities/texts/ArrayText.kt b/library/src/commonMain/kotlin/com/omega_r/libs/entities/texts/ArrayText.kt
@@ -0,0 +1,16 @@
+package com.omega_r.libs.entities.texts
+
+internal data class ArrayText internal constructor(private val list: List<Text>) : Text {
+
+    internal constructor(vararg text: Text): this(text.toList())
+
+    override val isEmpty: Boolean
+        get() {
+            if (list.isEmpty()) return true
+            list.forEach { text ->
+                if (!text.isEmpty) return false
+            }
+            return true
+        }
+
+}
diff --git a/library/src/commonMain/kotlin/com/omega_r/libs/entities/texts/StringText.kt b/library/src/commonMain/kotlin/com/omega_r/libs/entities/texts/StringText.kt
@@ -0,0 +1,7 @@
+package com.omega_r.libs.entities.texts
+
+data class StringText(val text: String?) : Text {
+
+    override val isEmpty: Boolean = text.isNullOrEmpty()
+
+}
diff --git a/library/src/commonMain/kotlin/com/omega_r/libs/entities/texts/StyledText.kt b/library/src/commonMain/kotlin/com/omega_r/libs/entities/texts/StyledText.kt
@@ -0,0 +1,9 @@
+package com.omega_r.libs.entities.texts
+
+import com.omega_r.libs.entities.texts.styles.TextStyle
+
+data class StyledText(val text: Text, val style: TextStyle) : Text {
+
+    override val isEmpty: Boolean = text.isEmpty
+
+}
diff --git a/library/src/commonMain/kotlin/com/omega_r/libs/entities/texts/Text.kt b/library/src/commonMain/kotlin/com/omega_r/libs/entities/texts/Text.kt
@@ -0,0 +1,62 @@
+package com.omega_r.libs.entities.texts
+
+import com.omega_r.libs.entities.texts.styles.TextStyle
+import kotlin.jvm.JvmOverloads
+import kotlin.jvm.JvmStatic
+
+interface Text : TextHolder {
+
+    companion object {
+
+        @JvmStatic
+        @JvmOverloads
+        fun from(value: String): Text = StringText(value)
+
+        @JvmStatic
+        @JvmOverloads
+        fun from(holder: StringHolder): Text = StringText(holder.getString())
+
+        @JvmStatic
+        @JvmOverloads
+        fun from(vararg text: Text): Text = ArrayText(*text)
+
+        @JvmStatic
+        @JvmOverloads
+        fun from(list: List<Text>): Text = ArrayText(list)
+
+    }
+
+    val isEmpty: Boolean
+
+    operator fun plus(text: Text): Text {
+        return TextBuilder.BuilderText(this) + text
+    }
+
+    operator fun plus(text: TextHolder): Text {
+        return this + text.getText()
+    }
+
+    operator fun plus(string: String): Text {
+        return TextBuilder.BuilderText(this) + string
+    }
+
+    operator fun plus(textStyle: TextStyle): Text {
+        return StyledText(this, textStyle)
+    }
+
+    override fun getText(): Text = this
+
+}
+
+
+interface StringHolder {
+
+    fun getString(): String?
+
+}
+
+interface TextHolder {
+
+    fun getText(): Text
+
+}
diff --git a/library/src/commonMain/kotlin/com/omega_r/libs/entities/texts/TextBuilder.kt b/library/src/commonMain/kotlin/com/omega_r/libs/entities/texts/TextBuilder.kt
@@ -0,0 +1,76 @@
+package com.omega_r.libs.entities.texts
+
+private const val DEFAULT_CAPACITY = 10
+
+class TextBuilder(capacity: Int) {
+
+    private val list: MutableList<Text> = ArrayList(capacity)
+
+    constructor(): this(DEFAULT_CAPACITY)
+
+    constructor(list: List<Text>): this(list.size + DEFAULT_CAPACITY) {
+        this.list.addAll(list)
+    }
+
+    constructor(vararg text: Text): this(text.size + DEFAULT_CAPACITY) {
+        list.addAll(text)
+    }
+
+    fun append(text: Text): TextBuilder {
+        list += text
+        return this
+    }
+
+    fun append(value: String) = append(Text.from(value))
+
+    fun append(stringHolder: StringHolder) = append(Text.from(stringHolder))
+
+    fun append(value: TextHolder) = append(value.getText())
+
+    fun append(vararg texts: Text) = append(Text.from(*texts))
+
+    fun insert(text: Text, index: Int): TextBuilder {
+        list.add(index, text)
+        return this
+    }
+
+    fun toText(): Text = Text.from(list)
+
+    fun build() = toText()
+
+    class BuilderText(private val builder: TextBuilder) : Text {
+
+        constructor(text: Text): this(TextBuilder(text))
+
+        constructor(): this(TextBuilder())
+
+        override val isEmpty: Boolean
+            get() {
+                val list = builder.list
+                if (list.isEmpty()) return true
+                list.forEach {
+                    if (!it.isEmpty) return false
+                }
+                return true
+            }
+
+        fun insert(text: Text, index: Int): BuilderText {
+            builder.insert(text, index)
+            return this
+        }
+
+        override operator fun plus(text: Text): Text {
+            builder.append(text)
+            return this
+        }
+
+        override operator fun plus(string: String): Text {
+            builder.append(string)
+            return this
+        }
+
+        override fun getText(): Text = builder.build()
+
+    }
+
+}
diff --git a/library/src/commonMain/kotlin/com/omega_r/libs/entities/texts/styles/TextStyle.kt b/library/src/commonMain/kotlin/com/omega_r/libs/entities/texts/styles/TextStyle.kt
@@ -0,0 +1,3 @@
+package com.omega_r.libs.entities.texts.styles
+
+interface TextStyle

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.omega_r.entities`
	`1`	`+package com.omega_r.libs.entities`
`2`	`2`
`3`	`3`	`interface Identifiable<T> {`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+package com.omega_r.libs.entities`
	`2`	`+`
	`3`	`+interface Size`