Merge pull request #15 from indrih17/window_leaked_fix

Method `hide` replaced `dismiss`.
whalemare · Apr 1, 2019 · 297189a · 297189a
2 parents d017ac9 + 5f03ad4
commit 297189a
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 20 deletions.
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/src/main/java/ru/whalemare/bottomsheet/MainActivityKotlin.kt b/app/src/main/java/ru/whalemare/bottomsheet/MainActivityKotlin.kt
@@ -11,11 +11,12 @@ import androidx.recyclerview.widget.GridLayoutManager
 import ru.whalemare.sheetmenu.SheetMenu
 
 open class MainActivityKotlin : AppCompatActivity() {
-
     var needTitle = false
 
     var needIcons = true
 
+    private var sheetMenu: SheetMenu? = null
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
@@ -35,29 +36,36 @@ open class MainActivityKotlin : AppCompatActivity() {
         }
     }
 
+    override fun onPause() {
+        super.onPause()
+        sheetMenu?.dismiss()
+    }
+
     fun setupLinear() {
-        SheetMenu().apply {
+        sheetMenu = SheetMenu().apply {
             titleId = if (needTitle) R.string.title else 0
             click = MenuItem.OnMenuItemClickListener {
                 toast("Click on ${it.title}")
                 true
             }
             menu = R.menu.menu_icons
             showIcons = needIcons
-        }.show(this)
+        }
+        sheetMenu?.show(this)
     }
 
     fun setupGrid() {
-        SheetMenu(
-                titleId = if (needTitle) R.string.title else 0,
-                menu = R.menu.menu_long_icons,
-                layoutManager = GridLayoutManager(this, 3),
-                click = MenuItem.OnMenuItemClickListener {
-                    toast("Click on ${it.title}")
-                    true
-                },
-                showIcons = needIcons
-        ).show(this)
+        sheetMenu = SheetMenu(
+            titleId = if (needTitle) R.string.title else 0,
+            menu = R.menu.menu_long_icons,
+            layoutManager = GridLayoutManager(this, 3),
+            click = MenuItem.OnMenuItemClickListener {
+                toast("Click on ${it.title}")
+                true
+            },
+            showIcons = needIcons
+        )
+        sheetMenu?.show(this)
     }
 }
 

diff --git a/sheetmenu/src/main/java/ru/whalemare/sheetmenu/SheetMenu.kt b/sheetmenu/src/main/java/ru/whalemare/sheetmenu/SheetMenu.kt
@@ -62,8 +62,8 @@ open class SheetMenu(
         dialog.show()
     }
 
-    fun hide() {
-        dialog?.hide()
+    fun dismiss() {
+        dialog?.dismiss()
         dialog = null
     }