Browse Source

ktlint: Property name should start with a lowercase letter and use camel case

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Andy Scherzinger 1 năm trước cách đây
mục cha
commit
3f911965bd

+ 1 - 1
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
     }
 }

+ 3 - 3
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 {

+ 10 - 10
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<PollResultItem> = ArrayList()
-    private var _itemsDetailsList: ArrayList<PollResultItem> = ArrayList()
+    private var itemsOverviewList: ArrayList<PollResultItem> = ArrayList()
+    private var itemsDetailsList: ArrayList<PollResultItem> = ArrayList()
 
     private var _items: MutableLiveData<ArrayList<PollResultItem>?> = MutableLiveData<ArrayList<PollResultItem>?>()
     val items: MutableLiveData<ArrayList<PollResultItem>?>
@@ -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
         }
     }