From 30f2c2cf9bc6e7fdceb81105c363e97c4dc928cb Mon Sep 17 00:00:00 2001 From: Laurent Date: Thu, 19 Mar 2020 11:52:31 +0100 Subject: [PATCH] Remove warnings --- .../android/ui/{fragment => modules/feed}/FeedFragment.kt | 0 .../feed}/FeedHandHistoryRowRepresentableAdapter.kt | 0 .../feed}/FeedSessionRowRepresentableAdapter.kt | 0 .../feed}/FeedTransactionRowRepresentableAdapter.kt | 0 .../net/pokeranalytics/android/util/csv/CSVDescriptor.kt | 6 +++--- 5 files changed, 3 insertions(+), 3 deletions(-) rename app/src/main/java/net/pokeranalytics/android/ui/{fragment => modules/feed}/FeedFragment.kt (100%) rename app/src/main/java/net/pokeranalytics/android/ui/{adapter => modules/feed}/FeedHandHistoryRowRepresentableAdapter.kt (100%) rename app/src/main/java/net/pokeranalytics/android/ui/{adapter => modules/feed}/FeedSessionRowRepresentableAdapter.kt (100%) rename app/src/main/java/net/pokeranalytics/android/ui/{adapter => modules/feed}/FeedTransactionRowRepresentableAdapter.kt (100%) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedFragment.kt similarity index 100% rename from app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt rename to app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedFragment.kt diff --git a/app/src/main/java/net/pokeranalytics/android/ui/adapter/FeedHandHistoryRowRepresentableAdapter.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedHandHistoryRowRepresentableAdapter.kt similarity index 100% rename from app/src/main/java/net/pokeranalytics/android/ui/adapter/FeedHandHistoryRowRepresentableAdapter.kt rename to app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedHandHistoryRowRepresentableAdapter.kt diff --git a/app/src/main/java/net/pokeranalytics/android/ui/adapter/FeedSessionRowRepresentableAdapter.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedSessionRowRepresentableAdapter.kt similarity index 100% rename from app/src/main/java/net/pokeranalytics/android/ui/adapter/FeedSessionRowRepresentableAdapter.kt rename to app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedSessionRowRepresentableAdapter.kt diff --git a/app/src/main/java/net/pokeranalytics/android/ui/adapter/FeedTransactionRowRepresentableAdapter.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedTransactionRowRepresentableAdapter.kt similarity index 100% rename from app/src/main/java/net/pokeranalytics/android/ui/adapter/FeedTransactionRowRepresentableAdapter.kt rename to app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedTransactionRowRepresentableAdapter.kt diff --git a/app/src/main/java/net/pokeranalytics/android/util/csv/CSVDescriptor.kt b/app/src/main/java/net/pokeranalytics/android/util/csv/CSVDescriptor.kt index a4e915f9..df529a68 100644 --- a/app/src/main/java/net/pokeranalytics/android/util/csv/CSVDescriptor.kt +++ b/app/src/main/java/net/pokeranalytics/android/util/csv/CSVDescriptor.kt @@ -92,7 +92,7 @@ abstract class CSVDescriptor(var source: DataSource, vararg elements: CSVField) protected var fieldMapping: MutableMap = mutableMapOf() init { - if (elements.size > 0) { + if (elements.isNotEmpty()) { this.fields = elements.toList() } } @@ -126,9 +126,9 @@ abstract class CSVDescriptor(var source: DataSource, vararg elements: CSVField) count++ } } - val mandatoryfields = this.fields.filter { it.optional == false } + val mandatoryFields = this.fields.filter { !it.optional } Timber.d("source= ${this.source.name} > total fields = ${this.fields.size}, identified = $count") - return count >= mandatoryfields.size + return count >= mandatoryFields.size } }