Move from folder dialog to custom folder drawing

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

@@ -38,7 +38,6 @@ import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.commons.helpers.*
 import com.simplemobiletools.launcher.BuildConfig
 import com.simplemobiletools.launcher.R
-import com.simplemobiletools.launcher.dialogs.FolderIconsDialog
 import com.simplemobiletools.launcher.databinding.ActivityMainBinding
 import com.simplemobiletools.launcher.databinding.AllAppsFragmentBinding
 import com.simplemobiletools.launcher.databinding.WidgetsFragmentBinding
@@ -64,7 +63,6 @@ class MainActivity : SimpleActivity(), FlingListener {
     private var mIgnoreMoveEvents = false
     private var mLongPressedIcon: HomeScreenGridItem? = null
     private var mOpenPopupMenu: PopupMenu? = null
-    private var mOpenFolderDialog: FolderIconsDialog? = null
     private var mCachedLaunchers = ArrayList<AppLauncher>()
     private var mLastTouchCoords = Pair(-1f, -1f)
     private var mActionOnCanBindWidget: ((granted: Boolean) -> Unit)? = null
@@ -398,12 +396,11 @@ class MainActivity : SimpleActivity(), FlingListener {
                     hasFingerMoved(event)
                 }
 
-                if (mLongPressedIcon != null && (mOpenPopupMenu != null || mOpenFolderDialog != null) && hasFingerMoved) {
+                if (mLongPressedIcon != null && (mOpenPopupMenu != null) && hasFingerMoved) {
                     mOpenPopupMenu?.dismiss()
                     mOpenPopupMenu = null
                     binding.homeScreenGrid.root.itemDraggingStarted(mLongPressedIcon!!)
                     hideFragment(binding.allAppsFragment)
-                    mOpenFolderDialog?.dismiss()
                 }
 
                 if (mLongPressedIcon != null && hasFingerMoved) {
@@ -475,7 +472,6 @@ class MainActivity : SimpleActivity(), FlingListener {
 
         if (hasDeletedAnything) {
             binding.homeScreenGrid.root.fetchGridItems()
-            mOpenFolderDialog?.fetchItems()
         }
 
         mCachedLaunchers = launchers
@@ -558,6 +554,9 @@ class MainActivity : SimpleActivity(), FlingListener {
         if (clickedGridItem != null) {
             performItemClick(clickedGridItem)
         }
+        if (clickedGridItem?.type != ITEM_TYPE_FOLDER) {
+            binding.homeScreenGrid.root.closeFolder(redraw = true)
+        }
     }
 
     fun closeAppDrawer(delayed: Boolean = false) {
@@ -595,7 +594,7 @@ class MainActivity : SimpleActivity(), FlingListener {
     private fun performItemClick(clickedGridItem: HomeScreenGridItem) {
         when (clickedGridItem.type) {
             ITEM_TYPE_ICON -> launchApp(clickedGridItem.packageName, clickedGridItem.activityName)
-            ITEM_TYPE_FOLDER -> showFolderDialog(clickedGridItem)
+            ITEM_TYPE_FOLDER -> openFolder(clickedGridItem)
             ITEM_TYPE_SHORTCUT -> {
                 val id = clickedGridItem.shortcutId
                 val packageName = clickedGridItem.packageName
@@ -607,19 +606,8 @@ class MainActivity : SimpleActivity(), FlingListener {
         }
     }
 
-    private fun showFolderDialog(folder: HomeScreenGridItem) {
+    private fun openFolder(folder: HomeScreenGridItem) {
-        mOpenFolderDialog = FolderIconsDialog(
+        binding.homeScreenGrid.root.openFolder(folder)
-            activity = this,
-            folder = folder,
-            iconWidth = binding.homeScreenGrid.root.getCurrentCellSize(),
-            iconPadding = binding.homeScreenGrid.root.getCurrentCellMargin(),
-            dismissListener = {
-                mOpenFolderDialog = null
-            },
-            itemClick = {
-                performItemClick(it)
-            }
-        )
     }
 
     private fun performItemLongClick(x: Float, clickedGridItem: HomeScreenGridItem) {
@@ -631,11 +619,6 @@ class MainActivity : SimpleActivity(), FlingListener {
         showHomeIconMenu(x, anchorY, clickedGridItem, false)
     }
 
-    fun startHandlingItem(gridItem: HomeScreenGridItem) {
-        mLongPressedIcon = gridItem
-        mOpenFolderDialog?.dismiss()
-    }
-
     fun showHomeIconMenu(x: Float, y: Float, gridItem: HomeScreenGridItem, isOnAllAppsFragment: Boolean) {
         binding.homeScreenGrid.root.hideResizeLines()
         mLongPressedIcon = gridItem

app/src/main/kotlin/com/simplemobiletools/launcher/dialogs/FolderIconsDialog.kt

@@ -1,84 +0,0 @@
-package com.simplemobiletools.launcher.dialogs
-
-import android.graphics.drawable.BitmapDrawable
-import androidx.appcompat.app.AlertDialog
-import com.simplemobiletools.commons.activities.BaseSimpleActivity
-import com.simplemobiletools.commons.extensions.getAlertDialogBuilder
-import com.simplemobiletools.commons.extensions.setupDialogStuff
-import com.simplemobiletools.commons.helpers.ensureBackgroundThread
-import com.simplemobiletools.commons.views.AutoGridLayoutManager
-import com.simplemobiletools.launcher.adapters.FolderIconsAdapter
-import com.simplemobiletools.launcher.databinding.DialogFolderIconsBinding
-import com.simplemobiletools.launcher.extensions.getDrawableForPackageName
-import com.simplemobiletools.launcher.extensions.homeScreenGridItemsDB
-import com.simplemobiletools.launcher.helpers.ITEM_TYPE_ICON
-import com.simplemobiletools.launcher.helpers.ITEM_TYPE_SHORTCUT
-import com.simplemobiletools.launcher.models.HomeScreenGridItem
-
-class FolderIconsDialog(
-    val activity: BaseSimpleActivity,
-    private val folder: HomeScreenGridItem,
-    private val iconWidth: Int,
-    private val iconPadding: Int,
-    private val dismissListener: () -> Unit,
-    private val itemClick: (HomeScreenGridItem) -> Unit
-) {
-    private var dialog: AlertDialog? = null
-    private val binding = DialogFolderIconsBinding.inflate(activity.layoutInflater)
-
-    init {
-
-        binding.dialogFolderIconsGrid.layoutManager = AutoGridLayoutManager(activity, iconWidth)
-
-        ensureBackgroundThread {
-            val items = activity.homeScreenGridItemsDB.getFolderItems(folder.id!!)
-            items.forEach { item ->
-                if (item.type == ITEM_TYPE_ICON) {
-                    item.drawable = activity.getDrawableForPackageName(item.packageName)
-                } else if (item.type == ITEM_TYPE_SHORTCUT) {
-                    item.drawable = BitmapDrawable(item.icon)
-                }
-            }
-            activity.runOnUiThread {
-                initDialog(items, binding)
-            }
-        }
-    }
-
-    private fun initDialog(items: List<HomeScreenGridItem>, binding: DialogFolderIconsBinding) {
-        binding.dialogFolderIconsGrid.adapter = FolderIconsAdapter(activity, items.toMutableList(), iconPadding, binding.dialogFolderIconsGrid) {
-            it as HomeScreenGridItem
-            itemClick(it)
-            dialog?.dismiss()
-        }
-
-        activity.getAlertDialogBuilder()
-            .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null)
-            .setOnDismissListener { dismissListener() }
-            .apply {
-                activity.setupDialogStuff(binding.root, this, 0, folder.title) { alertDialog ->
-                    dialog = alertDialog
-                }
-            }
-    }
-
-    fun fetchItems() {
-        ensureBackgroundThread {
-            val items = activity.homeScreenGridItemsDB.getFolderItems(folder.id!!)
-            items.forEach { item ->
-                if (item.type == ITEM_TYPE_ICON) {
-                    item.drawable = activity.getDrawableForPackageName(item.packageName)
-                } else if (item.type == ITEM_TYPE_SHORTCUT) {
-                    item.drawable = BitmapDrawable(item.icon)
-                }
-            }
-            activity.runOnUiThread {
-                (binding.dialogFolderIconsGrid.adapter as FolderIconsAdapter).updateItems(items)
-            }
-        }
-    }
-
-    fun dismiss() {
-        dialog?.dismiss()
-    }
-}

app/src/main/kotlin/com/simplemobiletools/launcher/views/HomeScreenGrid.kt

@@ -22,6 +22,7 @@ import android.view.View
 import android.widget.RelativeLayout
 import androidx.core.graphics.drawable.toBitmap
 import androidx.core.graphics.drawable.toDrawable
+import androidx.core.graphics.toRectF
 import androidx.core.view.ViewCompat
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat
 import androidx.customview.widget.ExploreByTouchHelper
@@ -37,10 +38,7 @@ import com.simplemobiletools.launcher.extensions.getDrawableForPackageName
 import com.simplemobiletools.launcher.extensions.homeScreenGridItemsDB
 import com.simplemobiletools.launcher.helpers.*
 import com.simplemobiletools.launcher.models.HomeScreenGridItem
-import kotlin.math.abs
+import kotlin.math.*
-import kotlin.math.floor
-import kotlin.math.max
-import kotlin.math.min
 
 class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : RelativeLayout(context, attrs, defStyle) {
     constructor(context: Context, attrs: AttributeSet) : this(context, attrs, 0)
@@ -64,6 +62,7 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Rel
     private var dragShadowCirclePaint: Paint
     private var emptyPageIndicatorPaint: Paint
     private var currentPageIndicatorPaint: Paint
+    private var folderBackgroundPaint: Paint
     private var draggedItem: HomeScreenGridItem? = null
     private var resizedWidget: HomeScreenGridItem? = null
     private var isFirstDraw = true
@@ -78,6 +77,8 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Rel
     private var pageChangeEnabled = true
     private var pageChangeIndicatorsAlpha = 0f
 
+    private var currentlyOpenFolder: HomeScreenGridItem? = null
+
     // apply fake margins at the home screen. Real ones would cause the icons be cut at dragging at screen sides
     var sideMargins = Rect()
 
@@ -136,6 +137,11 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Rel
             style = Paint.Style.FILL
         }
 
+        folderBackgroundPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+            color = context.getProperBackgroundColor()
+            style = Paint.Style.FILL
+        }
+
         val sideMargin = context.resources.getDimension(com.simplemobiletools.commons.R.dimen.normal_margin).toInt()
         sideMargins.apply {
             top = context.statusBarHeight
@@ -469,6 +475,7 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Rel
                             parentItem.id = newId
                             potentialParent?.apply {
                                 parentId = newId
+                                left = 0
                                 context.homeScreenGridItemsDB.updateItemPosition(left, top, right, bottom, page, docked, newId, id!!)
                             }
                             (context as? MainActivity)?.runOnUiThread {
@@ -496,12 +503,17 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Rel
     }
 
     private fun addAppIconOrShortcut(draggedHomeGridItem: HomeScreenGridItem?, xIndex: Int, yIndex: Int, newParentId: Long? = null) {
+        val finalXIndex = if (newParentId != null) {
+                gridItems.find { it.id == newParentId }?.getFolderItems()?.maxOf { it.left + 1 } ?: 0
+            } else {
+                xIndex
+            }
         // we are moving an existing home screen item from one place to another
         if (draggedHomeGridItem != null) {
             draggedHomeGridItem.apply {
-                left = xIndex
+                left = finalXIndex
                 top = yIndex
-                right = xIndex
+                right = finalXIndex
                 bottom = yIndex
                 page = currentPage
                 docked = yIndex == rowCount - 1
@@ -515,9 +527,9 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Rel
             // we are dragging a new item at the home screen from the All Apps fragment
             val newHomeScreenGridItem = HomeScreenGridItem(
                 null,
-                xIndex,
+                finalXIndex,
                 yIndex,
-                xIndex,
+                finalXIndex,
                 yIndex,
                 currentPage,
                 draggedItem!!.packageName,
@@ -798,9 +810,9 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Rel
             1 - pageChangeAnimLeftPercentage
         }
 
-        fun handleItemDrawing(item: HomeScreenGridItem, xFactor: Float) {
+        fun handleGridItemDrawing(item: HomeScreenGridItem, baseItemX: Int, baseItemY: Int) {
             if (item.id != draggedItem?.id) {
-                val drawableX = cellXCoords[item.left] + iconMargin + extraXMargin + sideMargins.left + (width * xFactor).toInt()
+                val drawableX = baseItemX + iconMargin + extraXMargin
 
                 val drawable = if (item.type == ITEM_TYPE_FOLDER) {
                     resources.getColoredDrawableWithColor(com.simplemobiletools.commons.R.drawable.ic_folder_vector, context.getProperPrimaryColor())
@@ -813,12 +825,12 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Rel
 
                     drawable.setBounds(drawableX, drawableY, drawableX + iconSize, drawableY + iconSize)
                 } else {
-                    val drawableY = cellYCoords[item.top] + iconMargin + extraYMargin + sideMargins.top
+                    val drawableY = baseItemY + iconMargin + extraYMargin
                     drawable.setBounds(drawableX, drawableY, drawableX + iconSize, drawableY + iconSize)
 
                     if (item.id != draggedItem?.id && item.title.isNotEmpty()) {
-                        val textX = cellXCoords[item.left].toFloat() + labelSideMargin + sideMargins.left + width * xFactor
+                        val textX = baseItemX.toFloat() + labelSideMargin
-                        val textY = cellYCoords[item.top].toFloat() + iconSize + iconMargin + extraYMargin + labelSideMargin + sideMargins.top
+                        val textY = baseItemY.toFloat() + iconSize + iconMargin + extraYMargin + labelSideMargin
                         val staticLayout = StaticLayout.Builder
                             .obtain(item.title, 0, item.title.length, textPaint, cellWidth - 2 * labelSideMargin)
                             .setMaxLines(2)
@@ -837,13 +849,21 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Rel
             }
         }
 
+        fun handleMainGridItemDrawing(item: HomeScreenGridItem, xFactor: Float) {
+            handleGridItemDrawing(
+                item,
+                cellXCoords[item.left] + sideMargins.left + (width * xFactor).toInt(),
+                cellYCoords[item.top] + sideMargins.top
+            )
+        }
+
         gridItems.filter { (it.drawable != null && it.type == ITEM_TYPE_ICON || it.type == ITEM_TYPE_SHORTCUT || it.type == ITEM_TYPE_FOLDER) && it.page == currentPage && !it.docked && it.parentId == null }
             .forEach { item ->
                 if (item.outOfBounds()) {
                     return@forEach
                 }
 
-                handleItemDrawing(item, currentXFactor)
+                handleMainGridItemDrawing(item, currentXFactor)
             }
         gridItems.filter { (it.drawable != null && it.type == ITEM_TYPE_ICON || it.type == ITEM_TYPE_SHORTCUT || it.type == ITEM_TYPE_FOLDER) && it.docked && it.parentId == null }
             .forEach { item ->
@@ -851,7 +871,7 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Rel
                     return@forEach
                 }
 
-                handleItemDrawing(item, 0f)
+                handleMainGridItemDrawing(item, 0f)
             }
         if (pageChangeAnimLeftPercentage > 0f) {
             gridItems.filter { (it.drawable != null && it.type == ITEM_TYPE_ICON || it.type == ITEM_TYPE_SHORTCUT || it.type == ITEM_TYPE_FOLDER) && it.page == lastPage && !it.docked && it.parentId == null }
@@ -860,7 +880,7 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Rel
                         return@forEach
                     }
 
-                    handleItemDrawing(item, lastXFactor)
+                    handleMainGridItemDrawing(item, lastXFactor)
                 }
         }
 
@@ -966,6 +986,23 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Rel
             }
         }
 
+        val folder = currentlyOpenFolder
+        if (folder != null) {
+            val items = folder.getFolderItems()
+            val folderRect = folder.getFolderRect()
+
+            canvas.drawRoundRect(folderRect, roundedCornerRadius, roundedCornerRadius, folderBackgroundPaint)
+
+            items.forEach { item ->
+                val (row, column) = item.getPositionInFolder(folder)
+                handleGridItemDrawing(
+                    item,
+                    (folderRect.left + column * cellWidth).roundToInt(),
+                    (folderRect.top + row * cellHeight).roundToInt()
+                )
+            }
+        }
+
         isFirstDraw = false
     }
 
@@ -1016,12 +1053,23 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Rel
             fillCellSizes()
         }
 
-        val clickableLeft = cellXCoords[item.left] + sideMargins.left + extraXMargin
+        val folder = currentlyOpenFolder
-        val clickableTop = if (item.docked) {
+        val clickableLeft: Int
-            cellYCoords[item.getDockAdjustedTop(rowCount)] + cellHeight - iconSize - iconMargin
+        val clickableTop: Int
+        if (folder != null && item.parentId == folder.id) {
+            val folderRect = folder.getFolderRect()
+            val (row, column) = item.getPositionInFolder(folder)
+            clickableLeft = (folderRect.left + column * cellWidth + extraXMargin).toInt()
+            clickableTop  = (folderRect.top + row * cellHeight - iconMargin + extraYMargin).toInt()
         } else {
-            cellYCoords[item.top] - iconMargin + extraYMargin
+            clickableLeft = cellXCoords[item.left] + sideMargins.left + extraXMargin
-        } + sideMargins.top
+            clickableTop = if (item.docked) {
+                cellYCoords[item.getDockAdjustedTop(rowCount)] + cellHeight - iconSize - iconMargin
+            } else {
+                cellYCoords[item.top] - iconMargin + extraYMargin
+            } + sideMargins.top
+        }
+
         return Rect(clickableLeft, clickableTop, clickableLeft + iconSize + 2 * iconMargin, clickableTop + iconSize + 2 * iconMargin)
     }
 
@@ -1051,6 +1099,15 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Rel
     }
 
     fun isClickingGridItem(x: Int, y: Int): HomeScreenGridItem? {
+        currentlyOpenFolder?.also { folder ->
+            folder.getFolderItems().forEach { gridItem ->
+                val rect = getClickableRect(gridItem)
+                if (x >= rect.left && x <= rect.right && y >= rect.top && y <= rect.bottom) {
+                    return gridItem
+                }
+            }
+        }
+
         for (gridItem in gridItems.filterVisibleOnly()) {
             if (gridItem.outOfBounds()) {
                 continue
@@ -1191,6 +1248,18 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Rel
         return false
     }
 
+    fun openFolder(folder: HomeScreenGridItem) {
+        currentlyOpenFolder = folder
+        redrawGrid()
+    }
+
+    fun closeFolder(redraw: Boolean = false) {
+        currentlyOpenFolder = null
+        if (redraw) {
+            redrawGrid()
+        }
+    }
+
     fun getCurrentIconSize(): Int = iconSize
 
     fun getCurrentCellSize(): Int = cellWidth
@@ -1200,6 +1269,7 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Rel
     private fun handlePageChange(redraw: Boolean = false) {
         pageChangeEnabled = false
         pageChangeIndicatorsAlpha = 0f
+        closeFolder()
         removeCallbacks(startFadingIndicators)
         if (redraw) {
             redrawGrid()
@@ -1227,6 +1297,37 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Rel
 
     private fun ArrayList<HomeScreenGridItem>.filterVisibleOnly() = filter { (it.page == currentPage || it.docked) && it.parentId == null }
 
+    private fun HomeScreenGridItem.getFolderItems() = gridItems.filter { (it.drawable != null && it.type == ITEM_TYPE_ICON || it.type == ITEM_TYPE_SHORTCUT) && it.parentId == id }
+
+    private fun HomeScreenGridItem.getFolderRect(): RectF {
+        val count = getFolderItems().count()
+        val columnsCount = if (count == 2) {
+            2
+        } else {
+            ceil(count / 2.0f).roundToInt()
+        }
+        val rowsCount = ceil(count.toFloat() / columnsCount).roundToInt()
+        val centerX = cellXCoords[left] + cellWidth / 2
+        val centerY = cellYCoords[top] + cellHeight / 2
+        val folderDialogWidth = (columnsCount * cellWidth).toFloat()
+        val folderDialogHeight = (rowsCount * cellHeight).toFloat()
+        val folderDialogTop = centerY - folderDialogHeight / 2 + sideMargins.top
+        val folderDialogLeft = centerX - folderDialogWidth / 2 + sideMargins.left
+        return RectF(folderDialogLeft, folderDialogTop, folderDialogLeft + folderDialogWidth, folderDialogTop + folderDialogHeight)
+    }
+
+    private fun HomeScreenGridItem.getPositionInFolder(folder: HomeScreenGridItem): Pair<Int, Int> {
+        val count = folder.getFolderItems().count()
+        val columnsCount = if (count == 2) {
+            2
+        } else {
+            ceil(count / 2.0f).roundToInt()
+        }
+        val column = left % columnsCount
+        val row = left / columnsCount
+        return Pair(row, column)
+    }
+
     companion object {
         private const val PAGE_CHANGE_HOLD_THRESHOLD = 500L
         private const val PAGE_INDICATORS_FADE_DELAY = PAGE_CHANGE_HOLD_THRESHOLD + 300L