From 306b9d80dc539b9c53f5e0672e3364157fcc7b30 Mon Sep 17 00:00:00 2001 From: Laurent Date: Mon, 14 Dec 2020 14:46:32 +0100 Subject: [PATCH] Warnings removal --- .../android/ui/fragment/ComparisonChartFragment.kt | 4 ++-- .../android/ui/fragment/CurrenciesFragment.kt | 12 ++++++------ .../android/ui/fragment/ImportFragment.kt | 4 ++-- .../android/ui/fragment/ReportsFragment.kt | 4 ++-- .../android/ui/fragment/SettingsFragment.kt | 4 ++-- .../android/ui/fragment/StatisticsFragment.kt | 2 +- .../android/ui/fragment/SubscriptionFragment.kt | 10 +++++++--- .../android/ui/fragment/Top10Fragment.kt | 6 +++--- .../ui/modules/bankroll/BankrollDetailsFragment.kt | 2 +- .../android/ui/modules/bankroll/BankrollFragment.kt | 9 ++++----- .../ui/modules/calendar/CalendarDetailsFragment.kt | 2 +- .../android/ui/modules/calendar/CalendarFragment.kt | 10 +++++----- .../android/ui/modules/data/BankrollDataFragment.kt | 2 +- .../ui/modules/data/CustomFieldDataFragment.kt | 6 +++--- .../android/ui/modules/data/EditableDataFragment.kt | 2 +- .../android/ui/modules/data/LocationDataFragment.kt | 4 ++-- .../ui/modules/data/TransactionTypeDataFragment.kt | 2 +- .../pokeranalytics/android/util/billing/AppGuard.kt | 2 +- 18 files changed, 45 insertions(+), 42 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/ComparisonChartFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/ComparisonChartFragment.kt index a6f82776..3fc6c73f 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/ComparisonChartFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/ComparisonChartFragment.kt @@ -49,7 +49,7 @@ class ComparisonChartFragment : BaseFragment(), StaticRowRepresentableDataSource // Life Cycle - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { _binding = FragmentComparisonChartBinding.inflate(inflater, container, false) return binding.root } @@ -75,7 +75,7 @@ class ComparisonChartFragment : BaseFragment(), StaticRowRepresentableDataSource } // Rows - override fun adapterRows(): List? { + override fun adapterRows(): List { return rowRepresentation } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/CurrenciesFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/CurrenciesFragment.kt index e72a75bd..a6f2e5cf 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/CurrenciesFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/CurrenciesFragment.kt @@ -39,9 +39,9 @@ class CurrenciesFragment : BaseFragment(), StaticRowRepresentableDataSource, Row private val mostUsedCurrencies = this.mostUsedCurrencyCodes.map { code -> CurrencyRow( - this.systemCurrencies.filter { - it.currencyCode == code - }.first() + this.systemCurrencies.first { + it.currencyCode == code + } ) } @@ -76,7 +76,7 @@ class CurrenciesFragment : BaseFragment(), StaticRowRepresentableDataSource, Row // Life Cycle - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { _binding = FragmentCurrenciesBinding.inflate(inflater, container, false) return binding.root } @@ -95,8 +95,8 @@ class CurrenciesFragment : BaseFragment(), StaticRowRepresentableDataSource, Row // StaticRowRepresentableDataSource - override fun adapterRows(): List? { - return CurrenciesFragment.rowRepresentation + override fun adapterRows(): List { + return rowRepresentation } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/ImportFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/ImportFragment.kt index 4374cf94..b4c56d5d 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/ImportFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/ImportFragment.kt @@ -33,7 +33,7 @@ class ImportFragment : RealmFragment(), ImportDelegate { // Life Cycle - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { super.onCreateView(inflater, container, savedInstanceState) _binding = FragmentImportBinding.inflate(inflater, container, false) return binding.root @@ -151,7 +151,7 @@ class ImportFragment : RealmFragment(), ImportDelegate { activity?.finish() } - val numberFormatter = NumberFormat.getNumberInstance() + private val numberFormatter = NumberFormat.getNumberInstance() // ImportDelegate diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/ReportsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/ReportsFragment.kt index 335da63e..801ac0bf 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/ReportsFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/ReportsFragment.kt @@ -64,7 +64,7 @@ class ReportsFragment : DeletableItemFragment(), StaticRowRepresentableDataSourc // Life Cycle - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { super.onCreateView(inflater, container, savedInstanceState) _binding = FragmentReportsBinding.inflate(inflater, container, false) return binding.root @@ -151,7 +151,7 @@ class ReportsFragment : DeletableItemFragment(), StaticRowRepresentableDataSourc this.dataListAdapter.notifyDataSetChanged() } - override fun adapterRows(): List? { + override fun adapterRows(): List { return this.adapterRows } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt index 925e9fda..ec3e29cc 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt @@ -76,7 +76,7 @@ class SettingsFragment : RealmFragment(), RowRepresentableDelegate, StaticRowRep // Life Cycle - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { super.onCreateView(inflater, container, savedInstanceState) _binding = FragmentSettingsBinding.inflate(inflater, container, false) return binding.root @@ -133,7 +133,7 @@ class SettingsFragment : RealmFragment(), RowRepresentableDelegate, StaticRowRep } } - override fun adapterRows(): List? { + override fun adapterRows(): List { return rowRepresentation } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatisticsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatisticsFragment.kt index 3d3e0001..32bd0571 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatisticsFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatisticsFragment.kt @@ -52,7 +52,7 @@ class StatisticsFragment : FilterableFragment(), RealmAsyncListener { // Life Cycle - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { super.onCreateView(inflater, container, savedInstanceState) _binding = FragmentStatsBinding.inflate(inflater, container, false) return binding.root diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SubscriptionFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SubscriptionFragment.kt index 61e787b3..f4ddde3c 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SubscriptionFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SubscriptionFragment.kt @@ -3,6 +3,7 @@ package net.pokeranalytics.android.ui.fragment import android.content.Context import android.graphics.drawable.GradientDrawable import android.net.ConnectivityManager +import android.net.NetworkCapabilities import android.net.NetworkInfo import android.os.Build import android.os.Bundle @@ -60,7 +61,7 @@ class SubscriptionFragment : BaseFragment(), SkuDetailsResponseListener, Purchas // Life Cycle - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { _binding = FragmentSubscriptionBinding.inflate(inflater, container, false) return binding.root } @@ -75,8 +76,11 @@ class SubscriptionFragment : BaseFragment(), SkuDetailsResponseListener, Purchas super.onCreate(savedInstanceState) val cm = requireContext().getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager - val activeNetwork: NetworkInfo? = cm.activeNetworkInfo - val isConnected: Boolean = activeNetwork?.isConnected == true +// val activeNetwork = cm.activeNetworkInfo +// val isConnected = activeNetwork?.isConnected == true + + val capability = cm.getNetworkCapabilities(cm.activeNetwork) + val isConnected = capability?.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) ?: false if (!isConnected) { Toast.makeText(requireContext(), R.string.connection_unavailable, Toast.LENGTH_LONG).show() diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/Top10Fragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/Top10Fragment.kt index 0507adf2..47934d3a 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/Top10Fragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/Top10Fragment.kt @@ -47,7 +47,7 @@ class Top10Fragment : RealmFragment(), RowRepresentableDataSource, RowRepresenta // Life Cycle - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { super.onCreateView(inflater, container, savedInstanceState) _binding = FragmentTop10Binding.inflate(inflater, container, false) return binding.root @@ -161,14 +161,14 @@ class Top10Fragment : RealmFragment(), RowRepresentableDataSource, RowRepresenta dataListAdapter.notifyDataSetChanged() } - override fun adapterRows(): List? { + override fun adapterRows(): List { return when (currentTab) { Tab.CASH_GAMES -> realmCashGames Tab.TOURNAMENTS -> realmTournaments } } - override fun rowRepresentableForPosition(position: Int): RowRepresentable? { + override fun rowRepresentableForPosition(position: Int): RowRepresentable { return when (currentTab) { Tab.CASH_GAMES -> realmCashGames[position] Tab.TOURNAMENTS -> realmTournaments[position] diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/bankroll/BankrollDetailsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/bankroll/BankrollDetailsFragment.kt index dc7bf18f..b56e6334 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/bankroll/BankrollDetailsFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/bankroll/BankrollDetailsFragment.kt @@ -52,7 +52,7 @@ class BankrollDetailsFragment : RealmFragment(), StaticRowRepresentableDataSourc // Life Cycle - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { super.onCreateView(inflater, container, savedInstanceState) _binding = FragmentBankrollDetailsBinding.inflate(inflater, container, false) return binding.root diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/bankroll/BankrollFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/bankroll/BankrollFragment.kt index 599d0fee..63139c66 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/bankroll/BankrollFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/bankroll/BankrollFragment.kt @@ -16,18 +16,17 @@ import kotlinx.coroutines.launch import net.pokeranalytics.android.R import net.pokeranalytics.android.calculus.bankroll.BankrollReportManager import net.pokeranalytics.android.databinding.FragmentBankrollBinding -import net.pokeranalytics.android.databinding.FragmentBankrollDetailsBinding import net.pokeranalytics.android.model.LiveData import net.pokeranalytics.android.model.interfaces.Deletable import net.pokeranalytics.android.model.realm.Bankroll -import net.pokeranalytics.android.ui.modules.datalist.DataListActivity -import net.pokeranalytics.android.ui.modules.data.EditableDataActivity import net.pokeranalytics.android.ui.activity.GraphActivity import net.pokeranalytics.android.ui.activity.components.RequestCode import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource import net.pokeranalytics.android.ui.fragment.components.DeletableItemFragment +import net.pokeranalytics.android.ui.modules.data.EditableDataActivity +import net.pokeranalytics.android.ui.modules.datalist.DataListActivity import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowViewType import net.pokeranalytics.android.ui.view.rowrepresentable.BankrollGraphRow @@ -72,7 +71,7 @@ class BankrollFragment : DeletableItemFragment(), StaticRowRepresentableDataSour // Life Cycle - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { super.onCreateView(inflater, container, savedInstanceState) _binding = FragmentBankrollBinding.inflate(inflater, container, false) return binding.root @@ -179,7 +178,7 @@ class BankrollFragment : DeletableItemFragment(), StaticRowRepresentableDataSour } } - override fun adapterRows(): List? { + override fun adapterRows(): List { return rows } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarDetailsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarDetailsFragment.kt index 5a6375a3..5c3932e2 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarDetailsFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarDetailsFragment.kt @@ -57,7 +57,7 @@ class CalendarDetailsFragment : BaseFragment(), StaticRowRepresentableDataSource private var _binding: FragmentCalendarDetailsBinding? = null private val binding get() = _binding!! - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { _binding = FragmentCalendarDetailsBinding.inflate(inflater, container, false) return binding.root } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarFragment.kt index 40a7e3f0..d10a6439 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarFragment.kt @@ -76,7 +76,7 @@ class CalendarFragment : RealmFragment(), CoroutineScope, StaticRowRepresentable // Life Cycle - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { super.onCreateView(inflater, container, savedInstanceState) _binding = FragmentCalendarBinding.inflate(inflater, container, false) return binding.root @@ -242,8 +242,8 @@ class CalendarFragment : RealmFragment(), CoroutineScope, StaticRowRepresentable */ private fun launchAsyncStatComputation() { - binding.progressBar?.showWithAnimation() - binding.recyclerView?.hideWithAnimation() + binding.progressBar.showWithAnimation() + binding.recyclerView.hideWithAnimation() GlobalScope.launch { @@ -393,7 +393,7 @@ class CalendarFragment : RealmFragment(), CoroutineScope, StaticRowRepresentable ) rows.add(row) - datesForRows.put(row, date) + datesForRows[row] = date } } } @@ -410,7 +410,7 @@ class CalendarFragment : RealmFragment(), CoroutineScope, StaticRowRepresentable ) rows.add(row) - datesForRows.put(row, date) + datesForRows[row] = date } } } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/data/BankrollDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/BankrollDataFragment.kt index 61d5dd41..36697514 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/data/BankrollDataFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/BankrollDataFragment.kt @@ -123,7 +123,7 @@ class BankrollDataFragment : EditableDataFragment(), StaticRowRepresentableDataS return this } - override fun adapterRows(): List? { + override fun adapterRows(): List { return rows } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/data/CustomFieldDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/CustomFieldDataFragment.kt index 7bcc948a..c6963ee4 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/data/CustomFieldDataFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/CustomFieldDataFragment.kt @@ -210,6 +210,7 @@ class CustomFieldDataFragment : EditableDataFragment(), StaticRowRepresentableDa * Init UI */ private fun initUI() { + val addItem = binding.addItem val sortChoices = binding.sortChoices val sortDescending = binding.sortDescending @@ -220,7 +221,7 @@ class CustomFieldDataFragment : EditableDataFragment(), StaticRowRepresentableDa binding.bottomBar.visibility = View.VISIBLE if (customField.sortCondition == CustomField.Sort.DEFAULT.uniqueIdentifier) { - itemTouchHelper.attachToRecyclerView(binding.recyclerView) + itemTouchHelper.attachToRecyclerView(recyclerView) } else { itemTouchHelper.attachToRecyclerView(null) } @@ -253,7 +254,7 @@ class CustomFieldDataFragment : EditableDataFragment(), StaticRowRepresentableDa } if (customField.sortCondition == CustomField.Sort.DEFAULT.uniqueIdentifier) { - itemTouchHelper.attachToRecyclerView(binding.recyclerView) + itemTouchHelper.attachToRecyclerView(recyclerView) } else { itemTouchHelper.attachToRecyclerView(null) } @@ -271,7 +272,6 @@ class CustomFieldDataFragment : EditableDataFragment(), StaticRowRepresentableDa } } - /** * Update UI */ diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/data/EditableDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/EditableDataFragment.kt index e390e06a..9428f646 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/data/EditableDataFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/EditableDataFragment.kt @@ -125,7 +125,7 @@ open class EditableDataFragment : DataManagerFragment(), RowRepresentableDelegat val index = indexOfFirstRowToSelect() dataSource.adapterRows()?.let { rows -> if (rows.size > index) { - onRowSelected(index, rows.get(index)) + onRowSelected(index, rows[index]) } } } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/data/LocationDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/LocationDataFragment.kt index 012b062e..a1fe1b02 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/data/LocationDataFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/LocationDataFragment.kt @@ -63,7 +63,7 @@ class LocationDataFragment : EditableDataFragment(), StaticRowRepresentableDataS return this } - override fun adapterRows(): List? { + override fun adapterRows(): List { return rows } @@ -73,7 +73,7 @@ class LocationDataFragment : EditableDataFragment(), StaticRowRepresentableDataS tag: Int ): CharSequence { return when (row) { - SimpleRow.NAME -> if (location.name.isNotEmpty())location.name else NULL_TEXT + SimpleRow.NAME -> if (location.name.isNotEmpty()) location.name else NULL_TEXT else -> return super.charSequenceForRow(row, context, 0) } } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/data/TransactionTypeDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/TransactionTypeDataFragment.kt index 2a316ebe..c05f9229 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/data/TransactionTypeDataFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/TransactionTypeDataFragment.kt @@ -11,7 +11,7 @@ import net.pokeranalytics.android.ui.view.rowrepresentable.TransactionTypeRow class TransactionTypeDataFragment : EditableDataFragment(), RowRepresentableDataSource { - val transactionType: TransactionType + private val transactionType: TransactionType get() { return this.model.item as TransactionType } diff --git a/app/src/main/java/net/pokeranalytics/android/util/billing/AppGuard.kt b/app/src/main/java/net/pokeranalytics/android/util/billing/AppGuard.kt index 00a22cfa..ec401d48 100644 --- a/app/src/main/java/net/pokeranalytics/android/util/billing/AppGuard.kt +++ b/app/src/main/java/net/pokeranalytics/android/util/billing/AppGuard.kt @@ -65,7 +65,7 @@ object AppGuard : PurchasesUpdatedListener { if (this.endOfUse != null) return true return if (BuildConfig.DEBUG) { - true //false //true + false //true } else { this._isProUser }