fix bug and make it to lib

Author: zhaochunyu

.idea/gradle.xml

@@ -23,6 +23,7 @@ android {
 }
 
 dependencies {
+    implementation project(':fancydialog')
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.1.0-alpha03'

app/build.gradle

@@ -3,7 +3,6 @@
           xmlns:tools="http://schemas.android.com/tools" package="com.zcy.nidavellir.fancydialog">
 
     <application
-            android:name=".MyApp"
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_name"
             android:roundIcon="@mipmap/ic_launcher_round"

app/src/main/AndroidManifest.xml

@@ -6,6 +6,7 @@ import android.view.Gravity
 import android.view.View
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
+import com.zcy.fancydialog.*
 
 class MainActivity : AppCompatActivity() {
 

app/src/main/java/com/zcy/nidavellir/fancydialog/MainActivity.kt

@@ -0,0 +1 @@
+/build

app/src/main/java/com/zcy/nidavellir/fancydialog/MyApp.kt

@@ -0,0 +1,38 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-android'
+
+android {
+    compileSdkVersion 28
+
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 28
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'androidx.appcompat:appcompat:1.1.0-alpha03'
+    implementation 'com.google.android.material:material:1.0.0'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}
+repositories {
+    mavenCentral()
+}

fancydialog/.gitignore

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

fancydialog/build.gradle

@@ -0,0 +1,26 @@
+package com.zcy.fancydialog;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("com.zcy.fancydialog.test", appContext.getPackageName());
+    }
+}

fancydialog/proguard-rules.pro

@@ -0,0 +1,4 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.zcy.fancydialog">
+    <application android:name=".MyApp"/>
+</manifest>

fancydialog/src/androidTest/java/com/zcy/fancydialog/ExampleInstrumentedTest.java

@@ -1,4 +1,4 @@
-package com.zcy.nidavellir.fancydialog
+package com.zcy.fancydialog
 
 import android.os.Bundle
 import android.view.Gravity

fancydialog/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
-package com.zcy.nidavellir.fancydialog
+package com.zcy.fancydialog
 
 import android.os.Bundle
 import android.view.LayoutInflater

app/src/main/java/com/zcy/nidavellir/fancydialog/AskDialog.kt fancydialog/src/main/java/com/zcy/fancydialog/AskDialog.kt

@@ -1,4 +1,4 @@
-package com.zcy.nidavellir.fancydialog
+package com.zcy.fancydialog
 
 import android.content.Context
 import android.graphics.Color

app/src/main/java/com/zcy/nidavellir/fancydialog/AskMoreDialog.kt fancydialog/src/main/java/com/zcy/fancydialog/AskMoreDialog.kt

@@ -1,5 +1,6 @@
-package com.zcy.nidavellir.fancydialog
+package com.zcy.fancydialog
 
+import android.content.Context
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
@@ -8,7 +9,8 @@ import android.text.TextWatcher
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Toast
+import android.view.WindowManager
+import android.view.inputmethod.InputMethodManager
 import androidx.appcompat.widget.AppCompatEditText
 import androidx.appcompat.widget.AppCompatTextView
 import androidx.fragment.app.FragmentManager
@@ -18,7 +20,6 @@ import androidx.fragment.app.FragmentManager
  * @description:    带输入框的Dialog
  * @date:           2019/1/2
  */
-
 inline fun editDialog(fragmentManager: FragmentManager, dsl: DSLEditDialog.() -> Unit) {
     DSLEditDialog.newInstance().apply(dsl).show(fragmentManager, "dialog")
 }
@@ -40,9 +41,16 @@ class DSLEditDialog : BaseFragmentDialog() {
     private var leftClicks: (() -> Unit)? = null
     private var rightClicks: ((String) -> Unit)? = null
 
+    private lateinit var rootView: View
+
+    init {
+        lowerBackground = true
+    }
+
     private lateinit var edit: AppCompatEditText
     override fun setView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         val view = inflater.inflate(R.layout.layout_edit_dialog, container, false)
+        rootView = view
         edit = view.findViewById<AppCompatEditText>(R.id.labelEdit)
         edit.setText(mDefault)
         mHint?.let {
@@ -53,9 +61,7 @@ class DSLEditDialog : BaseFragmentDialog() {
         val sure = view.findViewById<AppCompatTextView>(R.id.sure)
         val title = view.findViewById<AppCompatTextView>(R.id.title)
         val message = view.findViewById<AppCompatTextView>(R.id.desc)
-        mTitle?.also {
-            title.text = mTitle
-        }
+        title.text = mTitle
         mMessage?.let {
             message.isVisibility(true)
             message.text = it
@@ -77,13 +83,12 @@ class DSLEditDialog : BaseFragmentDialog() {
                         sure?.isEnabled = true
                         sure?.alpha = 1F
                         if (s.length > mMaxLength) {
-                            Toast.makeText(context, "太多了", Toast.LENGTH_SHORT).show()
-                            edit?.let {
+                            edit.let {
                                 val selectionStart = it.selectionStart
                                 val selectionEnd = it.selectionEnd
                                 s.delete(selectionStart - 1, selectionEnd)
                                 it.text = s
-                                it.setSelection(it.text!!.length)
+                                it.setSelection(it.text.toString().length)
                                 return@TAG
                             }
                         }
@@ -105,7 +110,7 @@ class DSLEditDialog : BaseFragmentDialog() {
 
         sure.setOnClickListener {
             rightClicks?.let { onClick ->
-                onClick(edit.text!!.trim().toString())
+                onClick(edit.text.toString().trim())
             }
             dismiss()
         }
@@ -127,12 +132,24 @@ class DSLEditDialog : BaseFragmentDialog() {
         rightClicks = onClick
     }
 
+    override fun dismiss() {
+        Handler(Looper.getMainLooper()).post { hintPopInput(rootView) }
+        super.dismiss()
+    }
+
+    private fun hintPopInput(view: View) {
+        val imm = mContext.getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager
+        imm?.hideSoftInputFromWindow(view.windowToken, 2)
+        activity?.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN)
+    }
+
+
     override fun show(manager: FragmentManager, tag: String?) {
         Handler(Looper.getMainLooper()).postDelayed({
             if (this::edit.isInitialized) {
                 edit.showSoft()
             }
-        }, 200)
+        }, 100)
         super.show(manager, tag)
     }
 

app/src/main/java/com/zcy/nidavellir/fancydialog/BaseFragmentDialog.kt fancydialog/src/main/java/com/zcy/fancydialog/BaseFragmentDialog.kt

@@ -1,13 +1,12 @@
-package com.zcy.nidavellir.fancydialog
+package com.zcy.fancydialog
 
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.LinearLayout
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.zcy.nidavellir.fancydialog.list.ListDialogAdapter
+import com.zcy.fancydialog.list.ListDialogAdapter
 
 /**
  * @author:         zhaochunyu

app/src/main/java/com/zcy/nidavellir/fancydialog/EditDialog.kt fancydialog/src/main/java/com/zcy/fancydialog/EditDialog.kt

@@ -0,0 +1,19 @@
+package com.zcy.fancydialog
+
+import android.app.Application
+
+/**
+ * @author:         zhaochunyu
+ * @description:    application context
+ * @date:           2019/1/2
+ */
+class MyApp : Application() {
+    override fun onCreate() {
+        super.onCreate()
+        instance = this
+    }
+
+    companion object {
+        lateinit var instance: Application
+    }
+}

app/src/main/java/com/zcy/nidavellir/fancydialog/ListDialog.kt fancydialog/src/main/java/com/zcy/fancydialog/ListDialog.kt

@@ -1,10 +1,10 @@
-package com.zcy.nidavellir.fancydialog.list
+package com.zcy.fancydialog.list
 
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.zcy.nidavellir.fancydialog.R
+import com.zcy.fancydialog.R
 import kotlinx.android.synthetic.main.item_list_dialog.view.*
 
 /**

fancydialog/src/main/java/com/zcy/fancydialog/MyApp.kt

@@ -1,4 +1,4 @@
-package com.zcy.nidavellir.fancydialog
+package com.zcy.fancydialog
 
 import android.app.Activity
 import android.content.Context

app/src/main/java/com/zcy/nidavellir/fancydialog/list/ListDialogAdapter.kt fancydialog/src/main/java/com/zcy/fancydialog/list/ListDialogAdapter.kt

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#008577</color>
+    <color name="colorPrimaryDark">#00574B</color>
+    <color name="colorAccent">#D81B60</color>
+</resources>

app/src/main/java/com/zcy/nidavellir/fancydialog/utils.kt fancydialog/src/main/java/com/zcy/fancydialog/utils.kt

@@ -0,0 +1,5 @@
+<resources>
+    <string name="app_name">FancyDialog</string>
+    <string name="sure">确定</string>
+    <string name="cancel">取消</string>
+</resources>

app/src/main/res/anim/activity_anim_bottom_to_top.xml fancydialog/src/main/res/anim/activity_anim_bottom_to_top.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="DialogAnimation">
+        <item name="android:windowEnterAnimation">@anim/activity_anim_bottom_to_top</item>
+        <item name="android:windowExitAnimation">@anim/activity_anim_top_to_bottom</item>
+    </style>
+</resources>

app/src/main/res/anim/activity_anim_top_to_bottom.xml fancydialog/src/main/res/anim/activity_anim_top_to_bottom.xml

@@ -1 +1 @@
-include ':app'
+include ':app', ':fancydialog'