Fix horizontal drawer padding

This is a very temporary fix until we actually improve the behavior or responsive grid

Closes #4513
This commit is contained in:
SuperDragonXD
2024-08-06 20:45:28 +08:00
parent 0d6e385c69
commit 376c279ed0
2 changed files with 10 additions and 4 deletions

View File

@@ -70,7 +70,7 @@ class LawnchairSearchAdapterProvider(
): BaseAllAppsAdapter.ViewHolder {
val view = layoutInflater.inflate(layoutIdMap[viewType], parent, false)
val grid: DeviceProfile = mLauncher.deviceProfile
val horizontalMargin = if (grid.isTablet) grid.allAppsPadding.left + grid.allAppsPadding.right + 48 else grid.allAppsPadding.left + grid.allAppsPadding.right
val horizontalMargin = grid.allAppsPadding.left + grid.allAppsPadding.right
if (viewType != SEARCH_RESULT_ICON) {
val layoutParams = ViewGroup.MarginLayoutParams(view.layoutParams)

View File

@@ -41,6 +41,7 @@ import android.graphics.PointF;
import android.graphics.Rect;
import android.graphics.Typeface;
import android.util.DisplayMetrics;
import android.util.Log;
import android.util.SparseArray;
import android.view.Surface;
@@ -1460,8 +1461,13 @@ public class DeviceProfile {
.firstBlocking(preferenceManager2.getDrawerLeftRightMarginFactor());
var marginMultiplier = allAppLeftRightMarginMultiplier * (!isTablet ? 100 : 2);
allAppsLeftRightMargin = (int) (allAppsLeftRightMargin * marginMultiplier);
allAppsPadding.left = (int) (allAppsPadding.left * marginMultiplier);
allAppsPadding.right = (int) (allAppsPadding.right * marginMultiplier);
// todo fix how drawer padding values are calculated in responsive grid type
int leftPadding = (int) (allAppsPadding.left != 0 ? allAppsPadding.left * marginMultiplier : marginMultiplier);
int rightPadding = (int) (allAppsPadding.right != 0 ? allAppsPadding.right * marginMultiplier : marginMultiplier);
allAppsPadding.left = leftPadding;
allAppsPadding.right = rightPadding;
}
private void setupAllAppsStyle(Context context) {
@@ -2434,4 +2440,4 @@ public class DeviceProfile {
mIsGestureMode, mViewScaleProvider, mOverrideProvider, mIsTransientTaskbar);
}
}
}
}