summaryrefslogtreecommitdiff
path: root/main/src/main/res/layout/server_card.xml
diff options
context:
space:
mode:
Diffstat (limited to 'main/src/main/res/layout/server_card.xml')
-rw-r--r--main/src/main/res/layout/server_card.xml197
1 files changed, 112 insertions, 85 deletions
diff --git a/main/src/main/res/layout/server_card.xml b/main/src/main/res/layout/server_card.xml
index 690a27bd..bad9a3c6 100644
--- a/main/src/main/res/layout/server_card.xml
+++ b/main/src/main/res/layout/server_card.xml
@@ -1,85 +1,82 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (c) 2012-2014 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
-<FrameLayout xmlns:tools="http://schemas.android.com/tools"
- xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_margin="@dimen/stdpadding"
- >
+ android:layout_margin="@dimen/stdpadding">
<!-- A CardView that contains a TextView -->
<android.support.v7.widget.CardView
android:id="@+id/card_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
- card_view:cardCornerRadius="10dp"
- >
+ card_view:cardCornerRadius="10dp">
<RelativeLayout
- android:animateLayoutChanges="true"
- android:padding="5dp"
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- xmlns:android="http://schemas.android.com/apk/res/android">
+ android:animateLayoutChanges="true"
+ android:padding="5dp">
<TextView
- style="@style/item"
android:id="@+id/port_label"
- android:text="@string/port"
+ style="@style/item"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
+ android:layout_alignParentRight="true"
+ android:text="@string/port"
android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView
+ android:id="@+id/server_label"
style="@style/item"
android:text="@string/address"
- android:id="@+id/server_label"
android:textAppearance="?android:attr/textAppearanceSmall" />
<EditText
android:id="@+id/portnumber"
- android:layout_alignParentRight="true"
- android:layout_alignParentEnd="true"
- android:layout_below="@id/port_label"
android:layout_width="wrap_content"
-
android:layout_height="wrap_content"
+ android:layout_alignParentEnd="true"
+ android:layout_alignParentRight="true"
+
+ android:layout_below="@id/port_label"
android:inputType="numberDecimal"
- android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
- android:text="1194" />
+ android:text="1194"
+ android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium" />
<EditText
android:id="@+id/servername"
- android:singleLine="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
- android:inputType="textUri"
android:layout_below="@id/server_label"
android:layout_toLeftOf="@id/portnumber"
android:layout_toStartOf="@id/portnumber"
- android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
- android:text="openvpn.blinkt.de" />
+ android:inputType="textUri"
+ android:singleLine="true"
+ android:text="openvpn.blinkt.de"
+ android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium" />
<TextView
- android:paddingTop="10dp"
+ android:id="@+id/protocol"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/servername"
- android:id="@+id/protocol"
+ android:paddingTop="10dp"
android:text="Protocol" />
<RadioGroup
@@ -106,103 +103,133 @@
android:layout_height="wrap_content"
android:text="TCP" />
</RadioGroup>
- <!-- <TextView
- android:paddingTop="10dp"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@id/udptcpradiogroup"
- android:id="@+id/proxytext"
- android:text="Proxy" />
- <RadioGroup
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:id="@+id/proxygroup"
- android:paddingLeft="20dp"
- android:layout_below="@id/proxytext">
- <RadioButton
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="None" />
+ <!-- <TextView
+ android:paddingTop="10dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/udptcpradiogroup"
+ android:id="@+id/proxytext"
+ android:text="Proxy" />
+
+ <RadioGroup
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:id="@+id/proxygroup"
+ android:paddingLeft="20dp"
+ android:layout_below="@id/proxytext">
+
+ <RadioButton
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="None" />
+
+ <Space
+ android:layout_width="10dp"
+ android:layout_height="wrap_content" />
+
+ <RadioButton
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="HTTP" />
+
+ <Space
+ android:layout_width="10dp"
+ android:layout_height="wrap_content" />
+
+ <RadioButton
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Socks" />
+ </RadioGroup> -->
- <Space
- android:layout_width="10dp"
- android:layout_height="wrap_content" />
+ <TextView
+ android:id="@+id/connect_timeout_label"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/udptcpradiogroup"
+ android:paddingTop="10dp"
+ android:text="@string/connect_timeout" />
- <RadioButton
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="HTTP" />
+ <EditText
+ android:id="@+id/connect_timeout"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
+ android:layout_below="@+id/connect_timeout_label"
+ android:ems="3"
+ android:inputType="numberDecimal" />
- <Space
- android:layout_width="10dp"
- android:layout_height="wrap_content" />
+ <SeekBar
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/connect_silder"
+ android:max="300"
+ android:layout_alignBottom="@id/connect_timeout"
+ android:layout_toLeftOf="@id/connect_timeout"
+ android:layout_toStartOf="@id/connect_timeout"
+ android:layout_below="@id/connect_timeout_label" />
- <RadioButton
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="Socks" />
- </RadioGroup> -->
<CheckBox
- android:paddingTop="10dp"
+ android:id="@+id/use_customoptions"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@id/udptcpradiogroup"
- android:id="@+id/use_customoptions"
+ android:layout_below="@id/connect_timeout"
+ android:paddingTop="10dp"
android:text="@string/custom_connection_options" />
<LinearLayout
- android:paddingLeft="10dp"
- android:paddingStart="10dp"
android:id="@+id/custom_options_layout"
- android:layout_below="@id/use_customoptions"
android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/use_customoptions"
android:orientation="vertical"
- android:layout_height="wrap_content">
+ android:paddingLeft="10dp"
+ android:paddingStart="10dp">
+
<TextView
android:id="@+id/warnung_custom"
- android:text="@string/custom_connection_options_warng"
android:layout_width="wrap_content"
- android:layout_height="wrap_content" />
+ android:layout_height="wrap_content"
+ android:text="@string/custom_connection_options_warng" />
<EditText
- android:inputType="textMultiLine"
android:id="@+id/customoptions"
- android:lines="5"
android:layout_width="match_parent"
- android:layout_height="wrap_content" />
+ android:layout_height="wrap_content"
+ android:inputType="textMultiLine"
+ android:lines="5" />
</LinearLayout>
<Switch
+ android:id="@+id/remoteSwitch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="Enable"
- android:id="@+id/remoteSwitch"
- android:layout_gravity="right|bottom"
- android:layout_below="@+id/portnumber"
+ android:layout_alignEnd="@+id/portnumber"
android:layout_alignRight="@+id/portnumber"
- android:layout_alignEnd="@+id/portnumber" />
+ android:layout_below="@+id/portnumber"
+ android:layout_gravity="right|bottom"
+ android:text="Enable" />
+
<ImageButton
- android:layout_margin="12dp"
+ android:id="@+id/remove_connection"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:padding="12dp"
- android:layout_alignRight="@+id/portnumber"
android:layout_alignEnd="@+id/portnumber"
+ android:layout_alignRight="@+id/portnumber"
android:layout_below="@id/remoteSwitch"
+ android:layout_margin="12dp"
android:background="@drawable/ic_menu_delete_grey"
- android:id="@+id/remove_connection"
- android:contentDescription="@string/remove_connection_entry" />
+ android:contentDescription="@string/remove_connection_entry"
+ android:padding="12dp" />
</RelativeLayout>
</android.support.v7.widget.CardView>
-
-
-
</FrameLayout> \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 02:35:16 +0000