Merge pull request #10 from jungh0/master

데모를 이쁘게 수정했습니다
BlueCat-Community · Oct 15, 2019 · 70c160f · 70c160f
2 parents 19798f1 + 5065a7b
commit 70c160f
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 18 deletions.
diff --git a/app/src/main/java/com/bluecat/view404Demo/MainActivity.kt b/app/src/main/java/com/bluecat/view404Demo/MainActivity.kt
@@ -22,30 +22,39 @@ import androidx.appcompat.app.AppCompatActivity
 import com.bluecat.view404.View404
 import com.bluecat.view404.show404
 import kotlinx.android.synthetic.main.activity_main.*
+import kotlinx.android.synthetic.main.activity_main.dismissError
+import kotlinx.android.synthetic.main.layout_404.*
 import kotlinx.android.synthetic.main.layout_404.view.*
 
 class MainActivity : AppCompatActivity() {
 
     private var view404: View404? = null
 
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
+        showError.setOnClickListener {
+            if (view404 == null) {
+                view404 = View404(this, R.layout.layout_404)
+                Toast.makeText(this, "shown", Toast.LENGTH_SHORT).show()
 
-        button2.setOnClickListener {
-            view404 = View404(this, R.layout.layout_404)
-            Toast.makeText(this, "shown", Toast.LENGTH_SHORT).show()
+                //parentLayout.show404(view404!!)
+                errorLayout.show404(view404!!, R.anim.abc_fade_in)
+            } else {
+                Toast.makeText(this, "already shown", Toast.LENGTH_SHORT).show()
+            }
+        }
 
-            view404?.view404?.button?.setOnClickListener {
-                //view404?.dismiss()
-                view404?.dismiss(R.anim.abc_fade_out)
+        dismissError.setOnClickListener {
+            if (view404 != null) {
                 Toast.makeText(this, "dismissed", Toast.LENGTH_SHORT).show()
-            }
 
-            //parentLayout.show404(view404!!)
-            parentLayout.show404(view404!!, R.anim.abc_fade_in)
+                view404?.dismiss(R.anim.abc_fade_out)
+                view404 = null
+            } else {
+                Toast.makeText(this, "already dismissed", Toast.LENGTH_SHORT).show()
+            }
         }
     }
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -7,10 +7,28 @@
     android:layout_height="match_parent"
     android:background="@color/background">
 
+    <RelativeLayout
+        android:id="@+id/errorLayout"
+        android:background="#000000"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="50dp"
+        android:layout_above="@+id/showError">
+
+    </RelativeLayout>
+
     <Button
-        android:id="@+id/button2"
+        android:id="@+id/showError"
+        android:layout_above="@+id/dismissError"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:text="Show Error" />
+
+    <Button
+        android:id="@+id/dismissError"
         android:layout_alignParentBottom="true"
-        android:text="show" />
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Dismiss Error" />
+
 </RelativeLayout>
diff --git a/app/src/main/res/layout/layout_404.xml b/app/src/main/res/layout/layout_404.xml
@@ -13,10 +13,4 @@
         android:textSize="16sp"
         android:textStyle="bold" />
 
-    <Button
-        android:id="@+id/button"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:text="dismiss" />
 </RelativeLayout>