Fixing crash due to refactoring

feature/top10
Laurent 7 years ago
parent 738571bdd5
commit dcc3113fe6
  1. 2
      app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
  2. 2
      app/src/main/java/net/pokeranalytics/android/calculus/Report.kt
  3. 2
      app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt
  4. 2
      app/src/main/java/net/pokeranalytics/android/ui/fragment/StatsFragment.kt

@ -97,11 +97,13 @@ class Calculator {
fun computeStatsWithEvolutionByAggregationType( fun computeStatsWithEvolutionByAggregationType(
realm: Realm, realm: Realm,
stat: Stat,
group: ComputableGroup, group: ComputableGroup,
aggregationType: AggregationType aggregationType: AggregationType
): Report { ): Report {
val options = Options(evolutionValues = Options.EvolutionValues.STANDARD, aggregationType = aggregationType) val options = Options(evolutionValues = Options.EvolutionValues.STANDARD, aggregationType = aggregationType)
options.displayedStats = listOf(stat)
if (aggregationType == AggregationType.DURATION) { if (aggregationType == AggregationType.DURATION) {
options.evolutionValues = Options.EvolutionValues.TIMED options.evolutionValues = Options.EvolutionValues.TIMED
} }

@ -388,7 +388,7 @@ class ComputedResults(group: ComputableGroup, shouldManageMultiGroupProgressValu
override val entryTitle: String = this.group.name override val entryTitle: String = this.group.name
override fun formattedValue(stat: Stat, context: Context): TextFormat { override fun formattedValue(stat: Stat, context: Context): TextFormat {
this.computedStat(stat)?.secondValue?.let { this.computedStat(stat)?.progressValue?.let {
return stat.format(it, context = context) return stat.format(it, context = context)
// return it.format(context) // return it.format(context)
} ?: run { } ?: run {

@ -147,7 +147,7 @@ class GraphFragment : PokerAnalyticsFragment(), OnChartValueSelectedListener, Co
val realm = Realm.getDefaultInstance() val realm = Realm.getDefaultInstance()
val report = val report =
Calculator.computeStatsWithEvolutionByAggregationType(realm, computableGroup, aggregationType) Calculator.computeStatsWithEvolutionByAggregationType(realm, stat, computableGroup, aggregationType)
reports[aggregationType] = report reports[aggregationType] = report
r = report r = report

@ -247,7 +247,7 @@ class StatsFragment : SessionObserverFragment(), StaticRowRepresentableDataSourc
val realm = Realm.getDefaultInstance() val realm = Realm.getDefaultInstance()
val aggregationType = stat.aggregationTypes.first() val aggregationType = stat.aggregationTypes.first()
report = Calculator.computeStatsWithEvolutionByAggregationType(realm, computableGroup, aggregationType) report = Calculator.computeStatsWithEvolutionByAggregationType(realm, stat, computableGroup, aggregationType)
realm.close() realm.close()

Loading…
Cancel
Save