From f27728a8aead534f152b394a74f04d80f8ca7a96 Mon Sep 17 00:00:00 2001 From: Laurent Date: Wed, 27 Feb 2019 20:30:54 +0100 Subject: [PATCH] Remove warnings --- .../pokeranalytics/android/PokerAnalyticsApplication.kt | 2 +- .../net/pokeranalytics/android/calculus/Calculator.kt | 3 ++- .../net/pokeranalytics/android/model/realm/Session.kt | 1 + .../android/ui/fragment/EditableDataFragment.kt | 2 +- .../pokeranalytics/android/ui/fragment/StatsFragment.kt | 3 +-- .../bottomsheet/BottomSheetDoubleEditTextFragment.kt | 2 +- .../components/bottomsheet/BottomSheetEditTextFragment.kt | 2 +- .../components/bottomsheet/BottomSheetSumFragment.kt | 2 +- .../net/pokeranalytics/android/ui/view/RowViewType.kt | 8 ++++---- 9 files changed, 13 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt b/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt index 9c056d4a..636900ec 100644 --- a/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt +++ b/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt @@ -44,7 +44,7 @@ class PokerAnalyticsApplication : Application() { val realm: Realm = Realm.getDefaultInstance() // Add observer on session time frame changes this.sessions = realm.where(Session::class.java).findAll() // monitor session deletions - this.sessions?.addChangeListener { t, changeSet -> + this.sessions?.addChangeListener { _, changeSet -> /* val deletedSessions = realm.where(Session::class.java).`in`("id", changeSet.deletions.toTypedArray()).findAll() diff --git a/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt b/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt index 26922fcd..482b6c01 100644 --- a/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt +++ b/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt @@ -135,7 +135,8 @@ class Calculator { // Compute for each serie var duration: Double = 0.0 - var hourlyRate: Double = 0.0; var hourlyRateBB: Double = 0.0 + var hourlyRate: Double = 0.0 + var hourlyRateBB: Double = 0.0 var gIndex = 0; var gSum = 0.0; var gTotalHands = 0.0; var gBBSum = 0.0; sessionSets.forEach { sessionSet -> diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt index 2a95ab7e..87f7b9b4 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt @@ -169,6 +169,7 @@ open class Session : RealmObject(), SessionInterface, Savable, this.timeFrame?.pauseDate = null this.timeFrame?.setDate(null, Date()) } + else -> throw Exception("Stopping session in unmanaged state") } } } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt index 7cc75b50..e968cadc 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt @@ -124,7 +124,7 @@ class EditableDataFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, builder.setTitle(R.string.warning) .setMessage(R.string.are_you_sure_you_want_to_do_that_) .setNegativeButton(R.string.no, null) - .setPositiveButton(R.string.yes) { _, id -> + .setPositiveButton(R.string.yes) { _, _ -> if (this.item.isManaged) { Toast.makeText(requireContext(), "isManaged", Toast.LENGTH_SHORT).show() Timber.d("is managed") diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatsFragment.kt index 479409b3..7a0ea91e 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatsFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatsFragment.kt @@ -60,8 +60,7 @@ class StatsFragment : PokerAnalyticsFragment(), RowRepresentableDataSource { override fun stringForRow(row: RowRepresentable): String { if (row is StatRepresentable) { - val stat = row as StatRepresentable - val format = stat.computedStat.format() + val format = row.computedStat.format() return format.text } return "shouldn't happen :)" diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt index b0ef64ce..21a38c0a 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt @@ -63,7 +63,7 @@ class BottomSheetDoubleEditTextFragment : BottomSheetFragment() { editText2.addTextChangedListener { values[1] = it?.toString() ?: "" } editText2.setText((data[1].defaultValue ?: "").toString()) - editText2.setOnEditorActionListener { v, actionId, event -> + editText2.setOnEditorActionListener { v, actionId, _ -> if (actionId == EditorInfo.IME_ACTION_DONE) { this.delegate.onRowValueChanged(values, row) dismiss() diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt index 9e6be4a7..b3a137d7 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt @@ -54,7 +54,7 @@ class BottomSheetEditTextFragment : BottomSheetFragment() { editText1.addTextChangedListener { value = it?.toString() ?: "" } editText1.setText((data[0].defaultValue ?: "").toString()) - editText1.setOnEditorActionListener { v, actionId, event -> + editText1.setOnEditorActionListener { v, actionId, _ -> if (actionId == EditorInfo.IME_ACTION_DONE) { delegate.onRowValueChanged(getValue(), row) dismiss() diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt index 4933d08b..5c24e532 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt @@ -117,7 +117,7 @@ class BottomSheetSumFragment : BottomSheetFragment() { } } - editText2.setOnEditorActionListener { v, actionId, event -> + editText2.setOnEditorActionListener { v, actionId, _ -> if (actionId == EditorInfo.IME_ACTION_DONE) { this.delegate.onRowValueChanged(value, row) dismiss() diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt index 00be9c7e..3c57373a 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt @@ -137,9 +137,9 @@ enum class RowViewType { adapter.dataSource?.let { itemView.rowHeaderTitleValue_value.text = it.stringForRow(row, itemView.context) } - val listener = View.OnClickListener { - adapter.delegate?.onRowSelected(position, row) - } +// val listener = View.OnClickListener { +// adapter.delegate?.onRowSelected(position, row) +// } //itemView.rowHeaderTitleValue_container.setOnClickListener(listener) itemView.rowHeaderTitleValue_separator.visibility = if (row.needSeparator) View.VISIBLE else View.GONE } @@ -228,7 +228,7 @@ enum class RowViewType { BindableHolder { override fun bind(position: Int, row: RowRepresentable, adapter: RowRepresentableAdapter) { itemView.rowTitleValueAction_title.text = row.localizedTitle(itemView.context) - adapter.dataSource?.let { rowDelegate -> + adapter.dataSource.let { rowDelegate -> val value = rowDelegate.stringForRow(row, itemView.context) itemView.rowTitleValueAction_value.text = value