#4 Make the dialog singleton proper

Author: Gkemon

app/build.gradle

@@ -28,8 +28,10 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-    /*implementation project(path: ':easy-loading')*/
-    implementation 'com.github.Gkemon:Easy-Android-Loading:v1.0'
+/*
+    implementation project(path: ':easy-loading')
+*/
+    implementation 'com.github.Gkemon:Easy-Android-Loading:1.1'
 
     implementation "androidx.core:core-ktx:1.3.2"
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1'

app/src/main/AndroidManifest.xml

@@ -14,11 +14,6 @@
             android:label="@string/title_activity_second"
             android:theme="@style/AppTheme.NoActionBar">
         </activity>
-        <activity
-            android:name="com.gk.emon.easyLoadingDemo.ThirdActivity"
-            android:label="@string/title_activity_second"
-            android:theme="@style/AppTheme.NoActionBar">
-        </activity>
         <activity android:name="com.gk.emon.easyLoadingDemo.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app/src/main/java/com/gk/emon/easyLoadingDemo/MainActivity.kt

@@ -1,5 +1,6 @@
 package com.gk.emon.easyLoadingDemo
 
+import android.content.Intent
 import android.graphics.PorterDuff
 import android.graphics.PorterDuffColorFilter
 import android.os.Bundle
@@ -39,12 +40,18 @@ class MainActivity : AppCompatActivity() {
         getInstance(this)
                 .customLoading()
                 .setCustomViewID(R.layout.layout_my_custom_loading, android.R.color.holo_red_dark)
-                .doIntentionalDelay()
-                .setDelayDurationInMillSec(1000)
+                .noIntentionalDelay()
                 .setBackgroundOpacity(70)
                 .build()
 
 
+        LoadingPopup.showLoadingPopUp()
+
+        Handler(Looper.getMainLooper()).postDelayed({
+            startActivity(Intent(this,SecondActivity::class.java))
+        }, 2000)
+
+
     }
 
     private fun doConfigureAndShowDefaultLovelyLoading() {

app/src/main/java/com/gk/emon/easyLoadingDemo/SecondActivity.java

@@ -0,0 +1,19 @@
+package com.gk.emon.easyLoadingDemo
+
+import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import androidx.appcompat.app.AppCompatActivity
+import com.gk.emon.lovelyLoading.LoadingPopup
+
+class SecondActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_second)
+
+        Handler(Looper.getMainLooper()).postDelayed({
+            LoadingPopup.hideLoadingPopUp()
+        }, 2000)
+
+    }
+}

app/src/main/java/com/gk/emon/easyLoadingDemo/SecondActivity.kt

@@ -123,7 +123,7 @@ class LoadingPopup(context: Context) : Dialog(context) {
         fun build()
     }
 
-    class LoadingBuilder(activity: Activity) : FinalStep, TypeStep, DelayDurationStep, DelayStep, CustomLayoutStep {
+    class LoadingBuilder(private val activity: Activity) : FinalStep, TypeStep, DelayDurationStep, DelayStep, CustomLayoutStep {
         private var isAutoCancelable = false
         private var intentionalDelayInMillSec: Long = 0
         var dialog: LoadingPopup? = null
@@ -168,7 +168,7 @@ class LoadingPopup(context: Context) : Dialog(context) {
         }
 
         override fun build() {
-            dialog?.apply {
+            getDialog(activity)?.apply {
                 setIntentionalDelayInMillSec(intentionalDelayInMillSec)
                 if (isAutoCancelable) setCancelable()
                 setCustomViewID(customLayoutID, backgroundColor)
@@ -201,29 +201,22 @@ class LoadingPopup(context: Context) : Dialog(context) {
         private fun registerActivityChangeListener(activity: Activity?) {
             if (activity != null && activity.application != null) {
                 activity.application
-                    .registerActivityLifecycleCallbacks(object : ActivityLifecycleCallbacks {
-                        override fun onActivityCreated(activity: Activity, bundle: Bundle?) {
-                            dialog?.hide()
-                            dialog = null
-                            dialog = getDialog(activity)
-                        }
-
-                        override fun onActivityStarted(activity: Activity) {}
-                        override fun onActivityResumed(activity: Activity) {
-                            dialog = getDialog(activity)
-                            build()
-                        }
-
-                        override fun onActivityPaused(activity: Activity) {}
-                        override fun onActivityStopped(activity: Activity) {}
-                        override fun onActivitySaveInstanceState(
-                            activity: Activity,
-                            bundle: Bundle
-                        ) {
-                        }
-
-                        override fun onActivityDestroyed(activity: Activity) {}
-                    })
+                        .registerActivityLifecycleCallbacks(object : ActivityLifecycleCallbacks {
+                            override fun onActivityCreated(activity: Activity, bundle: Bundle?) {
+                                dialog?.hide()
+                                dialog = null
+                                dialog = getDialog(activity)
+                            }
+                            override fun onActivityStarted(activity: Activity) {}
+                            override fun onActivityResumed(activity: Activity) {
+                                dialog = getDialog(activity)
+                                build()
+                            }
+                            override fun onActivityPaused(activity: Activity) {}
+                            override fun onActivityStopped(activity: Activity) {}
+                            override fun onActivitySaveInstanceState(activity: Activity, bundle: Bundle) {}
+                            override fun onActivityDestroyed(activity: Activity) {}
+                        })
             }
         }