From 397ef6d4ec0bfc9988a9e92eb4851331d0f73ab6 Mon Sep 17 00:00:00 2001 From: Naveen Date: Tue, 14 Jun 2022 09:53:49 +0530 Subject: [PATCH] Remove unnecessary lambda based listener --- .../applauncher/activities/MainActivity.kt | 9 ++------- .../applauncher/adapters/LaunchersAdapter.kt | 5 +++-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/MainActivity.kt index 31a4764..1384b7c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/MainActivity.kt @@ -124,7 +124,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { checkInvalidApps() initZoomListener() setupAdapter(displayedLaunchers) - maybeShowEmptyView(displayedLaunchers) + maybeShowEmptyView() } private fun setupAdapter(launchers: ArrayList) { @@ -136,7 +136,6 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { launchers = launchers, listener = this, recyclerView = launchers_grid, - onItemsRemoved = ::onItemsRemoved, ) { hideKeyboard() val launchIntent = packageManager.getLaunchIntentForPackage((it as AppLauncher).packageName) @@ -280,11 +279,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { } } - private fun onItemsRemoved() { - maybeShowEmptyView() - } - - private fun maybeShowEmptyView(displayedLaunchers: ArrayList = dbHelper.getLaunchers()) { + private fun maybeShowEmptyView() { val emptyViews = arrayOf(add_icons_placeholder, no_items_placeholder) if (displayedLaunchers.isEmpty()) { launchers_fastscroller.fadeOut() diff --git a/app/src/main/kotlin/com/simplemobiletools/applauncher/adapters/LaunchersAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/applauncher/adapters/LaunchersAdapter.kt index 7c67f50..9c9505e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/applauncher/adapters/LaunchersAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/applauncher/adapters/LaunchersAdapter.kt @@ -31,7 +31,6 @@ class LaunchersAdapter( val launchers: ArrayList, val listener: RefreshRecyclerViewListener?, recyclerView: MyRecyclerView, - var onItemsRemoved: (() -> Unit)? = null, itemClick: (Any) -> Unit ) : MyRecyclerViewAdapter(activity, recyclerView, itemClick), ItemTouchHelperContract, RecyclerViewFastScroller.OnPopupTextUpdate { @@ -179,7 +178,9 @@ class LaunchersAdapter( activity.dbHelper.deleteLaunchers(removeIds) positions.sortDescending() removeSelectedItems(positions) - onItemsRemoved?.invoke() + if (launchers.isEmpty()) { + listener?.refreshItems() + } } private fun setupView(view: View, launcher: AppLauncher, holder: ViewHolder) {