From c8049b230759e89c61ec4d6388c6f07876b32e7d Mon Sep 17 00:00:00 2001
From: Jays2Kings <jays@outlook.com>
Date: Wed, 23 Jun 2021 18:56:56 -0400
Subject: [PATCH] Swap cancel button and install button around

---
 .../main/res/layout/extension_card_item.xml   | 65 +++++++++++--------
 1 file changed, 37 insertions(+), 28 deletions(-)

diff --git a/app/src/main/res/layout/extension_card_item.xml b/app/src/main/res/layout/extension_card_item.xml
index b9007feaa3..571caeb3fc 100644
--- a/app/src/main/res/layout/extension_card_item.xml
+++ b/app/src/main/res/layout/extension_card_item.xml
@@ -51,7 +51,7 @@
             android:textAppearance="@style/TextAppearance.Regular.SubHeading"
             android:textSize="14sp"
             app:layout_constraintBottom_toTopOf="@id/lang"
-            app:layout_constraintEnd_toStartOf="@id/cancel_button"
+            app:layout_constraintEnd_toStartOf="@id/button_layout"
             app:layout_constraintStart_toEndOf="@id/source_image"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintVertical_chainStyle="packed"
@@ -96,39 +96,48 @@
             app:layout_constraintTop_toBottomOf="@+id/ext_title"
             tools:text="Warning" />
 
-        <ImageButton
-            android:id="@+id/cancel_button"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/button_layout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:layout_constraintWidth_max="wrap"
-            android:background="?selectableItemBackgroundBorderless"
-            android:contentDescription="@string/next_title"
-            android:padding="12dp"
-            android:tooltipText="@string/stop"
-            app:layout_constraintEnd_toStartOf="@id/ext_button"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintHorizontal_chainStyle="spread"
             app:layout_constraintStart_toEndOf="@id/ext_title"
-            app:layout_constraintTop_toTopOf="parent"
-            android:layout_marginEnd="4dp"
-            app:srcCompat="@drawable/ic_close_24dp"
-            app:tint="?colorAccent" />
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/ext_button"
-            style="@style/Theme.Widget.Button.OutlinedButtonAccent"
-            android:textAllCaps="false"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginBottom="16dp"
-            app:layout_constraintStart_toEndOf="@id/cancel_button"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:text="Details" />
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginEnd="16dp">
 
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/ext_button"
+                style="@style/Theme.Widget.Button.OutlinedButtonAccent"
+                android:textAllCaps="false"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:layout_marginEnd="4dp"
+                android:layout_marginBottom="16dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/cancel_button"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:text="Details" />
+
+            <ImageButton
+                android:id="@+id/cancel_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:layout_constraintWidth_max="wrap"
+                android:background="?selectableItemBackgroundBorderless"
+                android:contentDescription="@string/stop"
+                android:padding="12dp"
+                android:tooltipText="@string/stop"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintHorizontal_chainStyle="spread"
+                app:layout_constraintStart_toEndOf="@id/ext_button"
+                app:layout_constraintTop_toTopOf="parent"
+                app:srcCompat="@drawable/ic_close_24dp"
+                app:tint="?colorAccent" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </FrameLayout>