reworked the layout to better support all screen sizes.

woocommerce · Feb 10, 2024 · e6e0055 · e6e0055
1 parent 03801fa
commit e6e0055
Showing 1 changed file with 35 additions and 47 deletions.
diff --git a/WooCommerce/src/main/res/layout/view_expandable_notice_card.xml b/WooCommerce/src/main/res/layout/view_expandable_notice_card.xml
@@ -24,58 +24,47 @@
             tools:textOff="@string/product_wip_title"
             tools:textOn="@string/product_wip_title_m5" />
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/notice_morePanel"
-            android:layout_width="@dimen/minor_00"
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/notice_message"
+            style="@style/Woo.Card.Body"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
+            android:layout_marginStart="@dimen/minor_00"
+            android:layout_marginEnd="@dimen/major_300"
+            android:gravity="start"
+            app:layout_constraintBottom_toTopOf="@+id/btn_mainAction"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toEndOf="@+id/guideline7"
             app:layout_constraintTop_toBottomOf="@+id/notice_viewMore"
-            tools:visibility="visible">
-
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/notice_message"
-                style="@style/Woo.Card.Body"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/minor_00"
-                android:layout_marginEnd="@dimen/major_300"
-                android:gravity="start"
-                app:layout_constraintBottom_toTopOf="@+id/btn_mainAction"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.5"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:text="@string/error_chooser_photo" />
-
-            <!-- PRIMARY button -->
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/btn_secondaryAction"
-                style="@style/Woo.Card.Button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                tools:text="@string/support_contact"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/notice_message" />
+            tools:text="@string/error_chooser_photo" />
 
-            <!-- SECONDARY button -->
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/btn_mainAction"
-                style="@style/Woo.Card.Button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginEnd="@dimen/minor_100"
-                tools:text="@string/error_troubleshooting"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@+id/btn_secondaryAction"
-                app:layout_constraintTop_toBottomOf="@+id/notice_message" />
+        <!-- PRIMARY button -->
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/btn_secondaryAction"
+            style="@style/Woo.Card.Button"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/btn_mainAction"
+            app:layout_constraintTop_toBottomOf="@+id/notice_message"
+            tools:text="@string/support_contact" />
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
+        <!-- SECONDARY button -->
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/btn_mainAction"
+            style="@style/Woo.Card.Button"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/minor_00"
+            android:layout_marginEnd="8dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/btn_secondaryAction"
+            app:layout_constraintStart_toEndOf="@+id/guideline7"
+            app:layout_constraintTop_toBottomOf="@+id/notice_message"
+            tools:text="@string/error_troubleshooting" />
 
         <androidx.constraintlayout.widget.Guideline
             android:id="@+id/guideline7"
@@ -86,4 +75,3 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </merge>
-