warning cleanup

feature/top10
Laurent 7 years ago
parent c268cca124
commit 4e478afa75
  1. 15
      app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
  2. 4
      app/src/main/java/net/pokeranalytics/android/calculus/bankroll/BankrollCalculator.kt
  3. 6
      app/src/main/java/net/pokeranalytics/android/model/utils/SessionSetManager.kt
  4. 2
      app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt
  5. 4
      app/src/main/java/net/pokeranalytics/android/ui/fragment/BankrollDataFragment.kt
  6. 2
      app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt
  7. 2
      app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt
  8. 2
      app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt

@ -58,10 +58,10 @@ class Calculator {
companion object { companion object {
fun computePreAggregation(sets: List<SessionSet>, options: Options): List<ComputedResults> { // fun computePreAggregation(sets: List<SessionSet>, options: Options): List<ComputedResults> {
Timber.d("sets = ${sets.size}") // Timber.d("sets = ${sets.size}")
return listOf() // return listOf()
} // }
/** /**
* Computes all stats for list of Session sessionGroup * Computes all stats for list of Session sessionGroup
@ -168,6 +168,9 @@ class Calculator {
} }
} }
else -> {
// nothing
}
} }
val sessionSets = computableGroup.sets val sessionSets = computableGroup.sets
@ -190,8 +193,8 @@ class Calculator {
var tSum = 0.0 var tSum = 0.0
var tTotalHands = 0.0 var tTotalHands = 0.0
var tBBSum = 0.0 var tBBSum = 0.0
var tHourlyRate = 0.0 var tHourlyRate: Double = 0.0
var tHourlyRateBB = 0.0 var tHourlyRateBB: Double = 0.0
sessionSets.forEach { sessionSet -> sessionSets.forEach { sessionSet ->
tIndex++ tIndex++

@ -18,14 +18,14 @@ class BankrollCalculator {
if (setup.bankroll != null) { if (setup.bankroll != null) {
sessionQuery.equalTo("bankroll.id", setup.bankroll.id) sessionQuery.equalTo("bankroll.id", setup.bankroll.id)
} }
val sessions = sessionQuery.findAll() // val sessions = sessionQuery.findAll()
val transactionQuery = realm.where(Transaction::class.java) val transactionQuery = realm.where(Transaction::class.java)
if (setup.bankroll != null) { if (setup.bankroll != null) {
transactionQuery.equalTo("bankroll.id", setup.bankroll.id).findAll() transactionQuery.equalTo("bankroll.id", setup.bankroll.id).findAll()
} }
val transactions = transactionQuery.findAll() val transactions = transactionQuery.findAll()
val sessionsNet = sessions.sum("result.net") // val sessionsNet = sessions.sum("result.net")
val transactionsNet = transactions.sum("value") val transactionsNet = transactions.sum("value")
transactions.forEach { transactions.forEach {

@ -125,9 +125,9 @@ class SessionSetManager {
session.sessionSet = set session.sessionSet = set
// Add all orphan endedSessions // Add all orphan endedSessions
sessions.forEach { session -> sessions.forEach { s ->
session.sessionSet = set s.sessionSet = set
set.breakDuration = max(set.breakDuration, session.breakDuration) set.breakDuration = max(set.breakDuration, s.breakDuration)
} }
set.computeStats() set.computeStats()

@ -152,7 +152,7 @@ class HomeActivity : PokerAnalyticsActivity() {
} }
} }
.setNegativeButton(R.string.cancel) {dialog, which -> .setNegativeButton(R.string.cancel) { _, which ->
Timber.d("Click on cancel") Timber.d("Click on cancel")
} }

@ -111,7 +111,7 @@ class BankrollDataFragment : EditableDataFragment(), StaticRowRepresentableDataS
override fun onRowSelected(position: Int, row: RowRepresentable, fromAction: Boolean) { override fun onRowSelected(position: Int, row: RowRepresentable, fromAction: Boolean) {
when (row) { when (row) {
BankrollRow.CURRENCY -> CurrenciesActivity.newInstanceForResult(this@BankrollDataFragment, BankrollDataFragment.REQUEST_CODE_CURRENCY) BankrollRow.CURRENCY -> CurrenciesActivity.newInstanceForResult(this@BankrollDataFragment, REQUEST_CODE_CURRENCY)
BankrollRow.REFRESH_RATE -> refreshRate() BankrollRow.REFRESH_RATE -> refreshRate()
else -> super.onRowSelected(position, row, fromAction) else -> super.onRowSelected(position, row, fromAction)
} }
@ -197,7 +197,7 @@ class BankrollDataFragment : EditableDataFragment(), StaticRowRepresentableDataS
override fun onResponse(call: Call<Map<String, CurrencyConverterValue>>, response: Response<Map<String, CurrencyConverterValue>>) { override fun onResponse(call: Call<Map<String, CurrencyConverterValue>>, response: Response<Map<String, CurrencyConverterValue>>) {
response.body()?.let { response.body()?.let {
it[currenciesConverterValue]?.value?.let {rate -> it[currenciesConverterValue]?.value?.let { rate ->
onRowValueChanged(rate.toString(), BankrollRow.RATE) onRowValueChanged(rate.toString(), BankrollRow.RATE)
} }
} }

@ -88,7 +88,7 @@ class BottomSheetDoubleEditTextFragment : BottomSheetFragment() {
} }
editText2.setOnEditorActionListener { v, actionId, _ -> editText2.setOnEditorActionListener { _, actionId, _ ->
if (actionId == EditorInfo.IME_ACTION_DONE) { if (actionId == EditorInfo.IME_ACTION_DONE) {
this.delegate.onRowValueChanged(values, row) this.delegate.onRowValueChanged(values, row)
dismiss() dismiss()

@ -53,7 +53,7 @@ class BottomSheetEditTextFragment : BottomSheetFragment() {
editText1.addTextChangedListener { value = it?.toString() ?: "" } editText1.addTextChangedListener { value = it?.toString() ?: "" }
editText1.setText((data[0].defaultValue ?: "").toString()) editText1.setText((data[0].defaultValue ?: "").toString())
editText1.setOnEditorActionListener { v, actionId, _ -> editText1.setOnEditorActionListener { _, actionId, _ ->
if (actionId == EditorInfo.IME_ACTION_DONE) { if (actionId == EditorInfo.IME_ACTION_DONE) {
delegate.onRowValueChanged(getValue(), row) delegate.onRowValueChanged(getValue(), row)
dismiss() dismiss()

@ -117,7 +117,7 @@ class BottomSheetSumFragment : BottomSheetFragment() {
} }
} }
editText2.setOnEditorActionListener { v, actionId, _ -> editText2.setOnEditorActionListener { _, actionId, _ ->
if (actionId == EditorInfo.IME_ACTION_DONE) { if (actionId == EditorInfo.IME_ACTION_DONE) {
this.delegate.onRowValueChanged(value, row) this.delegate.onRowValueChanged(value, row)
dismiss() dismiss()

Loading…
Cancel
Save