Java interop

Author: scrinoman

build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.2.50'
+    ext.kotlin_version = '1.2.60'
     ext.supportVersion = '27.1.1'
     ext.compileSdkVersion = 27
     ext.targetSdkVersion = 27
@@ -11,7 +11,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:3.1.4'
         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

omegatypes/src/main/java/com/omega_r/libs/omegatypes/Image.kt

@@ -12,33 +12,39 @@ import android.view.View
 import android.widget.ImageView
 import java.io.Serializable
 
-interface Image : Serializable {
+open class Image : Serializable {
 
-    fun getDrawable(context: Context): Drawable?
+    open fun getDrawable(context: Context): Drawable? = null
 
     companion object {
 
+        @JvmStatic
+        fun empty() = Image()
+
+        @JvmStatic
         fun from(@DrawableRes stringRes: Int): Image = ResourceImage(stringRes)
 
+        @JvmStatic
         fun from(drawable: Drawable): Image = DrawableImage(drawable)
 
+        @JvmStatic
         fun from(bitmap: Bitmap): Image = BitmapImage(bitmap)
     }
 
-    class ResourceImage(@DrawableRes private val resId: Int) : Image {
+    class ResourceImage(@DrawableRes private val resId: Int) : Image() {
 
         override fun getDrawable(context: Context): Drawable? =
                 ContextCompat.getDrawable(context, resId)
 
     }
 
-    class DrawableImage(private val drawable: Drawable) : Image {
+    class DrawableImage(private val drawable: Drawable) : Image() {
 
         override fun getDrawable(context: Context): Drawable = drawable
 
     }
 
-    class BitmapImage(private val bitmap: Bitmap) : Image {
+    class BitmapImage(private val bitmap: Bitmap) : Image() {
 
         override fun getDrawable(context: Context): Drawable =
                 BitmapDrawable(context.resources, bitmap)

omegatypes/src/main/java/com/omega_r/libs/omegatypes/Text.kt

@@ -9,24 +9,30 @@ import android.widget.TextView
 import android.widget.Toast
 import java.io.Serializable
 
-interface Text : Serializable {
+open class Text private constructor() : Serializable {
 
-    fun isEmpty(): Boolean
-    fun getString(resources: Resources): String?
+    open fun isEmpty(): Boolean = true
+    open fun getString(resources: Resources): String? = null
 
     companion object {
+        @JvmStatic
+        fun empty(): Text = Text()
 
+        @JvmStatic
         fun from(string: String): Text = StringText(string)
 
+        @JvmStatic
         fun from(@StringRes stringRes: Int): Text = ResourceText(stringRes)
 
+        @JvmStatic
         fun from(@StringRes stringRes: Int, vararg formatArgs: Any): Text =
                 FormatResourceText(stringRes, *formatArgs)
 
+        @JvmStatic
         fun from(throwable: Throwable): Text = StringText(throwable.message)
     }
 
-    class StringText constructor(private val string: String?) : Text {
+    private class StringText internal constructor(private val string: String?) : Text() {
 
         override fun isEmpty(): Boolean = string.isNullOrEmpty()
 
@@ -35,7 +41,7 @@ interface Text : Serializable {
         }
     }
 
-    class ResourceText internal constructor(@StringRes private val stringRes: Int) : Text {
+    private class ResourceText internal constructor(@StringRes private val stringRes: Int) : Text() {
 
         override fun isEmpty(): Boolean = stringRes <= 0
 
@@ -45,8 +51,8 @@ interface Text : Serializable {
 
     }
 
-    class FormatResourceText internal constructor(@StringRes private val stringRes: Int,
-                                                  private vararg val formatArgs: Any) : Text {
+    private class FormatResourceText internal constructor(@StringRes private val stringRes: Int,
+                                                  private vararg val formatArgs: Any) : Text() {
 
         override fun isEmpty(): Boolean = stringRes <= 0