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

Update assistant

Browse source
This commit is contained in:
Margaux Clerc 2015-09-01 11:18:37 +02:00
parent 3eca96e3c5
commit 4c895ecb51
19 changed files with 151 additions and 195 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
res/drawable-xhdpi/resizable_assistant_button_over.9.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 506 B

8
res/drawable/assistant_button.xml Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/resizable_assistant_button_over" />
<item
android:drawable="@drawable/resizable_assistant_button" />
</selector>

7
res/drawable/menu_burger.xml Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false"
android:drawable="@drawable/menu_disabled" />
<item
android:drawable="@drawable/menu" />
</selector>

5
res/drawable/menu_disabled.xml Normal file
View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<bitmap
xmlns:android="http://schemas.android.com/apk/res/android"
android:src="@drawable/menu"
android:alpha="0.3" />

9
res/layout/assistant.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:background="@color/colorH" android:background="@color/colorH"
android:layout_height="match_parent"> android:layout_height="match_parent">
@ -9,7 +10,13 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<include layout="@layout/status" android:id="@+id/status" /> <fragment
android:id="@+id/status"
android:name="org.linphone.StatusFragment"
android:layout_width="match_parent"
android:layout_height="40dp"
tools:layout="@layout/status" />
<include layout="@layout/assistant_toolbar" android:id="@+id/toolbar" /> <include layout="@layout/assistant_toolbar" android:id="@+id/toolbar" />
<LinearLayout <LinearLayout

65
res/layout/assistant_account_creation.xml
View file

@ -46,10 +46,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText <EditText
android:id="@+id/assistant_username" android:id="@+id/assistant_username"
android:background="@drawable/resizable_textfield" android:background="@drawable/resizable_textfield"
@ -62,18 +58,6 @@
android:paddingRight="10dp" android:paddingRight="10dp"
android:singleLine="true"/> android:singleLine="true"/>
<ImageView
android:id="@+id/assistant_username_ok"
android:src="@drawable/wizard_notok"
android:contentDescription="@string/content_description_setup_ok"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="5dp"
android:layout_centerVertical="true"
android:layout_alignParentRight="true" />
</RelativeLayout>
<TextView <TextView
android:text="@string/password" android:text="@string/password"
style="@style/font13" style="@style/font13"
@ -82,9 +66,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText <EditText
android:id="@+id/assistant_password" android:id="@+id/assistant_password"
@ -98,19 +79,6 @@
android:paddingRight="10dp" android:paddingRight="10dp"
android:singleLine="true"/> android:singleLine="true"/>
<ImageView
android:id="@+id/assistant_password_ok"
android:src="@drawable/wizard_notok"
android:contentDescription="@string/content_description_setup_ok"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="5dp"
android:layout_centerVertical="true"
android:layout_alignParentRight="true" />
</RelativeLayout>
<TextView <TextView
android:text="@string/assistant_password_confirm" android:text="@string/assistant_password_confirm"
style="@style/font13" style="@style/font13"
@ -119,9 +87,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText <EditText
android:id="@+id/assistant_password_confirm" android:id="@+id/assistant_password_confirm"
@ -135,18 +100,6 @@
android:paddingRight="10dp" android:paddingRight="10dp"
android:singleLine="true"/> android:singleLine="true"/>
<ImageView
android:id="@+id/assistant_confirm_password_ok"
android:src="@drawable/wizard_notok"
android:contentDescription="@string/content_description_setup_ok"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="5dp"
android:layout_centerVertical="true"
android:layout_alignParentRight="true" />
</RelativeLayout>
<TextView <TextView
android:text="@string/email" android:text="@string/email"
style="@style/font13" style="@style/font13"
@ -155,10 +108,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText <EditText
android:id="@+id/assistant_email" android:id="@+id/assistant_email"
android:background="@drawable/resizable_textfield" android:background="@drawable/resizable_textfield"
@ -171,18 +120,6 @@
android:paddingRight="10dp" android:paddingRight="10dp"
android:singleLine="true"/> android:singleLine="true"/>
<ImageView
android:id="@+id/assistant_email_ok"
android:src="@drawable/wizard_notok"
android:contentDescription="@string/content_description_setup_ok"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="5dp"
android:layout_centerVertical="true"
android:layout_alignParentRight="true" />
</RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -191,7 +128,7 @@
<Button <Button
android:id="@+id/assistant_create" android:id="@+id/assistant_create"
android:text="@string/assistant_create" android:text="@string/assistant_create"
android:background="@drawable/resizable_assistant_button" android:background="@drawable/assistant_button"
style="@style/font8" style="@style/font8"
android:contentDescription="@string/content_description_validate" android:contentDescription="@string/content_description_validate"
android:layout_width="wrap_content" android:layout_width="wrap_content"

2
res/layout/assistant_account_creation_confirm.xml
View file

@ -31,7 +31,7 @@
<Button <Button
android:id="@+id/assistant_check" android:id="@+id/assistant_check"
android:text="@string/assistant_create" android:text="@string/assistant_create"
android:background="@drawable/resizable_assistant_button" android:background="@drawable/assistant_button"
style="@style/font8" style="@style/font8"
android:contentDescription="@string/content_description_validate" android:contentDescription="@string/content_description_validate"
android:layout_width="wrap_content" android:layout_width="wrap_content"

29
res/layout/assistant_ec_calibration.xml
View file

@ -4,14 +4,23 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" > android:orientation="vertical" >
<TextView
android:text="@string/assistant_ec_calibration"
android:contentDescription="@string/content_description_welcome"
style="@style/font6"
android:textAllCaps="true"
android:paddingTop="20dp"
android:layout_gravity="center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_horizontal"/>
<ImageView <ImageView
android:contentDescription="@string/content_description_welcome" android:contentDescription="@string/content_description_welcome"
android:layout_width="match_parent" android:layout_width="200dp"
android:layout_height="match_parent" android:layout_height="200dp"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:src="@drawable/logo"/> android:src="@drawable/linphone_orange"/>
<ProgressBar <ProgressBar
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -19,14 +28,4 @@
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" /> android:layout_centerHorizontal="true" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@android:color/black"
android:textStyle="bold"
android:textSize="20dp"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:text="@string/setup_ec_calibration" />
</RelativeLayout> </RelativeLayout>

4
res/layout/assistant_generic_login.xml
View file

@ -87,7 +87,7 @@
android:singleLine="true"/> android:singleLine="true"/>
<TextView <TextView
android:text="@string/display_name" android:text="@string/assistant_display_name"
style="@style/font13" style="@style/font13"
android:textAllCaps="true" android:textAllCaps="true"
android:paddingTop="10dp" android:paddingTop="10dp"
@ -114,7 +114,7 @@
<Button <Button
android:id="@+id/assistant_apply" android:id="@+id/assistant_apply"
android:text="@string/assistant_apply" android:text="@string/assistant_apply"
android:background="@drawable/resizable_assistant_button" android:background="@drawable/assistant_button"
style="@style/font8" style="@style/font8"
android:contentDescription="@string/content_description_validate" android:contentDescription="@string/content_description_validate"
android:layout_width="wrap_content" android:layout_width="wrap_content"

4
res/layout/assistant_linphone_login.xml
View file

@ -65,7 +65,7 @@
android:singleLine="true"/> android:singleLine="true"/>
<TextView <TextView
android:text="@string/display_name" android:text="@string/assistant_display_name"
style="@style/font13" style="@style/font13"
android:textAllCaps="true" android:textAllCaps="true"
android:paddingTop="10dp" android:paddingTop="10dp"
@ -92,7 +92,7 @@
<Button <Button
android:id="@+id/assistant_apply" android:id="@+id/assistant_apply"
android:text="@string/assistant_apply" android:text="@string/assistant_apply"
android:background="@drawable/resizable_assistant_button" android:background="@drawable/assistant_button"
style="@style/font8" style="@style/font8"
android:contentDescription="@string/content_description_validate" android:contentDescription="@string/content_description_validate"
android:layout_width="wrap_content" android:layout_width="wrap_content"

27
res/layout/assistant_menu.xml
View file

@ -27,11 +27,11 @@
android:padding="10dp"> android:padding="10dp">
<Button <Button
android:id="@+id/setup_create_account" android:id="@+id/create_account"
android:text="@string/assistant_create_account" android:text="@string/assistant_create_account"
android:background="@drawable/resizable_assistant_button" android:background="@drawable/assistant_button"
style="@style/font8" style="@style/font8"
android:contentDescription="@string/setup_create_account" android:contentDescription="@string/assistant_create_account"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerInParent="true"/> android:layout_centerInParent="true"/>
@ -39,17 +39,16 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/setup_login_linphone_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="10dp"> android:padding="10dp">
<Button <Button
android:id="@+id/setup_login_linphone" android:id="@+id/login_linphone"
android:text="@string/assistant_login_linphone" android:text="@string/assistant_login_linphone"
android:background="@drawable/resizable_assistant_button" android:background="@drawable/assistant_button"
style="@style/font8" style="@style/font8"
android:contentDescription="@string/setup_login_linphone" android:contentDescription="@string/assistant_login_linphone"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
@ -57,17 +56,16 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/setup_login_generic_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="10dp"> android:padding="10dp">
<Button <Button
android:id="@+id/setup_login_generic" android:id="@+id/login_generic"
android:text="@string/assistant_login_generic" android:text="@string/assistant_login_generic"
android:background="@drawable/resizable_assistant_button" android:background="@drawable/assistant_button"
style="@style/font8" style="@style/font8"
android:contentDescription="@string/setup_login_generic" android:contentDescription="@string/assistant_login_generic"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
@ -75,17 +73,16 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/setup_remote_provisioning_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="10dp"> android:padding="10dp">
<Button <Button
android:id="@+id/setup_remote_provisioning" android:id="@+id/remote_provisioning"
android:text="@string/assistant_remote_provisioning" android:text="@string/assistant_remote_provisioning"
android:background="@drawable/resizable_assistant_button" android:background="@drawable/assistant_button"
style="@style/font8" style="@style/font8"
android:contentDescription="@string/setup_remote_provisioning" android:contentDescription="@string/assistant_remote_provisioning"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>

4
res/layout/assistant_remote_provisioning.xml
View file

@ -33,7 +33,7 @@
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<EditText <EditText
android:id="@+id/setup_remote_provisioning_url" android:id="@+id/assistant_remote_provisioning_url"
android:background="@drawable/resizable_textfield" android:background="@drawable/resizable_textfield"
android:textColor="@color/colorB" android:textColor="@color/colorB"
android:textCursorDrawable="@null" android:textCursorDrawable="@null"
@ -52,7 +52,7 @@
<Button <Button
android:id="@+id/assistant_apply" android:id="@+id/assistant_apply"
android:text="@string/assistant_apply" android:text="@string/assistant_apply"
android:background="@drawable/resizable_assistant_button" android:background="@drawable/assistant_button"
style="@style/font8" style="@style/font8"
android:contentDescription="@string/content_description_validate" android:contentDescription="@string/content_description_validate"
android:layout_width="wrap_content" android:layout_width="wrap_content"

2
res/layout/assistant_remote_provisioning_login.xml
View file

@ -18,7 +18,7 @@
android:textColor="@android:color/black" android:textColor="@android:color/black"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/setup_title_assistant"/> android:text="@string/assistant_title"/>
<TextView <TextView
android:paddingTop="10dp" android:paddingTop="10dp"

4
res/values/strings.xml
View file

@ -27,11 +27,13 @@
<string name="assistant_create_account_title">Create an account</string> <string name="assistant_create_account_title">Create an account</string>
<string name="assistant_create_account_part_1">1/2</string> <string name="assistant_create_account_part_1">1/2</string>
<string name="assistant_create_account_part_2">2/2</string> <string name="assistant_create_account_part_2">2/2</string>
<string name="assistant_display_name">Display name (optional)</string>
<string name="assistant_linphone_account_title">Configure linphohe account</string> <string name="assistant_linphone_account_title">Configure linphohe account</string>
<string name="assistant_general_account_title">Configure Sip account</string> <string name="assistant_general_account_title">Configure Sip account</string>
<string name="assistant_remote_provisioning_title">Remote provisioning</string> <string name="assistant_remote_provisioning_title">Remote provisioning</string>
<string name="assistant_create">Create account</string> <string name="assistant_create">Create account</string>
<string name="assistant_apply">Apply</string> <string name="assistant_apply">Apply</string>
<string name="assistant_ec_calibration">Echo canceller calibration in progress</string>
<string name="assistant_password_confirm">Apply</string> <string name="assistant_password_confirm">Apply</string>
<!-- 1. Dailer --> <!-- 1. Dailer -->
@ -401,7 +403,7 @@
<string name="pref_auto_accept_friends_desc">Automatically accept new friend requests</string> <string name="pref_auto_accept_friends_desc">Automatically accept new friend requests</string>
<string name="linphone_friend_new_request_title">Friend request</string> <string name="linphone_friend_new_request_title">Friend request</string>
<string name="linphone_friend_new_request_desc">wants to share it\'s presence status with you and be aware of yours.</string> <string name="linphone_friend_new_request_desc">wants to share it\'s presence status with you and be aware of yours.</string>
<string name="setup_ec_calibration">Echo canceller calibration in progress</string>
<string name="pref_image_sharing_server_title">Sharing server</string> <string name="pref_image_sharing_server_title">Sharing server</string>
<string name="pref_remote_provisioning_title">Remote provisioning</string> <string name="pref_remote_provisioning_title">Remote provisioning</string>
<string name="delete_contact">Delete</string> <string name="delete_contact">Delete</string>

25
src/org/linphone/assistant/AssistantActivity.java
View file

@ -22,6 +22,7 @@ import org.linphone.LinphoneManager;
import org.linphone.LinphonePreferences; import org.linphone.LinphonePreferences;
import org.linphone.LinphonePreferences.AccountBuilder; import org.linphone.LinphonePreferences.AccountBuilder;
import org.linphone.R; import org.linphone.R;
import org.linphone.StatusFragment;
import org.linphone.core.LinphoneAddress; import org.linphone.core.LinphoneAddress;
import org.linphone.core.LinphoneAddress.TransportType; import org.linphone.core.LinphoneAddress.TransportType;
import org.linphone.core.LinphoneCore; import org.linphone.core.LinphoneCore;
@ -56,6 +57,7 @@ public class AssistantActivity extends Activity implements OnClickListener {
private boolean accountCreated = false; private boolean accountCreated = false;
private LinphoneCoreListenerBase mListener; private LinphoneCoreListenerBase mListener;
private LinphoneAddress address; private LinphoneAddress address;
private StatusFragment status;
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@ -65,10 +67,9 @@ public class AssistantActivity extends Activity implements OnClickListener {
} }
setContentView(R.layout.assistant); setContentView(R.layout.assistant);
initUI(); initUI();
firstFragment = getResources().getBoolean(R.bool.setup_use_linphone_as_first_fragment) ? firstFragment = getResources().getBoolean(R.bool.assistant_use_linphone_login_as_first_fragment) ?
AssistantFragmentsEnum.LINPHONE_LOGIN : AssistantFragmentsEnum.MENU; AssistantFragmentsEnum.LINPHONE_LOGIN : AssistantFragmentsEnum.MENU;
if (findViewById(R.id.fragmentContainer) != null) { if (findViewById(R.id.fragmentContainer) != null) {
if (savedInstanceState == null) { if (savedInstanceState == null) {
@ -95,7 +96,6 @@ public class AssistantActivity extends Activity implements OnClickListener {
} }
} }
}; };
instance = this; instance = this;
}; };
@ -129,16 +129,20 @@ public class AssistantActivity extends Activity implements OnClickListener {
return instance; return instance;
} }
public void updateStatusFragment(StatusFragment fragment) {
status = fragment;
}
private void initUI() { private void initUI() {
back = (RelativeLayout) findViewById(R.id.assistant_back); back = (RelativeLayout) findViewById(R.id.assistant_back);
back.setOnClickListener(this); back.setOnClickListener(this);
cancel = (RelativeLayout) findViewById(R.id.assistant_cancel); cancel = (RelativeLayout) findViewById(R.id.assistant_cancel);
cancel.setOnClickListener(this); cancel.setOnClickListener(this);
status.enableLeftMenu(false);
} }
private void changeFragment(Fragment newFragment) { private void changeFragment(Fragment newFragment) {
FragmentTransaction transaction = getFragmentManager().beginTransaction(); FragmentTransaction transaction = getFragmentManager().beginTransaction();
// transaction.addToBackStack("");
transaction.replace(R.id.fragmentContainer, newFragment); transaction.replace(R.id.fragmentContainer, newFragment);
transaction.commitAllowingStateLoss(); transaction.commitAllowingStateLoss();
} }
@ -194,9 +198,6 @@ public class AssistantActivity extends Activity implements OnClickListener {
back.setVisibility(View.VISIBLE); back.setVisibility(View.VISIBLE);
cancel.setEnabled(false); cancel.setEnabled(false);
} else { } else {
if (mPrefs.isFirstLaunch()) {
mPrefs.setEchoCancellation(LinphoneManager.getLc().hasBuiltInEchoCanceler());
}
success(); success();
} }
} }
@ -241,7 +242,6 @@ public class AssistantActivity extends Activity implements OnClickListener {
default: default:
throw new IllegalStateException("Can't handle " + fragment); throw new IllegalStateException("Can't handle " + fragment);
} }
back.setVisibility(View.VISIBLE);
} }
public void displayMenu() { public void displayMenu() {
@ -260,12 +260,19 @@ public class AssistantActivity extends Activity implements OnClickListener {
public void displayLoginLinphone() { public void displayLoginLinphone() {
fragment = new LinphoneLoginFragment(); fragment = new LinphoneLoginFragment();
//LinphoneManager.getInstance().loadConfig(R.raw.config_linphone_account);
//LinphoneManager.getInstance().resetLinphoneCore(this);
//Log.w(LinphoneManager.getLc().getConfig().getString("proxy_default_values","reg_proxy","loool"));
changeFragment(fragment); changeFragment(fragment);
currentFragment = AssistantFragmentsEnum.LINPHONE_LOGIN; currentFragment = AssistantFragmentsEnum.LINPHONE_LOGIN;
back.setVisibility(View.VISIBLE); back.setVisibility(View.VISIBLE);
} }
public void displayWizard() { public void displayCreateAccount() {
fragment = new CreateAccountFragment(); fragment = new CreateAccountFragment();
changeFragment(fragment); changeFragment(fragment);
currentFragment = AssistantFragmentsEnum.CREATE_ACCOUNT; currentFragment = AssistantFragmentsEnum.CREATE_ACCOUNT;

23
src/org/linphone/assistant/CreateAccountFragment.java
View file

@ -84,8 +84,7 @@ public class CreateAccountFragment extends Fragment {
View view = inflater.inflate(R.layout.assistant_account_creation, container, false); View view = inflater.inflate(R.layout.assistant_account_creation, container, false);
username = (EditText) view.findViewById(R.id.assistant_username); username = (EditText) view.findViewById(R.id.assistant_username);
ImageView usernameOkIV = (ImageView) view.findViewById(R.id.assistant_username_ok); addXMLRPCUsernameHandler(username, null);
addXMLRPCUsernameHandler(username, usernameOkIV);
inputFilterCharacters = new String(acceptedChars); inputFilterCharacters = new String(acceptedChars);
if (getResources().getBoolean(R.bool.allow_only_phone_numbers_in_wizard)) { if (getResources().getBoolean(R.bool.allow_only_phone_numbers_in_wizard)) {
@ -109,15 +108,11 @@ public class CreateAccountFragment extends Fragment {
password = (EditText) view.findViewById(R.id.assistant_password); password = (EditText) view.findViewById(R.id.assistant_password);
passwordConfirm = (EditText) view.findViewById(R.id.assistant_password_confirm); passwordConfirm = (EditText) view.findViewById(R.id.assistant_password_confirm);
ImageView passwordOkIV = (ImageView) view.findViewById(R.id.assistant_password_ok); addXMLRPCPasswordHandler(password, null);
addXMLRPCPasswordHandler(password, passwordOkIV); addXMLRPCConfirmPasswordHandler(password, passwordConfirm, null);
ImageView passwordConfirmOkIV = (ImageView) view.findViewById(R.id.assistant_confirm_password_ok);
addXMLRPCConfirmPasswordHandler(password, passwordConfirm, passwordConfirmOkIV);
email = (EditText) view.findViewById(R.id.assistant_email); email = (EditText) view.findViewById(R.id.assistant_email);
ImageView emailOkIV = (ImageView) view.findViewById(R.id.assistant_email_ok); addXMLRPCEmailHandler(email, null);
addXMLRPCEmailHandler(email, emailOkIV);
errorMessage = (TextView) view.findViewById(R.id.assistant_error); errorMessage = (TextView) view.findViewById(R.id.assistant_error);
@ -170,7 +165,6 @@ public class CreateAccountFragment extends Fragment {
public void run() { public void run() {
errorMessage.setText(R.string.wizard_server_unavailable); errorMessage.setText(R.string.wizard_server_unavailable);
usernameOk = false; usernameOk = false;
icon.setImageResource(R.drawable.wizard_notok);
createAccount.setEnabled(usernameOk && passwordOk && confirmPasswordOk && emailOk); createAccount.setEnabled(usernameOk && passwordOk && confirmPasswordOk && emailOk);
} }
}; };
@ -183,7 +177,6 @@ public class CreateAccountFragment extends Fragment {
public void run() { public void run() {
errorMessage.setText(R.string.wizard_username_unavailable); errorMessage.setText(R.string.wizard_username_unavailable);
usernameOk = false; usernameOk = false;
icon.setImageResource(R.drawable.wizard_notok);
createAccount.setEnabled(usernameOk && passwordOk && confirmPasswordOk && emailOk); createAccount.setEnabled(usernameOk && passwordOk && confirmPasswordOk && emailOk);
} }
}; };
@ -191,7 +184,6 @@ public class CreateAccountFragment extends Fragment {
Runnable runOk = new Runnable() { Runnable runOk = new Runnable() {
public void run() { public void run() {
errorMessage.setText(""); errorMessage.setText("");
icon.setImageResource(R.drawable.wizard_ok);
usernameOk = true; usernameOk = true;
createAccount.setEnabled(usernameOk && passwordOk && confirmPasswordOk && emailOk); createAccount.setEnabled(usernameOk && passwordOk && confirmPasswordOk && emailOk);
} }
@ -304,7 +296,6 @@ public class CreateAccountFragment extends Fragment {
isUsernameRegistred(username, icon); isUsernameRegistred(username, icon);
} else { } else {
errorMessage.setText(R.string.wizard_username_incorrect); errorMessage.setText(R.string.wizard_username_incorrect);
icon.setImageResource(R.drawable.wizard_notok);
} }
} }
}); });
@ -324,13 +315,11 @@ public class CreateAccountFragment extends Fragment {
{ {
emailOk = false; emailOk = false;
if (isEmailCorrect(field.getText().toString())) { if (isEmailCorrect(field.getText().toString())) {
icon.setImageResource(R.drawable.wizard_ok);
emailOk = true; emailOk = true;
errorMessage.setText(""); errorMessage.setText("");
} }
else { else {
errorMessage.setText(R.string.wizard_email_incorrect); errorMessage.setText(R.string.wizard_email_incorrect);
icon.setImageResource(R.drawable.wizard_notok);
} }
createAccount.setEnabled(usernameOk && passwordOk && confirmPasswordOk && emailOk); createAccount.setEnabled(usernameOk && passwordOk && confirmPasswordOk && emailOk);
} }
@ -352,12 +341,10 @@ public class CreateAccountFragment extends Fragment {
passwordOk = false; passwordOk = false;
if (isPasswordCorrect(field1.getText().toString())) { if (isPasswordCorrect(field1.getText().toString())) {
passwordOk = true; passwordOk = true;
icon.setImageResource(R.drawable.wizard_ok);
errorMessage.setText(""); errorMessage.setText("");
} }
else { else {
errorMessage.setText(R.string.wizard_password_incorrect); errorMessage.setText(R.string.wizard_password_incorrect);
icon.setImageResource(R.drawable.wizard_notok);
} }
createAccount.setEnabled(usernameOk && passwordOk && confirmPasswordOk && emailOk); createAccount.setEnabled(usernameOk && passwordOk && confirmPasswordOk && emailOk);
} }
@ -381,7 +368,6 @@ public class CreateAccountFragment extends Fragment {
confirmPasswordOk = false; confirmPasswordOk = false;
if (field1.getText().toString().equals(field2.getText().toString())) { if (field1.getText().toString().equals(field2.getText().toString())) {
confirmPasswordOk = true; confirmPasswordOk = true;
icon.setImageResource(R.drawable.wizard_ok);
if (!isPasswordCorrect(field1.getText().toString())) { if (!isPasswordCorrect(field1.getText().toString())) {
errorMessage.setText(R.string.wizard_password_incorrect); errorMessage.setText(R.string.wizard_password_incorrect);
@ -392,7 +378,6 @@ public class CreateAccountFragment extends Fragment {
} }
else { else {
errorMessage.setText(R.string.wizard_passwords_unmatched); errorMessage.setText(R.string.wizard_passwords_unmatched);
icon.setImageResource(R.drawable.wizard_notok);
} }
createAccount.setEnabled(usernameOk && passwordOk && confirmPasswordOk && emailOk); createAccount.setEnabled(usernameOk && passwordOk && confirmPasswordOk && emailOk);
} }

4
src/org/linphone/assistant/LinphoneLoginFragment.java
View file

@ -17,10 +17,12 @@ You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
import org.linphone.LinphoneManager;
import org.linphone.R; import org.linphone.R;
import android.app.Fragment; import android.app.Fragment;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
@ -46,7 +48,7 @@ public class LinphoneLoginFragment extends Fragment implements OnClickListener {
apply = (Button) view.findViewById(R.id.assistant_apply); apply = (Button) view.findViewById(R.id.assistant_apply);
apply.setOnClickListener(this); apply.setOnClickListener(this);
if (getResources().getBoolean(R.bool.setup_use_linphone_as_first_fragment)) { if (getResources().getBoolean(R.bool.assistant_use_linphone_login_as_first_fragment)) {
view.findViewById(R.id.assistant_apply).setVisibility(View.GONE); view.findViewById(R.id.assistant_apply).setVisibility(View.GONE);
} }

24
src/org/linphone/assistant/MenuFragment.java
View file

@ -38,26 +38,26 @@ public class MenuFragment extends Fragment implements OnClickListener {
Bundle savedInstanceState) { Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.assistant_menu, container, false); View view = inflater.inflate(R.layout.assistant_menu, container, false);
createAccount = (Button) view.findViewById(R.id.setup_create_account); createAccount = (Button) view.findViewById(R.id.create_account);
createAccount.setOnClickListener(this); createAccount.setOnClickListener(this);
logLinphoneAccount = (Button) view.findViewById(R.id.setup_login_linphone); logLinphoneAccount = (Button) view.findViewById(R.id.login_linphone);
if (getResources().getBoolean(R.bool.hide_linphone_accounts_wizard)) { if (getResources().getBoolean(R.bool.hide_linphone_accounts_wizard)) {
view.findViewById(R.id.setup_login_linphone_layout).setVisibility(View.GONE); logLinphoneAccount.setVisibility(View.GONE);
} else { } else {
logLinphoneAccount.setOnClickListener(this); logLinphoneAccount.setOnClickListener(this);
} }
logGenericAccount = (Button) view.findViewById(R.id.setup_login_generic); logGenericAccount = (Button) view.findViewById(R.id.login_generic);
if (getResources().getBoolean(R.bool.hide_generic_accounts_wizard)) { if (getResources().getBoolean(R.bool.hide_generic_accounts_wizard)) {
view.findViewById(R.id.setup_login_generic_layout).setVisibility(View.GONE); logGenericAccount.setVisibility(View.GONE);
} else { } else {
logGenericAccount.setOnClickListener(this); logGenericAccount.setOnClickListener(this);
} }
remoteProvisioning = (Button) view.findViewById(R.id.setup_remote_provisioning); remoteProvisioning = (Button) view.findViewById(R.id.remote_provisioning);
if (getResources().getBoolean(R.bool.hide_remote_provisioning_in_wizard)) { if (getResources().getBoolean(R.bool.hide_remote_provisioning_in_wizard)) {
view.findViewById(R.id.setup_remote_provisioning_layout).setVisibility(View.GONE); remoteProvisioning.setVisibility(View.GONE);
} else { } else {
remoteProvisioning.setOnClickListener(this); remoteProvisioning.setOnClickListener(this);
} }
@ -68,13 +68,13 @@ public class MenuFragment extends Fragment implements OnClickListener {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
int id = v.getId(); int id = v.getId();
if (id == R.id.setup_login_generic) { if (id == R.id.login_generic) {
AssistantActivity.instance().displayLoginGeneric(); AssistantActivity.instance().displayLoginGeneric();
} else if (id == R.id.setup_login_linphone) { } else if (id == R.id.login_linphone) {
AssistantActivity.instance().displayLoginLinphone(); AssistantActivity.instance().displayLoginLinphone();
} else if (id == R.id.setup_create_account) { } else if (id == R.id.create_account) {
AssistantActivity.instance().displayWizard(); AssistantActivity.instance().displayCreateAccount();
} else if (id == R.id.setup_remote_provisioning) { } else if (id == R.id.remote_provisioning) {
AssistantActivity.instance().displayRemoteProvisioning(); AssistantActivity.instance().displayRemoteProvisioning();
} }
} }

2
src/org/linphone/assistant/RemoteProvisioningFragment.java
View file

@ -24,7 +24,7 @@ public class RemoteProvisioningFragment extends Fragment implements OnClickListe
Bundle savedInstanceState) { Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.assistant_remote_provisioning, container, false); View view = inflater.inflate(R.layout.assistant_remote_provisioning, container, false);
remoteProvisioningUrl = (EditText) view.findViewById(R.id.setup_remote_provisioning_url); remoteProvisioningUrl = (EditText) view.findViewById(R.id.assistant_remote_provisioning_url);
apply = (Button) view.findViewById(R.id.assistant_apply); apply = (Button) view.findViewById(R.id.assistant_apply);
apply.setOnClickListener(this); apply.setOnClickListener(this);