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

Show display name in front on SIP address for non-default accounts in side menu

Browse source
This commit is contained in:
Sylvain Berfini 2020-12-03 13:52:40 +01:00
parent 66bd8f26b5
commit 611fe4cf29
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt
View file

@ -32,7 +32,6 @@ import org.linphone.activities.main.settings.SettingListenerStub
import org.linphone.core.* import org.linphone.core.*
import org.linphone.core.tools.Log import org.linphone.core.tools.Log
import org.linphone.utils.Event import org.linphone.utils.Event
import org.linphone.utils.LinphoneUtils
class AccountSettingsViewModelFactory(private val identity: String) : class AccountSettingsViewModelFactory(private val identity: String) :
ViewModelProvider.NewInstanceFactory() { ViewModelProvider.NewInstanceFactory() {
@ -296,7 +295,7 @@ class AccountSettingsViewModel(val proxyConfig: ProxyConfig) : GenericSettingsVi
isDefault.value = core.defaultProxyConfig == proxyConfig isDefault.value = core.defaultProxyConfig == proxyConfig
val identityAddress = proxyConfig.identityAddress val identityAddress = proxyConfig.identityAddress
if (identityAddress != null) { if (identityAddress != null) {
displayName.value = LinphoneUtils.getDisplayName(identityAddress) displayName.value = identityAddress.displayName ?: ""
identity.value = identityAddress.asStringUriOnly() identity.value = identityAddress.asStringUriOnly()
} }

7
app/src/main/res/layout/side_menu_account_cell.xml
View file

@ -15,8 +15,11 @@
android:gravity="center"> android:gravity="center">
<TextView <TextView
android:text="@{data.displayUsernameInsteadOfIdentity ? data.userName : data.identity}" android:text="@{data.displayName + ` ` + (data.displayUsernameInsteadOfIdentity ? data.userName : data.identity)}"
style="@style/assistant_input_field_header_font" android:textColor="?attr/primaryTextColor"
android:textSize="13sp"
android:singleLine="true"
android:ellipsize="end"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center_vertical" android:gravity="center_vertical"

2
app/src/main/res/layout/side_menu_fragment.xml
View file

@ -82,7 +82,7 @@
<TextView <TextView
android:visibility="@{viewModel.defaultAccountFound ? View.VISIBLE : View.GONE}" android:visibility="@{viewModel.defaultAccountFound ? View.VISIBLE : View.GONE}"
android:text="@{viewModel.defaultAccount.displayName}" android:text="@{viewModel.defaultAccount.displayName.isEmpty() ? viewModel.defaultAccount.userName : viewModel.defaultAccount.displayName}"
android:textColor="?attr/lightToolbarTextColor" android:textColor="?attr/lightToolbarTextColor"
android:textStyle="bold" android:textStyle="bold"
android:textSize="18sp" android:textSize="18sp"