cleanup + warnings fixes

app/src/main/AndroidManifest.xml

@@ -19,7 +19,7 @@
 			android:value="false" />
 
 		<activity
-			android:name=".ui.activity.HomeActivity"
+			android:name="net.pokeranalytics.android.ui.activity.HomeActivity"
 			android:screenOrientation="portrait"
 			android:label="@string/app_name">
 			<intent-filter>
@@ -30,68 +30,68 @@
 		</activity>
 
 		<activity
-			android:name=".ui.activity.SessionActivity"
+			android:name="net.pokeranalytics.android.ui.activity.SessionActivity"
 			android:launchMode="singleTop"
 			android:screenOrientation="portrait"
 			android:windowSoftInputMode="adjustNothing" />
 
 		<activity
-			android:name=".ui.activity.BankrollActivity"
+			android:name="net.pokeranalytics.android.ui.activity.BankrollActivity"
 			android:launchMode="singleTop"
 			android:screenOrientation="portrait" />
 
 		<activity
-			android:name=".ui.activity.SettingsActivity"
+			android:name="net.pokeranalytics.android.ui.activity.SettingsActivity"
 			android:launchMode="singleTop"
 			android:screenOrientation="portrait" />
 
 		<activity
-			android:name=".ui.activity.StatisticDetailsActivity"
+			android:name="net.pokeranalytics.android.ui.activity.StatisticDetailsActivity"
 			android:launchMode="singleTop"
 			android:screenOrientation="portrait" />
 
 		<activity
-			android:name=".ui.activity.ReportDetailsActivity"
+			android:name="net.pokeranalytics.android.ui.activity.ReportDetailsActivity"
 			android:launchMode="singleTop"
 			android:screenOrientation="portrait" />
 
 		<activity
-			android:name=".ui.activity.CalendarDetailsActivity"
+			android:name="net.pokeranalytics.android.ui.activity.CalendarDetailsActivity"
 			android:launchMode="singleTop"
 			android:screenOrientation="portrait" />
 
 		<activity
-			android:name=".ui.activity.ComparisonChartActivity"
+			android:name="net.pokeranalytics.android.ui.activity.ComparisonChartActivity"
 			android:launchMode="singleTop"
 			android:screenOrientation="portrait" />
 
 		<activity
-			android:name=".ui.activity.DataListActivity"
+			android:name="net.pokeranalytics.android.ui.activity.DataListActivity"
 			android:launchMode="singleTop"
 			android:screenOrientation="portrait" />
 
 		<activity
-			android:name=".ui.activity.EditableDataActivity"
+			android:name="net.pokeranalytics.android.ui.activity.EditableDataActivity"
 			android:launchMode="singleTop"
 			android:screenOrientation="portrait" />
 
 		<activity
-			android:name=".ui.activity.CurrenciesActivity"
+			android:name="net.pokeranalytics.android.ui.activity.CurrenciesActivity"
 			android:launchMode="singleTop"
 			android:screenOrientation="portrait" />
 
 		<activity
-			android:name=".ui.activity.FiltersActivity"
+			android:name="net.pokeranalytics.android.ui.activity.FiltersActivity"
 			android:launchMode="singleTop"
 			android:screenOrientation="portrait" />
 
 		<activity
-			android:name=".ui.activity.FilterDetailsActivity"
+			android:name="net.pokeranalytics.android.ui.activity.FilterDetailsActivity"
 			android:launchMode="singleTop"
 			android:screenOrientation="portrait" />
 
 		<activity
-			android:name=".ui.activity.GDPRActivity"
+			android:name="net.pokeranalytics.android.ui.activity.GDPRActivity"
 			android:launchMode="singleTop"
 			android:screenOrientation="portrait" />
 

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()

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()
 

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()
 			}
 		}
 

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)
+				toolbar.title = getString(R.string.feed)
-				homeMenu?.findItem(net.pokeranalytics.android.R.id.filter)?.isVisible = true
+				homeMenu?.findItem(R.id.filter)?.isVisible = true
 			}
 			1 -> {
-				toolbar.title = getString(net.pokeranalytics.android.R.string.stats)
+				toolbar.title = getString(R.string.stats)
-				homeMenu?.findItem(net.pokeranalytics.android.R.id.filter)?.isVisible = true
+				homeMenu?.findItem(R.id.filter)?.isVisible = true
 			}
 			2 -> {
-				toolbar.title = getString(net.pokeranalytics.android.R.string.calendar)
+				toolbar.title = getString(R.string.calendar)
-				homeMenu?.findItem(net.pokeranalytics.android.R.id.filter)?.isVisible = false
+				homeMenu?.findItem(R.id.filter)?.isVisible = false
 			}
 			3 -> {
-				toolbar.title = getString(net.pokeranalytics.android.R.string.reports)
+				toolbar.title = getString(R.string.reports)
-				homeMenu?.findItem(net.pokeranalytics.android.R.id.filter)?.isVisible = false
+				homeMenu?.findItem(R.id.filter)?.isVisible = false
 			}
 			4 -> {
-				toolbar.title = getString(net.pokeranalytics.android.R.string.more)
+				toolbar.title = getString(R.string.more)
-				homeMenu?.findItem(net.pokeranalytics.android.R.id.filter)?.isVisible = false
+				homeMenu?.findItem(R.id.filter)?.isVisible = false
 			}
 		}
 	}
@@ -209,16 +211,16 @@ class HomeActivity : PokerAnalyticsActivity() {
 		val filterSelected = false
 
 		val choices = ArrayList<CharSequence>()
-		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(R.string.modify_current_filter))
-			choices.add(getString(net.pokeranalytics.android.R.string.load_from_db))
+			choices.add(getString(R.string.load_from_db))
-			choices.add(getString(net.pokeranalytics.android.R.string.remove_filter))
+			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")
 			}
 

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
 		)
 	}
 

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, dataSet.label)
-					this.selectValue(entry, groupName ?: "")
 
 				}
 			}
@@ -167,9 +164,7 @@ class GraphFragment : PokerAnalyticsFragment(), OnChartValueSelectedListener {
 
 		this.chartContainer.addView(this.chartView)
 
-		this.chartView?.let {
+		this.chartView?.setStyle(false, axisFormatting, requireContext())
-			it.setStyle(false, axisFormatting, requireContext())
-		}
 
 	}
 

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<Session>().findAll().sort("startDate", Sort.DESCENDING)
-		this.realmSessions.addChangeListener { _, changeSet ->
+		this.realmSessions.addChangeListener { _, _ ->
 			this.historyAdapter.refreshData()
 			this.historyAdapter.notifyDataSetChanged()
 		}

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<Stat>()
+		val computedStats = mutableListOf<Stat>()
 		computedStats.addAll(allStats)
 		computedStats.addAll(cgStats)
 		computedStats.addAll(tStats)

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) {
+	fun showLoader(resId: Int? = null, cancelable: Boolean = false) {
-		loaderDialogFragment = LoaderDialogFragment.newInstance(resId, false)
+		loaderDialogFragment = LoaderDialogFragment.newInstance(resId, cancelable)
 		activity?.let {
 			loaderDialogFragment?.show(it.supportFragmentManager, "loader")
 		}