Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rework setup views

Browse source
This commit is contained in:
Margaux Clerc 2015-07-27 15:48:47 +02:00
parent cf59a82120
commit dc01389161
34 changed files with 475 additions and 1775 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

106
res/layout-small/setup_generic_login.xml
View file

@ -1,106 +0,0 @@
<?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:contentDescription="@string/content_description_welcome"
android:paddingTop="40dp"
android:textSize="20sp"
android:textStyle="bold"
android:textColor="@android:color/black"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
android:text="@string/setup_title_assistant"/>
<TextView
android:paddingTop="10dp"
android:gravity="center"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/setup_general_account_hint"
android:textColor="@android:color/black"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="40dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:gravity="center"
android:orientation="vertical">
<EditText
android:textCursorDrawable="@null"
android:id="@+id/setup_username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/setup_username_hint"
android:inputType="textEmailAddress"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:singleLine="true"
android:textColor="@android:color/black"
android:background="@drawable/setup_field_background" />
<EditText
android:textCursorDrawable="@null"
android:id="@+id/setup_password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/setup_password_hint"
android:inputType="textPassword"
android:layout_marginTop="5dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:singleLine="true"
android:textColor="@android:color/black"
android:background="@drawable/setup_field_background" />
<EditText
android:textCursorDrawable="@null"
android:id="@+id/setup_domain"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/setup_domain_hint"
android:inputType="textEmailAddress"
android:layout_marginTop="5dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:singleLine="true"
android:textColor="@android:color/black"
android:background="@drawable/setup_field_background" />
<RelativeLayout
android:layout_marginTop="10dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:contentDescription="@string/content_description_validate"
android:id="@+id/setup_apply"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/button"
android:layout_centerInParent="true" />
<TextView
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_apply"
android:textColor="@android:color/black"/>
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="10dp"
android:paddingRight="10dp" />
</LinearLayout>
</LinearLayout>

93
res/layout-small/setup_linphone_login.xml
View file

@ -1,93 +0,0 @@
<?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:contentDescription="@string/content_description_welcome"
android:paddingTop="40dp"
android:textSize="20sp"
android:textStyle="bold"
android:textColor="@android:color/black"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
android:text="@string/setup_title_assistant"/>
<TextView
android:paddingTop="10dp"
android:gravity="center"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/setup_linphone_account_hint"
android:textColor="@android:color/black"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="40dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:gravity="center"
android:orientation="vertical">
<EditText
android:textCursorDrawable="@null"
android:id="@+id/setup_username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/setup_username_hint"
android:inputType="textEmailAddress"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:singleLine="true"
android:textColor="@android:color/black"
android:background="@drawable/setup_field_background" />
<EditText
android:textCursorDrawable="@null"
android:id="@+id/setup_password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/setup_password_hint"
android:inputType="textPassword"
android:layout_marginTop="5dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:singleLine="true"
android:textColor="@android:color/black"
android:background="@drawable/setup_field_background" />
<RelativeLayout
android:id="@+id/setup_apply_button"
android:layout_marginTop="10dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:contentDescription="@string/content_description_validate"
android:id="@+id/setup_apply"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/button"
android:layout_centerInParent="true" />
<TextView
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_apply"
android:textColor="@android:color/black"/>
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="10dp"
android:paddingRight="10dp" />
</LinearLayout>
</LinearLayout>

137
res/layout-small/setup_menu.xml
View file

@ -1,137 +0,0 @@
<?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:contentDescription="@string/content_description_welcome"
android:paddingTop="10dp"
android:textSize="20sp"
android:textStyle="bold"
android:textColor="@android:color/black"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_title_assistant"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="10dp"
android:gravity="center"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="0.7"
android:layout_marginBottom="10dp"
android:paddingLeft="10dp"
android:paddingRight="10dp">
<ImageView
android:id="@+id/setup_create_account"
android:contentDescription="@string/setup_create_account"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:scaleType="fitXY"
android:src="@drawable/button"
android:layout_centerInParent="true" />
<TextView
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_create_account"
android:textColor="@android:color/black"/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/setup_login_linphone_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="0.7"
android:layout_marginBottom="10dp"
android:paddingLeft="10dp"
android:paddingRight="10dp">
<ImageView
android:id="@+id/setup_login_linphone"
android:contentDescription="@string/setup_login_linphone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:scaleType="fitXY"
android:src="@drawable/button"
android:layout_centerInParent="true" />
<TextView
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_login_linphone"
android:textColor="@android:color/black"/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/setup_login_generic_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="0.7"
android:layout_marginBottom="10dp"
android:paddingLeft="10dp"
android:paddingRight="10dp">
<ImageView
android:id="@+id/setup_login_generic"
android:contentDescription="@string/setup_login_generic"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:scaleType="fitXY"
android:src="@drawable/button"
android:layout_centerInParent="true" />
<TextView
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_login_generic"
android:textColor="@android:color/black"/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/setup_remote_provisioning_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="0.7"
android:layout_marginBottom="10dp"
android:paddingLeft="10dp"
android:paddingRight="10dp">
<ImageView
android:id="@+id/setup_remote_provisioning"
android:contentDescription="@string/setup_remote_provisioning"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:scaleType="fitXY"
android:src="@drawable/button"
android:layout_centerInParent="true" />
<TextView
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_remote_provisioning"
android:textColor="@android:color/black"/>
</RelativeLayout>
</LinearLayout>
</LinearLayout>

181
res/layout-small/setup_wizard.xml
View file

@ -1,181 +0,0 @@
<?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:contentDescription="@string/content_description_welcome"
android:paddingTop="40dp"
android:textSize="20sp"
android:textStyle="bold"
android:textColor="@android:color/black"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
android:text="@string/setup_title_assistant"/>
<TextView
android:paddingTop="10dp"
android:gravity="center"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/setup_error"
android:textColor="#ffff0000"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="10dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:gravity="center"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:textCursorDrawable="@null"
android:id="@+id/setup_username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/setup_username_hint"
android:inputType="textEmailAddress"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:singleLine="true"
android:textColor="@android:color/black"
android:background="@drawable/setup_field_background" />
<ImageView
android:contentDescription="@string/content_description_setup_ok"
android:id="@+id/setup_username_ok"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="5dp"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:src="@drawable/wizard_notok"/>
</RelativeLayout>
<RelativeLayout
android:layout_marginTop="5dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:textCursorDrawable="@null"
android:id="@+id/setup_password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/setup_password_hint"
android:inputType="textPassword"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:singleLine="true"
android:textColor="@android:color/black"
android:background="@drawable/setup_field_background" />
<ImageView
android:contentDescription="@string/content_description_setup_ok"
android:id="@+id/setup_password_ok"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="5dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:src="@drawable/wizard_notok"/>
</RelativeLayout>
<RelativeLayout
android:layout_marginTop="5dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:textCursorDrawable="@null"
android:id="@+id/setup_password_confirm"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/setup_password_confirm_hint"
android:singleLine="true"
android:lines="1"
android:maxLines="1"
android:inputType="textPassword"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:ellipsize="end"
android:textColor="@android:color/black"
android:background="@drawable/setup_field_background" />
<ImageView
android:contentDescription="@string/content_description_setup_ok"
android:id="@+id/setup_confirm_password_ok"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="5dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:src="@drawable/wizard_notok"/>
</RelativeLayout>
<RelativeLayout
android:layout_marginTop="5dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:textCursorDrawable="@null"
android:id="@+id/setup_email"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/setup_email_hint"
android:inputType="textEmailAddress"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:singleLine="true"
android:textColor="@android:color/black"
android:background="@drawable/setup_field_background" />
<ImageView
android:contentDescription="@string/content_description_setup_ok"
android:id="@+id/setup_email_ok"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="5dp"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:src="@drawable/wizard_notok"/>
</RelativeLayout>
<RelativeLayout
android:layout_marginTop="10dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:contentDescription="@string/content_description_validate"
android:id="@+id/setup_create"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/button"
android:layout_centerInParent="true" />
<TextView
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_create"
android:textColor="@android:color/black"/>
</RelativeLayout>
</LinearLayout>
</LinearLayout>

47
res/layout-small/setup_wizard_confirm.xml
View file

@ -1,47 +0,0 @@
<?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:gravity="center_horizontal"
android:orientation="vertical" >
<TextView
android:contentDescription="@string/content_description_welcome"
android:paddingTop="40dp"
android:textSize="20sp"
android:textStyle="bold"
android:textColor="@android:color/black"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
android:text="@string/setup_title_assistant"/>
<TextView
android:paddingTop="40dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_validate_account"
android:textColor="@android:color/black" />
<RelativeLayout
android:layout_marginTop="20dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/setup_check"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/button"
android:layout_centerInParent="true" />
<TextView
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_check_account_validation"
android:textColor="@android:color/black" />
</RelativeLayout>
</LinearLayout>

30
res/layout-sw533dp-land/setup.xml
View file

@ -1,30 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:background="@drawable/background"
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/fragmentContainer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="20dp"
android:layout_above="@id/menu"
android:orientation="horizontal" />
<LinearLayout
android:id="@+id/menu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:orientation="horizontal">
<include layout="@layout/setup_cancel_button" />
<include layout="@layout/setup_next_button" />
<include layout="@layout/setup_back_button" />
</LinearLayout>
</RelativeLayout>

30
res/layout-sw533dp-land/setup_back_button.xml
View file

@ -1,30 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/setup_back"
android:visibility="gone"
android:layout_weight="0.5"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/image"
android:contentDescription="@string/content_description_back"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@drawable/setup_back"
android:adjustViewBounds="true"
android:scaleType="fitXY" />
<TextView
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:paddingTop="20dp"
android:textSize="18dp"
android:textColor="@drawable/text_color"
android:text="@string/button_setup_back" />
</RelativeLayout>

29
res/layout-sw533dp-land/setup_cancel_button.xml
View file

@ -1,29 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/setup_cancel"
android:layout_weight="0.5"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/image"
android:contentDescription="@string/content_description_cancel_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@drawable/setup_cancel"
android:adjustViewBounds="true"
android:scaleType="fitXY"/>
<TextView
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:paddingTop="20dp"
android:textSize="18dp"
android:textColor="@drawable/text_color"
android:text="@string/button_setup_cancel" />
</RelativeLayout>

99
res/layout-sw533dp-land/setup_generic_login.xml
View file

@ -1,99 +0,0 @@
<?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:contentDescription="@string/content_description_welcome"
android:paddingTop="40dp"
android:textSize="20sp"
android:textStyle="bold"
android:textColor="@android:color/black"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_title_assistant"/>
<TextView
android:paddingTop="10dp"
android:gravity="center"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/setup_general_account_hint"
android:textColor="@android:color/black"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="40dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:gravity="center"
android:orientation="vertical">
<EditText
android:textCursorDrawable="@null"
android:id="@+id/setup_username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/setup_username_hint"
android:inputType="textEmailAddress"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:singleLine="true"
android:textColor="@android:color/black"
android:background="@drawable/setup_field_background" />
<EditText
android:textCursorDrawable="@null"
android:id="@+id/setup_password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/setup_password_hint"
android:inputType="textPassword"
android:layout_marginTop="5dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:singleLine="true"
android:textColor="@android:color/black"
android:background="@drawable/setup_field_background" />
<EditText
android:textCursorDrawable="@null"
android:id="@+id/setup_domain"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/setup_domain_hint"
android:inputType="textEmailAddress"
android:layout_marginTop="5dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:singleLine="true"
android:textColor="@android:color/black"
android:background="@drawable/setup_field_background" />
<RelativeLayout
android:layout_marginTop="10dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:contentDescription="@string/content_description_validate"
android:id="@+id/setup_apply"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/button"
android:layout_centerInParent="true" />
<TextView
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_apply"
android:textColor="@android:color/black"/>
</RelativeLayout>
</LinearLayout>
</LinearLayout>

86
res/layout-sw533dp-land/setup_linphone_login.xml
View file

@ -1,86 +0,0 @@
<?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:contentDescription="@string/content_description_welcome"
android:paddingTop="40dp"
android:textSize="20sp"
android:textStyle="bold"
android:textColor="@android:color/black"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_title_assistant"/>
<TextView
android:paddingTop="10dp"
android:gravity="center"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/setup_linphone_account_hint"
android:textColor="@android:color/black"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingTop="40dp"
android:gravity="center"
android:orientation="vertical">
<EditText
android:textCursorDrawable="@null"
android:id="@+id/setup_username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/setup_username_hint"
android:inputType="textEmailAddress"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:singleLine="true"
android:textColor="@android:color/black"
android:background="@drawable/setup_field_background" />
<EditText
android:textCursorDrawable="@null"
android:id="@+id/setup_password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/setup_password_hint"
android:inputType="textPassword"
android:layout_marginTop="5dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:singleLine="true"
android:textColor="@android:color/black"
android:background="@drawable/setup_field_background" />
<RelativeLayout
android:id="@+id/setup_apply_button"
android:layout_marginTop="10dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:contentDescription="@string/content_description_validate"
android:id="@+id/setup_apply"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/button"
android:layout_centerInParent="true" />
<TextView
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_apply"
android:textColor="@android:color/black"/>
</RelativeLayout>
</LinearLayout>
</LinearLayout>

129
res/layout-sw533dp-land/setup_menu.xml
View file

@ -1,129 +0,0 @@
<?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:contentDescription="@string/content_description_welcome"
android:paddingTop="40dp"
android:textSize="20sp"
android:textStyle="bold"
android:textColor="@android:color/black"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_title_assistant"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingTop="40dp"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:paddingLeft="10dp"
android:layout_marginTop="10dp"
android:paddingRight="10dp">
<ImageView
android:id="@+id/setup_create_account"
android:contentDescription="@string/setup_create_account"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/button"
android:layout_centerInParent="true" />
<TextView
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_create_account"
android:textColor="@android:color/black"/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/setup_login_linphone_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_marginTop="10dp"
android:paddingLeft="10dp"
android:paddingRight="10dp">
<ImageView
android:id="@+id/setup_login_linphone"
android:contentDescription="@string/setup_login_linphone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/button"
android:layout_centerInParent="true" />
<TextView
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_login_linphone"
android:textColor="@android:color/black"/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/setup_login_generic_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_marginTop="10dp"
android:paddingLeft="10dp"
android:paddingRight="10dp">
<ImageView
android:id="@+id/setup_login_generic"
android:contentDescription="@string/setup_login_generic"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/button"
android:layout_centerInParent="true" />
<TextView
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_login_generic"
android:textColor="@android:color/black"/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/setup_remote_provisioning_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_marginTop="10dp"
android:paddingLeft="10dp"
android:paddingRight="10dp">
<ImageView
android:id="@+id/setup_remote_provisioning"
android:contentDescription="@string/setup_remote_provisioning"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/button"
android:layout_centerInParent="true" />
<TextView
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_remote_provisioning"
android:textColor="@android:color/black"/>
</RelativeLayout>
</LinearLayout>
</LinearLayout>

29
res/layout-sw533dp-land/setup_next_button.xml
View file

@ -1,29 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/setup_next"
android:layout_weight="0.5"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/image"
android:contentDescription="@string/content_description_next"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@drawable/setup_next"
android:adjustViewBounds="true"
android:scaleType="fitXY" />
<TextView
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:paddingTop="20dp"
android:textSize="18dp"
android:textColor="@drawable/text_color"
android:text="@string/button_setup_next" />
</RelativeLayout>

177
res/layout-sw533dp-land/setup_wizard.xml
View file

@ -1,177 +0,0 @@
<?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:contentDescription="@string/content_description_welcome"
android:paddingTop="40dp"
android:textSize="20sp"
android:textStyle="bold"
android:textColor="@android:color/black"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_title_assistant"/>
<TextView
android:paddingTop="10dp"
android:gravity="center"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/setup_error"
android:textColor="#ffff0000"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingTop="40dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:orientation="vertical" >
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:textCursorDrawable="@null"
android:id="@+id/setup_username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/setup_username_hint"
android:inputType="textEmailAddress"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:singleLine="true"
android:textColor="@android:color/black"
android:background="@drawable/setup_field_background" />
<ImageView
android:contentDescription="@string/content_description_setup_ok"
android:id="@+id/setup_username_ok"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="5dp"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:src="@drawable/wizard_notok"/>
</RelativeLayout>
<RelativeLayout
android:layout_marginTop="5dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:textCursorDrawable="@null"
android:id="@+id/setup_password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/setup_password_hint"
android:inputType="textPassword"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:singleLine="true"
android:textColor="@android:color/black"
android:background="@drawable/setup_field_background" />
<ImageView
android:contentDescription="@string/content_description_setup_ok"
android:id="@+id/setup_password_ok"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="5dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:src="@drawable/wizard_notok"/>
</RelativeLayout>
<RelativeLayout
android:layout_marginTop="5dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:textCursorDrawable="@null"
android:id="@+id/setup_password_confirm"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/setup_password_confirm_hint"
android:inputType="textPassword"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:singleLine="true"
android:textColor="@android:color/black"
android:background="@drawable/setup_field_background" />
<ImageView
android:contentDescription="@string/content_description_setup_ok"
android:id="@+id/setup_confirm_password_ok"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="5dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:src="@drawable/wizard_notok"/>
</RelativeLayout>
<RelativeLayout
android:layout_marginTop="5dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:textCursorDrawable="@null"
android:id="@+id/setup_email"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/setup_email_hint"
android:inputType="textEmailAddress"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:singleLine="true"
android:textColor="@android:color/black"
android:background="@drawable/setup_field_background" />
<ImageView
android:contentDescription="@string/content_description_setup_ok"
android:id="@+id/setup_email_ok"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="5dp"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:src="@drawable/wizard_notok"/>
</RelativeLayout>
<RelativeLayout
android:layout_marginTop="10dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:contentDescription="@string/content_description_validate"
android:id="@+id/setup_create"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/button"
android:layout_centerInParent="true" />
<TextView
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_create"
android:textColor="@android:color/black"/>
</RelativeLayout>
</LinearLayout>
</LinearLayout>

67
res/layout/setup.xml
View file

@ -1,59 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:background="@drawable/background"
android:background="@color/background"
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/mark"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:orientation="horizontal">
<ImageView
android:contentDescription="@string/content_description_mark"
android:visibility="invisible"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@drawable/setup_mark"
android:adjustViewBounds="true"
android:scaleType="fitXY"
android:layout_weight="0.5"/>
<ImageView
android:contentDescription="@string/content_description_mark"
android:visibility="invisible"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@drawable/setup_mark"
android:adjustViewBounds="true"
android:scaleType="fitXY"
android:layout_weight="0.5"/>
</LinearLayout>
<LinearLayout
android:id="@+id/fragmentContainer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="20dp"
android:layout_above="@id/mark"
android:orientation="horizontal" />
<LinearLayout
android:id="@+id/menu"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:orientation="horizontal">
<include layout="@layout/setup_cancel_button" />
<include layout="@layout/setup_next_button" />
<include layout="@layout/setup_back_button" />
android:orientation="vertical"
android:layout_above="@id/footer">
<include layout="@layout/status" android:id="@+id/status" />
<include layout="@layout/setup_toolbar" android:id="@+id/toolbar" />
<LinearLayout
android:id="@+id/fragmentContainer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="20dp"
android:orientation="horizontal" />
</LinearLayout>
</RelativeLayout>

119
res/layout/setup_generic_login.xml
View file

@ -3,103 +3,114 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
<TextView
android:contentDescription="@string/content_description_welcome"
android:paddingTop="40dp"
android:textSize="20sp"
android:textStyle="bold"
android:textColor="@android:color/black"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_title_assistant"/>
<TextView
android:paddingTop="10dp"
android:gravity="center"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/setup_general_account_hint"
android:textColor="@android:color/black"/>
<LinearLayout
<TextView
android:contentDescription="@string/content_description_welcome"
android:paddingTop="20dp"
android:textSize="30sp"
android:textStyle="bold"
android:layout_gravity="center"
android:textColor="@color/footer_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_general_account_hint"
android:gravity="center_horizontal"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="40dp"
android:paddingTop="20dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:gravity="center"
android:orientation="vertical">
<TextView
android:textSize="16sp"
android:paddingTop="10dp"
android:textColor="@color/colorD"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAllCaps="true"
android:text="@string/setup_username_hint"/>
<EditText
android:textCursorDrawable="@null"
android:id="@+id/setup_username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/setup_username_hint"
android:layout_height="40dp"
android:inputType="textEmailAddress"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:singleLine="true"
android:textColor="@android:color/black"
android:background="@drawable/setup_field_background" />
android:background="@drawable/resizable_textfield" />
<TextView
android:textSize="16sp"
android:paddingTop="10dp"
android:textColor="@color/colorD"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAllCaps="true"
android:text="@string/setup_password_hint"/>
<EditText
android:textCursorDrawable="@null"
android:id="@+id/setup_password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/setup_password_hint"
android:layout_height="40dp"
android:inputType="textPassword"
android:layout_marginTop="5dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:singleLine="true"
android:textColor="@android:color/black"
android:background="@drawable/setup_field_background" />
android:background="@drawable/resizable_textfield" />
<TextView
android:textSize="16sp"
android:paddingTop="10dp"
android:textColor="@color/colorD"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAllCaps="true"
android:text="@string/setup_domain_hint"/>
<EditText
android:textCursorDrawable="@null"
android:id="@+id/setup_domain"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/setup_domain_hint"
android:layout_height="40dp"
android:inputType="textEmailAddress"
android:layout_marginTop="5dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:singleLine="true"
android:textColor="@android:color/black"
android:background="@drawable/setup_field_background" />
android:background="@drawable/resizable_textfield" />
<RelativeLayout
android:layout_marginTop="10dp"
android:layout_marginTop="20dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:contentDescription="@string/content_description_validate"
android:id="@+id/setup_apply"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/button"
android:layout_centerInParent="true" />
<TextView
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_apply"
android:textColor="@android:color/black"/>
<Button
android:id="@+id/setup_apply"
android:layout_width="wrap_content"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:textAllCaps="true"
android:layout_centerInParent="true"
android:layout_height="wrap_content"
android:textColor="@android:color/black"
android:contentDescription="@string/content_description_validate"
android:background="@drawable/resizable_assistant_button_2"
android:text="@string/setup_apply"
android:layout_centerVertical="true"/>
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="10dp"
android:paddingRight="10dp" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

144
res/layout/setup_linphone_login.xml
View file

@ -3,90 +3,94 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:contentDescription="@string/content_description_welcome"
android:paddingTop="40dp"
android:textSize="20sp"
android:textStyle="bold"
android:textColor="@android:color/black"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_title_assistant"/>
<TextView
android:paddingTop="10dp"
android:gravity="center"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/setup_linphone_account_hint"
android:textColor="@android:color/black"/>
<TextView
android:contentDescription="@string/content_description_welcome"
android:paddingTop="20dp"
android:textSize="30sp"
android:textStyle="bold"
android:layout_gravity="center"
android:textColor="@color/footer_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_linphone_account_hint"
android:gravity="center_horizontal"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="40dp"
android:paddingTop="20dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:gravity="center"
android:orientation="vertical">
<EditText
android:textCursorDrawable="@null"
android:id="@+id/setup_username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/setup_username_hint"
android:inputType="textEmailAddress"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:singleLine="true"
android:textColor="@android:color/black"
android:background="@drawable/setup_field_background" />
<EditText
android:textCursorDrawable="@null"
android:id="@+id/setup_password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/setup_password_hint"
android:inputType="textPassword"
android:layout_marginTop="5dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:singleLine="true"
android:textColor="@android:color/black"
android:background="@drawable/setup_field_background" />
<TextView
android:textSize="16sp"
android:paddingTop="10dp"
android:textColor="@color/colorD"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAllCaps="true"
android:text="@string/setup_username_hint"/>
<EditText
android:textCursorDrawable="@null"
android:id="@+id/setup_username"
android:layout_width="match_parent"
android:layout_height="40dp"
android:inputType="textEmailAddress"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:singleLine="true"
android:textColor="@android:color/black"
android:background="@drawable/resizable_textfield" />
<TextView
android:textSize="16sp"
android:paddingTop="10dp"
android:textColor="@color/colorD"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAllCaps="true"
android:text="@string/setup_password_hint"/>
<EditText
android:textCursorDrawable="@null"
android:id="@+id/setup_password"
android:layout_width="match_parent"
android:layout_height="40dp"
android:inputType="textPassword"
android:layout_marginTop="5dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:singleLine="true"
android:textColor="@android:color/black"
android:background="@drawable/resizable_textfield" />
<RelativeLayout
android:id="@+id/setup_apply_button"
android:layout_marginTop="10dp"
android:layout_marginTop="20dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:contentDescription="@string/content_description_validate"
android:id="@+id/setup_apply"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/button"
android:layout_centerInParent="true" />
<TextView
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_apply"
android:textColor="@android:color/black"/>
<Button
android:id="@+id/setup_apply"
android:layout_width="wrap_content"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:textAllCaps="true"
android:layout_centerInParent="true"
android:layout_height="wrap_content"
android:textColor="@android:color/black"
android:contentDescription="@string/content_description_validate"
android:background="@drawable/resizable_assistant_button_2"
android:text="@string/setup_apply"
android:layout_centerVertical="true"/>
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="10dp"
android:paddingRight="10dp" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

164
res/layout/setup_menu.xml
View file

@ -2,130 +2,102 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:orientation="vertical"
android:weightSum="1">
<TextView
android:paddingTop="40dp"
android:textSize="20sp"
android:paddingTop="20dp"
android:textSize="30sp"
android:textStyle="bold"
android:textColor="@android:color/black"
android:layout_gravity="center"
android:textColor="@color/footer_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_title_assistant"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="40dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_margin="20dp"
android:layout_gravity="center"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="0.7"
android:paddingLeft="10dp"
android:paddingRight="10dp">
<ImageView
android:id="@+id/setup_create_account"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/button"
android:contentDescription="@string/setup_create_account"
android:layout_centerInParent="true" />
<TextView
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_create_account"
android:textColor="@android:color/black"/>
android:layout_height="wrap_content"
android:padding="10dp">
<Button
android:id="@+id/setup_create_account"
android:layout_centerInParent="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@android:color/black"
android:textAllCaps="true"
android:contentDescription="@string/setup_create_account"
android:background="@drawable/resizable_assistant_button_2"
android:text="@string/setup_create_account"/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/setup_login_linphone_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="0.7"
android:paddingLeft="10dp"
android:paddingRight="10dp">
<ImageView
android:id="@+id/setup_login_linphone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/button"
android:contentDescription="@string/setup_login_linphone"
android:layout_centerInParent="true" />
<TextView
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_login_linphone"
android:textColor="@android:color/black"/>
android:layout_height="wrap_content"
android:padding="10dp">
<Button
android:id="@+id/setup_login_linphone"
android:layout_centerInParent="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAllCaps="true"
android:textColor="@android:color/black"
android:contentDescription="@string/setup_login_linphone"
android:background="@drawable/resizable_assistant_button_2"
android:text="@string/setup_login_linphone"/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/setup_login_generic_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="0.7"
android:paddingLeft="10dp"
android:paddingRight="10dp">
<ImageView
android:id="@+id/setup_login_generic"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/button"
android:contentDescription="@string/setup_login_generic"
android:layout_centerInParent="true" />
<TextView
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_login_generic"
android:textColor="@android:color/black"/>
android:layout_height="wrap_content"
android:padding="10dp">
<Button
android:id="@+id/setup_login_generic"
android:layout_centerInParent="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@android:color/black"
android:textAllCaps="true"
android:contentDescription="@string/setup_login_generic"
android:background="@drawable/resizable_assistant_button_2"
android:text="@string/setup_login_generic"/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/setup_remote_provisioning_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="0.7"
android:paddingLeft="10dp"
android:paddingRight="10dp">
<ImageView
android:id="@+id/setup_remote_provisioning"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/button"
android:contentDescription="@string/setup_remote_provisioning"
android:layout_centerInParent="true" />
<TextView
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_remote_provisioning"
android:textColor="@android:color/black"/>
android:layout_height="wrap_content"
android:padding="10dp">
<Button
android:id="@+id/setup_remote_provisioning"
android:layout_centerInParent="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@android:color/black"
android:textAllCaps="true"
android:contentDescription="@string/setup_remote_provisioning"
android:background="@drawable/resizable_assistant_button_2"
android:text="@string/setup_remote_provisioning"/>
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="0.5"
android:paddingLeft="10dp"
android:paddingRight="10dp" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

28
res/layout/setup_next_button.xml
View file

@ -1,28 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/setup_next"
android:layout_weight="0.5"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/image"
android:contentDescription="@string/content_description_next"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@drawable/setup_next"
android:adjustViewBounds="true"
android:scaleType="fitXY" />
<TextView
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_alignBottom="@id/image"
android:paddingBottom="10dp"
android:textColor="@drawable/text_color"
android:text="@string/button_setup_next" />
</RelativeLayout>

87
res/layout/setup_remote_provisioning.xml
View file

@ -3,76 +3,71 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:contentDescription="@string/content_description_welcome"
android:paddingTop="40dp"
android:textSize="20sp"
android:textStyle="bold"
android:textColor="@android:color/black"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_title_assistant"/>
<TextView
android:paddingTop="10dp"
android:gravity="center"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/setup_remote_provisioning_hint"
android:textColor="@android:color/black"/>
<TextView
android:contentDescription="@string/content_description_welcome"
android:paddingTop="20dp"
android:textSize="30sp"
android:textStyle="bold"
android:layout_gravity="center"
android:textColor="@color/footer_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_remote_provisioning_hint"
android:gravity="center_horizontal"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="40dp"
android:paddingTop="20dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:gravity="center"
android:orientation="vertical">
<TextView
android:textSize="16sp"
android:paddingTop="10dp"
android:textColor="@color/colorD"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAllCaps="true"
android:text="@string/setup_remote_provisioning_url_hint"/>
<EditText
android:textCursorDrawable="@null"
android:id="@+id/setup_remote_provisioning_url"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/setup_remote_provisioning_url_hint"
android:layout_height="40dp"
android:inputType="textUri"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:singleLine="true"
android:textColor="@android:color/black"
android:background="@drawable/setup_field_background" />
android:background="@drawable/resizable_textfield" />
<RelativeLayout
android:id="@+id/setup_apply_button"
android:layout_marginTop="10dp"
android:layout_marginTop="20dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:contentDescription="@string/content_description_validate"
android:id="@+id/setup_apply"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/button"
android:layout_centerInParent="true" />
<TextView
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_apply"
android:textColor="@android:color/black"/>
<Button
android:id="@+id/setup_apply"
android:layout_width="wrap_content"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:textAllCaps="true"
android:layout_centerInParent="true"
android:layout_height="wrap_content"
android:textColor="@android:color/black"
android:contentDescription="@string/content_description_validate"
android:background="@drawable/resizable_assistant_button_2"
android:text="@string/setup_apply"
android:layout_centerVertical="true"/>
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="10dp"
android:paddingRight="10dp" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

52
res/layout/setup_remote_provisioning_login.xml
View file

@ -1,42 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:background="@drawable/background"
android:background="@color/background"
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/mark"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:orientation="horizontal">
<ImageView
android:contentDescription="@string/content_description_mark"
android:visibility="invisible"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@drawable/setup_mark"
android:adjustViewBounds="true"
android:scaleType="fitXY"
android:layout_weight="0.5"/>
<ImageView
android:contentDescription="@string/content_description_mark"
android:visibility="invisible"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@drawable/setup_mark"
android:adjustViewBounds="true"
android:scaleType="fitXY"
android:layout_weight="0.5"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/background"
android:padding="20dp"
android:layout_above="@id/mark"
android:orientation="vertical">
@ -79,7 +49,7 @@
android:paddingRight="10dp"
android:singleLine="true"
android:textColor="@color/edittextcolor"
android:background="@drawable/setup_field_background" />
android:background="@drawable/resizable_textfield" />
<EditText
android:textCursorDrawable="@null"
@ -93,7 +63,7 @@
android:paddingRight="10dp"
android:singleLine="true"
android:textColor="@color/edittextcolor"
android:background="@drawable/setup_field_background" />
android:background="@drawable/resizable_textfield" />
<EditText
android:textCursorDrawable="@null"
@ -107,15 +77,9 @@
android:paddingRight="10dp"
android:singleLine="true"
android:textColor="@color/edittextcolor"
android:background="@drawable/setup_field_background" />
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="10dp"
android:paddingRight="10dp" />
</LinearLayout>
android:background="@drawable/resizable_textfield" />
</LinearLayout>
</LinearLayout>
@ -125,10 +89,6 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:orientation="horizontal">
<include layout="@layout/setup_cancel_button" />
<include layout="@layout/setup_next_button" />
</LinearLayout>

53
res/layout/setup_toolbar.xml Normal file
View file

@ -0,0 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/toolbar"
android:background="@color/button_addContact"
android:layout_width="match_parent"
android:layout_height="60dp">
<RelativeLayout
android:id="@+id/setup_back"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentLeft="true">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_centerInParent="true"
android:contentDescription="@string/content_description_back"
android:src="@drawable/back" />
</RelativeLayout>
<TextView
android:id="@+id/toolbar_text"
android:text="@string/setup_title"
android:textColor="@color/footer_select"
android:textSize="28sp"
android:textAllCaps="true"
android:textStyle="bold"
android:paddingLeft="10dp"
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"/>
<RelativeLayout
android:id="@+id/setup_cancel"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentRight="true">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:contentDescription="@string/content_description_dialer"
android:layout_centerInParent="true"
android:src="@drawable/dialer_back" />
</RelativeLayout>
</RelativeLayout>

22
res/layout/setup_welcome.xml
View file

@ -1,22 +0,0 @@
<?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" >
<ImageView
android:contentDescription="@string/content_description_welcome"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="0.3"
android:src="@drawable/setup_welcome_logo"/>
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="0.7"
android:text="@string/setup_welcome"
android:gravity="center"
android:textColor="@android:color/black" />
</LinearLayout>

142
res/layout/setup_wizard.xml
View file

@ -3,16 +3,26 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
<TextView
android:contentDescription="@string/content_description_welcome"
android:paddingTop="40dp"
android:textSize="20sp"
android:textStyle="bold"
android:textColor="@android:color/black"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_title_assistant"/>
<TextView
android:contentDescription="@string/content_description_welcome"
android:paddingTop="20dp"
android:textSize="30sp"
android:textStyle="bold"
android:layout_gravity="center"
android:textColor="@color/footer_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_create_account"
android:gravity="center_horizontal"/>
<TextView
android:textSize="20sp"
android:layout_gravity="center"
android:textColor="@color/footer_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_create_account_part_1"/>
<TextView
android:paddingTop="10dp"
@ -25,28 +35,33 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="40dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:gravity="center"
android:orientation="vertical">
<TextView
android:textSize="16sp"
android:textColor="@color/colorD"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAllCaps="true"
android:text="@string/setup_username_hint"/>
<RelativeLayout
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:textCursorDrawable="@null"
android:id="@+id/setup_username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/setup_username_hint"
android:layout_height="40dp"
android:inputType="textEmailAddress"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:padding="10dp"
android:singleLine="true"
android:textColor="@android:color/black"
android:background="@drawable/setup_field_background" />
android:background="@drawable/resizable_textfield" />
<ImageView
android:contentDescription="@string/content_description_setup_ok"
@ -59,9 +74,17 @@
android:src="@drawable/wizard_notok"/>
</RelativeLayout>
<TextView
android:textSize="16sp"
android:paddingTop="10dp"
android:textColor="@color/colorD"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAllCaps="true"
android:text="@string/setup_password_hint"/>
<RelativeLayout
android:layout_marginTop="5dp"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
@ -69,14 +92,13 @@
android:textCursorDrawable="@null"
android:id="@+id/setup_password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/setup_password_hint"
android:layout_height="40dp"
android:inputType="textPassword"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:singleLine="true"
android:textColor="@android:color/black"
android:background="@drawable/setup_field_background" />
android:background="@drawable/resizable_textfield" />
<ImageView
android:contentDescription="@string/content_description_setup_ok"
@ -89,9 +111,17 @@
android:src="@drawable/wizard_notok"/>
</RelativeLayout>
<TextView
android:textSize="16sp"
android:paddingTop="10dp"
android:textColor="@color/colorD"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAllCaps="true"
android:text="@string/setup_password_confirm_hint"/>
<RelativeLayout
android:layout_marginTop="5dp"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
@ -99,14 +129,13 @@
android:textCursorDrawable="@null"
android:id="@+id/setup_password_confirm"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/setup_password_confirm_hint"
android:layout_height="40dp"
android:inputType="textPassword"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:singleLine="true"
android:textColor="@android:color/black"
android:background="@drawable/setup_field_background" />
android:background="@drawable/resizable_textfield" />
<ImageView
android:contentDescription="@string/content_description_setup_ok"
@ -119,9 +148,17 @@
android:src="@drawable/wizard_notok"/>
</RelativeLayout>
<TextView
android:textSize="16sp"
android:paddingTop="10dp"
android:textColor="@color/colorD"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAllCaps="true"
android:text="@string/setup_email_hint"/>
<RelativeLayout
android:layout_marginTop="5dp"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
@ -129,14 +166,13 @@
android:textCursorDrawable="@null"
android:id="@+id/setup_email"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/setup_email_hint"
android:layout_height="40dp"
android:inputType="textEmailAddress"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:singleLine="true"
android:textColor="@android:color/black"
android:background="@drawable/setup_field_background" />
android:background="@drawable/resizable_textfield" />
<ImageView
android:contentDescription="@string/content_description_setup_ok"
@ -152,32 +188,24 @@
<RelativeLayout
android:layout_marginTop="10dp"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageView
android:contentDescription="@string/content_description_validate"
android:id="@+id/setup_create"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/button"
android:layout_centerInParent="true" />
<TextView
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_create"
android:textColor="@android:color/black"/>
<Button
android:id="@+id/setup_create"
android:layout_width="wrap_content"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:textAllCaps="true"
android:layout_height="wrap_content"
android:textColor="@android:color/black"
android:contentDescription="@string/content_description_validate"
android:background="@drawable/resizable_assistant_button_2"
android:text="@string/setup_create"
android:layout_centerVertical="true"/>
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="10dp"
android:paddingRight="10dp" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

61
res/layout/setup_wizard_confirm.xml
View file

@ -4,38 +4,45 @@
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical" >
<ImageView
android:paddingTop="40dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/setup_title_assistant"/>
<TextView
android:paddingTop="40dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_validate_account"
android:textColor="@android:color/black" />
<TextView
android:contentDescription="@string/content_description_welcome"
android:paddingTop="20dp"
android:textSize="30sp"
android:textStyle="bold"
android:layout_gravity="center"
android:textColor="@color/footer_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_create_account"
android:gravity="center_horizontal"/>
<TextView
android:textSize="20sp"
android:layout_gravity="center"
android:textColor="@color/footer_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_create_account_part_2"/>
<RelativeLayout
android:layout_marginTop="20dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/setup_check"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/button"
android:layout_centerInParent="true" />
<TextView
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_check_account_validation"
android:textColor="@android:color/black" />
<Button
android:id="@+id/setup_check"
android:layout_width="wrap_content"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:textAllCaps="true"
android:layout_centerInParent="true"
android:layout_height="wrap_content"
android:textColor="@android:color/black"
android:contentDescription="@string/setup_check_account_validation"
android:background="@drawable/resizable_assistant_button_2"
android:text="@string/setup_create"
android:layout_centerVertical="true"/>
</RelativeLayout>

5
src/org/linphone/setup/GenericLoginFragment.java
View file

@ -25,6 +25,7 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.Toast;
@ -33,7 +34,7 @@ import android.widget.Toast;
*/
public class GenericLoginFragment extends Fragment implements OnClickListener {
private EditText login, password, domain;
private ImageView apply;
private Button apply;
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
@ -43,7 +44,7 @@ public class GenericLoginFragment extends Fragment implements OnClickListener {
login = (EditText) view.findViewById(R.id.setup_username);
password = (EditText) view.findViewById(R.id.setup_password);
domain = (EditText) view.findViewById(R.id.setup_domain);
apply = (ImageView) view.findViewById(R.id.setup_apply);
apply = (Button) view.findViewById(R.id.setup_apply);
apply.setOnClickListener(this);
return view;

5
src/org/linphone/setup/LinphoneLoginFragment.java
View file

@ -25,6 +25,7 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.Toast;
@ -33,7 +34,7 @@ import android.widget.Toast;
*/
public class LinphoneLoginFragment extends Fragment implements OnClickListener {
private EditText login, password;
private ImageView apply;
private Button apply;
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
@ -42,7 +43,7 @@ public class LinphoneLoginFragment extends Fragment implements OnClickListener {
login = (EditText) view.findViewById(R.id.setup_username);
password = (EditText) view.findViewById(R.id.setup_password);
apply = (ImageView) view.findViewById(R.id.setup_apply);
apply = (Button) view.findViewById(R.id.setup_apply);
apply.setOnClickListener(this);
if (getResources().getBoolean(R.bool.setup_use_linphone_as_first_fragment)) {

11
src/org/linphone/setup/MenuFragment.java
View file

@ -25,36 +25,37 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ImageView;
/**
* @author Sylvain Berfini
*/
public class MenuFragment extends Fragment implements OnClickListener {
private ImageView createAccount, logLinphoneAccount, logGenericAccount, remoteProvisioning;
private Button createAccount, logLinphoneAccount, logGenericAccount, remoteProvisioning;
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.setup_menu, container, false);
createAccount = (ImageView) view.findViewById(R.id.setup_create_account);
createAccount = (Button) view.findViewById(R.id.setup_create_account);
createAccount.setOnClickListener(this);
logLinphoneAccount = (ImageView) view.findViewById(R.id.setup_login_linphone);
logLinphoneAccount = (Button) view.findViewById(R.id.setup_login_linphone);
if (getResources().getBoolean(R.bool.hide_linphone_accounts_wizard)) {
view.findViewById(R.id.setup_login_linphone_layout).setVisibility(View.GONE);
} else {
logLinphoneAccount.setOnClickListener(this);
}
logGenericAccount = (ImageView) view.findViewById(R.id.setup_login_generic);
logGenericAccount = (Button) view.findViewById(R.id.setup_login_generic);
if (getResources().getBoolean(R.bool.hide_generic_accounts_wizard)) {
view.findViewById(R.id.setup_login_generic_layout).setVisibility(View.GONE);
} else {
logGenericAccount.setOnClickListener(this);
}
remoteProvisioning = (ImageView) view.findViewById(R.id.setup_remote_provisioning);
remoteProvisioning = (Button) view.findViewById(R.id.setup_remote_provisioning);
if (getResources().getBoolean(R.bool.hide_remote_provisioning_in_wizard)) {
view.findViewById(R.id.setup_remote_provisioning_layout).setVisibility(View.GONE);
} else {

5
src/org/linphone/setup/RemoteProvisioningFragment.java
View file

@ -12,12 +12,13 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageView;
public class RemoteProvisioningFragment extends Fragment implements OnClickListener {
private EditText remoteProvisioningUrl;
private ImageView apply;
private Button apply;
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
@ -25,7 +26,7 @@ public class RemoteProvisioningFragment extends Fragment implements OnClickListe
View view = inflater.inflate(R.layout.setup_remote_provisioning, container, false);
remoteProvisioningUrl = (EditText) view.findViewById(R.id.setup_remote_provisioning_url);
apply = (ImageView) view.findViewById(R.id.setup_apply);
apply = (Button) view.findViewById(R.id.setup_apply);
apply.setOnClickListener(this);
return view;

16
src/org/linphone/setup/RemoteProvisioningLoginActivity.java
View file

@ -40,7 +40,7 @@ import android.widget.Toast;
*/
public class RemoteProvisioningLoginActivity extends Activity implements OnClickListener {
private EditText login, password, domain;
private RelativeLayout next, cancel;
private RelativeLayout cancel;
@Override
public void onCreate(Bundle savedInstanceState) {
@ -50,9 +50,7 @@ public class RemoteProvisioningLoginActivity extends Activity implements OnClick
login = (EditText) findViewById(R.id.setup_username);
password = (EditText) findViewById(R.id.setup_password);
domain = (EditText) findViewById(R.id.setup_domain);
next = (RelativeLayout) findViewById(R.id.setup_next);
next.setOnClickListener(this);
cancel = (RelativeLayout) findViewById(R.id.setup_cancel);
cancel.setOnClickListener(this);
@ -97,15 +95,7 @@ public class RemoteProvisioningLoginActivity extends Activity implements OnClick
public void onClick(View v) {
int id = v.getId();
if (id == R.id.setup_next) {
if (login.getText() == null || login.length() == 0 || password.getText() == null || password.length() == 0 || domain.getText() == null || domain.length() == 0) {
Toast.makeText(this, getString(R.string.first_launch_no_login_password), Toast.LENGTH_LONG).show();
return;
}
storeAccount(login.getText().toString(), password.getText().toString(), domain.getText().toString());
cancelWizard(true);
} else if (id == R.id.setup_cancel) {
if (id == R.id.setup_cancel) {
cancelWizard(false);
}
}

49
src/org/linphone/setup/SetupActivity.java
View file

@ -47,7 +47,7 @@ import android.widget.Toast;
*/
public class SetupActivity extends Activity implements OnClickListener {
private static SetupActivity instance;
private RelativeLayout back, next, cancel;
private RelativeLayout back, cancel;
private SetupFragmentsEnum currentFragment;
private SetupFragmentsEnum firstFragment;
private Fragment fragment;
@ -65,7 +65,7 @@ public class SetupActivity extends Activity implements OnClickListener {
setContentView(R.layout.setup);
firstFragment = getResources().getBoolean(R.bool.setup_use_linphone_as_first_fragment) ?
SetupFragmentsEnum.LINPHONE_LOGIN : SetupFragmentsEnum.WELCOME;
SetupFragmentsEnum.LINPHONE_LOGIN : SetupFragmentsEnum.MENU;
if (findViewById(R.id.fragmentContainer) != null) {
if (savedInstanceState == null) {
display(firstFragment);
@ -130,8 +130,6 @@ public class SetupActivity extends Activity implements OnClickListener {
private void initUI() {
back = (RelativeLayout) findViewById(R.id.setup_back);
back.setOnClickListener(this);
next = (RelativeLayout) findViewById(R.id.setup_next);
next.setOnClickListener(this);
cancel = (RelativeLayout) findViewById(R.id.setup_cancel);
cancel.setOnClickListener(this);
}
@ -157,22 +155,6 @@ public class SetupActivity extends Activity implements OnClickListener {
setResult(Activity.RESULT_CANCELED);
finish();
}
} else if (id == R.id.setup_next) {
if (firstFragment == SetupFragmentsEnum.LINPHONE_LOGIN) {
LinphoneLoginFragment linphoneFragment = (LinphoneLoginFragment) fragment;
linphoneFragment.linphoneLogIn();
} else {
if (currentFragment == SetupFragmentsEnum.WELCOME) {
MenuFragment fragment = new MenuFragment();
changeFragment(fragment);
currentFragment = SetupFragmentsEnum.MENU;
next.setVisibility(View.GONE);
back.setVisibility(View.VISIBLE);
} else if (currentFragment == SetupFragmentsEnum.WIZARD_CONFIRM) {
finish();
}
}
} else if (id == R.id.setup_back) {
onBackPressed();
}
@ -188,22 +170,14 @@ public class SetupActivity extends Activity implements OnClickListener {
setResult(Activity.RESULT_CANCELED);
finish();
}
}
if (currentFragment == SetupFragmentsEnum.MENU) {
WelcomeFragment fragment = new WelcomeFragment();
changeFragment(fragment);
currentFragment = SetupFragmentsEnum.WELCOME;
next.setVisibility(View.VISIBLE);
back.setVisibility(View.GONE);
} else if (currentFragment == SetupFragmentsEnum.GENERIC_LOGIN
} else if (currentFragment == SetupFragmentsEnum.GENERIC_LOGIN
|| currentFragment == SetupFragmentsEnum.LINPHONE_LOGIN
|| currentFragment == SetupFragmentsEnum.WIZARD
|| currentFragment == SetupFragmentsEnum.REMOTE_PROVISIONING) {
MenuFragment fragment = new MenuFragment();
changeFragment(fragment);
currentFragment = SetupFragmentsEnum.MENU;
} else if (currentFragment == SetupFragmentsEnum.WELCOME) {
} else if (currentFragment == SetupFragmentsEnum.MENU) {
finish();
}
}
@ -217,8 +191,6 @@ public class SetupActivity extends Activity implements OnClickListener {
changeFragment(fragment);
currentFragment = SetupFragmentsEnum.ECHO_CANCELLER_CALIBRATION;
back.setVisibility(View.VISIBLE);
next.setVisibility(View.GONE);
next.setEnabled(false);
cancel.setEnabled(false);
} else {
if (mPrefs.isFirstLaunch()) {
@ -259,8 +231,8 @@ public class SetupActivity extends Activity implements OnClickListener {
private void display(SetupFragmentsEnum fragment) {
switch (fragment) {
case WELCOME:
displayWelcome();
case MENU:
displayMenu();
break;
case LINPHONE_LOGIN:
displayLoginLinphone();
@ -270,10 +242,10 @@ public class SetupActivity extends Activity implements OnClickListener {
}
}
public void displayWelcome() {
fragment = new WelcomeFragment();
public void displayMenu() {
fragment = new MenuFragment();
changeFragment(fragment);
currentFragment = SetupFragmentsEnum.WELCOME;
currentFragment = SetupFragmentsEnum.MENU;
}
public void displayLoginGeneric() {
@ -382,9 +354,6 @@ public class SetupActivity extends Activity implements OnClickListener {
changeFragment(fragment);
currentFragment = SetupFragmentsEnum.WIZARD_CONFIRM;
next.setVisibility(View.VISIBLE);
next.setEnabled(false);
back.setVisibility(View.GONE);
}

1
src/org/linphone/setup/SetupFragmentsEnum.java
View file

@ -21,7 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* @author Sylvain Berfini
*/
public enum SetupFragmentsEnum {
WELCOME,
MENU,
WIZARD,
WIZARD_CONFIRM,

38
src/org/linphone/setup/WelcomeFragment.java
View file

@ -1,38 +0,0 @@
package org.linphone.setup;
/*
WelcomeFragment.java
Copyright (C) 2012 Belledonne Communications, Grenoble, France
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
import org.linphone.R;
import android.app.Fragment;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
/**
* @author Sylvain Berfini
*/
public class WelcomeFragment extends Fragment {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.setup_welcome, container, false);
return view;
}
}

3
src/org/linphone/setup/WizardConfirmFragment.java
View file

@ -28,6 +28,7 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.Toast;
import de.timroes.axmlrpc.XMLRPCCallback;
@ -48,7 +49,7 @@ public class WizardConfirmFragment extends Fragment {
username = getArguments().getString("Username");
ImageView checkAccount = (ImageView) view.findViewById(R.id.setup_check);
Button checkAccount = (Button) view.findViewById(R.id.setup_check);
checkAccount.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {

5
src/org/linphone/setup/WizardFragment.java
View file

@ -43,6 +43,7 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.TextView;
@ -61,7 +62,7 @@ public class WizardFragment extends Fragment {
private boolean passwordOk = false;
private boolean emailOk = false;
private boolean confirmPasswordOk = false;
private ImageView createAccount;
private Button createAccount;
private TextView errorMessage;
private char[] acceptedChars = new char[]{ 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
@ -120,7 +121,7 @@ public class WizardFragment extends Fragment {
errorMessage = (TextView) view.findViewById(R.id.setup_error);
createAccount = (ImageView) view.findViewById(R.id.setup_create);
createAccount = (Button) view.findViewById(R.id.setup_create);
createAccount.setEnabled(false);
createAccount.setOnClickListener(new OnClickListener() {
public void onClick(View v) {