diff --git a/.idea/modules.xml b/.idea/modules.xml index 0b825bf..f1c993b 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,12 +2,9 @@ - - - - - + + \ No newline at end of file diff --git a/app/src/main/java/ru/whalemare/bottomsheet/MainActivityKotlin.kt b/app/src/main/java/ru/whalemare/bottomsheet/MainActivityKotlin.kt index e8d1d99..1414535 100644 --- 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,8 +36,13 @@ 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}") @@ -44,20 +50,22 @@ open class MainActivityKotlin : AppCompatActivity() { } 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 index 2b0d29a..cabf2ed 100644 --- 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 }