Merge remote-tracking branch 'origin/develop'

Author: KsenyaBol

core/build.gradle

@@ -35,7 +35,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.github.Omega-R:OmegaLaunchers:1.0.3'
+    implementation 'com.github.Omega-R.OmegaLaunchers:omegalauncherslib:1.0.4'
     api 'com.github.Omega-R.OmegaTypes:omegatypes:2.0.3'
 
     compileOnly "androidx.appcompat:appcompat:$androidX"

core/src/main/java/com/omega_r/libs/omegaintentbuilder/IntentBuilderLauncher.kt

@@ -1,14 +1,43 @@
 package com.omega_r.libs.omegaintentbuilder
 
 import android.content.Context
+import android.os.Parcel
+import android.os.Parcelable.Creator
 import com.omega_r.libs.omegaintentbuilder.interfaces.IntentBuilder
+import com.omega_r.libs.omegaintentbuilder.interfaces.IntentHandlerBuilder
 import com.omegar.libs.omegalaunchers.BaseIntentLauncher
 
 /**
  * Created by Anton Knyazev on 2019-08-08.
  */
 class IntentBuilderLauncher(private val intentBuilder: IntentBuilder) : BaseIntentLauncher() {
 
+    constructor(parcel: Parcel) : this(parcel.readParcelable(IntentBuilder::class.java.classLoader)!!)
+
     override fun getIntent(context: Context) = intentBuilder.createIntent(context)
 
+    override fun launch(context: Context) {
+        if (intentBuilder is IntentHandlerBuilder) {
+            intentBuilder.startActivity(context)
+        } else super.launch(context)
+    }
+
+    override fun writeToParcel(parcel: Parcel, flags: Int) {
+        parcel.writeParcelable(intentBuilder, flags)
+    }
+
+    override fun describeContents(): Int {
+        return 0
+    }
+
+    companion object CREATOR : Creator<IntentBuilderLauncher> {
+
+        override fun createFromParcel(parcel: Parcel): IntentBuilderLauncher {
+            return IntentBuilderLauncher(parcel)
+        }
+
+        override fun newArray(size: Int): Array<IntentBuilderLauncher?> {
+            return arrayOfNulls(size)
+        }
+    }
 }

core/src/main/java/com/omega_r/libs/omegaintentbuilder/OmegaIntentBuilder.kt

@@ -23,6 +23,7 @@ import com.omega_r.libs.omegaintentbuilder.builders.share.ShareIntentBuilder
 import com.omega_r.libs.omegaintentbuilder.types.CalendarActionTypes
 import com.omega_r.libs.omegaintentbuilder.types.MapTypes
 import com.omega_r.libs.omegaintentbuilder.types.ShowType
+import com.omega_r.libs.omegatypes.Text
 
 /**
  * OmegaIntentBuilder class for creating supports createdIntent builders.
@@ -58,6 +59,13 @@ object OmegaIntentBuilder {
     @JvmStatic
     fun web(urlAddress: String) = BrowserBuilder(urlAddress)
 
+    /**
+     * @param urlAddress Text
+     * @return BrowserBuilder for creating intent to start web browser
+     */
+    @JvmStatic
+    fun web(urlAddress: Text) = BrowserBuilder(urlAddress)
+
     /**
      * @param uri Uri
      * @return BrowserBuilder for creating intent to start web browser

core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/ActivityIntentBuilder.kt

@@ -13,15 +13,19 @@ package com.omega_r.libs.omegaintentbuilder.builders
 import android.app.Activity
 import android.app.Fragment
 import android.content.Context
+import android.os.Parcel
+import android.os.Parcelable.Creator
 import com.omega_r.libs.omegaintentbuilder.handlers.ActivityIntentHandler
 import com.omega_r.libs.omegaintentbuilder.handlers.ContextIntentHandler
 import com.omega_r.libs.omegaintentbuilder.handlers.FragmentIntentHandler
 import com.omega_r.libs.omegaintentbuilder.handlers.SupportFragmentIntentHandler
 import com.omega_r.libs.omegaintentbuilder.interfaces.IntentHandlerBuilder
 
-class ActivityIntentBuilder<T : Activity>(
-        activity: Class<T>
-) : BaseIntentBuilder<ActivityIntentBuilder<T>, T>(activity), IntentHandlerBuilder {
+class ActivityIntentBuilder<T : Activity> : BaseIntentBuilder<ActivityIntentBuilder<T>, T>, IntentHandlerBuilder {
+
+    constructor(activity: Class<T>) : super(activity)
+
+    constructor(parcel: Parcel) : super(parcel)
 
     override fun createIntentHandler(context: Context): ContextIntentHandler {
         return ContextIntentHandler(context, createIntent(context))
@@ -39,4 +43,22 @@ class ActivityIntentBuilder<T : Activity>(
         return SupportFragmentIntentHandler(fragment, createIntent(fragment.activity!!))
     }
 
+    override fun writeToParcel(parcel: Parcel, flags: Int) {
+        super.writeToParcel(parcel, flags)
+    }
+
+    override fun describeContents(): Int {
+        return 0
+    }
+
+    companion object CREATOR : Creator<ActivityIntentBuilder<*>> {
+
+        override fun createFromParcel(parcel: Parcel): ActivityIntentBuilder<*> {
+            return ActivityIntentBuilder<Activity>(parcel)
+        }
+
+        override fun newArray(size: Int): Array<ActivityIntentBuilder<*>?> {
+            return arrayOfNulls(size)
+        }
+    }
 }

core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/AlarmIntentBuilder.kt

@@ -2,9 +2,11 @@ package com.omega_r.libs.omegaintentbuilder.builders
 
 import android.content.Context
 import android.content.Intent
+import android.os.Parcel
+import android.os.Parcelable.Creator
 import android.provider.AlarmClock.*
 
-class AlarmIntentBuilder : BaseActivityBuilder() {
+class AlarmIntentBuilder() : BaseActivityBuilder() {
     private var message: String? = null
     private var hour: Int? = null
     private var minutes: Int? = null
@@ -13,6 +15,16 @@ class AlarmIntentBuilder : BaseActivityBuilder() {
     private var vibrate: Boolean? = null
     private var ringtoneSilent: Boolean = false
 
+    constructor(parcel: Parcel) : this() {
+        message = parcel.readString()
+        hour = parcel.readValue(Int::class.java.classLoader) as? Int
+        minutes = parcel.readValue(Int::class.java.classLoader) as? Int
+        ringtone = parcel.readString()
+        skipUI = parcel.readByte() != 0.toByte()
+        vibrate = parcel.readValue(Boolean::class.java.classLoader) as? Boolean
+        ringtoneSilent = parcel.readByte() != 0.toByte()
+    }
+
     /**
      * Set custom message for the alarm.
      * <p>
@@ -134,4 +146,28 @@ class AlarmIntentBuilder : BaseActivityBuilder() {
         }
     }
 
+    override fun writeToParcel(parcel: Parcel, flags: Int) {
+        parcel.writeString(message)
+        parcel.writeValue(hour)
+        parcel.writeValue(minutes)
+        parcel.writeString(ringtone)
+        parcel.writeByte(if (skipUI) 1 else 0)
+        parcel.writeValue(vibrate)
+        parcel.writeByte(if (ringtoneSilent) 1 else 0)
+    }
+
+    override fun describeContents(): Int {
+        return 0
+    }
+
+    companion object CREATOR : Creator<AlarmIntentBuilder> {
+
+        override fun createFromParcel(parcel: Parcel): AlarmIntentBuilder {
+            return AlarmIntentBuilder(parcel)
+        }
+
+        override fun newArray(size: Int): Array<AlarmIntentBuilder?> {
+            return arrayOfNulls(size)
+        }
+    }
 }

core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/BaseIntentBuilder.kt

@@ -3,14 +3,23 @@ package com.omega_r.libs.omegaintentbuilder.builders
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.os.Parcel
 import android.os.Parcelable
+import android.os.Parcelable.Creator
 import java.io.Serializable
 
 @Suppress("UNCHECKED_CAST")
-open class BaseIntentBuilder<out S, T>(private val classT: Class<T>) {
+abstract class BaseIntentBuilder<out S, T>(
+    private val classT: Class<T>,
+    private val extras: Bundle = Bundle(),
+    private var flags: Int = 0,
+) : Parcelable {
 
-    private val extras = Bundle()
-    private var flags: Int = 0
+    constructor(parcel: Parcel) : this(
+        parcel.readSerializable() as Class<T>,
+        parcel.readBundle(Bundle::class.java.classLoader) ?: Bundle(),
+        parcel.readInt()
+    )
 
     /**
      * Add extended data to the createdIntent.  The name must include a package
@@ -539,4 +548,10 @@ open class BaseIntentBuilder<out S, T>(private val classT: Class<T>) {
         flags = this@BaseIntentBuilder.flags
     }
 
+    override fun writeToParcel(parcel: Parcel, flags: Int) {
+        parcel.writeSerializable(classT)
+        parcel.writeBundle(extras)
+        parcel.writeInt(flags)
+    }
+
 }

core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/BaseServiceBuilder.kt

@@ -1,9 +1,10 @@
 package com.omega_r.libs.omegaintentbuilder.builders
 
 import android.content.Context
+import android.os.Parcelable
 import com.omega_r.libs.omegaintentbuilder.interfaces.ServiceHandler
 
-abstract class BaseServiceBuilder : ServiceHandler {
+abstract class BaseServiceBuilder : ServiceHandler, Parcelable {
 
     override fun startService(context: Context) {
         context.startService(createIntent(context))

core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/BaseUriBuilder.kt

@@ -13,28 +13,37 @@ package com.omega_r.libs.omegaintentbuilder.builders
 import android.content.Context
 import android.graphics.Bitmap
 import android.net.Uri
+import android.os.Parcel
+import android.os.Parcelable.Creator
 import com.omega_r.libs.omegaintentbuilder.builders.share.DownloadBuilder
 import com.omega_r.libs.omegaintentbuilder.downloader.Download
 import com.omega_r.libs.omegaintentbuilder.providers.FileProvider
 import com.omega_r.libs.omegatypes.image.Image
 import java.io.File
 import java.io.FileOutputStream
 
-abstract class BaseUriBuilder() : BaseActivityBuilder(), Download<BaseUriBuilder> {
-
-    private val uriSet: MutableSet<Uri> = mutableSetOf()
-    private val fileSet: MutableSet<File> = mutableSetOf()
-    private val bitmapSet: MutableSet<Bitmap> = mutableSetOf()
-
-    private val downloadBuilder by lazy { DownloadBuilder(this) }
-    private var localFilesDir: File? = null
+abstract class BaseUriBuilder(
+    private val uriSet: MutableSet<Uri> = mutableSetOf(),
+    private val fileSet: MutableSet<File> = mutableSetOf(),
+    private val bitmapSet: MutableSet<Bitmap> = mutableSetOf(),
+    private var localFilesDir: File? = null,
+) : BaseActivityBuilder(), Download<BaseUriBuilder> {
 
     companion object {
+
         private const val FILE_DIR = "intent_files" // this value from xml/file_paths.xml
         private const val DEFAULT_IMAGE_FILE_NAME = "File"
         private const val DEFAULT_IMAGE_FILE_TYPE = ".jpg";
     }
 
+    private val downloadBuilder by lazy { DownloadBuilder(this) }
+
+    constructor(parcel: Parcel) : this(
+        parcel.readParcelableArray(MutableSet::class.java.classLoader)?.toMutableSet() as? MutableSet<Uri> ?: mutableSetOf(),
+        parcel.readSerializable() as MutableSet<File>,
+        parcel.readParcelableArray(MutableSet::class.java.classLoader)?.toMutableSet() as? MutableSet<Bitmap> ?: mutableSetOf(),
+        parcel.readSerializable() as File?
+    )
 
     internal fun getLocalFilesDir(context: Context): File {
         if (localFilesDir == null) {
@@ -195,4 +204,11 @@ abstract class BaseUriBuilder() : BaseActivityBuilder(), Download<BaseUriBuilder
         return uriSet
     }
 
+    override fun writeToParcel(parcel: Parcel, flags: Int) {
+        parcel.writeParcelableArray(uriSet.toTypedArray(), flags)
+        parcel.writeSerializable(HashSet(fileSet))
+        parcel.writeParcelableArray(bitmapSet.toTypedArray(), flags)
+        parcel.writeSerializable(localFilesDir)
+    }
+
 }

core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/BrowserBuilder.kt

@@ -13,16 +13,42 @@ package com.omega_r.libs.omegaintentbuilder.builders
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
+import android.os.Parcel
+import android.os.Parcelable.Creator
+import com.omega_r.libs.omegatypes.Text
+import com.omega_r.libs.omegatypes.toText
 
 /**
  * BrowserBuilder class for starting web browser
  */
-class BrowserBuilder (private val uri: Uri) : BaseActivityBuilder() {
+class BrowserBuilder(private val uri: Text) : BaseActivityBuilder() {
 
-    constructor(urlAddress: String) : this(Uri.parse(urlAddress))
+    constructor(parcel: Parcel) : this(parcel.readSerializable() as Text)
+
+    constructor(urlAddress: String) : this(urlAddress.toText())
+
+    constructor(uri: Uri) : this(uri.toString())
 
     override fun createIntent(context: Context) =  Intent(Intent.ACTION_VIEW).apply {
-        data = uri
+        data = Uri.parse(uri.getString(context))
     }
 
+    override fun writeToParcel(parcel: Parcel, flags: Int) {
+        parcel.writeSerializable(uri)
+    }
+
+    override fun describeContents(): Int {
+        return 0
+    }
+
+    companion object CREATOR : Creator<BrowserBuilder> {
+
+        override fun createFromParcel(parcel: Parcel): BrowserBuilder {
+            return BrowserBuilder(parcel)
+        }
+
+        override fun newArray(size: Int): Array<BrowserBuilder?> {
+            return arrayOfNulls(size)
+        }
+    }
 }