fix: [ANDROAPP-6579] set dropdownmenu max width to 70% of screen size (…

…#3905) * fix: set dropdownmenu max width to 70% of screen size * fix:[ANDROAPP-6579] modify offset for dropdown menu in teiDashboard --------- Co-authored-by: Xavier Molloy <[email protected]>
dhis2 · Dec 12, 2024 · f8dcbfd · f8dcbfd
1 parent 749bfe9
commit f8dcbfd
Showing 1 changed file with 17 additions and 5 deletions.
diff --git a/app/src/main/java/org/dhis2/utils/customviews/MoreMenuView.kt b/app/src/main/java/org/dhis2/utils/customviews/MoreMenuView.kt
@@ -1,13 +1,18 @@
 package org.dhis2.utils.customviews
 
+import android.content.res.Resources
+import androidx.compose.foundation.layout.widthIn
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.MoreVert
 import androidx.compose.material3.Icon
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.DpOffset
 import org.hisp.dhis.mobile.ui.designsystem.component.IconButton
 import org.hisp.dhis.mobile.ui.designsystem.component.menu.DropDownMenu
 import org.hisp.dhis.mobile.ui.designsystem.component.menu.MenuItemData
+import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing
 import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor
 
 @Composable
@@ -29,13 +34,20 @@ fun <T> MoreOptionsWithDropDownMenuButton(
     ) {
         onMenuToggle(!expanded)
     }
-
     DropDownMenu(
+        modifier = Modifier.widthIn(max = 0.7.dw),
         items = dropDownMenuItems,
         expanded = expanded,
+        offset = DpOffset(x = -Spacing.Spacing16, y = Spacing.Spacing0),
         onDismissRequest = { onMenuToggle(false) },
-    ) { itemId ->
-        onMenuToggle(false)
-        onItemClick(itemId)
-    }
+        onItemClick = { itemId ->
+            onMenuToggle(false)
+            onItemClick(itemId)
+        },
+    )
 }
+
+inline val Double.dw: Dp
+    get() = Resources.getSystem().displayMetrics.let {
+        Dp(value = ((this * it.widthPixels) / it.density).toFloat())
+    }