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

Commit fef13c09 authored by Amit Kumar's avatar Amit Kumar 💻
Browse files

Center the hotseat icons

parent 7f118f16

.idea/deploymentTargetDropDown.xml

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<project version="4">

  <component name="deploymentTargetDropDown">

    <targetSelectedWithDropDown>

      <Target>

        <type value="QUICK_BOOT_TARGET" />

        <deviceKey>

          <Key>

            <type value="VIRTUAL_DEVICE_PATH" />

            <value value="$USER_HOME$/.android/avd/Pixel_3a_XL_API_29.avd" />

          </Key>

        </deviceKey>

      </Target>

    </targetSelectedWithDropDown>

    <timeTargetWasSelectedWithDropDown value="2021-09-30T08:57:06.401616Z" />

  </component>

</project>
 
 No newline at end of file

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

+1 −2
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import foundation.e.blisslauncher.core.database.model.ApplicationItem 
import foundation.e.blisslauncher.core.database.model.LauncherItem

import foundation.e.blisslauncher.core.database.model.ShortcutItem

import foundation.e.blisslauncher.core.utils.Constants

import foundation.e.blisslauncher.features.launcher.Hotseat

import foundation.e.blisslauncher.features.test.anim.Interpolators

import foundation.e.blisslauncher.features.test.dragndrop.DropTarget

import foundation.e.blisslauncher.features.test.graphics.DragPreviewProvider
@@ -199,7 +198,7 @@ open class CellLayout @JvmOverloads constructor( 
        return Math.min(

            measuredHeight,

            launcher.deviceProfile

                .getCellHeight(if (parent is Hotseat) Constants.CONTAINER_HOTSEAT else Constants.CONTAINER_DESKTOP)

                .getCellHeight(mContainerType)

        )

    }

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

+1 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ class IconTextView @JvmOverloads constructor( 
        compoundDrawablePadding = dp.iconDrawablePaddingPx

        ellipsize = TruncateAt.END

        longPressHelper = CheckLongPressHelper(this)

        setTextAlpha(1f)

    }



    override fun onFocusChanged(

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

+6 −5
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.view.WindowManager 
import foundation.e.blisslauncher.R

import foundation.e.blisslauncher.core.Utilities

import foundation.e.blisslauncher.core.utils.Constants

import foundation.e.blisslauncher.core.utils.ResourceUtils

import foundation.e.blisslauncher.features.notification.DotRenderer

import foundation.e.blisslauncher.features.test.uninstall.UninstallButtonRenderer

import kotlin.math.max
@@ -211,8 +212,8 @@ class VariantDeviceProfile( 
            res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_bottom_padding)

        hotseatBarSidePaddingPx =

            res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_side_padding)

        hotseatBarSizePx =

            res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_size) + hotseatBarTopPaddingPx + hotseatBarBottomPaddingPx

        hotseatBarSizePx = ResourceUtils.pxFromDp(inv.iconSize, dm) + (res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_extra_vertical_size)

            + hotseatBarTopPaddingPx + hotseatBarBottomPaddingPx)

        workspacePageIndicatorHeight =

            res.getDimensionPixelSize(R.dimen.dotSize) * 2 + res.getDimensionPixelSize(R.dimen.dotPadding) * 2
@@ -467,10 +468,10 @@ class VariantDeviceProfile( 
            insets.top + availableHeightPx - hotseatBarSizePx - -edgeMarginPx

        )



    fun getCellHeight(containerType: Long): Int {

    fun getCellHeight(containerType: Int): Int {

        return when (containerType) {

            Constants.CONTAINER_DESKTOP -> cellHeightPx

            Constants.CONTAINER_HOTSEAT -> hotseatCellHeightPx

            CellLayout.WORKSPACE -> cellHeightPx

            CellLayout.HOTSEAT -> hotseatCellHeightPx

            else -> 0

        }

    }

app/src/main/res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
    <dimen name="dynamic_grid_hotseat_top_padding">8dp</dimen>

    <dimen name="dynamic_grid_hotseat_bottom_padding">2dp</dimen>

    <dimen name="dynamic_grid_hotseat_size">80dp</dimen>

    <dimen name="dynamic_grid_hotseat_extra_vertical_size">34dp</dimen>

    <dimen name="dynamic_grid_hotseat_side_padding">0dp</dimen>



    <dimen name="folder_cell_x_padding">9dp</dimen>