From ebe660de498dd37a97b9cf0c438df790120cb145 Mon Sep 17 00:00:00 2001 From: Laurent Date: Fri, 24 May 2019 16:19:56 +0200 Subject: [PATCH] Cleanup + TextFormat package change --- .../pokeranalytics/android/calculus/Report.kt | 40 +++++-------------- .../pokeranalytics/android/calculus/Stat.kt | 1 + .../android/model/realm/Session.kt | 2 +- .../android/model/realm/SessionSet.kt | 2 +- .../android/model/realm/Transaction.kt | 2 +- .../ui/adapter/RowRepresentableDataSource.kt | 12 +++--- .../android/ui/extensions/UIExtensions.kt | 2 +- .../report/ComposableTableReportFragment.kt | 1 + .../android/ui/graph/GraphUnderlyingEntry.kt | 2 +- .../android/ui/view/LegendView.kt | 2 +- .../android/ui/view/MultiLineLegendView.kt | 2 +- .../android/{calculus => util}/TextFormat.kt | 2 +- 12 files changed, 26 insertions(+), 44 deletions(-) rename app/src/main/java/net/pokeranalytics/android/{calculus => util}/TextFormat.kt (87%) 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 73bcc3ba..79a61c71 100644 --- a/app/src/main/java/net/pokeranalytics/android/calculus/Report.kt +++ b/app/src/main/java/net/pokeranalytics/android/calculus/Report.kt @@ -17,6 +17,7 @@ import net.pokeranalytics.android.ui.graph.GraphUnderlyingEntry import net.pokeranalytics.android.ui.view.DefaultLegendValues import net.pokeranalytics.android.ui.view.LegendContent import net.pokeranalytics.android.util.ColorUtils +import net.pokeranalytics.android.util.TextFormat import kotlin.math.abs /** @@ -95,21 +96,17 @@ class Report(var options: Calculator.Options) { /** * A sessionGroup of computable items identified by a name */ -class ComputableGroup(query: Query, stats: List? = null) { +class ComputableGroup(var query: Query, var stats: List? = null) { -// constructor(query: Query, statIds: List? = null) : this(query.name, query.conditions) -// -// private constructor(name: String = "", conditions: List = listOf(), statIds: List? = null) - - var query: Query = query + /** + * A subgroup used to compute stat variation + */ + var comparedGroup: ComputableGroup? = null /** - * The display name of the group + * The computed statIds of the comparable sessionGroup */ -// val name: String -// get() { -// return this.query.name -// } + var comparedComputedResults: ComputedResults? = null /** * A list of _conditions to get @@ -164,21 +161,6 @@ class ComputableGroup(query: Query, stats: List? = null) { return sets } - /** - * The list of statIds to display - */ - var stats: List? = stats - - /** - * A subgroup used to compute stat variation - */ - var comparedGroup: ComputableGroup? = null - - /** - * The computed statIds of the comparable sessionGroup - */ - var comparedComputedResults: ComputedResults? = null - fun cleanup() { this._computables = null this._sessionSets = null @@ -220,10 +202,10 @@ class ComputedResults(group: ComputableGroup, shouldManageMultiGroupProgressValu } else { Point(value, data = data.objectIdentifier) } - this._addEvolutionValue(point, stat = stat) + this.addEvolutionValue(point, stat = stat) } - private fun _addEvolutionValue(point: Point, stat: Stat) { + private fun addEvolutionValue(point: Point, stat: Stat) { val evolutionValues = this._evolutionValues[stat] if (evolutionValues != null) { evolutionValues.add(point) @@ -364,9 +346,7 @@ class ComputedResults(group: ComputableGroup, shouldManageMultiGroupProgressValu } fun finalize() { - this.consolidateProgressStats() - } // MPAndroidChart diff --git a/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt b/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt index 7179990b..d065af5f 100644 --- a/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt +++ b/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt @@ -6,6 +6,7 @@ import net.pokeranalytics.android.exceptions.FormattingException import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowViewType import net.pokeranalytics.android.util.NULL_TEXT +import net.pokeranalytics.android.util.TextFormat import net.pokeranalytics.android.util.enumerations.IntIdentifiable import net.pokeranalytics.android.util.enumerations.IntSearchable import net.pokeranalytics.android.util.extensions.formatted diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt index 7749e651..8de86f78 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt @@ -15,7 +15,7 @@ import net.pokeranalytics.android.R import net.pokeranalytics.android.calculus.ComputedStat import net.pokeranalytics.android.calculus.Stat import net.pokeranalytics.android.calculus.StatFormattingException -import net.pokeranalytics.android.calculus.TextFormat +import net.pokeranalytics.android.util.TextFormat import net.pokeranalytics.android.exceptions.ModelException import net.pokeranalytics.android.model.Limit import net.pokeranalytics.android.model.TableSize diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/SessionSet.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/SessionSet.kt index ee0e43b5..da9976b6 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/SessionSet.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/SessionSet.kt @@ -8,7 +8,7 @@ import io.realm.annotations.LinkingObjects import io.realm.annotations.PrimaryKey import net.pokeranalytics.android.calculus.Stat import net.pokeranalytics.android.calculus.StatFormattingException -import net.pokeranalytics.android.calculus.TextFormat +import net.pokeranalytics.android.util.TextFormat import net.pokeranalytics.android.model.filter.Filterable import net.pokeranalytics.android.model.filter.QueryCondition import net.pokeranalytics.android.model.interfaces.Timed diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Transaction.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Transaction.kt index 930a4776..4ef2e5a6 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Transaction.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Transaction.kt @@ -8,7 +8,7 @@ import io.realm.annotations.PrimaryKey import io.realm.kotlin.where import net.pokeranalytics.android.R import net.pokeranalytics.android.calculus.Stat -import net.pokeranalytics.android.calculus.TextFormat +import net.pokeranalytics.android.util.TextFormat import net.pokeranalytics.android.model.filter.Filterable import net.pokeranalytics.android.model.filter.QueryCondition import net.pokeranalytics.android.model.interfaces.* diff --git a/app/src/main/java/net/pokeranalytics/android/ui/adapter/RowRepresentableDataSource.kt b/app/src/main/java/net/pokeranalytics/android/ui/adapter/RowRepresentableDataSource.kt index ff8ea00e..a33c6a6e 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/adapter/RowRepresentableDataSource.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/adapter/RowRepresentableDataSource.kt @@ -1,7 +1,7 @@ package net.pokeranalytics.android.ui.adapter import android.content.Context -import net.pokeranalytics.android.calculus.TextFormat +import net.pokeranalytics.android.util.TextFormat import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor @@ -77,11 +77,11 @@ interface LiveRowRepresentableDataSource: RowRepresentableDataSource { * Custom class providing the value to display and how to display them */ class DisplayDescriptor( - var boolValue: Boolean? = null, - var stringValue: String? = null, - var textFormat: TextFormat? = null, - var actionIcon: Int? = null, - var context: Context? = null) { + var boolValue: Boolean? = null, + var stringValue: String? = null, + var textFormat: TextFormat? = null, + var actionIcon: Int? = null, + var context: Context? = null) { } class UnmanagedRowRepresentableException(message: String) : Exception(message) { diff --git a/app/src/main/java/net/pokeranalytics/android/ui/extensions/UIExtensions.kt b/app/src/main/java/net/pokeranalytics/android/ui/extensions/UIExtensions.kt index 2b1ff140..6d58bb5c 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/extensions/UIExtensions.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/extensions/UIExtensions.kt @@ -16,7 +16,7 @@ import androidx.core.content.FileProvider import androidx.core.view.isVisible import net.pokeranalytics.android.BuildConfig import net.pokeranalytics.android.R -import net.pokeranalytics.android.calculus.TextFormat +import net.pokeranalytics.android.util.TextFormat import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment import net.pokeranalytics.android.util.DeviceUtils diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/ComposableTableReportFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/ComposableTableReportFragment.kt index 734ed4b2..7bcfa1c3 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/ComposableTableReportFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/ComposableTableReportFragment.kt @@ -22,6 +22,7 @@ import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.rowrepresentable.CustomizableRowRepresentable import net.pokeranalytics.android.ui.view.rowrepresentable.StatRow import net.pokeranalytics.android.util.NULL_TEXT +import net.pokeranalytics.android.util.TextFormat import timber.log.Timber import java.util.* import kotlin.coroutines.CoroutineContext diff --git a/app/src/main/java/net/pokeranalytics/android/ui/graph/GraphUnderlyingEntry.kt b/app/src/main/java/net/pokeranalytics/android/ui/graph/GraphUnderlyingEntry.kt index a5846e19..fb072ffb 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/graph/GraphUnderlyingEntry.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/graph/GraphUnderlyingEntry.kt @@ -3,7 +3,7 @@ package net.pokeranalytics.android.ui.graph import android.content.Context import com.github.mikephil.charting.data.Entry import net.pokeranalytics.android.calculus.Stat -import net.pokeranalytics.android.calculus.TextFormat +import net.pokeranalytics.android.util.TextFormat import net.pokeranalytics.android.model.interfaces.Timed import net.pokeranalytics.android.ui.fragment.GraphFragment import net.pokeranalytics.android.ui.view.DefaultLegendValues diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/LegendView.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/LegendView.kt index c04c1aed..e95e4829 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/LegendView.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/LegendView.kt @@ -9,7 +9,7 @@ import androidx.core.view.isVisible import kotlinx.android.synthetic.main.layout_legend_default.view.* import net.pokeranalytics.android.R import net.pokeranalytics.android.calculus.Stat -import net.pokeranalytics.android.calculus.TextFormat +import net.pokeranalytics.android.util.TextFormat import net.pokeranalytics.android.ui.extensions.setTextFormat import net.pokeranalytics.android.ui.fragment.GraphFragment diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/MultiLineLegendView.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/MultiLineLegendView.kt index 53bc4237..42016bb6 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/MultiLineLegendView.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/MultiLineLegendView.kt @@ -9,7 +9,7 @@ import kotlinx.android.synthetic.main.layout_legend_default.view.stat2Name import kotlinx.android.synthetic.main.layout_legend_default.view.stat2Value import net.pokeranalytics.android.R import net.pokeranalytics.android.calculus.Stat -import net.pokeranalytics.android.calculus.TextFormat +import net.pokeranalytics.android.util.TextFormat import net.pokeranalytics.android.ui.extensions.setTextFormat import net.pokeranalytics.android.ui.fragment.GraphFragment diff --git a/app/src/main/java/net/pokeranalytics/android/calculus/TextFormat.kt b/app/src/main/java/net/pokeranalytics/android/util/TextFormat.kt similarity index 87% rename from app/src/main/java/net/pokeranalytics/android/calculus/TextFormat.kt rename to app/src/main/java/net/pokeranalytics/android/util/TextFormat.kt index a5d26c6c..5bea21f5 100644 --- a/app/src/main/java/net/pokeranalytics/android/calculus/TextFormat.kt +++ b/app/src/main/java/net/pokeranalytics/android/util/TextFormat.kt @@ -1,4 +1,4 @@ -package net.pokeranalytics.android.calculus +package net.pokeranalytics.android.util import android.content.Context import android.graphics.Color