AddTunnels: rearrange and relabel

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

1 files changed, 14 insertions, 14 deletions

diff --git a/ui/src/main/res/layout/add_tunnels_bottom_sheet.xml b/ui/src/main/res/layout/add_tunnels_bottom_sheet.xml
index 62f168b1..295a8e40 100644
--- a/ui/src/main/res/layout/add_tunnels_bottom_sheet.xml
+++ b/ui/src/main/res/layout/add_tunnels_bottom_sheet.xml
@@ -8,62 +8,62 @@
     android:paddingTop="@dimen/bottom_sheet_top_padding">
 
     <com.google.android.material.button.MaterialButton
-        android:id="@+id/create_empty"
+        android:id="@+id/create_from_file"
         android:layout_width="match_parent"
         android:layout_height="@dimen/bottom_sheet_item_height"
         android:layout_marginLeft="@dimen/normal_margin"
         android:layout_marginRight="@dimen/normal_margin"
         android:layout_marginStart="@dimen/normal_margin"
         android:layout_marginEnd="@dimen/normal_margin"
-        android:text="@string/create_empty"
+        android:text="@string/create_from_file"
         android:textAlignment="viewStart"
         android:textColor="?attr/colorOnSurface"
-        app:icon="@drawable/ic_action_edit"
+        app:icon="@drawable/ic_action_open_white"
         app:iconPadding="@dimen/bottom_sheet_icon_padding"
         app:iconTint="?attr/colorSecondary"
+        app:layout_constraintTop_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/create_from_qrcode"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/create_from_file"
-        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:rippleColor="?attr/colorSecondary"
         style="@style/Widget.MaterialComponents.Button.TextButton.Icon"/>
 
     <com.google.android.material.button.MaterialButton
-        android:id="@+id/create_from_file"
+        android:id="@+id/create_from_qrcode"
         android:layout_width="match_parent"
         android:layout_height="@dimen/bottom_sheet_item_height"
         android:layout_marginLeft="@dimen/normal_margin"
         android:layout_marginRight="@dimen/normal_margin"
         android:layout_marginStart="@dimen/normal_margin"
         android:layout_marginEnd="@dimen/normal_margin"
-        android:text="@string/create_from_file"
+        android:text="@string/create_from_qr_code"
         android:textAlignment="viewStart"
         android:textColor="?attr/colorOnSurface"
-        app:icon="@drawable/ic_action_open_white"
+        app:icon="@drawable/ic_action_scan_qr_code_white"
         app:iconPadding="@dimen/bottom_sheet_icon_padding"
         app:iconTint="?attr/colorSecondary"
-        app:layout_constraintTop_toBottomOf="@+id/create_empty"
-        app:layout_constraintBottom_toTopOf="@+id/create_from_qrcode"
+        app:layout_constraintTop_toBottomOf="@+id/create_from_file"
+        app:layout_constraintBottom_toBottomOf="@+id/create_empty"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:rippleColor="?attr/colorSecondary"
         style="@style/Widget.MaterialComponents.Button.TextButton.Icon"/>
 
     <com.google.android.material.button.MaterialButton
-        android:id="@+id/create_from_qrcode"
+        android:id="@+id/create_empty"
         android:layout_width="match_parent"
         android:layout_height="@dimen/bottom_sheet_item_height"
         android:layout_marginLeft="@dimen/normal_margin"
         android:layout_marginRight="@dimen/normal_margin"
         android:layout_marginStart="@dimen/normal_margin"
         android:layout_marginEnd="@dimen/normal_margin"
-        android:text="@string/create_from_qr_code"
+        android:text="@string/create_empty"
         android:textAlignment="viewStart"
         android:textColor="?attr/colorOnSurface"
-        app:icon="@drawable/ic_action_scan_qr_code_white"
+        app:icon="@drawable/ic_action_edit"
         app:iconPadding="@dimen/bottom_sheet_icon_padding"
         app:iconTint="?attr/colorSecondary"
-        app:layout_constraintTop_toBottomOf="@+id/create_from_file"
+        app:layout_constraintTop_toBottomOf="@+id/create_from_qrcode"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"