frank/wirevpn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

TunnelEditor: move generate button to inside box

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld
2020-03-28 16:26:22 -06:00
parent 5989298d3f
commit bee6ebe3b4
10 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/src/main/res/layout/tunnel_editor_fragment.xml
+4 -18
View File
@@ -93,9 +93,10 @@
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:hint="@string/private_key"
app:layout_constraintEnd_toStartOf="@id/generate_private_key_button"
app:layout_constraintHorizontal_chainStyle="spread"
app:layout_constraintHorizontal_weight="0.7"
app:endIconMode="custom"
app:endIconDrawable="@drawable/ic_action_generate"
app:endIconContentDescription="@string/generate_new_private_key"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/interface_name_layout">
@@ -108,21 +109,6 @@
app:filter="@{KeyInputFilter.newInstance()}" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.button.MaterialButton
android:id="@+id/generate_private_key_button"
style="@style/Widget.MaterialComponents.Button.TextButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:onClick="@{() -> config.interface.generateKeyPair()}"
android:text="@string/generate"
android:textColor="?attr/colorSecondary"
app:layout_constraintBaseline_toBaselineOf="@id/private_key_text_layout"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_weight="0.3"
app:layout_constraintStart_toEndOf="@id/private_key_text_layout"
app:rippleColor="?attr/colorSecondary" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/public_key_label_layout"
style="@style/TextInputLayoutBase"