From 3c7eab420f5cb11e251c00fe437fcb0670881b01 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 10 Jun 2013 11:31:11 +0200 Subject: [PATCH] Added bools to customize options button in call and possibility to send files in chat + use let's go button in simple wizard to validate form --- res/layout-small/setup_linphone_login.xml | 1 + res/layout/setup_linphone_login.xml | 1 + res/values/non_localizable_custom.xml | 7 ++-- src/org/linphone/ChatFragment.java | 18 ++++++---- src/org/linphone/InCallActivity.java | 7 +++- src/org/linphone/LinphoneActivity.java | 2 +- .../linphone/setup/LinphoneLoginFragment.java | 20 +++++++---- src/org/linphone/setup/SetupActivity.java | 33 +++++++++++-------- 8 files changed, 58 insertions(+), 31 deletions(-) diff --git a/res/layout-small/setup_linphone_login.xml b/res/layout-small/setup_linphone_login.xml index 3ac5e20e8..43fb7145f 100644 --- a/res/layout-small/setup_linphone_login.xml +++ b/res/layout-small/setup_linphone_login.xml @@ -57,6 +57,7 @@ android:background="@drawable/setup_field_background" /> diff --git a/res/layout/setup_linphone_login.xml b/res/layout/setup_linphone_login.xml index 7a2fda6ba..f4a64d588 100644 --- a/res/layout/setup_linphone_login.xml +++ b/res/layout/setup_linphone_login.xml @@ -56,6 +56,7 @@ android:background="@drawable/setup_field_background" /> diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml index 74b725c2b..71a18acfa 100644 --- a/res/values/non_localizable_custom.xml +++ b/res/values/non_localizable_custom.xml @@ -25,7 +25,7 @@ false false false - true + true false @@ -41,11 +41,11 @@ true false - true - false + true false + false false @@ -55,6 +55,7 @@ true false false + false true diff --git a/src/org/linphone/ChatFragment.java b/src/org/linphone/ChatFragment.java index acd14c710..2e30b64c7 100644 --- a/src/org/linphone/ChatFragment.java +++ b/src/org/linphone/ChatFragment.java @@ -156,13 +156,17 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC progressBar = (ProgressBar) view.findViewById(R.id.progressbar); sendImage = (TextView) view.findViewById(R.id.sendPicture); - registerForContextMenu(sendImage); - sendImage.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - pickImage(); - } - }); + if (!getResources().getBoolean(R.bool.disable_chat_send_file)) { + registerForContextMenu(sendImage); + sendImage.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + pickImage(); + } + }); + } else { + sendImage.setEnabled(false); + } cancelUpload = (ImageView) view.findViewById(R.id.cancelUpload); cancelUpload.setOnClickListener(new OnClickListener() { diff --git a/src/org/linphone/InCallActivity.java b/src/org/linphone/InCallActivity.java index 72b4cfc0f..a99505f5b 100644 --- a/src/org/linphone/InCallActivity.java +++ b/src/org/linphone/InCallActivity.java @@ -333,7 +333,12 @@ public class InCallActivity extends FragmentActivity implements mHandler.post(new Runnable() { @Override public void run() { - options.setEnabled(true); + if (getResources().getBoolean(R.bool.disable_options_in_call)) { + options.setEnabled(false); + } else { + options.setEnabled(true); + } + video.setEnabled(true); micro.setEnabled(true); speaker.setEnabled(true); diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java index 45ffb4299..27943b98d 100644 --- a/src/org/linphone/LinphoneActivity.java +++ b/src/org/linphone/LinphoneActivity.java @@ -138,7 +138,7 @@ public class LinphoneActivity extends FragmentActivity implements return; } - boolean useFirstLoginActivity = getResources().getBoolean(R.bool.use_first_login_activity); + boolean useFirstLoginActivity = getResources().getBoolean(R.bool.display_account_wizard_at_first_start); SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(this); if (useFirstLoginActivity && !pref.getBoolean(getString(R.string.first_launch_suceeded_once_key), false)) { if (pref.getInt(getString(R.string.pref_extra_accounts), -1) > -1) { diff --git a/src/org/linphone/setup/LinphoneLoginFragment.java b/src/org/linphone/setup/LinphoneLoginFragment.java index 198da57cb..2b4c361ca 100644 --- a/src/org/linphone/setup/LinphoneLoginFragment.java +++ b/src/org/linphone/setup/LinphoneLoginFragment.java @@ -45,20 +45,28 @@ public class LinphoneLoginFragment extends Fragment implements OnClickListener { apply = (ImageView) view.findViewById(R.id.setup_apply); apply.setOnClickListener(this); + if (getResources().getBoolean(R.bool.setup_use_linphone_as_first_fragment)) { + view.findViewById(R.id.setup_apply_button).setVisibility(View.GONE); + } + return view; } + + public void linphoneLogIn() { + if (login.getText() == null || login.length() == 0 || password.getText() == null || password.length() == 0) { + Toast.makeText(getActivity(), getString(R.string.first_launch_no_login_password), Toast.LENGTH_LONG).show(); + return; + } + + SetupActivity.instance().linphoneLogIn(login.getText().toString(), password.getText().toString()); + } @Override public void onClick(View v) { int id = v.getId(); if (id == R.id.setup_apply) { - if (login.getText() == null || login.length() == 0 || password.getText() == null || password.length() == 0) { - Toast.makeText(getActivity(), getString(R.string.first_launch_no_login_password), Toast.LENGTH_LONG).show(); - return; - } - - SetupActivity.instance().linphoneLogIn(login.getText().toString(), password.getText().toString()); + linphoneLogIn(); } } } diff --git a/src/org/linphone/setup/SetupActivity.java b/src/org/linphone/setup/SetupActivity.java index 12239668f..0e5a1d67e 100644 --- a/src/org/linphone/setup/SetupActivity.java +++ b/src/org/linphone/setup/SetupActivity.java @@ -45,6 +45,7 @@ public class SetupActivity extends FragmentActivity implements OnClickListener { private SetupFragmentsEnum currentFragment; private SharedPreferences mPref; private SetupFragmentsEnum firstFragment; + private Fragment fragment; private boolean accountCreated = false; protected void onCreate(Bundle savedInstanceState) { @@ -110,15 +111,20 @@ public class SetupActivity extends FragmentActivity implements OnClickListener { finish(); } } else if (id == R.id.setup_next) { - 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(); + 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(); @@ -224,24 +230,25 @@ public class SetupActivity extends FragmentActivity implements OnClickListener { } public void displayWelcome() { - changeFragment(new WelcomeFragment()); + fragment = new WelcomeFragment(); + changeFragment(fragment); currentFragment = SetupFragmentsEnum.WELCOME; } public void displayLoginGeneric() { - GenericLoginFragment fragment = new GenericLoginFragment(); + fragment = new GenericLoginFragment(); changeFragment(fragment); currentFragment = SetupFragmentsEnum.GENERIC_LOGIN; } public void displayLoginLinphone() { - LinphoneLoginFragment fragment = new LinphoneLoginFragment(); + fragment = new LinphoneLoginFragment(); changeFragment(fragment); currentFragment = SetupFragmentsEnum.LINPHONE_LOGIN; } public void displayWizard() { - WizardFragment fragment = new WizardFragment(); + fragment = new WizardFragment(); changeFragment(fragment); currentFragment = SetupFragmentsEnum.WIZARD; }