diff options
| -rw-r--r-- | app/src/main/res/layout/config_detail_fragment.xml | 19 | ||||
| -rw-r--r-- | app/src/main/res/layout/config_edit_fragment.xml | 6 | ||||
| -rw-r--r-- | app/src/main/res/layout/config_list_item.xml | 16 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 8 |
4 files changed, 22 insertions, 27 deletions
diff --git a/app/src/main/res/layout/config_detail_fragment.xml b/app/src/main/res/layout/config_detail_fragment.xml index add03c08..b229e568 100644 --- a/app/src/main/res/layout/config_detail_fragment.xml +++ b/app/src/main/res/layout/config_detail_fragment.xml @@ -19,26 +19,25 @@ android:padding="16dp"> <TextView - android:id="@+id/config_name_label" + android:id="@+id/status_label" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentTop="true" - android:labelFor="@+id/config_name_text" - android:text="@string/config_name" /> + android:text="@string/status" /> <TextView - android:id="@+id/config_name_text" + android:id="@+id/status_text" style="?android:attr/textAppearanceMedium" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_below="@+id/config_name_label" - android:text="@{config.name}" /> + android:layout_below="@+id/status_label" + android:text="@{config.enabled ? @string/enabled : @string/disabled}" /> <TextView android:id="@+id/public_key_label" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_below="@+id/config_name_text" + android:layout_below="@id/status_text" android:labelFor="@+id/public_key_text" android:text="@string/public_key" /> @@ -51,12 +50,6 @@ android:ellipsize="end" android:maxLines="1" android:text="@{config.interface.publicKey}" /> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_below="@id/public_key_text" - android:text="@{config.toString()}" /> </RelativeLayout> </ScrollView> </layout> diff --git a/app/src/main/res/layout/config_edit_fragment.xml b/app/src/main/res/layout/config_edit_fragment.xml index 285215fb..4f48727c 100644 --- a/app/src/main/res/layout/config_edit_fragment.xml +++ b/app/src/main/res/layout/config_edit_fragment.xml @@ -154,12 +154,6 @@ android:inputType="number" android:text="@={config.interface.mtu}" android:textAlignment="center" /> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_below="@id/dns_server_text" - android:text="@{config.toString()}" /> </RelativeLayout> </ScrollView> </layout> diff --git a/app/src/main/res/layout/config_list_item.xml b/app/src/main/res/layout/config_list_item.xml index 52bd385c..23935fdc 100644 --- a/app/src/main/res/layout/config_list_item.xml +++ b/app/src/main/res/layout/config_list_item.xml @@ -3,6 +3,8 @@ <data> + <import type="com.wireguard.android.VpnService" /> + <variable name="item" type="com.wireguard.config.Config" /> @@ -19,16 +21,20 @@ style="?android:attr/textAppearanceMedium" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentStart="true" + android:layout_toStartOf="@+id/config_switch" android:text="@{item.name}" /> <TextView - style="?android:attr/textAppearanceMedium" + android:id="@+id/config_switch" + style="?android:attr/textAppearanceButton" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignBaseline="@+id/config_name" android:layout_alignParentEnd="true" - android:layout_toEndOf="@+id/config_name" - android:text="@{item.isEnabled ? @string/connected : @string/disconnected}" - android:textAlignment="textEnd" - android:textColor="@{item.isEnabled ? @android:color/holo_green_dark : @android:color/holo_red_dark}" /> + android:gravity="center_vertical" + android:onClick="@{() -> item.enabled ? VpnService.instance.disable(item.name) : VpnService.instance.enable(item.name)}" + android:text="@string/toggle" + android:textColor="@{item.enabled ? @android:color/holo_green_dark : @android:color/holo_red_dark}" /> </RelativeLayout> </layout> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bba997e2..bee8685a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -6,11 +6,12 @@ </plurals> <string name="app_name">WireGuard</string> <string name="config_name">Configuration name</string> - <string name="connected">Connected</string> - <string name="disconnected">Disconnected</string> + <string name="delete">Delete</string> + <string name="disabled">Disabled</string> <string name="dns_servers">DNS servers</string> <string name="edit">Edit</string> <string name="edit_activity_title">Add WireGuard Configuration</string> + <string name="enabled">Enabled</string> <string name="generate">Generate</string> <string name="hint_automatic">(auto)</string> <string name="hint_generated">(generated)</string> @@ -23,5 +24,6 @@ <string name="public_key">Public key</string> <string name="save">Save</string> <string name="settings">Settings</string> - <string name="delete">Delete</string> + <string name="status">Status</string> + <string name="toggle">Toggle</string> </resources> |