Merge pull request #5 from Crdzbird/feature/custom_assets

Created Custom Asset Option in LottieAlertDialog
mayuce · May 28, 2019 · 0fdcb13 · 0fdcb13
2 parents f482688 + d823aa8
commit 0fdcb13
Show file tree

Hide file tree

Showing 7 changed files with 100 additions and 12 deletions.
diff --git a/app/src/main/assets/custom.json b/app/src/main/assets/custom.json
diff --git a/app/src/main/assets/dino.json b/app/src/main/assets/dino.json
diff --git a/app/src/main/assets/goodbye.json b/app/src/main/assets/goodbye.json
diff --git a/app/src/main/java/com/labters/lottiealertdialog/MainActivity.kt b/app/src/main/java/com/labters/lottiealertdialog/MainActivity.kt
@@ -73,6 +73,64 @@ class MainActivity : AppCompatActivity() {
         },2000)
     }
 
+    fun customAsset(view: View){
+        alertDialog= LottieAlertDialog.Builder(this,DialogTypes.TYPE_CUSTOM, "custom.json")
+            .setTitle("Loading new stuffs ;)")
+            .setDescription("Please Wait")
+            .build()
+        alertDialog.setCancelable(false)
+        alertDialog.show()
+        Handler().postDelayed(Runnable {
+            alertDialog.changeDialog(LottieAlertDialog.Builder(parentActivity,DialogTypes.TYPE_CUSTOM,"dino.json")
+                .setTitle("This is a Custom Asset")
+                .setDescription("Wanna see something more!")
+                .setPositiveText("Yeah")
+                .setNegativeText("Nah")
+                .setNoneText("None")
+                .setPositiveButtonColor(Color.parseColor("#f44242"))
+                .setPositiveTextColor(Color.parseColor("#ffeaea"))
+                .setNegativeButtonColor(Color.parseColor("#ffbb00"))
+                .setNegativeTextColor(Color.parseColor("#0a0906"))
+                .setNoneButtonColor(Color.parseColor("#1cd3ef"))
+                .setNoneTextColor(Color.parseColor("#c407c4"))
+                .setPositiveListener(object: ClickListener{
+                    override fun onClick(dialog: LottieAlertDialog) {
+                        alertDialog.changeDialog(LottieAlertDialog.Builder(parentActivity,DialogTypes.TYPE_CUSTOM,"goodbye.json")
+                            .setTitle("That's bad...")
+                            .setDescription("See you next time!")
+                            .setPositiveText("Okay")
+                            .setPositiveListener(object : ClickListener{
+                                override fun onClick(dialog: LottieAlertDialog) {
+                                    dialog.dismiss()
+                                }
+                            })
+                        )
+                    }
+                })
+                .setNegativeListener(object : ClickListener
+                {
+                    override fun onClick(dialog: LottieAlertDialog) {
+                        alertDialog.changeDialog(LottieAlertDialog.Builder(parentActivity,DialogTypes.TYPE_CUSTOM, "custom.json")
+                            .setTitle("Here you got")
+                            .setDescription("Loading something new.")
+                            .setPositiveText("Okay")
+                            .setPositiveListener(object : ClickListener{
+                                override fun onClick(dialog: LottieAlertDialog) {
+                                    dialog.dismiss()
+                                }
+                            }))
+                    }
+                })
+                .setNoneListener(object: ClickListener
+                {
+                    override fun onClick(dialog: LottieAlertDialog) {
+                        dialog.dismiss()
+                    }
+                })
+            )
+        }, 2000)
+    }
+
     fun onClick(view : View)
     {
         alertDialog= LottieAlertDialog.Builder(this,DialogTypes.TYPE_LOADING)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -7,12 +7,28 @@
         android:layout_height="match_parent"
         tools:context=".MainActivity">
 
-    <Button android:layout_width="wrap_content" android:layout_height="wrap_content"
+    <Button
+            android:id="@+id/start"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:text="Start"
             android:padding="20dp"
             android:background="@drawable/background_button"
             android:onClick="onClick"
     />
 
+    <Button
+            android:id="@+id/custom_asset"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/start"
+            android:layout_centerInParent="true"
+            android:layout_marginTop="10dp"
+            android:text="Custom Aset"
+            android:padding="20dp"
+            android:background="@drawable/background_button"
+            android:onClick="customAsset"
+    />
+
 </RelativeLayout>
diff --git a/lottiealertdialoglibrary/src/main/java/com/labters/lottiealertdialoglibrary/DialogTypes.kt b/lottiealertdialoglibrary/src/main/java/com/labters/lottiealertdialoglibrary/DialogTypes.kt
@@ -8,5 +8,6 @@ class DialogTypes
         @JvmField val TYPE_ERROR = 2
         @JvmField val TYPE_WARNING = 3
         @JvmField val TYPE_QUESTION = 4
+        @JvmField val TYPE_CUSTOM = 5
     }
 }
diff --git a/...lertdialoglibrary/src/main/java/com/labters/lottiealertdialoglibrary/LottieAlertDialog.kt b/...lertdialoglibrary/src/main/java/com/labters/lottiealertdialoglibrary/LottieAlertDialog.kt
@@ -1,6 +1,5 @@
 package com.labters.lottiealertdialoglibrary
 
-import android.animation.ValueAnimator
 import android.app.AlertDialog
 import android.content.Context
 import android.graphics.Color
@@ -19,6 +18,7 @@ import com.airbnb.lottie.LottieDrawable
 
 class LottieAlertDialog : AlertDialog
 {
+    private var mCustomAsset:String? = null
     private var mContext : Context
     private var mType:Int?=null
     private var mTitle:String? = null
@@ -61,10 +61,12 @@ class LottieAlertDialog : AlertDialog
         negativeBtnColor : Int?,
         negativeTextColor : Int?,
         noneBtnColor : Int?,
-        noneTextColor : Int?
+        noneTextColor : Int?,
+        customAsset: String?
     ) : super(context) {
         this.mContext = context
         this.mType = type
+        this.mCustomAsset = customAsset
         this.mTitle = title
         this.mDescription = description
         this.mPositiveText = positiveText
@@ -88,8 +90,9 @@ class LottieAlertDialog : AlertDialog
 
     data class Builder(
         private val context: Context? = null,
-        private val type:Int? = null
-        )
+        private val type:Int? = null,
+        private val customAsset:String? = null
+    )
     {
         private var title:String? = null
         private var description:String? = null
@@ -122,10 +125,11 @@ class LottieAlertDialog : AlertDialog
         fun setNoneTextColor(color:Int?) : Builder= apply { this.noneTextColor = color ; return@apply}
         fun build() = LottieAlertDialog(context!!,type,title, description, positiveText,
             negativeText,noneText,positiveListener,negativeListener,noneListener,
-            positiveBtnColor,positiveTextColor,negativeBtnColor,negativeTextColor,noneBtnColor,noneTextColor)
+            positiveBtnColor,positiveTextColor,negativeBtnColor,negativeTextColor,noneBtnColor,noneTextColor,customAsset)
 
         fun getContext() : Context? {return context}
         fun getType() : Int? { return  type}
+        fun getCustomAsset() : String? { return customAsset}
         fun getTitle() : String? { return  title}
         fun getDescription() : String? { return  description}
         fun getPositiveText() : String? { return  positiveText}
@@ -167,7 +171,7 @@ class LottieAlertDialog : AlertDialog
         lAnimation.startAnimation(animationFadeIn)
         if (mTitle!=null)
         {
-            tvTitle.setText(mTitle)
+            tvTitle.text = mTitle
             tvTitle.visibility=View.VISIBLE
         }
         else
@@ -176,7 +180,7 @@ class LottieAlertDialog : AlertDialog
         }
         if (mDescription!=null)
         {
-            tvDescription.setText(mDescription)
+            tvDescription.text = mDescription
             tvDescription.visibility=View.VISIBLE
         }
         else
@@ -185,9 +189,9 @@ class LottieAlertDialog : AlertDialog
         }
         if (mPositiveText!=null)
         {
-            btnPositive.setText(mPositiveText)
+            btnPositive.text = mPositiveText
             btnPositive.visibility=View.VISIBLE
-            btnPositive.setOnClickListener(View.OnClickListener { mPositiveListener?.onClick(LottieAlertDialog@this) })
+            btnPositive.setOnClickListener { mPositiveListener?.onClick(LottieAlertDialog@this) }
         }
         else
         {
@@ -197,7 +201,7 @@ class LottieAlertDialog : AlertDialog
         {
             btnNegative.setText(mNegativeText)
             btnNegative.visibility=View.VISIBLE
-            btnNegative.setOnClickListener(View.OnClickListener { mNegativeListener?.onClick(LottieAlertDialog@this) })
+            btnNegative.setOnClickListener { mNegativeListener?.onClick(LottieAlertDialog@this) }
         }
         else
         {
@@ -207,7 +211,7 @@ class LottieAlertDialog : AlertDialog
         {
             btnNone.setText(mNoneText)
             btnNone.visibility=View.VISIBLE
-            btnNone.setOnClickListener(View.OnClickListener { mNoneListener?.onClick(LottieAlertDialog@this) })
+            btnNone.setOnClickListener { mNoneListener?.onClick(LottieAlertDialog@this) }
         }
         else
         {
@@ -265,13 +269,19 @@ class LottieAlertDialog : AlertDialog
             lAnimation.setAnimation("question.json")
             lAnimation.repeatCount=LottieDrawable.INFINITE
         }
+        else if (mType == DialogTypes.TYPE_CUSTOM)
+        {
+            lAnimation.setAnimation(mCustomAsset)
+            lAnimation.repeatCount=LottieDrawable.INFINITE
+        }
         lAnimation.playAnimation()
     }
 
     fun changeDialog(builder : Builder)
     {
         mContext= builder.getContext()!!
         mType=builder.getType()
+        mCustomAsset=builder.getCustomAsset()
         mTitle=builder.getTitle()
         mDescription=builder.getDescription()
         mPositiveText=builder.getPositiveText()