fix: smartspacer padding (#5204)

* fix: smartspacer padding closes #4824 closes #5134 * fix style violations
LawnchairLauncher · Jan 24, 2025 · 2ffd541 · 2ffd541
1 parent 79852e7
commit 2ffd541
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/lawnchair/res/values/dimens.xml b/lawnchair/res/values/dimens.xml
@@ -77,6 +77,7 @@
     <dimen name="enhanced_smartspace_icon_margin">6dp</dimen>
     <dimen name="enhanced_smartspace_icon_size">20dp</dimen>
     <dimen name="enhanced_smartspace_margin_start_launcher">0dp</dimen>
+    <dimen name="enhanced_smartspace_padding_start">16dp</dimen>
     <dimen name="enhanced_smartspace_padding_top">16dp</dimen>
     <dimen name="enhanced_smartspace_secondary_card_corner_radius">28dp</dimen>
     <dimen name="enhanced_smartspace_secondary_card_end_margin">1dp</dimen>

diff --git a/lawnchair/src/app/lawnchair/smartspace/SmartspacerView.kt b/lawnchair/src/app/lawnchair/smartspace/SmartspacerView.kt
@@ -6,9 +6,9 @@ import android.graphics.Rect
 import android.graphics.RectF
 import android.util.AttributeSet
 import android.view.View
+import androidx.viewpager.widget.ViewPager
 import app.lawnchair.LawnchairLauncher
 import app.lawnchair.launcher
-import app.lawnchair.launcherNullable
 import app.lawnchair.preferences2.PreferenceManager2
 import app.lawnchair.preferences2.subscribeBlocking
 import app.lawnchair.ui.preferences.PreferenceActivity
@@ -27,6 +27,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 
 class SmartspacerView(context: Context, attrs: AttributeSet?) : BcSmartspaceView(context, attrs) {
+    private lateinit var viewPager: ViewPager
     private val prefs2 = PreferenceManager2.getInstance(context)
     private val coroutineScope = CoroutineScope(Dispatchers.Default)
     private var targetCount = 5
@@ -69,11 +70,10 @@ class SmartspacerView(context: Context, attrs: AttributeSet?) : BcSmartspaceView
         }
     }
 
-    override fun setPadding(left: Int, top: Int, right: Int, bottom: Int) {
-        val ctx = LawnchairLauncher.instance?.launcherNullable
-        val dp = ctx?.deviceProfile
-        val leftPadding = dp?.widgetPadding?.left ?: (left + 16)
-        super.setPadding(leftPadding, top, right, bottom)
+    override fun onFinishInflate() {
+        super.onFinishInflate()
+        viewPager = findViewById<ViewPager>(SmartspacerR.id.smartspace_card_pager)!!
+        viewPager.setLayoutParams(LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.UNSPECIFIED_GRAVITY))
     }
 
     override val config = SmartspaceConfig(

diff --git a/res/layout/smartspace_smartspacer.xml b/res/layout/smartspace_smartspacer.xml
@@ -4,7 +4,9 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center_vertical"
-    android:layout_marginStart="@dimen/enhanced_smartspace_margin_start_launcher">
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:paddingStart="@dimen/enhanced_smartspace_padding_start">
 
     <androidx.viewpager.widget.ViewPager
         android:id="@+id/smartspace_card_pager"