diff options
-rw-r--r-- | res/layout-xlarge/about.xml | 134 | ||||
-rw-r--r-- | res/layout-xlarge/client_dashboard.xml | 69 | ||||
-rw-r--r-- | res/layout-xlarge/configuration_wizard_activity.xml | 27 | ||||
-rw-r--r-- | res/layout-xlarge/eip_service_fragment.xml | 75 | ||||
-rw-r--r-- | res/layout-xlarge/log_in_dialog.xml | 39 | ||||
-rw-r--r-- | res/layout-xlarge/logwindow.xml | 17 | ||||
-rw-r--r-- | res/layout-xlarge/new_provider_dialog.xml | 26 | ||||
-rw-r--r-- | res/layout-xlarge/provider_detail_fragment.xml | 43 | ||||
-rw-r--r-- | res/layout-xlarge/provider_list_fragment.xml | 16 | ||||
-rw-r--r-- | res/layout-xlarge/provider_list_item.xml | 44 | ||||
-rw-r--r-- | res/layout/log_in_dialog.xml | 2 | ||||
-rw-r--r-- | res/layout/provider_list_item.xml | 43 | ||||
-rw-r--r-- | src/se/leap/bitmaskclient/ProviderListAdapter.java | 2 | ||||
-rw-r--r-- | src/se/leap/bitmaskclient/ProviderListFragment.java | 4 |
14 files changed, 538 insertions, 3 deletions
diff --git a/res/layout-xlarge/about.xml b/res/layout-xlarge/about.xml new file mode 100644 index 00000000..6ab88737 --- /dev/null +++ b/res/layout-xlarge/about.xml @@ -0,0 +1,134 @@ +<ScrollView 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" + android:layout_marginLeft="12sp" + tools:context=".Dashboard" > + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > + + <TextView + android:id="@+id/version" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="18sp" /> + + <Space + android:layout_width="match_parent" + android:layout_height="12sp" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="18sp" + android:autoLink="all" + android:text="@string/copyright_leapgui" /> + + <Space + android:layout_width="match_parent" + android:layout_height="12sp" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="18sp" + android:autoLink="all" + android:text="@string/repository_url_text" /> + + <Space + android:layout_width="match_parent" + android:layout_height="12sp" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="18sp" + android:autoLink="all" + android:text="@string/translation_project_text" /> + + <Space + android:layout_width="match_parent" + android:layout_height="12sp" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="18sp" + android:autoLink="all" + android:text="@string/translationby" /> + + <Space + android:layout_width="match_parent" + android:layout_height="18sp" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="18sp" + android:text="@string/copyright_others" /> + + <Space + android:layout_width="match_parent" + android:layout_height="12sp" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="18sp" + android:text="@string/openvpn" + android:textAppearance="?android:attr/textAppearanceMedium" /> + <!-- + ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@string/openvpn_logo_descr" + android:src="@drawable/openvpnLogo" /> + --> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="18sp" + android:text="@string/opevpn_copyright" /> + + <Space + android:layout_width="match_parent" + android:layout_height="20sp" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="18sp" + android:text="@string/lzo" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="18sp" + android:text="@string/lzo_copyright" /> + + <Space + android:layout_width="match_parent" + android:layout_height="20sp" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="18sp" + android:text="@string/openssl" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="18sp" + android:text="@string/copyright_openssl" /> + </LinearLayout> + +</ScrollView> diff --git a/res/layout-xlarge/client_dashboard.xml b/res/layout-xlarge/client_dashboard.xml new file mode 100644 index 00000000..bd644e1e --- /dev/null +++ b/res/layout-xlarge/client_dashboard.xml @@ -0,0 +1,69 @@ +<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" + android:layout_marginLeft="10sp" + android:layout_marginTop="10sp" + tools:context=".Dashboard" > + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="42dp" + android:background="?android:attr/selectableItemBackground" > + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:gravity="center_vertical" + android:orientation="vertical" + android:paddingLeft="10dp" > + + <TextView + 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="32sp" /> + + </LinearLayout> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:gravity="center_vertical" + android:orientation="vertical" + android:paddingLeft="32dp" > + + <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="1dp" + android:layout_marginBottom="7dp" + 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> + +</LinearLayout> diff --git a/res/layout-xlarge/configuration_wizard_activity.xml b/res/layout-xlarge/configuration_wizard_activity.xml new file mode 100644 index 00000000..bb169e00 --- /dev/null +++ b/res/layout-xlarge/configuration_wizard_activity.xml @@ -0,0 +1,27 @@ +<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" > + + <ProgressBar + android:id="@+id/progressbar_configuration_wizard" + style="?android:attr/progressBarStyleHorizontal" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:max="3" /> + + <TextView + android:id="@+id/progressbar_description" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:fadingEdge="horizontal" + android:singleLine="true" + android:text="@string/configuring_provider" + android:textSize="24sp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_centerHorizontal="true" + android:textColor="@android:color/holo_blue_bright" /> + +</RelativeLayout>
\ No newline at end of file diff --git a/res/layout-xlarge/eip_service_fragment.xml b/res/layout-xlarge/eip_service_fragment.xml new file mode 100644 index 00000000..e5c7f23d --- /dev/null +++ b/res/layout-xlarge/eip_service_fragment.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="utf-8"?> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="10dp" + android:layout_marginLeft="20dp" > + + <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" + android:textSize="26sp" /> + + <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" + android:height="26dp"/> + + <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/status_unknown" + android:textSize="16sp" /> + + </RelativeLayout> + +</RelativeLayout> diff --git a/res/layout-xlarge/log_in_dialog.xml b/res/layout-xlarge/log_in_dialog.xml new file mode 100644 index 00000000..3a9eebb8 --- /dev/null +++ b/res/layout-xlarge/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_hint" + 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_hint" + android:inputType="textPassword" /> + +</LinearLayout>
\ No newline at end of file diff --git a/res/layout-xlarge/logwindow.xml b/res/layout-xlarge/logwindow.xml new file mode 100644 index 00000000..4051c92c --- /dev/null +++ b/res/layout-xlarge/logwindow.xml @@ -0,0 +1,17 @@ +<?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:text="@string/speed_waiting" + android:singleLine="true" + android:id="@+id/speed" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> + <ListView + android:id="@android:id/list" + android:layout_width="fill_parent" + android:layout_height="fill_parent" /> + +</LinearLayout>
\ No newline at end of file diff --git a/res/layout-xlarge/new_provider_dialog.xml b/res/layout-xlarge/new_provider_dialog.xml new file mode 100644 index 00000000..fc7d84ab --- /dev/null +++ b/res/layout-xlarge/new_provider_dialog.xml @@ -0,0 +1,26 @@ +<?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" + android:textSize="24sp" > + + <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:textSize="24sp" + android:hint="@string/new_provider_uri" /> + + <CheckBox + android:id="@+id/danger_checkbox" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="24sp" + android:text="@string/danger_checkbox" /> + +</LinearLayout>
\ No newline at end of file diff --git a/res/layout-xlarge/provider_detail_fragment.xml b/res/layout-xlarge/provider_detail_fragment.xml new file mode 100644 index 00000000..4abbaa17 --- /dev/null +++ b/res/layout-xlarge/provider_detail_fragment.xml @@ -0,0 +1,43 @@ +<?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:textSize="32sp" + 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:textSize="24sp" + 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:textSize="18sp" + android:textStyle="normal" + android:textAppearance="?android:attr/textAppearanceSmall" /> + +</LinearLayout>
\ No newline at end of file diff --git a/res/layout-xlarge/provider_list_fragment.xml b/res/layout-xlarge/provider_list_fragment.xml new file mode 100644 index 00000000..59dd37d1 --- /dev/null +++ b/res/layout-xlarge/provider_list_fragment.xml @@ -0,0 +1,16 @@ +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:paddingLeft="12dp"
+ android:paddingRight="12dp"
+ android:paddingTop="12dp" >
+
+ <ListView
+ android:id="@id/android:list"
+ android:layout_width="match_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1"
+ android:drawSelectorOnTop="false" />
+
+</LinearLayout> diff --git a/res/layout-xlarge/provider_list_item.xml b/res/layout-xlarge/provider_list_item.xml new file mode 100644 index 00000000..ec5db117 --- /dev/null +++ b/res/layout-xlarge/provider_list_item.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 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. +--> + +<TwoLineListItem xmlns:android="http://schemas.android.com/apk/res/android" + android:paddingTop="2dip" + android:paddingBottom="2dip" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="?android:attr/activatedBackgroundIndicator" + android:minHeight="?android:attr/listPreferredItemHeight" + android:mode="twoLine" +> + + <TextView android:id="@android:id/text1" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="?android:attr/listPreferredItemPaddingLeft" + android:layout_marginTop="6dip" + android:textSize = "32sp" + android:textAppearance="?android:attr/textAppearanceListItem" + /> + + <TextView android:id="@android:id/text2" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@android:id/text1" + android:layout_alignLeft="@android:id/text1" + android:textSize = "24sp" + /> + +</TwoLineListItem> diff --git a/res/layout/log_in_dialog.xml b/res/layout/log_in_dialog.xml index 3a9eebb8..c8a2f0a8 100644 --- a/res/layout/log_in_dialog.xml +++ b/res/layout/log_in_dialog.xml @@ -21,6 +21,7 @@ android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:layout_marginTop="16dp" + android:textSize="24sp" android:ems="10" android:hint="@string/username_hint" android:inputType="textUri" > @@ -32,6 +33,7 @@ android:id="@+id/password_entered" android:layout_width="match_parent" android:layout_height="wrap_content" + android:textSize="24sp" android:ems="10" android:hint="@string/password_hint" android:inputType="textPassword" /> diff --git a/res/layout/provider_list_item.xml b/res/layout/provider_list_item.xml new file mode 100644 index 00000000..8746f6f8 --- /dev/null +++ b/res/layout/provider_list_item.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 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. +--> + +<TwoLineListItem xmlns:android="http://schemas.android.com/apk/res/android" + android:paddingTop="2dip" + android:paddingBottom="2dip" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="?android:attr/activatedBackgroundIndicator" + android:minHeight="?android:attr/listPreferredItemHeight" + android:mode="twoLine" +> + + <TextView android:id="@android:id/text1" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="?android:attr/listPreferredItemPaddingLeft" + android:layout_marginTop="6dip" + android:textAppearance="?android:attr/textAppearanceListItem" + /> + + <TextView android:id="@android:id/text2" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@android:id/text1" + android:layout_alignLeft="@android:id/text1" + android:textAppearance="?android:attr/textAppearanceSmall" + /> + +</TwoLineListItem> diff --git a/src/se/leap/bitmaskclient/ProviderListAdapter.java b/src/se/leap/bitmaskclient/ProviderListAdapter.java index c5e8b64d..43bba085 100644 --- a/src/se/leap/bitmaskclient/ProviderListAdapter.java +++ b/src/se/leap/bitmaskclient/ProviderListAdapter.java @@ -101,7 +101,7 @@ public class ProviderListAdapter<T> extends ArrayAdapter<T> { int position = getRealPosition(index); if (convertView == null) { LayoutInflater inflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE); - row = (TwoLineListItem)inflater.inflate(android.R.layout.simple_list_item_2, null); + row = (TwoLineListItem)inflater.inflate(R.layout.provider_list_item, null); } else { row = (TwoLineListItem)convertView; } diff --git a/src/se/leap/bitmaskclient/ProviderListFragment.java b/src/se/leap/bitmaskclient/ProviderListFragment.java index f35cf739..db414d87 100644 --- a/src/se/leap/bitmaskclient/ProviderListFragment.java +++ b/src/se/leap/bitmaskclient/ProviderListFragment.java @@ -94,12 +94,12 @@ public class ProviderListFragment extends ListFragment { if(getArguments().containsKey(SHOW_ALL_PROVIDERS))
content_adapter = new ProviderListAdapter<ProviderListContent.ProviderItem>(
getActivity(),
- android.R.layout.simple_list_item_activated_2,
+ R.layout.provider_list_item,
ProviderListContent.ITEMS, getArguments().getBoolean(SHOW_ALL_PROVIDERS));
else
content_adapter = new ProviderListAdapter<ProviderListContent.ProviderItem>(
getActivity(),
- android.R.layout.simple_list_item_activated_2,
+ R.layout.provider_list_item,
ProviderListContent.ITEMS);
|