Remove unnecessary FormattedTextView & clean code

app/src/main/java/net/pokeranalytics/android/ui/view/FormattedTextView.kt

@@ -1,47 +0,0 @@
-package net.pokeranalytics.android.ui.view
-
-import android.content.Context
-import android.util.AttributeSet
-import androidx.appcompat.widget.AppCompatTextView
-import net.pokeranalytics.android.calculus.TextFormat
-
-/**
- * Extended TextView to display a TextFormat object
- */
-class FormattedTextView: AppCompatTextView {
-
-	var textFormat: TextFormat? = null
-	set(value) {
-		field = value
-		updateUI()
-	}
-
-	constructor(context: Context?) : super(context) {
-		init(null)
-	}
-
-	constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs) {
-		init(attrs)
-	}
-
-	constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
-		init(attrs)
-	}
-
-	/**
-	 * Init class
-	 */
-	private fun init(attrs: AttributeSet?) {
-	}
-
-	/**
-	 * Update the UI to manage currency format & color management
-	 */
-	private fun updateUI() {
-		textFormat?.let {
-			setTextColor(it.getColor(context))
-			text = it.text
-		}
-	}
-
-}

app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt

@@ -83,7 +83,7 @@ enum class RowViewType(private var layoutRes: Int) {
 			// Separator
 			SEPARATOR -> SeparatorViewHolder(layout)
 
-			else -> throw Exception("Undefined rowViewType's holder")
+			//else -> throw Exception("Undefined rowViewType's holder")
 		}
 	}
 
@@ -102,7 +102,7 @@ enum class RowViewType(private var layoutRes: Int) {
 				}
 
 				// Value
-				itemView.findViewById<FormattedTextView?>(R.id.value)?.let {
+				itemView.findViewById<AppCompatTextView?>(R.id.value)?.let {
 					if (row.computedStat != null) {
 						val format = row.computedStat!!.format(itemView.context)
 						it.setTextColor(format.getColor(itemView.context))

app/src/main/java/net/pokeranalytics/android/ui/view/SessionRowView.kt

@@ -134,8 +134,9 @@ class SessionRowView : FrameLayout {
 			rowHistorySession.infoTitle.isVisible = false
 
 			val result = session.result?.net ?: 0.0
-			val stat = ComputedStat(Stat.NETRESULT, result)
+			val formattedStat = ComputedStat(Stat.NETRESULT, result).format(context)
-			rowHistorySession.gameResult.textFormat = stat.format(context)
+			rowHistorySession.gameResult.setTextColor(formattedStat.getColor(context))
+			rowHistorySession.gameResult.text = formattedStat.text
 		}
 
 	}

app/src/main/res/layout/row_header_title_amount.xml

@@ -24,7 +24,7 @@
 			app:layout_constraintTop_toTopOf="parent"
 			tools:text="Title" />
 
-		<net.pokeranalytics.android.ui.view.FormattedTextView
+		<androidx.appcompat.widget.AppCompatTextView
 			android:id="@+id/value"
 			style="@style/PokerAnalyticsTheme.TextView.RowValue"
 			android:layout_width="0dp"

app/src/main/res/layout/row_header_title_amount_big.xml

@@ -24,7 +24,7 @@
 			app:layout_constraintTop_toTopOf="parent"
 			tools:text="Title" />
 
-		<net.pokeranalytics.android.ui.view.FormattedTextView
+		<androidx.appcompat.widget.AppCompatTextView
 			android:id="@+id/value"
 			style="@style/PokerAnalyticsTheme.TextView.RowValue"
 			android:layout_width="0dp"

app/src/main/res/layout/row_header_title_value.xml

@@ -22,7 +22,7 @@
 			app:layout_constraintTop_toTopOf="parent"
 			tools:text="Title" />
 
-		<net.pokeranalytics.android.ui.view.FormattedTextView
+		<androidx.appcompat.widget.AppCompatTextView
 			android:id="@+id/value"
 			style="@style/PokerAnalyticsTheme.TextView.RowValue"
 			android:layout_width="0dp"

app/src/main/res/layout/row_session_view.xml

@@ -151,15 +151,14 @@
 		app:layout_constraintEnd_toStartOf="@+id/nextArrow"
 		app:layout_constraintTop_toTopOf="@+id/sessionTitle">
 
-		<net.pokeranalytics.android.ui.view.FormattedTextView
+		<androidx.appcompat.widget.AppCompatTextView
 			android:id="@+id/gameResult"
 			style="@style/PokerAnalyticsTheme.TextView.SessionRow.Result"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:visibility="gone"
-			app:isCurrency="true"
+			tools:visibility="visible"
-			tools:amount="1000"
+			tools:text="$ 1000"/>
-			tools:visibility="visible" />
 
 		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/infoIcon"

app/src/main/res/values/attrs.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<declare-styleable name="FormattedTextView">
-		<attr name="isCurrency" format="boolean" />
-		<attr name="amount" format="float" />
-	</declare-styleable>
-</resources>