diff --git a/app/src/main/java/org/linphone/contacts/AvatarGenerator.kt b/app/src/main/java/org/linphone/contacts/AvatarGenerator.kt
index 6fb729ef3..c67069226 100644
--- a/app/src/main/java/org/linphone/contacts/AvatarGenerator.kt
+++ b/app/src/main/java/org/linphone/contacts/AvatarGenerator.kt
@@ -30,21 +30,11 @@ import org.linphone.R
import org.linphone.utils.AppUtils
class AvatarGenerator(private val context: Context) {
- private var textSize: Float
- private var textColor: Int
- private var avatarSize: Int
+ private var textSize: Float = AppUtils.getDimension(R.dimen.avatar_initials_text_size)
+ private var textColor: Int = ContextCompat.getColor(context, R.color.gray_main2_600)
+ private var avatarSize: Int = AppUtils.getDimension(R.dimen.avatar_list_cell_size).toInt()
private var initials = " "
- private var backgroundColor: Int
-
- init {
- backgroundColor = ContextCompat.getColor(context, R.color.gray_main2_200)
-
- textColor = ContextCompat.getColor(context, R.color.gray_main2_600)
-
- textSize = AppUtils.getDimension(R.dimen.avatar_initials_text_size)
-
- avatarSize = AppUtils.getDimension(R.dimen.avatar_list_cell_size).toInt()
- }
+ private var backgroundColor: Int = ContextCompat.getColor(context, R.color.gray_main2_200)
fun setTextSize(size: Float) = apply {
textSize = size
diff --git a/app/src/main/java/org/linphone/ui/assistant/fragment/RegisterFragment.kt b/app/src/main/java/org/linphone/ui/assistant/fragment/RegisterFragment.kt
index 3abb582dd..c89ec51cf 100644
--- a/app/src/main/java/org/linphone/ui/assistant/fragment/RegisterFragment.kt
+++ b/app/src/main/java/org/linphone/ui/assistant/fragment/RegisterFragment.kt
@@ -174,7 +174,7 @@ class RegisterFragment : Fragment() {
viewModel.dialPlansLabelList
) {
override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
- val view = convertView ?: super.getView(position, convertView, parent)
+ val view = convertView ?: super.getView(position, null, parent)
val label = viewModel.dialPlansShortLabelList[position]
(view as? AppCompatTextView)?.text = label
return view
diff --git a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingViewModel.kt b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingViewModel.kt
index e1acada39..aede6ba6b 100644
--- a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingViewModel.kt
@@ -72,9 +72,6 @@ class MeetingViewModel @UiThread constructor() : ViewModel() {
private lateinit var conferenceInfo: ConferenceInfo
- init {
- }
-
override fun onCleared() {
super.onCleared()
diff --git a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingsListViewModel.kt b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingsListViewModel.kt
index 15f5056c8..1974a86d9 100644
--- a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingsListViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingsListViewModel.kt
@@ -125,9 +125,7 @@ class MeetingsListViewModel @UiThread constructor() : AbstractTopBarViewModel()
TimestampUtils.isAfterToday(it.timestamp)
}
Log.i("$TAG $firstMeetingAfterToday")
- if (firstMeetingAfterToday != null) {
- firstMeetingAfterToday.displayTodayIndicator.postValue(true)
- }
+ firstMeetingAfterToday?.displayTodayIndicator?.postValue(true)
}
meetings.postValue(list)
diff --git a/app/src/main/java/org/linphone/ui/main/settings/fragment/AccountSettingsFragment.kt b/app/src/main/java/org/linphone/ui/main/settings/fragment/AccountSettingsFragment.kt
index 93abe4509..0b8eb0c61 100644
--- a/app/src/main/java/org/linphone/ui/main/settings/fragment/AccountSettingsFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/settings/fragment/AccountSettingsFragment.kt
@@ -34,9 +34,9 @@ class AccountSettingsFragment : GenericFragment() {
private val dropdownListener = object : AdapterView.OnItemSelectedListener {
override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
val transport = viewModel.availableTransports[position]
- val transportType = when {
- transport == TransportType.Tcp.name.uppercase(Locale.getDefault()) -> TransportType.Tcp
- transport == TransportType.Tls.name.uppercase(Locale.getDefault()) -> TransportType.Tls
+ val transportType = when (transport) {
+ TransportType.Tcp.name.uppercase(Locale.getDefault()) -> TransportType.Tcp
+ TransportType.Tls.name.uppercase(Locale.getDefault()) -> TransportType.Tls
else -> TransportType.Udp
}
Log.i("$TAG Selected transport updated [$transport] -> [${transportType.name}]")
diff --git a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountProfileViewModel.kt b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountProfileViewModel.kt
index 64f995c6b..3705b3238 100644
--- a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountProfileViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountProfileViewModel.kt
@@ -115,7 +115,7 @@ class AccountProfileViewModel @UiThread constructor() : ViewModel() {
val prefix = account.params.internationalPrefix
if (!prefix.isNullOrEmpty()) {
Log.i(
- "$TAG Account [${account.params?.identityAddress?.asStringUriOnly()}] prefix is [$prefix]"
+ "$TAG Account [${account.params.identityAddress?.asStringUriOnly()}] prefix is [$prefix]"
)
val dialPlan = Factory.instance().dialPlans.find {
it.countryCallingCode == prefix
diff --git a/app/src/main/res/color/list_cell_background_color.xml b/app/src/main/res/color/list_cell_background_color.xml
deleted file mode 100644
index 1221b511e..000000000
--- a/app/src/main/res/color/list_cell_background_color.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-