diff --git a/app/src/main/java/com/skydoves/needsdemo/MainActivity.kt b/app/src/main/java/com/skydoves/needsdemo/MainActivity.kt index 072c4e1..f69a71a 100644 --- a/app/src/main/java/com/skydoves/needsdemo/MainActivity.kt +++ b/app/src/main/java/com/skydoves/needsdemo/MainActivity.kt @@ -20,44 +20,49 @@ import android.os.Bundle import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import com.skydoves.needs.Needs -import com.skydoves.needs.OnConfirmListener +import com.skydoves.needs.needs +import com.skydoves.needs.showNeeds import kotlinx.android.synthetic.main.activity_main.* class MainActivity : AppCompatActivity() { - private lateinit var needs: Needs + private lateinit var needs0: Needs + private val needs1 by needs { + NeedsUtils.getNeedsStyle1(this, this) + } override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) - this.needs = NeedsUtils.getNeedsStyle1(this, this) + needs1.setOnConfirmListener { needs1.dismiss() } + needs1.showNeeds(button0) + + this.needs0 = NeedsUtils.getNeedsStyle1(this, this) button0.setOnClickListener { - needs = NeedsUtils.getNeedsStyle0(this, this) + needs0 = NeedsUtils.getNeedsStyle0(this, this) setOnConfirmListener() - needs.show(main) + needs0.show(main) } button1.setOnClickListener { - needs = NeedsUtils.getNeedsStyle1(this, this) + needs0 = NeedsUtils.getNeedsStyle1(this, this) setOnConfirmListener() - needs.show(main) + needs0.show(main) } } private fun setOnConfirmListener() { - needs.setOnConfirmListener(object : OnConfirmListener { - override fun onConfirm() { - Toast.makeText(baseContext, "Confirmed!", Toast.LENGTH_SHORT).show() - needs.dismiss() - } - }) + needs0.setOnConfirmListener { + Toast.makeText(baseContext, "Confirmed!", Toast.LENGTH_SHORT).show() + needs0.dismiss() + } } override fun onBackPressed() { - if (needs.isShowing) { - needs.dismiss() + if (needs0.isShowing) { + needs0.dismiss() } else { super.onBackPressed() } diff --git a/dependencies.gradle b/dependencies.gradle index 2bf8a66..ff2d5ac 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,13 +1,13 @@ ext.versions = [ minSdk : 16, compileSdk : 29, - versionCode : 4, - versionName : '1.0.3', + versionCode : 5, + versionName : '1.0.4', gradleBuildTool : '3.4.2', spotlessGradle : '3.23.1', dokkaGradle : '0.9.17', - bintrayRelease : '0.9', + bintrayRelease : '0.9.1', kotlin : '1.3.41', androidxAppcompat : '1.1.0-rc01', diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/needs/src/main/java/com/skydoves/needs/NeedsExtension.kt b/needs/src/main/java/com/skydoves/needs/NeedsExtension.kt index b01912c..beb84f9 100644 --- a/needs/src/main/java/com/skydoves/needs/NeedsExtension.kt +++ b/needs/src/main/java/com/skydoves/needs/NeedsExtension.kt @@ -64,4 +64,3 @@ inline fun Fragment.needs( ): Lazy { return lazy { needsProducer() } } -