Skip to content

Commit 6833d5c

Browse files
committed
show the placeholder if no icons are hidden
1 parent 68cf94b commit 6833d5c

File tree

2 files changed

+25
-11
lines changed

2 files changed

+25
-11
lines changed

app/src/main/kotlin/com/simplemobiletools/launcher/activities/HiddenIconsActivity.kt

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ package com.simplemobiletools.launcher.activities
33
import android.content.Intent
44
import android.content.pm.PackageManager
55
import android.os.Bundle
6+
import com.simplemobiletools.commons.extensions.beVisibleIf
67
import com.simplemobiletools.commons.extensions.normalizeString
78
import com.simplemobiletools.commons.helpers.NavigationIcon
89
import com.simplemobiletools.commons.helpers.ensureBackgroundThread
10+
import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener
911
import com.simplemobiletools.commons.views.MyGridLayoutManager
1012
import com.simplemobiletools.launcher.R
1113
import com.simplemobiletools.launcher.adapters.HiddenIconsAdapter
@@ -15,7 +17,7 @@ import com.simplemobiletools.launcher.extensions.hiddenIconsDB
1517
import com.simplemobiletools.launcher.models.HiddenIcon
1618
import kotlinx.android.synthetic.main.activity_hidden_icons.*
1719

18-
class HiddenIconsActivity : SimpleActivity() {
20+
class HiddenIconsActivity : SimpleActivity(), RefreshRecyclerViewListener {
1921
override fun onCreate(savedInstanceState: Bundle?) {
2022
super.onCreate(savedInstanceState)
2123
setContentView(R.layout.activity_hidden_icons)
@@ -40,25 +42,32 @@ class HiddenIconsActivity : SimpleActivity() {
4042
})
4143
).toMutableList() as ArrayList<HiddenIcon>
4244

43-
val intent = Intent(Intent.ACTION_MAIN, null)
44-
intent.addCategory(Intent.CATEGORY_LAUNCHER)
45+
manage_hidden_icons_placeholder.beVisibleIf(hiddenIcons.isEmpty())
46+
if (hiddenIcons.isNotEmpty()) {
47+
val intent = Intent(Intent.ACTION_MAIN, null)
48+
intent.addCategory(Intent.CATEGORY_LAUNCHER)
4549

46-
val list = packageManager.queryIntentActivities(intent, PackageManager.PERMISSION_GRANTED)
47-
for (info in list) {
48-
val componentInfo = info.activityInfo.applicationInfo
49-
val packageName = componentInfo.packageName
50-
val activityName = info.activityInfo.name
51-
hiddenIcons.firstOrNull { it.getIconIdentifier() == "$packageName/$activityName" }?.apply {
52-
drawable = info.loadIcon(packageManager) ?: getDrawableForPackageName(packageName)
50+
val list = packageManager.queryIntentActivities(intent, PackageManager.PERMISSION_GRANTED)
51+
for (info in list) {
52+
val componentInfo = info.activityInfo.applicationInfo
53+
val packageName = componentInfo.packageName
54+
val activityName = info.activityInfo.name
55+
hiddenIcons.firstOrNull { it.getIconIdentifier() == "$packageName/$activityName" }?.apply {
56+
drawable = info.loadIcon(packageManager) ?: getDrawableForPackageName(packageName)
57+
}
5358
}
5459
}
5560

5661
runOnUiThread {
57-
HiddenIconsAdapter(this, hiddenIcons, manage_hidden_icons_list) {
62+
HiddenIconsAdapter(this, hiddenIcons, this, manage_hidden_icons_list) {
5863
}.apply {
5964
manage_hidden_icons_list.adapter = this
6065
}
6166
}
6267
}
6368
}
69+
70+
override fun refreshItems() {
71+
updateIcons()
72+
}
6473
}

app/src/main/kotlin/com/simplemobiletools/launcher/adapters/HiddenIconsAdapter.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter
1212
import com.simplemobiletools.commons.extensions.portrait
1313
import com.simplemobiletools.commons.extensions.realScreenSize
1414
import com.simplemobiletools.commons.helpers.ensureBackgroundThread
15+
import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener
1516
import com.simplemobiletools.commons.views.MyRecyclerView
1617
import com.simplemobiletools.launcher.R
1718
import com.simplemobiletools.launcher.extensions.hiddenIconsDB
@@ -21,6 +22,7 @@ import kotlinx.android.synthetic.main.item_hidden_icon.view.*
2122
class HiddenIconsAdapter(
2223
activity: BaseSimpleActivity,
2324
var hiddenIcons: ArrayList<HiddenIcon>,
25+
val listener: RefreshRecyclerViewListener,
2426
recyclerView: MyRecyclerView,
2527
itemClick: (Any) -> Unit
2628
) : MyRecyclerViewAdapter(activity, recyclerView, itemClick) {
@@ -77,6 +79,9 @@ class HiddenIconsAdapter(
7779

7880
activity.runOnUiThread {
7981
removeSelectedItems(positions)
82+
if (hiddenIcons.isEmpty()) {
83+
listener.refreshItems()
84+
}
8085
}
8186
}
8287
}

0 commit comments

Comments
 (0)