[#529] Review: Replace RelativeLayout with FrameLayout in XML

Orange-OpenSource · Jul 3, 2023 · 0e9059b · 0e9059b
1 parent d8f5db3
commit 0e9059b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/app/src/main/java/com/orange/ods/app/ui/components/buttons/ButtonsText.kt b/app/src/main/java/com/orange/ods/app/ui/components/buttons/ButtonsText.kt
@@ -10,7 +10,8 @@
 
 package com.orange.ods.app.ui.components.buttons
 
-import android.widget.RelativeLayout
+import android.view.ViewGroup
+import android.widget.FrameLayout
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -118,8 +119,9 @@ private fun TextButton(
                 this.enabled = enabled
                 this.style = style
                 this.displaySurface = displaySurface
-                val width = if (fullScreenWidth) RelativeLayout.LayoutParams.MATCH_PARENT else RelativeLayout.LayoutParams.WRAP_CONTENT
-                odsTextbutton.layoutParams = RelativeLayout.LayoutParams(width, RelativeLayout.LayoutParams.WRAP_CONTENT)
+                root.layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+                val width = if (fullScreenWidth) FrameLayout.LayoutParams.MATCH_PARENT else FrameLayout.LayoutParams.WRAP_CONTENT
+                odsTextbutton.layoutParams = FrameLayout.LayoutParams(width, FrameLayout.LayoutParams.WRAP_CONTENT)
             }
         )
     }

diff --git a/app/src/main/res/layout/ods_icon_button.xml b/app/src/main/res/layout/ods_icon_button.xml
@@ -30,7 +30,7 @@
 
     </data>
 
-    <RelativeLayout
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
@@ -54,6 +54,6 @@
             app:enabled="true"
             app:displaySurface="standard" />
 
-    </RelativeLayout>
+    </FrameLayout>
 
 </layout>
diff --git a/app/src/main/res/layout/ods_icon_toggle_buttons_group.xml b/app/src/main/res/layout/ods_icon_toggle_buttons_group.xml
@@ -22,7 +22,7 @@
 
     </data>
 
-    <RelativeLayout
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
@@ -42,6 +42,6 @@
             app:selectedIndex="0"
             app:displaySurface="standard" />
 
-    </RelativeLayout>
+    </FrameLayout>
 
 </layout>
diff --git a/app/src/main/res/layout/ods_icon_toogle_button.xml b/app/src/main/res/layout/ods_icon_toogle_button.xml
@@ -38,7 +38,7 @@
 
     </data>
 
-    <RelativeLayout
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
@@ -66,6 +66,6 @@
             app:iconContentDescription="Button"
             app:displaySurface="standard" />
 
-    </RelativeLayout>
+    </FrameLayout>
 
 </layout>
diff --git a/app/src/main/res/layout/ods_text_button.xml b/app/src/main/res/layout/ods_text_button.xml
@@ -34,7 +34,7 @@
 
     </data>
 
-    <RelativeLayout
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
@@ -60,6 +60,6 @@
             app:textButtonStyle="primary"
             app:displaySurface="standard" />
 
-    </RelativeLayout>
+    </FrameLayout>
 
 </layout>