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

Added & fixed some customization options

Browse source
This commit is contained in:
Sylvain Berfini 2019-04-01 16:14:24 +02:00
parent eb190ae525
commit ba4052ba4d
4 changed files with 51 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
app/src/main/java/org/linphone/LinphoneActivity.java
View file

@ -342,6 +342,9 @@ public class LinphoneActivity extends LinphoneGenericActivity
mDialer.setOnClickListener(this); mDialer.setOnClickListener(this);
mChat = findViewById(R.id.chat); mChat = findViewById(R.id.chat);
mChat.setOnClickListener(this); mChat.setOnClickListener(this);
if (getResources().getBoolean(R.bool.disable_chat)) {
mChat.setVisibility(View.GONE);
}
mHistorySelected = findViewById(R.id.history_select); mHistorySelected = findViewById(R.id.history_select);
mContactsSelected = findViewById(R.id.contacts_select); mContactsSelected = findViewById(R.id.contacts_select);
@ -1562,6 +1565,12 @@ public class LinphoneActivity extends LinphoneGenericActivity
private void initSideMenu() { private void initSideMenu() {
mSideMenu = findViewById(R.id.side_menu); mSideMenu = findViewById(R.id.side_menu);
mSideMenuItems = new ArrayList<>(); mSideMenuItems = new ArrayList<>();
if (getResources().getBoolean(R.bool.show_log_out_in_side_menu)) {
mSideMenuItems.add(
new MenuItem(
getResources().getString(R.string.menu_logout),
R.drawable.quit_default));
}
if (!getResources().getBoolean(R.bool.hide_assistant_from_side_menu)) { if (!getResources().getBoolean(R.bool.hide_assistant_from_side_menu)) {
mSideMenuItems.add( mSideMenuItems.add(
new MenuItem( new MenuItem(
@ -1579,10 +1588,12 @@ public class LinphoneActivity extends LinphoneGenericActivity
new MenuItem( new MenuItem(
getResources().getString(R.string.inapp), R.drawable.menu_options)); getResources().getString(R.string.inapp), R.drawable.menu_options));
} }
mSideMenuItems.add( if (!getResources().getBoolean(R.bool.hide_recordings_from_side_menu)) {
new MenuItem( mSideMenuItems.add(
getResources().getString(R.string.menu_recordings), new MenuItem(
R.drawable.menu_recordings)); getResources().getString(R.string.menu_recordings),
R.drawable.menu_recordings));
}
mSideMenuItems.add( mSideMenuItems.add(
new MenuItem(getResources().getString(R.string.menu_about), R.drawable.menu_about)); new MenuItem(getResources().getString(R.string.menu_about), R.drawable.menu_about));
mSideMenuContent = findViewById(R.id.side_menu_content); mSideMenuContent = findViewById(R.id.side_menu_content);
@ -1595,25 +1606,24 @@ public class LinphoneActivity extends LinphoneGenericActivity
new AdapterView.OnItemClickListener() { new AdapterView.OnItemClickListener() {
@Override @Override
public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) { public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
if (mSideMenuItemList String selectedItem = mSideMenuItemList.getAdapter().getItem(i).toString();
.getAdapter() if (selectedItem.equals(getString(R.string.menu_logout))) {
.getItem(i) Core lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
.toString() if (lc != null) {
.equals(getString(R.string.menu_settings))) { lc.clearAllAuthInfo();
lc.clearProxyConfig();
startActivity(
new Intent()
.setClass(
LinphoneManager.getInstance().getContext(),
AssistantActivity.class));
finish();
}
} else if (selectedItem.equals(getString(R.string.menu_settings))) {
LinphoneActivity.instance().displaySettings(); LinphoneActivity.instance().displaySettings();
} } else if (selectedItem.equals(getString(R.string.menu_about))) {
if (mSideMenuItemList
.getAdapter()
.getItem(i)
.toString()
.equals(getString(R.string.menu_about))) {
LinphoneActivity.instance().displayAbout(); LinphoneActivity.instance().displayAbout();
} } else if (selectedItem.equals(getString(R.string.menu_assistant))) {
if (mSideMenuItemList
.getAdapter()
.getItem(i)
.toString()
.equals(getString(R.string.menu_assistant))) {
LinphoneActivity.instance().displayAssistant(); LinphoneActivity.instance().displayAssistant();
} }
if (getResources().getBoolean(R.bool.enable_in_app_purchase)) { if (getResources().getBoolean(R.bool.enable_in_app_purchase)) {
@ -1699,17 +1709,19 @@ public class LinphoneActivity extends LinphoneGenericActivity
status.setImageResource(getStatusIconResource(proxy.getState())); status.setImageResource(getStatusIconResource(proxy.getState()));
status.setVisibility(View.VISIBLE); status.setVisibility(View.VISIBLE);
mDefaultAccount.setOnClickListener( if (!getResources().getBoolean(R.bool.disable_accounts_settings_from_side_menu)) {
new OnClickListener() { mDefaultAccount.setOnClickListener(
@Override new OnClickListener() {
public void onClick(View view) { @Override
LinphoneActivity.instance() public void onClick(View view) {
.displayAccountSettings( LinphoneActivity.instance()
LinphonePreferences.instance() .displayAccountSettings(
.getDefaultAccountIndex()); LinphonePreferences.instance()
openOrCloseSideMenu(false); .getDefaultAccountIndex());
} openOrCloseSideMenu(false);
}); }
});
}
} }
} }

3
app/src/main/java/org/linphone/contacts/ContactDetailsFragment.java
View file

@ -265,7 +265,8 @@ public class ContactDetailsFragment extends Fragment
v.findViewById(R.id.inviteFriend).setVisibility(View.GONE); v.findViewById(R.id.inviteFriend).setVisibility(View.GONE);
if (!noa.isSIPAddress() if (!noa.isSIPAddress()
&& v.findViewById(R.id.friendLinphone).getVisibility() == View.GONE) { && v.findViewById(R.id.friendLinphone).getVisibility() == View.GONE
&& !getResources().getBoolean(R.bool.hide_invite_contact)) {
v.findViewById(R.id.inviteFriend).setVisibility(View.VISIBLE); v.findViewById(R.id.inviteFriend).setVisibility(View.VISIBLE);
v.findViewById(R.id.inviteFriend).setTag(noa.getNormalizedPhone()); v.findViewById(R.id.inviteFriend).setTag(noa.getNormalizedPhone());
v.findViewById(R.id.inviteFriend) v.findViewById(R.id.inviteFriend)

4
app/src/main/res/values/non_localizable_custom.xml
View file

@ -100,6 +100,7 @@
<bool name="use_big_pictures_to_preview_images_file_transfers">true</bool> <bool name="use_big_pictures_to_preview_images_file_transfers">true</bool>
<bool name="show_sip_uri_in_chat">false</bool> <bool name="show_sip_uri_in_chat">false</bool>
<bool name="hide_empty_one_to_one_chat_rooms">true</bool> <bool name="hide_empty_one_to_one_chat_rooms">true</bool>
<bool name="hide_invite_contact">false</bool>
<!-- Contacts --> <!-- Contacts -->
<bool name="hide_contact_phone_numbers">false</bool> <bool name="hide_contact_phone_numbers">false</bool>
@ -117,6 +118,9 @@
<!-- Side Menu --> <!-- Side Menu -->
<bool name="hide_assistant_from_side_menu">false</bool> <bool name="hide_assistant_from_side_menu">false</bool>
<bool name="hide_settings_from_side_menu">false</bool> <bool name="hide_settings_from_side_menu">false</bool>
<bool name="hide_recordings_from_side_menu">false</bool>
<bool name="disable_accounts_settings_from_side_menu">false</bool>
<bool name="show_log_out_in_side_menu">false</bool>
<!-- Others Parameters--> <!-- Others Parameters-->
<bool name="enable_call_notification">true</bool> <bool name="enable_call_notification">true</bool>

1
app/src/main/res/values/strings.xml
View file

@ -257,6 +257,7 @@
<string name="voicemail_unread"> unread messages</string> <string name="voicemail_unread"> unread messages</string>
<!-- Side Menu --> <!-- Side Menu -->
<string name="menu_logout">Logout</string>
<string name="menu_assistant">Assistant</string> <string name="menu_assistant">Assistant</string>
<string name="menu_settings">Settings</string> <string name="menu_settings">Settings</string>
<string name="menu_recordings">Recordings</string> <string name="menu_recordings">Recordings</string>