mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Started account profile view

Browse source
This commit is contained in:
Sylvain Berfini 2023-08-20 20:19:57 +02:00
parent 64855cba77
commit d915e97ad2
12 changed files with 323 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/org/linphone/ui/main/MainActivity.kt
View file

@ -44,7 +44,7 @@ import org.linphone.core.Account
import org.linphone.databinding.AccountPopupMenuBinding
import org.linphone.databinding.MainActivityBinding
import org.linphone.ui.assistant.AssistantActivity
import org.linphone.ui.main.settings.fragment.AcocuntProfileFragmentDirections
import org.linphone.ui.main.settings.fragment.AccountProfileFragmentDirections
import org.linphone.ui.main.viewmodel.DrawerMenuViewModel
import org.linphone.utils.slideInToastFromTopForDuration
@ -212,8 +212,8 @@ class MainActivity : AppCompatActivity() {
popupView.setManageProfileClickListener {
val navController = findNavController(R.id.main_nav_host_fragment)
val identity = account.params.identityAddress?.asString().orEmpty()
val action = AcocuntProfileFragmentDirections.actionGlobalAcocuntProfileFragment(
val identity = account.params.identityAddress?.asStringUriOnly().orEmpty()
val action = AccountProfileFragmentDirections.actionGlobalAccountProfileFragment(
identity
)
navController.navigate(action)

4
app/src/main/java/org/linphone/ui/main/contacts/fragment/EditContactFragment.kt
View file

@ -101,10 +101,10 @@ class EditContactFragment : GenericFragment() {
postponeEnterTransition()
val refKey = args.contactRefKey
Log.i("[Contact Edit Fragment] Looking up for contact with ref key [$refKey]")
Log.i("$TAG Looking up for contact with ref key [$refKey]")
viewModel.findFriendByRefKey(refKey)
binding.setCancelClickListener {
binding.setBackClickListener {
val model = ConfirmationDialogModel()
val dialog = DialogUtils.getCancelContactChangesConfirmationDialog(
requireActivity(),

2
app/src/main/java/org/linphone/ui/main/contacts/fragment/NewContactFragment.kt
View file

@ -98,7 +98,7 @@ class NewContactFragment : GenericFragment() {
viewModel.findFriendByRefKey("")
binding.setCancelClickListener {
binding.setBackClickListener {
val model = ConfirmationDialogModel()
val dialog = DialogUtils.getCancelContactChangesConfirmationDialog(
requireActivity(),

19
app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactNewOrEditViewModel.kt
View file

@ -114,12 +114,9 @@ class ContactNewOrEditViewModel() : ViewModel() {
if (!::friend.isInitialized) {
friend = core.createFriend()
}
friend.name = "${firstName.value.orEmpty().trim()} ${lastName.value.orEmpty().trim()}"
if (isEdit.value == true) {
friend.edit()
}
friend.name = "${firstName.value.orEmpty()} ${lastName.value.orEmpty()}"
friend.edit()
val vCard = friend.vcard
if (vCard != null) {
@ -133,8 +130,8 @@ class ContactNewOrEditViewModel() : ViewModel() {
}
}
friend.organization = company.value.orEmpty()
friend.jobTitle = jobTitle.value.orEmpty()
friend.organization = company.value.orEmpty().trim()
friend.jobTitle = jobTitle.value.orEmpty().trim()
for (address in friend.addresses) {
friend.removeAddress(address)
@ -142,7 +139,7 @@ class ContactNewOrEditViewModel() : ViewModel() {
for (address in sipAddresses) {
val data = address.value.value
if (!data.isNullOrEmpty()) {
val parsedAddress = core.interpretUrl(data, true)
val parsedAddress = core.interpretUrl(data.trim(), true)
if (parsedAddress != null) {
friend.addAddress(parsedAddress)
}
@ -155,7 +152,7 @@ class ContactNewOrEditViewModel() : ViewModel() {
for (number in phoneNumbers) {
val data = number.value.value
if (!data.isNullOrEmpty()) {
friend.addPhoneNumber(data)
friend.addPhoneNumber(data.trim())
}
}
@ -170,9 +167,9 @@ class ContactNewOrEditViewModel() : ViewModel() {
// TODO : generate unique ref key
}
status = core.defaultFriendList?.addFriend(friend) ?: Status.InvalidFriend
} else {
friend.done()
}
friend.done()
coreContext.contactsManager.notifyContactsListChanged()
saveChangesEvent.postValue(

2
app/src/main/java/org/linphone/ui/main/conversations/NewConversationFragment.kt
View file

@ -94,7 +94,7 @@ class NewConversationFragment : Fragment() {
}
}
binding.setCancelClickListener {
binding.setBackClickListener {
requireActivity().onBackPressedDispatcher.onBackPressed()
}

112
app/src/main/java/org/linphone/ui/main/settings/fragment/AccountProfileFragment.kt Normal file
View file

@ -0,0 +1,112 @@
package org.linphone.ui.main.settings.fragment
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.activity.result.PickVisualMediaRequest
import androidx.activity.result.contract.ActivityResultContracts
import androidx.lifecycle.lifecycleScope
import androidx.navigation.fragment.findNavController
import androidx.navigation.fragment.navArgs
import androidx.navigation.navGraphViewModels
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import org.linphone.R
import org.linphone.core.tools.Log
import org.linphone.databinding.AccountProfileFragmentBinding
import org.linphone.ui.main.contacts.fragment.EditContactFragment
import org.linphone.ui.main.fragment.GenericFragment
import org.linphone.ui.main.settings.viewmodel.AccountProfileViewModel
import org.linphone.utils.FileUtils
class AccountProfileFragment : GenericFragment() {
companion object {
const val TAG = "[Account Profile Fragment]"
}
private lateinit var binding: AccountProfileFragmentBinding
private val viewModel: AccountProfileViewModel by navGraphViewModels(
R.id.accountProfileFragment
)
private val args: AccountProfileFragmentArgs by navArgs()
private val pickMedia = registerForActivityResult(ActivityResultContracts.PickVisualMedia()) { uri ->
if (uri != null) {
Log.i("$TAG Picture picked [$uri]")
// TODO FIXME: use a better file name
val localFileName = FileUtils.getFileStoragePath("temp", true)
lifecycleScope.launch {
if (FileUtils.copyFile(uri, localFileName)) {
withContext(Dispatchers.Main) {
viewModel.setImage(localFileName)
}
} else {
Log.e(
"${EditContactFragment.TAG} Failed to copy file from [$uri] to [${localFileName.absolutePath}]"
)
}
}
} else {
Log.w("${EditContactFragment.TAG} No picture picked")
}
}
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View {
binding = AccountProfileFragmentBinding.inflate(layoutInflater)
return binding.root
}
override fun goBack() {
findNavController().popBackStack()
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
postponeEnterTransition()
binding.lifecycleOwner = viewLifecycleOwner
binding.viewModel = viewModel
val identity = args.accountIdentity
Log.i("$TAG Looking up for account with identity address [$identity]")
viewModel.findAccountMatchingIdentity(identity)
binding.setBackClickListener {
goBack()
}
binding.setPickImageClickListener {
pickImage()
}
viewModel.accountFoundEvent.observe(viewLifecycleOwner) {
it.consume { found ->
if (found) {
startPostponedEnterTransition()
} else {
// TODO Error
goBack()
}
}
}
}
override fun onPause() {
super.onPause()
viewModel.saveDisplayNameChanges()
}
private fun pickImage() {
pickMedia.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly))
}
}

26
app/src/main/java/org/linphone/ui/main/settings/fragment/AcocuntProfileFragment.kt
View file

@ -1,26 +0,0 @@
package org.linphone.ui.main.settings.fragment
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import org.linphone.databinding.AccountProfileFragmentBinding
import org.linphone.ui.main.fragment.GenericFragment
class AcocuntProfileFragment : GenericFragment() {
private lateinit var binding: AccountProfileFragmentBinding
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View {
binding = AccountProfileFragmentBinding.inflate(layoutInflater)
return binding.root
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
binding.lifecycleOwner = viewLifecycleOwner
}
}

80
app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountProfileViewModel.kt Normal file
View file

@ -0,0 +1,80 @@
package org.linphone.ui.main.settings.viewmodel
import androidx.annotation.UiThread
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import java.io.File
import org.linphone.LinphoneApplication.Companion.coreContext
import org.linphone.core.Account
import org.linphone.utils.Event
class AccountProfileViewModel : ViewModel() {
val picturePath = MutableLiveData<String>()
val displayName = MutableLiveData<String>()
val accountFoundEvent = MutableLiveData<Event<Boolean>>()
private lateinit var account: Account
@UiThread
fun findAccountMatchingIdentity(identity: String) {
coreContext.postOnCoreThread { core ->
val found = core.accountList.find {
it.params.identityAddress?.asStringUriOnly() == identity
}
if (found != null) {
account = found
displayName.postValue(account.params.identityAddress?.displayName)
val friend = coreContext.contactsManager.localFriends.find {
it.addresses.find { address ->
address.asStringUriOnly() == identity
} != null
}
if (friend != null) {
picturePath.postValue(friend.photo)
} else {
// TODO
}
accountFoundEvent.postValue(Event(true))
} else {
accountFoundEvent.postValue(Event(false))
}
}
}
@UiThread
fun saveDisplayNameChanges() {
coreContext.postOnCoreThread {
if (::account.isInitialized) {
val params = account.params
val copy = params.clone()
val address = params.identityAddress
address?.displayName = displayName.value.orEmpty().trim()
copy.identityAddress = address
account.params = copy
}
}
}
@UiThread
fun setImage(file: File) {
val path = file.absolutePath
picturePath.value = path
coreContext.postOnCoreThread {
if (::account.isInitialized) {
val friend = coreContext.contactsManager.localFriends.find {
it.addresses.find { address ->
address.asStringUriOnly() == account.params.identityAddress?.asStringUriOnly()
} != null
}
if (friend != null) {
friend.edit()
friend.photo = path
friend.done()
}
}
}
}
}

107
app/src/main/res/layout/account_profile_fragment.xml
View file

@ -5,6 +5,15 @@
<data>
<import type="android.view.View" />
<variable
name="backClickListener"
type="View.OnClickListener" />
<variable
name="pickImageClickListener"
type="View.OnClickListener" />
<variable
name="viewModel"
type="org.linphone.ui.main.settings.viewmodel.AccountProfileViewModel" />
</data>
<androidx.constraintlayout.widget.ConstraintLayout
@ -12,6 +21,104 @@
android:layout_height="match_parent"
android:background="@color/white">
<ImageView
android:id="@+id/back"
android:onClick="@{backClickListener}"
android:layout_width="wrap_content"
android:layout_height="35dp"
android:layout_marginStart="10dp"
android:adjustViewBounds="true"
android:padding="5dp"
android:src="@drawable/back"
android:drawableTint="@color/primary_color"
app:layout_constraintBottom_toBottomOf="@id/title"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/title" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
android:id="@+id/title"
android:layout_width="0dp"
android:layout_height="@dimen/top_bar_height"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:gravity="center_vertical"
android:text="Account profile"
android:textColor="@color/primary_color"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/back"
app:layout_constraintTop_toTopOf="parent"/>
<ImageView
android:onClick="@{pickImageClickListener}"
android:id="@+id/avatar"
android:layout_width="@dimen/avatar_big_size"
android:layout_height="@dimen/avatar_big_size"
android:layout_marginTop="8dp"
android:background="@drawable/shape_button_round"
coil="@{viewModel.picturePath}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/title"/>
<ImageView
android:id="@+id/overlay"
android:layout_width="0dp"
android:layout_height="0dp"
android:padding="20dp"
android:src="@drawable/pick_picture"
app:layout_constraintEnd_toEndOf="@id/avatar"
app:layout_constraintStart_toStartOf="@id/avatar"
app:layout_constraintTop_toTopOf="@id/avatar"
app:layout_constraintBottom_toBottomOf="@id/avatar" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style"
android:id="@+id/add_picture_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="Add a picture"
android:textSize="14sp"
app:layout_constraintTop_toBottomOf="@id/avatar"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
android:id="@+id/first_name_label"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:text="Display Name"
android:textSize="13sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/add_picture_label"/>
<androidx.appcompat.widget.AppCompatEditText
style="@style/default_text_style"
android:id="@+id/first_name"
android:layout_width="0dp"
android:layout_height="50dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="5dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="@={viewModel.displayName, default=`John Doe`}"
android:textSize="14sp"
android:textColor="@color/gray_9"
android:maxLines="1"
android:background="@drawable/shape_edit_text_background"
android:inputType="text|textPersonName"
app:layout_constraintTop_toBottomOf="@id/first_name_label"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>

4
app/src/main/res/layout/contact_new_or_edit_fragment.xml
View file

@ -6,7 +6,7 @@
<data>
<import type="android.view.View" />
<variable
name="cancelClickListener"
name="backClickListener"
type="View.OnClickListener" />
<variable
name="pickImageClickListener"
@ -23,7 +23,7 @@
<ImageView
android:id="@+id/back"
android:onClick="@{cancelClickListener}"
android:onClick="@{backClickListener}"
android:layout_width="wrap_content"
android:layout_height="35dp"
android:layout_marginStart="10dp"

4
app/src/main/res/layout/conversation_start_fragment.xml
View file

@ -6,7 +6,7 @@
<data>
<import type="android.view.View" />
<variable
name="cancelClickListener"
name="backClickListener"
type="View.OnClickListener" />
<variable
name="viewModel"
@ -30,7 +30,7 @@
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/cancel"
android:onClick="@{cancelClickListener}"
android:onClick="@{backClickListener}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Annuler"

10
app/src/main/res/navigation/main_nav_graph.xml
View file

@ -91,9 +91,9 @@
</fragment>
<fragment
android:id="@+id/acocuntProfileFragment"
android:name="org.linphone.ui.main.settings.fragment.AcocuntProfileFragment"
android:label="AcocuntProfileFragment"
android:id="@+id/accountProfileFragment"
android:name="org.linphone.ui.main.settings.fragment.AccountProfileFragment"
android:label="AccountProfileFragment"
tools:layout="@layout/account_profile_fragment">
<argument
android:name="accountIdentity"
@ -101,8 +101,8 @@
</fragment>
<action
android:id="@+id/action_global_acocuntProfileFragment"
app:destination="@id/acocuntProfileFragment" />
android:id="@+id/action_global_accountProfileFragment"
app:destination="@id/accountProfileFragment" />
<fragment
android:id="@+id/settingsFragment"