From b41640837cd181a0732e283fca19a7d984f79abd Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Sat, 28 Mar 2020 15:43:22 -0600
Subject: [PATCH] TunnelEditor: get rid of weird gravity on add peer button

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 .../res/layout/tunnel_editor_fragment.xml     | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/ui/src/main/res/layout/tunnel_editor_fragment.xml b/ui/src/main/res/layout/tunnel_editor_fragment.xml
index 0eb5c249..4c6d8fd4 100644
--- a/ui/src/main/res/layout/tunnel_editor_fragment.xml
+++ b/ui/src/main/res/layout/tunnel_editor_fragment.xml
@@ -93,9 +93,9 @@
                             android:layout_height="wrap_content"
                             android:layout_margin="4dp"
                             android:hint="@string/private_key"
-                            app:endIconMode="custom"
-                            app:endIconDrawable="@drawable/ic_action_generate"
                             app:endIconContentDescription="@string/generate_new_private_key"
+                            app:endIconDrawable="@drawable/ic_action_generate"
+                            app:endIconMode="custom"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toBottomOf="@+id/interface_name_layout">
@@ -239,24 +239,25 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="?attr/actionBarSize"
                     android:divider="@null"
                     android:orientation="vertical"
                     app:items="@{config.peers}"
                     app:layout="@{@layout/tunnel_editor_peer}"
                     tools:ignore="UselessLeaf" />
+
+                <com.google.android.material.button.MaterialButton
+                    style="@style/Widget.MaterialComponents.Button.TextButton"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="bottom"
+                    android:background="?attr/colorPrimaryDark"
+                    android:gravity="center"
+                    android:onClick="@{() -> config.addPeer()}"
+                    android:text="@string/add_peer"
+                    android:textColor="?attr/colorSecondary"
+                    app:layout_anchorGravity="bottom"
+                    app:rippleColor="?attr/colorSecondary" />
             </LinearLayout>
         </ScrollView>
-
-        <TextView
-            style="@style/TextAppearance.MaterialComponents.Button"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:layout_gravity="bottom"
-            android:background="?attr/colorPrimaryDark"
-            android:gravity="center"
-            android:onClick="@{() -> config.addPeer()}"
-            android:text="@string/add_peer"
-            app:layout_anchorGravity="bottom" />
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </layout>