Cleanup + TextFormat package change

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<Stat>? = null) {
+class ComputableGroup(var query: Query, var stats: List<Stat>? = null) {
 
-//	constructor(query: Query, statIds: List<Stat>? = null) : this(query.name, query.conditions)
+	/**
-//
+	 * A subgroup used to compute stat variation
-//	private constructor(name: String = "", conditions: List<QueryCondition> = listOf(), statIds: List<Stat>? = null)
+	 */
-
+	var comparedGroup: ComputableGroup? = null
-	var query: Query = query
 
 	/**
-	 * The display name of the group
+	 * The computed statIds of the comparable sessionGroup
 	 */
-//	val name: String
+	var comparedComputedResults: ComputedResults? = null
-//		get() {
-//			return this.query.name
-//		}
 
 	/**
 	 * A list of _conditions to get
@@ -164,21 +161,6 @@ class ComputableGroup(query: Query, stats: List<Stat>? = null) {
 		return sets
 	}
 
-	/**
-	 * The list of statIds to display
-	 */
-	var stats: List<Stat>? = 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

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

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

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

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.*

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
 

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

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

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

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
 

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
 

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