ui: Use a proper CardView based layout
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
This commit is contained in:
parent
46b374cf25
commit
59aa3035a8
@ -41,6 +41,7 @@ dependencies {
|
|||||||
annotationProcessor "com.google.dagger:dagger-compiler:$daggerVersion"
|
annotationProcessor "com.google.dagger:dagger-compiler:$daggerVersion"
|
||||||
implementation "com.android.databinding:library:$databindingVersion"
|
implementation "com.android.databinding:library:$databindingVersion"
|
||||||
implementation "com.android.support:appcompat-v7:$supportLibsVersion"
|
implementation "com.android.support:appcompat-v7:$supportLibsVersion"
|
||||||
|
implementation "com.android.support:cardview-v7:$supportLibsVersion"
|
||||||
implementation "com.android.support:design:$supportLibsVersion"
|
implementation "com.android.support:design:$supportLibsVersion"
|
||||||
implementation "com.android.support:preference-v14:$supportLibsVersion"
|
implementation "com.android.support:preference-v14:$supportLibsVersion"
|
||||||
implementation "com.android.support:support-annotations:$supportLibsVersion"
|
implementation "com.android.support:support-annotations:$supportLibsVersion"
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
|
|
||||||
<RelativeLayout
|
<android.support.v7.widget.CardView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginBottom="4dp"
|
android:layout_marginBottom="4dp"
|
||||||
@ -38,84 +38,90 @@
|
|||||||
android:layout_marginStart="8dp"
|
android:layout_marginStart="8dp"
|
||||||
android:layout_marginTop="8dp"
|
android:layout_marginTop="8dp"
|
||||||
android:background="?android:attr/colorBackground"
|
android:background="?android:attr/colorBackground"
|
||||||
android:elevation="2dp"
|
app:cardCornerRadius="4dp"
|
||||||
android:padding="8dp">
|
app:cardElevation="2dp"
|
||||||
|
app:contentPadding="8dp">
|
||||||
|
|
||||||
<TextView
|
<RelativeLayout
|
||||||
android:id="@+id/interface_title"
|
|
||||||
style="?android:attr/textAppearanceMedium"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_alignParentStart="true"
|
|
||||||
android:layout_alignParentTop="true"
|
|
||||||
android:layout_toStartOf="@+id/tunnel_switch"
|
|
||||||
android:text="@string/interface_title" />
|
|
||||||
|
|
||||||
<com.wireguard.android.widget.ToggleSwitch
|
|
||||||
android:id="@+id/tunnel_switch"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_alignBaseline="@+id/interface_title"
|
|
||||||
android:layout_alignParentEnd="true"
|
|
||||||
app:checked="@{tunnel.state == State.UP}"
|
|
||||||
app:onBeforeCheckedChanged="@{TunnelController::setTunnelState}" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/interface_name_label"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content">
|
||||||
android:layout_below="@+id/interface_title"
|
|
||||||
android:layout_marginTop="8dp"
|
|
||||||
android:labelFor="@+id/interface_name_text"
|
|
||||||
android:text="@string/name" />
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/interface_name_text"
|
android:id="@+id/interface_title"
|
||||||
style="?android:attr/textAppearanceMedium"
|
style="?android:attr/textAppearanceMedium"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_below="@+id/interface_name_label"
|
android:layout_alignParentStart="true"
|
||||||
android:text="@{tunnel.name}" />
|
android:layout_alignParentTop="true"
|
||||||
|
android:layout_toStartOf="@+id/tunnel_switch"
|
||||||
|
android:text="@string/interface_title" />
|
||||||
|
|
||||||
<TextView
|
<com.wireguard.android.widget.ToggleSwitch
|
||||||
android:id="@+id/public_key_label"
|
android:id="@+id/tunnel_switch"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_below="@id/interface_name_text"
|
android:layout_alignBaseline="@+id/interface_title"
|
||||||
android:layout_marginTop="8dp"
|
android:layout_alignParentEnd="true"
|
||||||
android:labelFor="@+id/public_key_text"
|
app:checked="@{tunnel.state == State.UP}"
|
||||||
android:text="@string/public_key" />
|
app:onBeforeCheckedChanged="@{TunnelController::setTunnelState}" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/public_key_text"
|
android:id="@+id/interface_name_label"
|
||||||
style="?android:attr/textAppearanceMedium"
|
android:layout_width="match_parent"
|
||||||
android:layout_width="match_parent"
|
android:layout_height="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_below="@+id/interface_title"
|
||||||
android:layout_below="@+id/public_key_label"
|
android:layout_marginTop="8dp"
|
||||||
android:contentDescription="@string/public_key_description"
|
android:labelFor="@+id/interface_name_text"
|
||||||
android:ellipsize="end"
|
android:text="@string/name" />
|
||||||
android:maxLines="1"
|
|
||||||
android:onClick="@{ClipboardUtils::copyTextView}"
|
|
||||||
android:text="@{config.interfaceSection.publicKey}" />
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/addresses_label"
|
android:id="@+id/interface_name_text"
|
||||||
android:layout_width="match_parent"
|
style="?android:attr/textAppearanceMedium"
|
||||||
android:layout_height="wrap_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_below="@id/public_key_text"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="8dp"
|
android:layout_below="@+id/interface_name_label"
|
||||||
android:labelFor="@+id/addresses_text"
|
android:text="@{tunnel.name}" />
|
||||||
android:text="@string/addresses" />
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/addresses_text"
|
android:id="@+id/public_key_label"
|
||||||
style="?android:attr/textAppearanceMedium"
|
android:layout_width="match_parent"
|
||||||
android:layout_width="match_parent"
|
android:layout_height="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_below="@id/interface_name_text"
|
||||||
android:layout_below="@+id/addresses_label"
|
android:layout_marginTop="8dp"
|
||||||
android:contentDescription="@string/addresses"
|
android:labelFor="@+id/public_key_text"
|
||||||
android:text="@{config.interfaceSection.addresses}" />
|
android:text="@string/public_key" />
|
||||||
</RelativeLayout>
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/public_key_text"
|
||||||
|
style="?android:attr/textAppearanceMedium"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_below="@+id/public_key_label"
|
||||||
|
android:contentDescription="@string/public_key_description"
|
||||||
|
android:ellipsize="end"
|
||||||
|
android:maxLines="1"
|
||||||
|
android:onClick="@{ClipboardUtils::copyTextView}"
|
||||||
|
android:text="@{config.interfaceSection.publicKey}" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/addresses_label"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_below="@id/public_key_text"
|
||||||
|
android:layout_marginTop="8dp"
|
||||||
|
android:labelFor="@+id/addresses_text"
|
||||||
|
android:text="@string/addresses" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/addresses_text"
|
||||||
|
style="?android:attr/textAppearanceMedium"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_below="@+id/addresses_label"
|
||||||
|
android:contentDescription="@string/addresses"
|
||||||
|
android:text="@{config.interfaceSection.addresses}" />
|
||||||
|
</RelativeLayout>
|
||||||
|
</android.support.v7.widget.CardView>
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<layout xmlns:android="http://schemas.android.com/apk/res/android">
|
<layout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||||
|
|
||||||
<data>
|
<data>
|
||||||
|
|
||||||
@ -10,7 +11,7 @@
|
|||||||
type="com.wireguard.config.Peer.Observable" />
|
type="com.wireguard.config.Peer.Observable" />
|
||||||
</data>
|
</data>
|
||||||
|
|
||||||
<RelativeLayout
|
<android.support.v7.widget.CardView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginBottom="4dp"
|
android:layout_marginBottom="4dp"
|
||||||
@ -18,70 +19,76 @@
|
|||||||
android:layout_marginStart="8dp"
|
android:layout_marginStart="8dp"
|
||||||
android:layout_marginTop="4dp"
|
android:layout_marginTop="4dp"
|
||||||
android:background="?android:attr/colorBackground"
|
android:background="?android:attr/colorBackground"
|
||||||
android:elevation="2dp"
|
app:cardCornerRadius="4dp"
|
||||||
android:padding="8dp">
|
app:cardElevation="2dp"
|
||||||
|
app:contentPadding="8dp">
|
||||||
|
|
||||||
<TextView
|
<RelativeLayout
|
||||||
android:id="@+id/peer_title"
|
|
||||||
style="?android:attr/textAppearanceMedium"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content">
|
||||||
android:layout_alignParentTop="true"
|
|
||||||
android:text="@string/peer" />
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/public_key_label"
|
android:id="@+id/peer_title"
|
||||||
android:layout_width="match_parent"
|
style="?android:attr/textAppearanceMedium"
|
||||||
android:layout_height="wrap_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_below="@id/peer_title"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="8dp"
|
android:layout_alignParentTop="true"
|
||||||
android:labelFor="@+id/public_key_text"
|
android:text="@string/peer" />
|
||||||
android:text="@string/public_key" />
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/public_key_text"
|
android:id="@+id/public_key_label"
|
||||||
style="?android:attr/textAppearanceMedium"
|
android:layout_width="match_parent"
|
||||||
android:layout_width="match_parent"
|
android:layout_height="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_below="@id/peer_title"
|
||||||
android:layout_below="@+id/public_key_label"
|
android:layout_marginTop="8dp"
|
||||||
android:contentDescription="@string/public_key_description"
|
android:labelFor="@+id/public_key_text"
|
||||||
android:ellipsize="end"
|
android:text="@string/public_key" />
|
||||||
android:maxLines="1"
|
|
||||||
android:onClick="@{ClipboardUtils::copyTextView}"
|
|
||||||
android:text="@{item.publicKey}" />
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/allowed_ips_label"
|
android:id="@+id/public_key_text"
|
||||||
android:layout_width="match_parent"
|
style="?android:attr/textAppearanceMedium"
|
||||||
android:layout_height="wrap_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_below="@+id/public_key_text"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="8dp"
|
android:layout_below="@+id/public_key_label"
|
||||||
android:labelFor="@+id/allowed_ips_text"
|
android:contentDescription="@string/public_key_description"
|
||||||
android:text="@string/allowed_ips" />
|
android:ellipsize="end"
|
||||||
|
android:maxLines="1"
|
||||||
|
android:onClick="@{ClipboardUtils::copyTextView}"
|
||||||
|
android:text="@{item.publicKey}" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/allowed_ips_text"
|
android:id="@+id/allowed_ips_label"
|
||||||
style="?android:attr/textAppearanceMedium"
|
android:layout_width="match_parent"
|
||||||
android:layout_width="match_parent"
|
android:layout_height="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_below="@+id/public_key_text"
|
||||||
android:layout_below="@+id/allowed_ips_label"
|
android:layout_marginTop="8dp"
|
||||||
android:text="@{item.allowedIPs}" />
|
android:labelFor="@+id/allowed_ips_text"
|
||||||
|
android:text="@string/allowed_ips" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/endpoint_label"
|
android:id="@+id/allowed_ips_text"
|
||||||
android:layout_width="match_parent"
|
style="?android:attr/textAppearanceMedium"
|
||||||
android:layout_height="wrap_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_below="@+id/allowed_ips_text"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="8dp"
|
android:layout_below="@+id/allowed_ips_label"
|
||||||
android:labelFor="@+id/endpoint_text"
|
android:text="@{item.allowedIPs}" />
|
||||||
android:text="@string/endpoint" />
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/endpoint_text"
|
android:id="@+id/endpoint_label"
|
||||||
style="?android:attr/textAppearanceMedium"
|
android:layout_width="match_parent"
|
||||||
android:layout_width="match_parent"
|
android:layout_height="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_below="@+id/allowed_ips_text"
|
||||||
android:layout_below="@+id/endpoint_label"
|
android:layout_marginTop="8dp"
|
||||||
android:text="@{item.endpoint}" />
|
android:labelFor="@+id/endpoint_text"
|
||||||
</RelativeLayout>
|
android:text="@string/endpoint" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/endpoint_text"
|
||||||
|
style="?android:attr/textAppearanceMedium"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_below="@+id/endpoint_label"
|
||||||
|
android:text="@{item.endpoint}" />
|
||||||
|
</RelativeLayout>
|
||||||
|
</android.support.v7.widget.CardView>
|
||||||
</layout>
|
</layout>
|
||||||
|
@ -33,7 +33,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
|
|
||||||
<RelativeLayout
|
<android.support.v7.widget.CardView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginBottom="4dp"
|
android:layout_marginBottom="4dp"
|
||||||
@ -41,171 +41,177 @@
|
|||||||
android:layout_marginStart="8dp"
|
android:layout_marginStart="8dp"
|
||||||
android:layout_marginTop="8dp"
|
android:layout_marginTop="8dp"
|
||||||
android:background="?android:attr/colorBackground"
|
android:background="?android:attr/colorBackground"
|
||||||
android:elevation="2dp"
|
app:cardCornerRadius="4dp"
|
||||||
android:padding="8dp">
|
app:cardElevation="2dp"
|
||||||
|
app:contentPadding="8dp">
|
||||||
|
|
||||||
<TextView
|
<RelativeLayout
|
||||||
android:id="@+id/interface_title"
|
|
||||||
style="?android:attr/textAppearanceMedium"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content">
|
||||||
android:layout_alignParentTop="true"
|
|
||||||
android:text="@string/interface_title" />
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/interface_name_label"
|
android:id="@+id/interface_title"
|
||||||
android:layout_width="match_parent"
|
style="?android:attr/textAppearanceMedium"
|
||||||
android:layout_height="wrap_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_below="@+id/interface_title"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="8dp"
|
android:layout_alignParentTop="true"
|
||||||
android:labelFor="@+id/interface_name_text"
|
android:text="@string/interface_title" />
|
||||||
android:text="@string/name" />
|
|
||||||
|
|
||||||
<EditText
|
<TextView
|
||||||
android:id="@+id/interface_name_text"
|
android:id="@+id/interface_name_label"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_below="@+id/interface_name_label"
|
android:layout_below="@+id/interface_title"
|
||||||
android:inputType="textNoSuggestions|textVisiblePassword"
|
android:layout_marginTop="8dp"
|
||||||
android:text="@={config.name}"
|
android:labelFor="@+id/interface_name_text"
|
||||||
app:filter="@{NameInputFilter.newInstance()}" />
|
android:text="@string/name" />
|
||||||
|
|
||||||
<TextView
|
<EditText
|
||||||
android:id="@+id/private_key_label"
|
android:id="@+id/interface_name_text"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_below="@+id/interface_name_text"
|
android:layout_below="@+id/interface_name_label"
|
||||||
android:labelFor="@+id/private_key_text"
|
android:inputType="textNoSuggestions|textVisiblePassword"
|
||||||
android:text="@string/private_key" />
|
android:text="@={config.name}"
|
||||||
|
app:filter="@{NameInputFilter.newInstance()}" />
|
||||||
|
|
||||||
<EditText
|
<TextView
|
||||||
android:id="@+id/private_key_text"
|
android:id="@+id/private_key_label"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_alignParentStart="true"
|
android:layout_below="@+id/interface_name_text"
|
||||||
android:layout_below="@+id/private_key_label"
|
android:labelFor="@+id/private_key_text"
|
||||||
android:layout_toStartOf="@+id/generate_private_key_button"
|
android:text="@string/private_key" />
|
||||||
android:contentDescription="@string/public_key_description"
|
|
||||||
android:inputType="textNoSuggestions|textVisiblePassword"
|
|
||||||
android:text="@={config.interfaceSection.privateKey}"
|
|
||||||
app:filter="@{KeyInputFilter.newInstance()}" />
|
|
||||||
|
|
||||||
<Button
|
<EditText
|
||||||
android:id="@+id/generate_private_key_button"
|
android:id="@+id/private_key_text"
|
||||||
android:layout_width="96dp"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_alignBottom="@id/private_key_text"
|
android:layout_alignParentStart="true"
|
||||||
android:layout_alignParentEnd="true"
|
android:layout_below="@+id/private_key_label"
|
||||||
android:layout_below="@+id/private_key_label"
|
android:layout_toStartOf="@+id/generate_private_key_button"
|
||||||
android:onClick="@{() -> config.interfaceSection.generateKeypair()}"
|
android:contentDescription="@string/public_key_description"
|
||||||
android:text="@string/generate" />
|
android:inputType="textNoSuggestions|textVisiblePassword"
|
||||||
|
android:text="@={config.interfaceSection.privateKey}"
|
||||||
|
app:filter="@{KeyInputFilter.newInstance()}" />
|
||||||
|
|
||||||
<TextView
|
<Button
|
||||||
android:id="@+id/public_key_label"
|
android:id="@+id/generate_private_key_button"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="96dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_below="@+id/private_key_text"
|
android:layout_alignBottom="@id/private_key_text"
|
||||||
android:labelFor="@+id/public_key_text"
|
android:layout_alignParentEnd="true"
|
||||||
android:text="@string/public_key" />
|
android:layout_below="@+id/private_key_label"
|
||||||
|
android:onClick="@{() -> config.interfaceSection.generateKeypair()}"
|
||||||
|
android:text="@string/generate" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/public_key_text"
|
android:id="@+id/public_key_label"
|
||||||
style="?android:attr/editTextStyle"
|
android:layout_width="match_parent"
|
||||||
android:layout_width="match_parent"
|
android:layout_height="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_below="@+id/private_key_text"
|
||||||
android:layout_below="@+id/public_key_label"
|
android:labelFor="@+id/public_key_text"
|
||||||
android:contentDescription="@string/public_key_description"
|
android:text="@string/public_key" />
|
||||||
android:ellipsize="end"
|
|
||||||
android:focusable="false"
|
|
||||||
android:hint="@string/hint_generated"
|
|
||||||
android:maxLines="1"
|
|
||||||
android:onClick="@{ClipboardUtils::copyTextView}"
|
|
||||||
android:text="@{config.interfaceSection.publicKey}" />
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/addresses_label"
|
android:id="@+id/public_key_text"
|
||||||
android:layout_width="wrap_content"
|
style="?android:attr/editTextStyle"
|
||||||
android:layout_height="wrap_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_alignParentStart="true"
|
android:layout_height="wrap_content"
|
||||||
android:layout_below="@+id/public_key_text"
|
android:layout_below="@+id/public_key_label"
|
||||||
android:layout_toStartOf="@+id/listen_port_label"
|
android:contentDescription="@string/public_key_description"
|
||||||
android:labelFor="@+id/addresses_text"
|
android:ellipsize="end"
|
||||||
android:text="@string/addresses" />
|
android:focusable="false"
|
||||||
|
android:hint="@string/hint_generated"
|
||||||
|
android:maxLines="1"
|
||||||
|
android:onClick="@{ClipboardUtils::copyTextView}"
|
||||||
|
android:text="@{config.interfaceSection.publicKey}" />
|
||||||
|
|
||||||
<EditText
|
<TextView
|
||||||
android:id="@+id/addresses_text"
|
android:id="@+id/addresses_label"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_alignParentStart="true"
|
android:layout_alignParentStart="true"
|
||||||
android:layout_below="@+id/addresses_label"
|
android:layout_below="@+id/public_key_text"
|
||||||
android:layout_toStartOf="@+id/listen_port_text"
|
android:layout_toStartOf="@+id/listen_port_label"
|
||||||
android:inputType="textNoSuggestions|textVisiblePassword"
|
android:labelFor="@+id/addresses_text"
|
||||||
android:text="@={config.interfaceSection.addresses}" />
|
android:text="@string/addresses" />
|
||||||
|
|
||||||
<TextView
|
<EditText
|
||||||
android:id="@+id/listen_port_label"
|
android:id="@+id/addresses_text"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_alignBaseline="@+id/addresses_label"
|
android:layout_alignParentStart="true"
|
||||||
android:layout_alignParentEnd="true"
|
android:layout_below="@+id/addresses_label"
|
||||||
android:layout_alignStart="@+id/generate_private_key_button"
|
android:layout_toStartOf="@+id/listen_port_text"
|
||||||
android:labelFor="@+id/listen_port_text"
|
android:inputType="textNoSuggestions|textVisiblePassword"
|
||||||
android:text="@string/listen_port" />
|
android:text="@={config.interfaceSection.addresses}" />
|
||||||
|
|
||||||
<EditText
|
<TextView
|
||||||
android:id="@+id/listen_port_text"
|
android:id="@+id/listen_port_label"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_alignBaseline="@+id/addresses_text"
|
android:layout_alignBaseline="@+id/addresses_label"
|
||||||
android:layout_alignParentEnd="true"
|
android:layout_alignParentEnd="true"
|
||||||
android:layout_alignStart="@+id/generate_private_key_button"
|
android:layout_alignStart="@+id/generate_private_key_button"
|
||||||
android:hint="@string/hint_random"
|
android:labelFor="@+id/listen_port_text"
|
||||||
android:inputType="number"
|
android:text="@string/listen_port" />
|
||||||
android:text="@={config.interfaceSection.listenPort}"
|
|
||||||
android:textAlignment="center" />
|
|
||||||
|
|
||||||
<TextView
|
<EditText
|
||||||
android:id="@+id/dns_servers_label"
|
android:id="@+id/listen_port_text"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_alignParentStart="true"
|
android:layout_alignBaseline="@+id/addresses_text"
|
||||||
android:layout_below="@+id/addresses_text"
|
android:layout_alignParentEnd="true"
|
||||||
android:layout_toStartOf="@+id/mtu_label"
|
android:layout_alignStart="@+id/generate_private_key_button"
|
||||||
android:labelFor="@+id/dns_servers_text"
|
android:hint="@string/hint_random"
|
||||||
android:text="@string/dns_servers" />
|
android:inputType="number"
|
||||||
|
android:text="@={config.interfaceSection.listenPort}"
|
||||||
|
android:textAlignment="center" />
|
||||||
|
|
||||||
<EditText
|
<TextView
|
||||||
android:id="@+id/dns_servers_text"
|
android:id="@+id/dns_servers_label"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_alignParentStart="true"
|
android:layout_alignParentStart="true"
|
||||||
android:layout_below="@+id/dns_servers_label"
|
android:layout_below="@+id/addresses_text"
|
||||||
android:layout_toStartOf="@+id/mtu_text"
|
android:layout_toStartOf="@+id/mtu_label"
|
||||||
android:inputType="textNoSuggestions|textVisiblePassword"
|
android:labelFor="@+id/dns_servers_text"
|
||||||
android:text="@={config.interfaceSection.dnses}" />
|
android:text="@string/dns_servers" />
|
||||||
|
|
||||||
<TextView
|
<EditText
|
||||||
android:id="@+id/mtu_label"
|
android:id="@+id/dns_servers_text"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_alignBaseline="@+id/dns_servers_label"
|
android:layout_alignParentStart="true"
|
||||||
android:layout_alignParentEnd="true"
|
android:layout_below="@+id/dns_servers_label"
|
||||||
android:layout_alignStart="@+id/generate_private_key_button"
|
android:layout_toStartOf="@+id/mtu_text"
|
||||||
android:labelFor="@+id/mtu_text"
|
android:inputType="textNoSuggestions|textVisiblePassword"
|
||||||
android:text="@string/mtu" />
|
android:text="@={config.interfaceSection.dnses}" />
|
||||||
|
|
||||||
<EditText
|
<TextView
|
||||||
android:id="@+id/mtu_text"
|
android:id="@+id/mtu_label"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_alignBaseline="@+id/dns_servers_text"
|
android:layout_alignBaseline="@+id/dns_servers_label"
|
||||||
android:layout_alignParentEnd="true"
|
android:layout_alignParentEnd="true"
|
||||||
android:layout_alignStart="@+id/generate_private_key_button"
|
android:layout_alignStart="@+id/generate_private_key_button"
|
||||||
android:hint="@string/hint_automatic"
|
android:labelFor="@+id/mtu_text"
|
||||||
android:inputType="number"
|
android:text="@string/mtu" />
|
||||||
android:text="@={config.interfaceSection.mtu}"
|
|
||||||
android:textAlignment="center" />
|
<EditText
|
||||||
</RelativeLayout>
|
android:id="@+id/mtu_text"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignBaseline="@+id/dns_servers_text"
|
||||||
|
android:layout_alignParentEnd="true"
|
||||||
|
android:layout_alignStart="@+id/generate_private_key_button"
|
||||||
|
android:hint="@string/hint_automatic"
|
||||||
|
android:inputType="number"
|
||||||
|
android:text="@={config.interfaceSection.mtu}"
|
||||||
|
android:textAlignment="center" />
|
||||||
|
</RelativeLayout>
|
||||||
|
</android.support.v7.widget.CardView>
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
@ -15,128 +15,134 @@
|
|||||||
type="com.wireguard.config.Peer.Observable" />
|
type="com.wireguard.config.Peer.Observable" />
|
||||||
</data>
|
</data>
|
||||||
|
|
||||||
<RelativeLayout
|
<android.support.v7.widget.CardView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginBottom="4dp"
|
android:layout_marginBottom="4dp"
|
||||||
android:layout_marginEnd="8dp"
|
android:layout_marginEnd="8dp"
|
||||||
android:layout_marginStart="8dp"
|
android:layout_marginStart="8dp"
|
||||||
android:layout_marginTop="4dp"
|
android:layout_marginTop="4dp"
|
||||||
android:background="?android:attr/colorBackground"
|
android:background="?android:attr/colorBackground"
|
||||||
android:elevation="2dp"
|
app:cardCornerRadius="4dp"
|
||||||
android:padding="8dp">
|
app:cardElevation="2dp"
|
||||||
|
app:contentPadding="8dp">
|
||||||
|
|
||||||
<TextView
|
<RelativeLayout
|
||||||
android:id="@+id/peer_title"
|
|
||||||
style="?android:attr/textAppearanceMedium"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_alignParentStart="true"
|
|
||||||
android:layout_alignParentTop="true"
|
|
||||||
android:layout_marginBottom="8dp"
|
|
||||||
android:layout_toStartOf="@+id/peer_action_delete"
|
|
||||||
android:text="@string/peer" />
|
|
||||||
|
|
||||||
<ImageButton
|
|
||||||
android:id="@+id/peer_action_delete"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_alignParentEnd="true"
|
|
||||||
android:layout_alignParentTop="true"
|
|
||||||
android:background="@null"
|
|
||||||
android:contentDescription="@string/delete"
|
|
||||||
android:onClick="@{() -> collection.remove(item)}"
|
|
||||||
android:src="@drawable/ic_action_delete_black" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/public_key_label"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content">
|
||||||
android:layout_below="@id/peer_title"
|
|
||||||
android:labelFor="@+id/public_key_text"
|
|
||||||
android:text="@string/public_key" />
|
|
||||||
|
|
||||||
<EditText
|
<TextView
|
||||||
android:id="@+id/public_key_text"
|
android:id="@+id/peer_title"
|
||||||
android:layout_width="match_parent"
|
style="?android:attr/textAppearanceMedium"
|
||||||
android:layout_height="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_below="@+id/public_key_label"
|
android:layout_height="wrap_content"
|
||||||
android:inputType="textNoSuggestions|textVisiblePassword"
|
android:layout_alignParentStart="true"
|
||||||
android:text="@={item.publicKey}"
|
android:layout_alignParentTop="true"
|
||||||
app:filter="@{KeyInputFilter.newInstance()}" />
|
android:layout_marginBottom="8dp"
|
||||||
|
android:layout_toStartOf="@+id/peer_action_delete"
|
||||||
|
android:text="@string/peer" />
|
||||||
|
|
||||||
<TextView
|
<ImageButton
|
||||||
android:id="@+id/pre_shared_key_label"
|
android:id="@+id/peer_action_delete"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_below="@+id/public_key_text"
|
android:layout_alignParentEnd="true"
|
||||||
android:labelFor="@+id/pre_shared_key_text"
|
android:layout_alignParentTop="true"
|
||||||
android:text="@string/pre_shared_key" />
|
android:background="@null"
|
||||||
|
android:contentDescription="@string/delete"
|
||||||
|
android:onClick="@{() -> collection.remove(item)}"
|
||||||
|
android:src="@drawable/ic_action_delete_black" />
|
||||||
|
|
||||||
<EditText
|
<TextView
|
||||||
android:id="@+id/pre_shared_key_text"
|
android:id="@+id/public_key_label"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_below="@+id/pre_shared_key_label"
|
android:layout_below="@id/peer_title"
|
||||||
android:hint="@string/hint_optional"
|
android:labelFor="@+id/public_key_text"
|
||||||
android:inputType="textNoSuggestions|textVisiblePassword"
|
android:text="@string/public_key" />
|
||||||
android:text="@={item.preSharedKey}" />
|
|
||||||
|
|
||||||
<TextView
|
<EditText
|
||||||
android:id="@+id/allowed_ips_label"
|
android:id="@+id/public_key_text"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_below="@+id/pre_shared_key_text"
|
android:layout_below="@+id/public_key_label"
|
||||||
android:labelFor="@+id/allowed_ips_text"
|
android:inputType="textNoSuggestions|textVisiblePassword"
|
||||||
android:text="@string/allowed_ips" />
|
android:text="@={item.publicKey}"
|
||||||
|
app:filter="@{KeyInputFilter.newInstance()}" />
|
||||||
|
|
||||||
<EditText
|
<TextView
|
||||||
android:id="@+id/allowed_ips_text"
|
android:id="@+id/pre_shared_key_label"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_below="@+id/allowed_ips_label"
|
android:layout_below="@+id/public_key_text"
|
||||||
android:inputType="textNoSuggestions|textVisiblePassword"
|
android:labelFor="@+id/pre_shared_key_text"
|
||||||
android:text="@={item.allowedIPs}" />
|
android:text="@string/pre_shared_key" />
|
||||||
|
|
||||||
<TextView
|
<EditText
|
||||||
android:id="@+id/endpoint_label"
|
android:id="@+id/pre_shared_key_text"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_alignParentStart="true"
|
android:layout_below="@+id/pre_shared_key_label"
|
||||||
android:layout_below="@+id/allowed_ips_text"
|
android:hint="@string/hint_optional"
|
||||||
android:layout_toStartOf="@+id/persistent_keepalive_label"
|
android:inputType="textNoSuggestions|textVisiblePassword"
|
||||||
android:labelFor="@+id/endpoint_text"
|
android:text="@={item.preSharedKey}" />
|
||||||
android:text="@string/endpoint" />
|
|
||||||
|
|
||||||
<EditText
|
<TextView
|
||||||
android:id="@+id/endpoint_text"
|
android:id="@+id/allowed_ips_label"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_alignParentStart="true"
|
android:layout_below="@+id/pre_shared_key_text"
|
||||||
android:layout_below="@+id/endpoint_label"
|
android:labelFor="@+id/allowed_ips_text"
|
||||||
android:layout_toStartOf="@+id/persistent_keepalive_text"
|
android:text="@string/allowed_ips" />
|
||||||
android:inputType="textNoSuggestions|textVisiblePassword"
|
|
||||||
android:text="@={item.endpoint}" />
|
|
||||||
|
|
||||||
<TextView
|
<EditText
|
||||||
android:id="@+id/persistent_keepalive_label"
|
android:id="@+id/allowed_ips_text"
|
||||||
android:layout_width="96dp"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_alignBaseline="@+id/endpoint_label"
|
android:layout_below="@+id/allowed_ips_label"
|
||||||
android:layout_alignParentEnd="true"
|
android:inputType="textNoSuggestions|textVisiblePassword"
|
||||||
android:labelFor="@+id/persistent_keepalive_text"
|
android:text="@={item.allowedIPs}" />
|
||||||
android:text="@string/persistent_keepalive" />
|
|
||||||
|
|
||||||
<EditText
|
<TextView
|
||||||
android:id="@+id/persistent_keepalive_text"
|
android:id="@+id/endpoint_label"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_alignBaseline="@+id/endpoint_text"
|
android:layout_alignParentStart="true"
|
||||||
android:layout_alignParentEnd="true"
|
android:layout_below="@+id/allowed_ips_text"
|
||||||
android:layout_alignStart="@+id/persistent_keepalive_label"
|
android:layout_toStartOf="@+id/persistent_keepalive_label"
|
||||||
android:hint="@string/hint_optional"
|
android:labelFor="@+id/endpoint_text"
|
||||||
android:inputType="number"
|
android:text="@string/endpoint" />
|
||||||
android:text="@={item.persistentKeepalive}"
|
|
||||||
android:textAlignment="center" />
|
<EditText
|
||||||
</RelativeLayout>
|
android:id="@+id/endpoint_text"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignParentStart="true"
|
||||||
|
android:layout_below="@+id/endpoint_label"
|
||||||
|
android:layout_toStartOf="@+id/persistent_keepalive_text"
|
||||||
|
android:inputType="textNoSuggestions|textVisiblePassword"
|
||||||
|
android:text="@={item.endpoint}" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/persistent_keepalive_label"
|
||||||
|
android:layout_width="96dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignBaseline="@+id/endpoint_label"
|
||||||
|
android:layout_alignParentEnd="true"
|
||||||
|
android:labelFor="@+id/persistent_keepalive_text"
|
||||||
|
android:text="@string/persistent_keepalive" />
|
||||||
|
|
||||||
|
<EditText
|
||||||
|
android:id="@+id/persistent_keepalive_text"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignBaseline="@+id/endpoint_text"
|
||||||
|
android:layout_alignParentEnd="true"
|
||||||
|
android:layout_alignStart="@+id/persistent_keepalive_label"
|
||||||
|
android:hint="@string/hint_optional"
|
||||||
|
android:inputType="number"
|
||||||
|
android:text="@={item.persistentKeepalive}"
|
||||||
|
android:textAlignment="center" />
|
||||||
|
</RelativeLayout>
|
||||||
|
</android.support.v7.widget.CardView>
|
||||||
</layout>
|
</layout>
|
||||||
|
Loading…
Reference in New Issue
Block a user