Skip to content

Commit 0169862

Browse files
committed
rewrite hidden icons adapter so that we can unhide icons
1 parent 17c3179 commit 0169862

File tree

5 files changed

+61
-34
lines changed

5 files changed

+61
-34
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ class HiddenIconsActivity : SimpleActivity() {
4646
}
4747

4848
runOnUiThread {
49-
HiddenIconsAdapter(this, hiddenIcons) {
50-
49+
HiddenIconsAdapter(this, hiddenIcons, manage_hidden_icons_list) {
5150
}.apply {
5251
manage_hidden_icons_list.adapter = this
5352
}
Lines changed: 49 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,70 @@
11
package com.simplemobiletools.launcher.adapters
22

3-
import android.view.LayoutInflater
3+
import android.view.Menu
44
import android.view.View
55
import android.view.ViewGroup
6-
import androidx.recyclerview.widget.RecyclerView
76
import com.bumptech.glide.Glide
87
import com.bumptech.glide.load.engine.DiskCacheStrategy
98
import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
109
import com.bumptech.glide.request.transition.DrawableCrossFadeFactory
11-
import com.simplemobiletools.commons.extensions.getProperTextColor
10+
import com.simplemobiletools.commons.activities.BaseSimpleActivity
11+
import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter
1212
import com.simplemobiletools.commons.extensions.portrait
1313
import com.simplemobiletools.commons.extensions.realScreenSize
14+
import com.simplemobiletools.commons.views.MyRecyclerView
1415
import com.simplemobiletools.launcher.R
15-
import com.simplemobiletools.launcher.activities.SimpleActivity
1616
import com.simplemobiletools.launcher.models.HiddenIcon
1717
import kotlinx.android.synthetic.main.item_hidden_icon.view.*
1818

1919
class HiddenIconsAdapter(
20-
val activity: SimpleActivity,
20+
activity: BaseSimpleActivity,
2121
var hiddenIcons: ArrayList<HiddenIcon>,
22-
val itemClick: (Any) -> Unit
23-
) : RecyclerView.Adapter<HiddenIconsAdapter.ViewHolder>() {
22+
recyclerView: MyRecyclerView,
23+
itemClick: (Any) -> Unit
24+
) : MyRecyclerViewAdapter(activity, recyclerView, itemClick) {
2425

25-
private var textColor = activity.getProperTextColor()
2626
private var iconPadding = 0
2727

2828
init {
2929
calculateIconWidth()
3030
}
3131

32-
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
33-
val view = LayoutInflater.from(parent.context).inflate(R.layout.item_hidden_icon, parent, false)
34-
return ViewHolder(view)
32+
override fun getActionMenuId() = R.menu.cab_hidden_icons
33+
34+
override fun prepareActionMode(menu: Menu) {}
35+
36+
override fun actionItemPressed(id: Int) {
37+
when (id) {
38+
R.id.cab_unhide_icon -> unHideSelection()
39+
}
3540
}
3641

42+
override fun getSelectableItemCount() = hiddenIcons.size
43+
44+
override fun getIsItemSelectable(position: Int) = true
45+
46+
override fun getItemSelectionKey(position: Int) = hiddenIcons.getOrNull(position)?.hashCode()
47+
48+
override fun getItemKeyPosition(key: Int) = hiddenIcons.indexOfFirst { it.hashCode() == key }
49+
50+
override fun onActionModeCreated() {}
51+
52+
override fun onActionModeDestroyed() {}
53+
54+
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = createViewHolder(R.layout.item_hidden_icon, parent)
55+
3756
override fun onBindViewHolder(holder: ViewHolder, position: Int) {
38-
holder.bindView(hiddenIcons[position])
57+
val folder = hiddenIcons[position]
58+
holder.bindView(folder, true, true) { itemView, adapterPosition ->
59+
setupView(itemView, folder)
60+
}
61+
bindViewHolder(holder)
3962
}
4063

4164
override fun getItemCount() = hiddenIcons.size
4265

66+
private fun unHideSelection() {}
67+
4368
private fun calculateIconWidth() {
4469
val currentColumnCount = activity.resources.getInteger(
4570
if (activity.portrait) {
@@ -53,27 +78,20 @@ class HiddenIconsAdapter(
5378
iconPadding = (iconWidth * 0.1f).toInt()
5479
}
5580

56-
inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
57-
fun bindView(icon: HiddenIcon): View {
58-
itemView.apply {
59-
hidden_icon_label.text = icon.title
60-
hidden_icon_label.setTextColor(textColor)
61-
hidden_icon.setPadding(iconPadding, iconPadding, iconPadding, 0)
81+
private fun setupView(view: View, icon: HiddenIcon) {
82+
view.apply {
83+
hidden_icon_holder?.isSelected = selectedKeys.contains(icon.hashCode())
84+
hidden_icon_label.text = icon.title
85+
hidden_icon_label.setTextColor(textColor)
86+
hidden_icon.setPadding(iconPadding, iconPadding, iconPadding, 0)
6287

63-
val factory = DrawableCrossFadeFactory.Builder(150).setCrossFadeEnabled(true).build()
64-
65-
Glide.with(activity)
66-
.load(icon.drawable)
67-
.diskCacheStrategy(DiskCacheStrategy.RESOURCE)
68-
.transition(DrawableTransitionOptions.withCrossFade(factory))
69-
.into(hidden_icon)
70-
71-
setOnClickListener {
72-
itemClick(icon)
73-
}
74-
}
88+
val factory = DrawableCrossFadeFactory.Builder(150).setCrossFadeEnabled(true).build()
7589

76-
return itemView
90+
Glide.with(activity)
91+
.load(icon.drawable)
92+
.diskCacheStrategy(DiskCacheStrategy.RESOURCE)
93+
.transition(DrawableTransitionOptions.withCrossFade(factory))
94+
.into(hidden_icon)
7795
}
7896
}
7997
}

app/src/main/res/layout/activity_hidden_icons.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
android:layout_width="match_parent"
1616
android:layout_height="?attr/actionBarSize"
1717
android:background="@color/color_primary"
18-
app:title="@string/manage_hidden_icons"
18+
app:title="@string/hidden_icons"
1919
app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
2020

2121
</com.google.android.material.appbar.AppBarLayout>

app/src/main/res/layout/item_hidden_icon.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
android:background="?attr/selectableItemBackground"
77
android:clickable="true"
88
android:focusable="true"
9+
android:foreground="@drawable/selector"
910
android:paddingStart="@dimen/small_margin"
1011
android:paddingTop="@dimen/medium_margin"
1112
android:paddingEnd="@dimen/small_margin"
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<menu xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto">
4+
<item
5+
android:id="@+id/cab_unhide_icon"
6+
android:icon="@drawable/ic_unhide_vector"
7+
android:title="@string/unhide"
8+
app:showAsAction="always" />
9+
</menu>

0 commit comments

Comments
 (0)