Skip to content

Commit 17c3179

Browse files
committed
show proper hidden icon drawables at the activity
1 parent d1e615f commit 17c3179

File tree

2 files changed

+21
-5
lines changed

2 files changed

+21
-5
lines changed

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

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
package com.simplemobiletools.launcher.activities
22

3+
import android.content.Intent
4+
import android.content.pm.PackageManager
35
import android.os.Bundle
46
import com.simplemobiletools.commons.helpers.NavigationIcon
57
import com.simplemobiletools.commons.helpers.ensureBackgroundThread
68
import com.simplemobiletools.commons.views.MyGridLayoutManager
79
import com.simplemobiletools.launcher.R
810
import com.simplemobiletools.launcher.adapters.HiddenIconsAdapter
911
import com.simplemobiletools.launcher.extensions.getColumnCount
12+
import com.simplemobiletools.launcher.extensions.getDrawableForPackageName
1013
import com.simplemobiletools.launcher.extensions.hiddenIconsDB
1114
import com.simplemobiletools.launcher.models.HiddenIcon
1215
import kotlinx.android.synthetic.main.activity_hidden_icons.*
@@ -29,10 +32,25 @@ class HiddenIconsActivity : SimpleActivity() {
2932
private fun updateIcons() {
3033
ensureBackgroundThread {
3134
val hiddenIcons = hiddenIconsDB.getHiddenIcons().toMutableList() as ArrayList<HiddenIcon>
32-
HiddenIconsAdapter(this, hiddenIcons) {
35+
val intent = Intent(Intent.ACTION_MAIN, null)
36+
intent.addCategory(Intent.CATEGORY_LAUNCHER)
3337

34-
}.apply {
35-
manage_hidden_icons_list.adapter = this
38+
val list = packageManager.queryIntentActivities(intent, PackageManager.PERMISSION_GRANTED)
39+
for (info in list) {
40+
val componentInfo = info.activityInfo.applicationInfo
41+
val packageName = componentInfo.packageName
42+
val activityName = info.activityInfo.name
43+
hiddenIcons.firstOrNull { it.getIconIdentifier() == "$packageName/$activityName" }?.apply {
44+
drawable = info.loadIcon(packageManager) ?: getDrawableForPackageName(packageName)
45+
}
46+
}
47+
48+
runOnUiThread {
49+
HiddenIconsAdapter(this, hiddenIcons) {
50+
51+
}.apply {
52+
manage_hidden_icons_list.adapter = this
53+
}
3654
}
3755
}
3856
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import com.bumptech.glide.request.transition.DrawableCrossFadeFactory
1111
import com.simplemobiletools.commons.extensions.getProperTextColor
1212
import com.simplemobiletools.commons.extensions.portrait
1313
import com.simplemobiletools.commons.extensions.realScreenSize
14-
import com.simplemobiletools.commons.helpers.mydebug
1514
import com.simplemobiletools.launcher.R
1615
import com.simplemobiletools.launcher.activities.SimpleActivity
1716
import com.simplemobiletools.launcher.models.HiddenIcon
@@ -50,7 +49,6 @@ class HiddenIconsAdapter(
5049
}
5150
)
5251

53-
mydebug("size ${activity.realScreenSize.x}")
5452
val iconWidth = activity.realScreenSize.x / currentColumnCount
5553
iconPadding = (iconWidth * 0.1f).toInt()
5654
}

0 commit comments

Comments
 (0)