Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99721bf8 authored by Amit Kumar's avatar Amit Kumar 💻
Browse files

Use correct layout params when performing reorder

parent fef13c09

app/src/main/java/foundation/e/blisslauncher/core/customviews/LauncherPagedView.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -160,7 +160,7 @@ public class LauncherPagedView extends PagedView<PageIndicatorDots> implements V 
    private int mDragOverY = -1;

    private int mDragOverY = -1;





    private static final int FOLDER_CREATION_TIMEOUT = 100;

    private static final int FOLDER_CREATION_TIMEOUT = 100;

    public static final int REORDER_TIMEOUT = 650;

    public static final int REORDER_TIMEOUT = 350;

    private final Alarm mFolderCreationAlarm = new Alarm();

    private final Alarm mFolderCreationAlarm = new Alarm();

    private final Alarm mReorderAlarm = new Alarm();

    private final Alarm mReorderAlarm = new Alarm();

    //private FolderIcon mDragOverFolderIcon = null;

    //private FolderIcon mDragOverFolderIcon = null;
@@ -263,7 +263,7 @@ public class LauncherPagedView extends PagedView<PageIndicatorDots> implements V 
        mInsets.set(insets);

        mInsets.set(insets);





        VariantDeviceProfile grid = mLauncher.getDeviceProfile();

        VariantDeviceProfile grid = mLauncher.getDeviceProfile();

        mMaxDistanceForFolderCreation = (0.55f * grid.getIconSizePx());

        mMaxDistanceForFolderCreation = (0.35f * grid.getIconSizePx());

        Rect padding = grid.getWorkspacePadding();

        Rect padding = grid.getWorkspacePadding();

        setPadding(padding.left, padding.top, padding.right, padding.bottom);

        setPadding(padding.left, padding.top, padding.right, padding.bottom);

        int paddingLeftRight = grid.getCellLayoutPaddingLeftRightPx();

        int paddingLeftRight = grid.getCellLayoutPaddingLeftRightPx();

app/src/main/java/foundation/e/blisslauncher/features/test/CellLayout.kt

+18 −10
Original line number Original line Diff line number Diff line
@@ -15,6 +15,7 @@ import android.os.Handler 
import android.os.Looper

import android.os.Looper

import android.util.ArrayMap

import android.util.ArrayMap

import android.util.AttributeSet

import android.util.AttributeSet

import android.view.Gravity

import android.view.View

import android.view.View

import android.view.ViewGroup

import android.view.ViewGroup

import android.view.animation.AnimationUtils

import android.view.animation.AnimationUtils
@@ -813,19 +814,26 @@ open class CellLayout @JvmOverloads constructor( 
                result[1] = index / mCountX

                result[1] = index / mCountX

            }

            }





            // appView.findViewById(R.id.app_label).setVisibility(GONE);

            val genericLp: ViewGroup.LayoutParams = dragView.layoutParams

            val rowSpec = spec(UNDEFINED)

            val rowSpec = spec(UNDEFINED)

            val colSpec = spec(UNDEFINED)

            val colSpec = spec(UNDEFINED)

            val iconLayoutParams = LayoutParams(rowSpec, colSpec)

            val lp: LayoutParams

            // iconLayoutParams.setGravity(Gravity.CENTER)

            if (genericLp !is LayoutParams) {

            iconLayoutParams.height = if (mContainerType == HOTSEAT)

                lp = LayoutParams(rowSpec, colSpec)

                dp.hotseatCellHeightPx else dp.cellHeightPx

            } else {

            iconLayoutParams.width = dp.cellWidthPx

                lp = genericLp

            dragView.also {

                lp.rowSpec = rowSpec

                if (it is IconTextView) it.setTextVisibility(mContainerType != HOTSEAT)

                lp.columnSpec = colSpec

            }

            }

            dragView.layoutParams = iconLayoutParams

            lp.setGravity(Gravity.CENTER)

            addView(dragView, index)



            // Get the canonical child id to uniquely represent this view in this screen



            val childId: Int = launcher.getViewIdForItem(dragView.tag as LauncherItem)

            dragView.apply {

                if (this is IconTextView) setTextVisibility(mContainerType != HOTSEAT)

            }

            addViewToCellLayout(dragView, index, childId, lp, true)





            // Update item info after reordering so that we always save correct state in database.

            // Update item info after reordering so that we always save correct state in database.

            // TODO: May optimize this

            // TODO: May optimize this