From 3f911965bdce42c7009e5bc7580f703bfa3e68a9 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Tue, 5 Dec 2023 16:37:53 +0100 Subject: [PATCH] ktlint: Property name should start with a lowercase letter and use camel case Signed-off-by: Andy Scherzinger --- .../messages/CallStartedViewHolder.kt | 2 +- .../talk/data/source/local/TalkDatabase.kt | 6 +++--- .../polls/viewmodels/PollResultsViewModel.kt | 20 +++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/CallStartedViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/CallStartedViewHolder.kt index c6154ddaa..8aa0665cf 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/CallStartedViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/CallStartedViewHolder.kt @@ -124,6 +124,6 @@ class CallStartedViewHolder(incomingView: View, payload: Any) : } companion object { - var TAG: String? = CallStartedViewHolder::class.simpleName + val TAG: String? = CallStartedViewHolder::class.simpleName } } diff --git a/app/src/main/java/com/nextcloud/talk/data/source/local/TalkDatabase.kt b/app/src/main/java/com/nextcloud/talk/data/source/local/TalkDatabase.kt index 4db51a3e7..65eb7ee5f 100644 --- a/app/src/main/java/com/nextcloud/talk/data/source/local/TalkDatabase.kt +++ b/app/src/main/java/com/nextcloud/talk/data/source/local/TalkDatabase.kt @@ -64,12 +64,12 @@ abstract class TalkDatabase : RoomDatabase() { const val TAG = "TalkDatabase" @Volatile - private var INSTANCE: TalkDatabase? = null + private var instance: TalkDatabase? = null @JvmStatic fun getInstance(context: Context, appPreferences: AppPreferences): TalkDatabase = - INSTANCE ?: synchronized(this) { - INSTANCE ?: build(context, appPreferences).also { INSTANCE = it } + instance ?: synchronized(this) { + instance ?: build(context, appPreferences).also { instance = it } } private fun build(context: Context, appPreferences: AppPreferences): TalkDatabase { diff --git a/app/src/main/java/com/nextcloud/talk/polls/viewmodels/PollResultsViewModel.kt b/app/src/main/java/com/nextcloud/talk/polls/viewmodels/PollResultsViewModel.kt index 430b0d37c..8ce1737c5 100644 --- a/app/src/main/java/com/nextcloud/talk/polls/viewmodels/PollResultsViewModel.kt +++ b/app/src/main/java/com/nextcloud/talk/polls/viewmodels/PollResultsViewModel.kt @@ -41,8 +41,8 @@ class PollResultsViewModel @Inject constructor() : ViewModel() { val poll: Poll? get() = _poll - private var _itemsOverviewList: ArrayList = ArrayList() - private var _itemsDetailsList: ArrayList = ArrayList() + private var itemsOverviewList: ArrayList = ArrayList() + private var itemsDetailsList: ArrayList = ArrayList() private var _items: MutableLiveData?> = MutableLiveData?>() val items: MutableLiveData?> @@ -77,23 +77,23 @@ class PollResultsViewModel @Inject constructor() : ViewModel() { optionsPercent, isOptionSelfVoted(poll, index) ) - _itemsOverviewList.add(pollResultHeaderItem) - _itemsDetailsList.add(pollResultHeaderItem) + itemsOverviewList.add(pollResultHeaderItem) + itemsDetailsList.add(pollResultHeaderItem) val voters = poll.details?.filter { it.optionId == index } if (!voters.isNullOrEmpty()) { - _itemsOverviewList.add(PollResultVotersOverviewItem(voters)) + itemsOverviewList.add(PollResultVotersOverviewItem(voters)) } if (!voters.isNullOrEmpty()) { voters.forEach { - _itemsDetailsList.add(PollResultVoterItem(it)) + itemsDetailsList.add(PollResultVoterItem(it)) } } } - _items.value = _itemsOverviewList + _items.value = itemsOverviewList } private fun getVotersAmountForOption(poll: Poll, index: Int): Int { @@ -114,10 +114,10 @@ class PollResultsViewModel @Inject constructor() : ViewModel() { } fun toggleDetails() { - if (_items.value?.containsAll(_itemsDetailsList) == true) { - _items.value = _itemsOverviewList + if (_items.value?.containsAll(itemsDetailsList) == true) { + _items.value = itemsOverviewList } else { - _items.value = _itemsDetailsList + _items.value = itemsDetailsList } }