diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4fdeb098..0f90a6f6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -19,7 +19,7 @@ android:value="false" /> @@ -30,68 +30,68 @@ 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 9bcf98fc..5f679258 100644 --- a/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt +++ b/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt @@ -182,7 +182,7 @@ class Calculator { group.comparedComputedResults = report.results.lastOrNull() } - results.finalize(options) // later treatment, such as evolution numericValues sorting + results.finalize() // later treatment, such as evolution numericValues sorting report.addResults(results) val e = Date() diff --git a/app/src/main/java/net/pokeranalytics/android/calculus/Report.kt b/app/src/main/java/net/pokeranalytics/android/calculus/Report.kt index 8cee2454..01c5f336 100644 --- a/app/src/main/java/net/pokeranalytics/android/calculus/Report.kt +++ b/app/src/main/java/net/pokeranalytics/android/calculus/Report.kt @@ -341,7 +341,7 @@ class ComputedResults(group: ComputableGroup, shouldManageMultiGroupProgressValu } } - fun finalize(options: Calculator.Options) { + fun finalize() { this.consolidateProgressStats() diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Result.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Result.kt index e784e513..df768729 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Result.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Result.kt @@ -61,7 +61,7 @@ open class Result : RealmObject(), Filterable { field = value this.computeNet() if (value != null) { - this.session?.end() + this.session.end() } } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt index 23b9d5bd..719b8249 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt @@ -12,7 +12,9 @@ import com.google.android.material.bottomnavigation.BottomNavigationView import io.realm.RealmResults import kotlinx.android.synthetic.main.activity_home.* import net.pokeranalytics.android.BuildConfig +import net.pokeranalytics.android.R import net.pokeranalytics.android.model.realm.Currency +import net.pokeranalytics.android.ui.activity.FiltersActivity import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity import net.pokeranalytics.android.ui.adapter.HomePagerAdapter import timber.log.Timber @@ -46,19 +48,19 @@ class HomeActivity : PokerAnalyticsActivity() { displayFragment(2) } */ - net.pokeranalytics.android.R.id.navigation_history -> { + R.id.navigation_history -> { displayFragment(0) } - net.pokeranalytics.android.R.id.navigation_stats -> { + R.id.navigation_stats -> { displayFragment(1) } - net.pokeranalytics.android.R.id.navigation_calendar -> { + R.id.navigation_calendar -> { displayFragment(2) } - net.pokeranalytics.android.R.id.navigation_reports -> { + R.id.navigation_reports -> { displayFragment(3) } - net.pokeranalytics.android.R.id.navigation_more -> { + R.id.navigation_more -> { displayFragment(4) } } @@ -77,7 +79,7 @@ class HomeActivity : PokerAnalyticsActivity() { } } - setContentView(net.pokeranalytics.android.R.layout.activity_home) + setContentView(R.layout.activity_home) observeRealmObjects() initUI() @@ -86,16 +88,16 @@ class HomeActivity : PokerAnalyticsActivity() { override fun onCreateOptionsMenu(menu: Menu?): Boolean { menu?.clear() - menuInflater.inflate(net.pokeranalytics.android.R.menu.toolbar_home, menu) + menuInflater.inflate(R.menu.toolbar_home, menu) this.homeMenu = menu //TODO: Change queryWith button visibility - homeMenu?.findItem(net.pokeranalytics.android.R.id.filter)?.isVisible = true + homeMenu?.findItem(R.id.filter)?.isVisible = true return super.onCreateOptionsMenu(menu) } override fun onOptionsItemSelected(item: MenuItem?): Boolean { when (item?.itemId) { - net.pokeranalytics.android.R.id.filter -> manageFilters() + R.id.filter -> manageFilters() } return super.onOptionsItemSelected(item) } @@ -125,7 +127,7 @@ class HomeActivity : PokerAnalyticsActivity() { setSupportActionBar(toolbar) navigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener) - navigation.selectedItemId = net.pokeranalytics.android.R.id.navigation_history + navigation.selectedItemId = R.id.navigation_history val homePagerAdapter = HomePagerAdapter(supportFragmentManager) viewPager.offscreenPageLimit = 5 @@ -179,24 +181,24 @@ class HomeActivity : PokerAnalyticsActivity() { */ 0 -> { - toolbar.title = getString(net.pokeranalytics.android.R.string.feed) - homeMenu?.findItem(net.pokeranalytics.android.R.id.filter)?.isVisible = true + toolbar.title = getString(R.string.feed) + homeMenu?.findItem(R.id.filter)?.isVisible = true } 1 -> { - toolbar.title = getString(net.pokeranalytics.android.R.string.stats) - homeMenu?.findItem(net.pokeranalytics.android.R.id.filter)?.isVisible = true + toolbar.title = getString(R.string.stats) + homeMenu?.findItem(R.id.filter)?.isVisible = true } 2 -> { - toolbar.title = getString(net.pokeranalytics.android.R.string.calendar) - homeMenu?.findItem(net.pokeranalytics.android.R.id.filter)?.isVisible = false + toolbar.title = getString(R.string.calendar) + homeMenu?.findItem(R.id.filter)?.isVisible = false } 3 -> { - toolbar.title = getString(net.pokeranalytics.android.R.string.reports) - homeMenu?.findItem(net.pokeranalytics.android.R.id.filter)?.isVisible = false + toolbar.title = getString(R.string.reports) + homeMenu?.findItem(R.id.filter)?.isVisible = false } 4 -> { - toolbar.title = getString(net.pokeranalytics.android.R.string.more) - homeMenu?.findItem(net.pokeranalytics.android.R.id.filter)?.isVisible = false + toolbar.title = getString(R.string.more) + homeMenu?.findItem(R.id.filter)?.isVisible = false } } } @@ -209,16 +211,16 @@ class HomeActivity : PokerAnalyticsActivity() { val filterSelected = false val choices = ArrayList() - choices.add(getString(net.pokeranalytics.android.R.string.new_str)) + choices.add(getString(R.string.new_str)) if (filterSelected) { - choices.add(getString(net.pokeranalytics.android.R.string.modify_current_filter)) - choices.add(getString(net.pokeranalytics.android.R.string.load_from_db)) - choices.add(getString(net.pokeranalytics.android.R.string.remove_filter)) + choices.add(getString(R.string.modify_current_filter)) + choices.add(getString(R.string.load_from_db)) + choices.add(getString(R.string.remove_filter)) } val builder = AlertDialog.Builder(this) - builder.setTitle(net.pokeranalytics.android.R.string.filter_selection) + builder.setTitle(R.string.filter_selection) .setCancelable(true) .setItems(choices.toTypedArray()) { _, which -> Timber.d("Click on $which") @@ -226,7 +228,7 @@ class HomeActivity : PokerAnalyticsActivity() { 0 -> FiltersActivity.newInstance(this@HomeActivity) } } - .setNegativeButton(net.pokeranalytics.android.R.string.cancel) { _, _ -> + .setNegativeButton(R.string.cancel) { _, _ -> Timber.d("Click on cancel") } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/components/PokerAnalyticsActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/activity/components/PokerAnalyticsActivity.kt index 141035be..38bd6081 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/activity/components/PokerAnalyticsActivity.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/activity/components/PokerAnalyticsActivity.kt @@ -84,7 +84,7 @@ open class PokerAnalyticsActivity : AppCompatActivity() { private fun askForLocationPermission(permissionCallback: ((granted: Boolean) -> Unit)) { this.permissionCallback = permissionCallback ActivityCompat.requestPermissions( - this, arrayOf(Manifest.permission.ACCESS_FINE_LOCATION), PERMISSION_REQUEST_ACCESS_FINE_LOCATION + this, arrayOf(ACCESS_FINE_LOCATION), PERMISSION_REQUEST_ACCESS_FINE_LOCATION ) } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt index 8745d937..47646238 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt @@ -117,8 +117,6 @@ class GraphFragment : PokerAnalyticsFragment(), OnChartValueSelectedListener { this.chartContainer.removeAllViews() - var groupName: String? = null - this.lineDataSetList?.let { dataSets -> val lineChart = LineChart(context) @@ -134,8 +132,7 @@ class GraphFragment : PokerAnalyticsFragment(), OnChartValueSelectedListener { this.legendView.prepareWithStat(this.stat, dataSet.entryCount, this.style) if (dataSet.entryCount > 0) { val entry = dataSet.getEntryForIndex(dataSet.entryCount - 1) - groupName = dataSet.label - this.selectValue(entry, groupName ?: "") + this.selectValue(entry, dataSet.label) } } @@ -167,9 +164,7 @@ class GraphFragment : PokerAnalyticsFragment(), OnChartValueSelectedListener { this.chartContainer.addView(this.chartView) - this.chartView?.let { - it.setStyle(false, axisFormatting, requireContext()) - } + this.chartView?.setStyle(false, axisFormatting, requireContext()) } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt index 59c01ec9..06319966 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt @@ -111,7 +111,7 @@ class HistoryFragment : PokerAnalyticsFragment(), LiveRowRepresentableDataSource private fun initData() { this.realmSessions = getRealm().where().findAll().sort("startDate", Sort.DESCENDING) - this.realmSessions.addChangeListener { _, changeSet -> + this.realmSessions.addChangeListener { _, _ -> this.historyAdapter.refreshData() this.historyAdapter.notifyDataSetChanged() } 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 fd147bb0..336b56fd 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 @@ -140,7 +140,7 @@ class StatisticsFragment : TableReportFragment() { Timber.d(">>>>> Start computations...") val options = Calculator.Options() - var computedStats = mutableListOf() + val computedStats = mutableListOf() computedStats.addAll(allStats) computedStats.addAll(cgStats) computedStats.addAll(tStats) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/PokerAnalyticsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/PokerAnalyticsFragment.kt index 11ebca17..12a92fa0 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/PokerAnalyticsFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/PokerAnalyticsFragment.kt @@ -40,8 +40,8 @@ open class PokerAnalyticsFragment: Fragment() { /** * Show the loader */ - fun showLoader(resId: Int? = null, cancelable: Boolean? = false) { - loaderDialogFragment = LoaderDialogFragment.newInstance(resId, false) + fun showLoader(resId: Int? = null, cancelable: Boolean = false) { + loaderDialogFragment = LoaderDialogFragment.newInstance(resId, cancelable) activity?.let { loaderDialogFragment?.show(it.supportFragmentManager, "loader") }