diff options
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/about.xml | 26 | ||||
-rw-r--r-- | res/layout/basic_settings.xml | 15 | ||||
-rw-r--r-- | res/layout/client_dashboard.xml | 70 | ||||
-rw-r--r-- | res/layout/configuration_wizard_activity.xml | 8 | ||||
-rw-r--r-- | res/layout/eip_service_fragment.xml | 72 | ||||
-rw-r--r-- | res/layout/file_select.xml | 16 | ||||
-rw-r--r-- | res/layout/keystore_selector.xml | 16 | ||||
-rw-r--r-- | res/layout/log_in_dialog.xml | 39 | ||||
-rw-r--r-- | res/layout/new_provider_dialog.xml | 24 | ||||
-rw-r--r-- | res/layout/provider_detail_fragment.xml | 40 | ||||
-rw-r--r-- | res/layout/provider_list_fragment.xml | 22 | ||||
-rw-r--r-- | res/layout/vpn_list_item.xml | 16 |
12 files changed, 276 insertions, 88 deletions
diff --git a/res/layout/about.xml b/res/layout/about.xml index 5820d291..74835d1e 100644 --- a/res/layout/about.xml +++ b/res/layout/about.xml @@ -21,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:autoLink="all" - android:text="@string/copyright_blinktgui" /> + android:text="@string/copyright_leapgui" /> <Space android:layout_width="match_parent" @@ -33,19 +33,6 @@ android:autoLink="all" android:text="@string/copyright_guicode" /> - <Space - android:layout_width="match_parent" - android:layout_height="10sp" /> - - <TextView - android:id="@+id/donatestring" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - - <Space - android:layout_width="match_parent" - android:layout_height="10sp" /> - <TextView android:id="@+id/translation" android:layout_width="match_parent" @@ -87,17 +74,6 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/file_dialog" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/copyright_file_dialog" /> - <Space android:layout_width="match_parent" android:layout_height="20sp" /> diff --git a/res/layout/basic_settings.xml b/res/layout/basic_settings.xml index d56f6ad5..b71ae664 100644 --- a/res/layout/basic_settings.xml +++ b/res/layout/basic_settings.xml @@ -1,19 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2011 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:leap="http://schemas.android.com/apk/res/se.leap.leapclient" android:layout_width="wrap_content" diff --git a/res/layout/client_dashboard.xml b/res/layout/client_dashboard.xml new file mode 100644 index 00000000..9f05cfbc --- /dev/null +++ b/res/layout/client_dashboard.xml @@ -0,0 +1,70 @@ +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/dashboardLayout" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + tools:context=".Dashboard" > + + <LinearLayout + android:id="@+id/providerLine" + android:layout_width="match_parent" + android:layout_height="40dp" + android:background="?android:attr/selectableItemBackground" > + + <LinearLayout + android:id="@+id/providerLabelWrapper" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:gravity="center_vertical" + android:orientation="vertical" + android:paddingLeft="10dp" > + + <TextView + android:id="@+id/providerLabel" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="marquee" + android:fadingEdge="horizontal" + android:singleLine="true" + android:text="@string/provider_label" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textSize="24sp" /> + + </LinearLayout> + + <LinearLayout + android:id="@+id/providerNameWrapper" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:gravity="center_vertical" + android:orientation="vertical" + android:paddingLeft="15dp" > + + <TextView + android:id="@+id/providerName" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="marquee" + android:fadingEdge="horizontal" + android:singleLine="true" + android:text="@string/provider_label_none" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + </LinearLayout> + </LinearLayout> + + <View + android:layout_width="wrap_content" + android:layout_height="2dp" + android:layout_marginBottom="15dp" + android:background="@android:drawable/divider_horizontal_bright" /> + + <LinearLayout + android:id="@+id/servicesCollection" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="0.11" + android:orientation="vertical" /> + +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/configuration_wizard_activity.xml b/res/layout/configuration_wizard_activity.xml new file mode 100644 index 00000000..264ccf98 --- /dev/null +++ b/res/layout/configuration_wizard_activity.xml @@ -0,0 +1,8 @@ +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/configuration_wizard_layout" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context=".ConfigurationWizard" > + +</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/eip_service_fragment.xml b/res/layout/eip_service_fragment.xml new file mode 100644 index 00000000..e67f5651 --- /dev/null +++ b/res/layout/eip_service_fragment.xml @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="utf-8"?> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/eipServiceFragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="10dp" > + + <TextView + android:id="@+id/eipLabel" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_alignParentTop="true" + android:layout_marginLeft="10dp" + android:clickable="true" + android:text="@string/eip_service_label" + android:textAppearance="?android:attr/textAppearanceLarge" /> + + <Switch + android:id="@+id/eipSwitch" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_alignParentTop="true" + android:layout_marginRight="10dp" /> + + <ProgressBar + android:id="@+id/eipProgress" + android:layout_width="match_parent" + android:layout_height="wrap_content" + style="@android:style/Widget.Holo.ProgressBar.Horizontal" + android:indeterminate="true" + android:visibility="gone" + android:layout_below="@id/eipLabel" + android:layout_marginLeft="15dp" + android:layout_marginRight="15dp" /> + + <RelativeLayout + android:id="@+id/eipDetail" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_alignParentRight="true" + android:layout_below="@+id/eipLabel" + android:paddingBottom="10dp" + android:paddingLeft="10dp" + android:paddingRight="10dp" + android:paddingTop="10dp" + android:visibility="gone" > + + <ImageView + android:id="@+id/eipSettings" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_alignParentTop="true" + android:layout_margin="10dp" + android:contentDescription="@string/eip_settings_button_description" + android:src="@drawable/ic_sysbar_quicksettings" /> + + <TextView + android:id="@+id/eipStatus" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" + android:clickable="true" + android:text="@string/eip_status" /> + + </RelativeLayout> + +</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/file_select.xml b/res/layout/file_select.xml index 0dd1abba..7cc84c40 100644 --- a/res/layout/file_select.xml +++ b/res/layout/file_select.xml @@ -1,20 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2011 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - <!-- A layout to select a certificate, akin to a file selector on web pages. --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" diff --git a/res/layout/keystore_selector.xml b/res/layout/keystore_selector.xml index 211e977b..39b5d11b 100644 --- a/res/layout/keystore_selector.xml +++ b/res/layout/keystore_selector.xml @@ -1,20 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2011 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - <!-- A layout to select a certificate, akin to a file selector on web pages. --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" diff --git a/res/layout/log_in_dialog.xml b/res/layout/log_in_dialog.xml new file mode 100644 index 00000000..4c9fdbad --- /dev/null +++ b/res/layout/log_in_dialog.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical" + tools:context=".LogInDialog" > + + <TextView + android:id="@+id/user_message" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <EditText + android:id="@+id/username_entered" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="4dp" + android:layout_marginLeft="4dp" + android:layout_marginRight="4dp" + android:layout_marginTop="16dp" + android:ems="10" + android:hint="@string/username_ask" + android:inputType="textUri" > + + <requestFocus /> + </EditText> + + <EditText + android:id="@+id/password_entered" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:ems="10" + android:hint="@string/password_ask" + android:inputType="textPassword" /> + +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/new_provider_dialog.xml b/res/layout/new_provider_dialog.xml new file mode 100644 index 00000000..19b8f442 --- /dev/null +++ b/res/layout/new_provider_dialog.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical" > + + <EditText + android:id="@+id/new_provider_url" + android:inputType="textUri" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:layout_marginLeft="4dp" + android:layout_marginRight="4dp" + android:layout_marginBottom="4dp" + android:hint="@string/new_provider_uri" /> + + <CheckBox + android:id="@+id/danger_checkbox" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/danger_checkbox" /> + +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/provider_detail_fragment.xml b/res/layout/provider_detail_fragment.xml new file mode 100644 index 00000000..eb90fad9 --- /dev/null +++ b/res/layout/provider_detail_fragment.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" > + + <TextView + android:id="@+id/provider_detail_domain" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="4dp" + android:layout_marginLeft="4dp" + android:layout_marginRight="4dp" + android:layout_marginTop="16dp" + android:textAppearance="?android:attr/textAppearanceLarge" + android:textStyle="bold" /> + + <TextView + android:id="@+id/provider_detail_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:layout_marginLeft="4dp" + android:layout_marginRight="4dp" + android:layout_marginBottom="4dp" + android:textStyle="italic" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <TextView + android:id="@+id/provider_detail_description" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:layout_marginLeft="4dp" + android:layout_marginRight="4dp" + android:layout_marginBottom="4dp" + android:textStyle="normal" + android:textAppearance="?android:attr/textAppearanceSmall" /> + +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/provider_list_fragment.xml b/res/layout/provider_list_fragment.xml new file mode 100644 index 00000000..0db0734b --- /dev/null +++ b/res/layout/provider_list_fragment.xml @@ -0,0 +1,22 @@ +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:paddingLeft="8dp"
+ android:paddingRight="8dp">
+
+ <ListView
+ android:id="@id/android:list"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:layout_alignParentTop="true"
+ android:drawSelectorOnTop="false" />
+
+ <Button
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:onClick="addAndSelectNewProvider"
+ android:text="@string/new_provider_button" />
+
+</LinearLayout>
diff --git a/res/layout/vpn_list_item.xml b/res/layout/vpn_list_item.xml index 16d7d5bd..40cfff4a 100644 --- a/res/layout/vpn_list_item.xml +++ b/res/layout/vpn_list_item.xml @@ -1,20 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2011 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" |