From 44202dc50bbbc591762f9061406dcaa46ceed0c9 Mon Sep 17 00:00:00 2001 From: Laurent Date: Fri, 12 Apr 2019 14:20:48 +0200 Subject: [PATCH 1/5] Graph styling + restricting for proper stats --- .../pokeranalytics/android/calculus/Stat.kt | 11 ++- .../android/ui/fragment/GraphFragment.kt | 4 +- .../android/ui/fragment/StatsFragment.kt | 2 +- .../android/ui/graph/GraphExtensions.kt | 93 ++++++++----------- .../android/ui/view/RowViewType.kt | 7 +- 5 files changed, 59 insertions(+), 58 deletions(-) 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 d4e89d06..e4b93588 100644 --- a/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt +++ b/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt @@ -203,7 +203,16 @@ enum class Stat : RowRepresentable { get() { return when (this) { NETRESULT -> listOf(AggregationType.SESSION, AggregationType.MONTH, AggregationType.YEAR, AggregationType.DURATION) - else -> listOf(AggregationType.SESSION, AggregationType.MONTH, AggregationType.YEAR, AggregationType.DURATION) + NUMBER_OF_GAMES, NUMBER_OF_SETS -> listOf(AggregationType.MONTH, AggregationType.YEAR) + else -> listOf(AggregationType.SESSION, AggregationType.MONTH, AggregationType.YEAR) + } + } + + val hasEvolutionGraph: Boolean + get() { + return when (this) { + DURATION, AVERAGE_DURATION -> false + else -> true } } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt index 6afffdbf..0b1ad19b 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt @@ -96,9 +96,11 @@ class GraphFragment : PokerAnalyticsFragment(), OnChartValueSelectedListener { this.chartContainer.addView(this.chartView) - this.chartView.setStyle(requireContext()) + this.chartView.setStyle(false, requireContext()) this.chartView.setOnChartValueSelectedListener(this) + this.chartView.highlightValue((this.entries.size - 1).toFloat(), 0) + this.stat.aggregationTypes.forEach { type -> val chip = Chip(requireContext()) chip.id = type.ordinal diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatsFragment.kt index 65cb1378..30decac6 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatsFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatsFragment.kt @@ -199,7 +199,7 @@ class StatsFragment : SessionObserverFragment(), StaticRowRepresentableDataSourc override fun onRowSelected(position: Int, row: RowRepresentable, fromAction: Boolean) { - if (row is StatRepresentable) { + if (row is StatRepresentable && row.stat.hasEvolutionGraph) { // filter groups val groupResults = this.report?.results?.filter { diff --git a/app/src/main/java/net/pokeranalytics/android/ui/graph/GraphExtensions.kt b/app/src/main/java/net/pokeranalytics/android/ui/graph/GraphExtensions.kt index ee94423e..d5c5dfcc 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/graph/GraphExtensions.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/graph/GraphExtensions.kt @@ -1,76 +1,63 @@ package net.pokeranalytics.android.ui.graph import android.content.Context +import android.graphics.Typeface import androidx.core.content.ContextCompat import com.github.mikephil.charting.charts.BarLineChartBase import com.github.mikephil.charting.components.XAxis import net.pokeranalytics.android.R import net.pokeranalytics.android.util.extensions.px -//fun BarChart.setStyle(context: Context) { -// GraphHelper.setStyle(this, context) -//} +fun BarLineChartBase<*>.setStyle(small: Boolean, context: Context) { -fun BarLineChartBase<*>.setStyle(context: Context) { - GraphHelper.setStyle(this, context) -} + // X Axis + this.xAxis.axisLineColor = ContextCompat.getColor(context, R.color.chart_default) + this.xAxis.enableGridDashedLine(3.0f.px, 5.0f.px, 1.0f.px) + this.xAxis.textColor = ContextCompat.getColor(context, R.color.chart_default) + this.xAxis.labelCount = 4 + this.xAxis.position = XAxis.XAxisPosition.BOTTOM -class GraphHelper { + this.xAxis.enableGridDashedLine(3.0f.px, 5.0f.px, 1.0f.px) - companion object { + this.xAxis.textColor = ContextCompat.getColor(context, R.color.chart_default) + this.xAxis.typeface = Typeface.DEFAULT + this.xAxis.labelCount = 4 + this.xAxis.position = XAxis.XAxisPosition.BOTTOM - fun setStyle(chart: BarLineChartBase<*>, context: Context) { + this.xAxis.setDrawLabels(true) + this.xAxis.setDrawGridLines(true) + this.xAxis.granularity = 1.0f + this.xAxis.isGranularityEnabled = true + this.xAxis.isEnabled = true - chart.xAxis.axisLineColor = ContextCompat.getColor(context, R.color.chart_default) - chart.xAxis.enableGridDashedLine(3.0f.px, 5.0f.px, 1.0f.px) - chart.xAxis.textColor = ContextCompat.getColor(context, R.color.chart_default) - chart.xAxis.labelCount = 4 - chart.xAxis.position = XAxis.XAxisPosition.BOTTOM + // Y Axis + this.axisLeft.setDrawAxisLine(false) + this.axisLeft.setDrawGridLines(true) + this.axisLeft.enableGridDashedLine(3.0f.px, 5.0f.px, 1.0f.px) - chart.axisLeft.enableGridDashedLine(3.0f.px, 5.0f.px, 1.0f.px) + this.axisLeft.setDrawZeroLine(true) +// this.axisLeft.zeroLineWidth = 1.0f.px + this.axisLeft.zeroLineColor = ContextCompat.getColor(context, R.color.chart_default) -// this.xAxis.axisLineWidth = ChartAppearance.lineWidth -// this.xAxis.enableGridDashedLine(3.0f, 5.0f, 1.0f) -// -// this.xAxis.labelTextColor = ChartAppearance.defaultColor -// this.xAxis.labelFont = Fonts.graphAxis -// this.xAxis.labelCount = 4 -// this.xAxis.labelPosition = .bottom -// -// this.xAxis.drawLabelsEnabled = true -// this.xAxis.drawGridLinesEnabled = true -// this.xAxis.granularity = 1.0 -// this.xAxis.granularityEnabled = true -// this.xAxis.enabled = true -// -// // Y Axis -// this.leftAxis.drawAxisLineEnabled = false -// this.leftAxis.drawGridLinesEnabled = true -// this.leftAxis.gridLineDashLengths = [3.0, 5.0] -// -// this.leftAxis.drawZeroLineEnabled = true -// this.leftAxis.zeroLineWidth = ChartAppearance.lineWidth -// this.leftAxis.zeroLineColor = ChartAppearance.defaultColor -// -// this.leftAxis.granularityEnabled = true -// this.leftAxis.granularity = 1.0 -// -// this.leftAxis.labelTextColor = ChartAppearance.defaultColor -// this.leftAxis.labelFont = Fonts.graphAxis -// this.leftAxis.labelCount = small ? 1 : 7 // @todo not great if interval is [0..2] for number of records as we get decimals -// + this.axisLeft.isGranularityEnabled = true + this.axisLeft.granularity = 1.0f + + this.axisLeft.textColor = ContextCompat.getColor(context, R.color.chart_default) + this.axisLeft.typeface = Typeface.DEFAULT + this.axisLeft.labelCount = + if (small) 1 else 7 // @todo not great if interval is [0..2] for number of records as we get decimals + + this.axisRight.isEnabled = false + this.legend.isEnabled = false + + +// @todo // if timeYAxis { -// this.leftAxis.valueFormatter = HourValueFormatter() +// this.axisLeft.valueFormatter = HourValueFormatter() // } else { -// this.leftAxis.valueFormatter = LargeNumberFormatter() +// this.axisLeft.valueFormatter = LargeNumberFormatter() // } // -// this.rightAxis.enabled = false -// -// this.legend.enabled = false - - } - } } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt index 1659120d..4ffd4bec 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt @@ -13,6 +13,7 @@ import androidx.recyclerview.widget.RecyclerView import kotlinx.android.synthetic.main.row_history_session.view.* import kotlinx.android.synthetic.main.row_transaction.view.* import net.pokeranalytics.android.R +import net.pokeranalytics.android.model.StatRepresentable import net.pokeranalytics.android.model.realm.Session import net.pokeranalytics.android.model.realm.Transaction import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter @@ -232,11 +233,13 @@ enum class RowViewType(private var layoutRes: Int) { itemView.findViewById(R.id.value)?.let { view -> adapter.dataSource.contentDescriptorForRow(row)?.textFormat?.let { view.setTextFormat(it, itemView.context) -// view.text = it.text -// view.setTextColor(it.getColor(itemView.context)) } } + if (row is StatRepresentable) { + itemView.findViewById(R.id.nextArrow)?.isVisible = row.stat.hasEvolutionGraph + } + // Listener val listener = View.OnClickListener { adapter.delegate?.onRowSelected(position, row) From 221400ad32ce90d0889a0b7e555b724630fda37c Mon Sep 17 00:00:00 2001 From: Laurent Date: Fri, 12 Apr 2019 14:54:32 +0200 Subject: [PATCH 2/5] Graph style --- .../java/net/pokeranalytics/android/ui/graph/ChartDataSet.kt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 app/src/main/java/net/pokeranalytics/android/ui/graph/ChartDataSet.kt diff --git a/app/src/main/java/net/pokeranalytics/android/ui/graph/ChartDataSet.kt b/app/src/main/java/net/pokeranalytics/android/ui/graph/ChartDataSet.kt new file mode 100644 index 00000000..626bbe2b --- /dev/null +++ b/app/src/main/java/net/pokeranalytics/android/ui/graph/ChartDataSet.kt @@ -0,0 +1,2 @@ +package net.pokeranalytics.android.ui.graph + From 1f8cb4d8f3f83513b80dc22905e34d9a154e877e Mon Sep 17 00:00:00 2001 From: Laurent Date: Fri, 12 Apr 2019 14:54:43 +0200 Subject: [PATCH 3/5] Graph style --- .../android/PokerAnalyticsApplication.kt | 2 +- .../android/ui/fragment/GraphFragment.kt | 4 ++-- .../pokeranalytics/android/ui/graph/ChartDataSet.kt | 13 +++++++++++++ .../android/ui/graph/GraphExtensions.kt | 2 -- app/src/main/res/values/colors.xml | 1 + 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt b/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt index a92e3af4..62539914 100644 --- a/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt +++ b/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt @@ -51,7 +51,7 @@ class PokerAnalyticsApplication : Application() { } if (BuildConfig.DEBUG) { - // this.createFakeSessions() + this.createFakeSessions() } } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt index 7873db89..474e6a34 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt @@ -9,7 +9,6 @@ import com.github.mikephil.charting.charts.BarLineChartBase import com.github.mikephil.charting.charts.LineChart import com.github.mikephil.charting.data.Entry import com.github.mikephil.charting.data.LineData -import com.github.mikephil.charting.data.LineDataSet import com.github.mikephil.charting.highlight.Highlight import com.github.mikephil.charting.listener.OnChartValueSelectedListener import com.google.android.material.chip.Chip @@ -21,6 +20,7 @@ import net.pokeranalytics.android.calculus.ObjectIdentifier import net.pokeranalytics.android.calculus.Stat import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment +import net.pokeranalytics.android.ui.graph.PALineDataSet import net.pokeranalytics.android.ui.graph.setStyle import net.pokeranalytics.android.ui.view.LegendView import net.pokeranalytics.android.util.extensions.ChipGroupExtension @@ -68,7 +68,7 @@ class GraphFragment : PokerAnalyticsFragment(), OnChartValueSelectedListener { this.legendContainer.addView(this.legendView) this.legendView.prepareWithStat(this.stat, this.entries.size) - val dataSet = LineDataSet(this.entries, this.stat.name) + val dataSet = PALineDataSet(this.entries, this.stat.name, requireContext()) val colors = arrayOf(R.color.green_light).toIntArray() dataSet.setColors(colors, context) dataSet.setDrawCircles(false) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/graph/ChartDataSet.kt b/app/src/main/java/net/pokeranalytics/android/ui/graph/ChartDataSet.kt index 626bbe2b..df878d24 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/graph/ChartDataSet.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/graph/ChartDataSet.kt @@ -1,2 +1,15 @@ package net.pokeranalytics.android.ui.graph +import android.content.Context +import com.github.mikephil.charting.data.Entry +import com.github.mikephil.charting.data.LineDataSet +import net.pokeranalytics.android.R + +class PALineDataSet(yVals: List, label: String, context: Context) : LineDataSet(yVals, label) { + + init { + this.highLightColor = context.getColor(R.color.chart_highlight_indicator) + } + + +} \ No newline at end of file diff --git a/app/src/main/java/net/pokeranalytics/android/ui/graph/GraphExtensions.kt b/app/src/main/java/net/pokeranalytics/android/ui/graph/GraphExtensions.kt index d5c5dfcc..12f82a12 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/graph/GraphExtensions.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/graph/GraphExtensions.kt @@ -17,8 +17,6 @@ fun BarLineChartBase<*>.setStyle(small: Boolean, context: Context) { this.xAxis.labelCount = 4 this.xAxis.position = XAxis.XAxisPosition.BOTTOM - this.xAxis.enableGridDashedLine(3.0f.px, 5.0f.px, 1.0f.px) - this.xAxis.textColor = ContextCompat.getColor(context, R.color.chart_default) this.xAxis.typeface = Typeface.DEFAULT this.xAxis.labelCount = 4 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 65d61cb7..16a219a4 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -38,5 +38,6 @@ #8e35c8 #5c7258 + #f8ffe5 From 91790f15ecba1ead32def6e976cf491386faeaf2 Mon Sep 17 00:00:00 2001 From: Laurent Date: Fri, 12 Apr 2019 15:01:17 +0200 Subject: [PATCH 4/5] Refactoring, moved UIExtensions in the ui package --- .../android/{util/extensions => ui}/UIExtensions.kt | 9 ++++++++- .../android/ui/fragment/ComparisonChartFragment.kt | 2 +- .../android/ui/fragment/GraphFragment.kt | 4 ++-- .../android/ui/fragment/SettingsFragment.kt | 6 +++--- .../bottomsheet/BottomSheetListGameFragment.kt | 2 +- .../bottomsheet/BottomSheetTableSizeGridFragment.kt | 2 +- .../pokeranalytics/android/ui/graph/GraphExtensions.kt | 2 +- .../android/ui/view/fields/FieldsExtension.kt | 10 ---------- 8 files changed, 17 insertions(+), 20 deletions(-) rename app/src/main/java/net/pokeranalytics/android/{util/extensions => ui}/UIExtensions.kt (91%) delete mode 100644 app/src/main/java/net/pokeranalytics/android/ui/view/fields/FieldsExtension.kt diff --git a/app/src/main/java/net/pokeranalytics/android/util/extensions/UIExtensions.kt b/app/src/main/java/net/pokeranalytics/android/ui/UIExtensions.kt similarity index 91% rename from app/src/main/java/net/pokeranalytics/android/util/extensions/UIExtensions.kt rename to app/src/main/java/net/pokeranalytics/android/ui/UIExtensions.kt index 06f89e3b..20b26d1a 100644 --- a/app/src/main/java/net/pokeranalytics/android/util/extensions/UIExtensions.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/UIExtensions.kt @@ -1,4 +1,4 @@ -package net.pokeranalytics.android.util.extensions +package net.pokeranalytics.android.ui import android.content.ActivityNotFoundException import android.content.Context @@ -7,10 +7,12 @@ import android.content.res.Resources import android.net.Uri import android.widget.Toast import androidx.appcompat.app.AlertDialog +import androidx.appcompat.widget.AppCompatTextView import androidx.browser.customtabs.CustomTabsIntent import androidx.core.content.ContextCompat import net.pokeranalytics.android.BuildConfig import net.pokeranalytics.android.R +import net.pokeranalytics.android.calculus.TextFormat import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment import net.pokeranalytics.android.util.DeviceUtils @@ -100,4 +102,9 @@ fun showAlertDialog(context: Context, title: Int? = null, message: Int? = null) } builder.setPositiveButton(R.string.ok, null) builder.show() +} + +fun AppCompatTextView.setTextFormat(textFormat: TextFormat, context: Context) { + this.setTextColor(textFormat.getColor(context)) + this.text = textFormat.text } \ No newline at end of file diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/ComparisonChartFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/ComparisonChartFragment.kt index ec221671..2b6648bb 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/ComparisonChartFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/ComparisonChartFragment.kt @@ -13,7 +13,7 @@ import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.rowrepresentable.MoreTabRow -import net.pokeranalytics.android.util.extensions.toast +import net.pokeranalytics.android.ui.toast class ComparisonChartFragment : PokerAnalyticsFragment(), StaticRowRepresentableDataSource, RowRepresentableDelegate { diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt index 474e6a34..eceea2f8 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt @@ -24,8 +24,8 @@ import net.pokeranalytics.android.ui.graph.PALineDataSet import net.pokeranalytics.android.ui.graph.setStyle import net.pokeranalytics.android.ui.view.LegendView import net.pokeranalytics.android.util.extensions.ChipGroupExtension -import net.pokeranalytics.android.util.extensions.px -import net.pokeranalytics.android.util.extensions.toast +import net.pokeranalytics.android.ui.px +import net.pokeranalytics.android.ui.toast import java.text.DateFormat class GraphFragment : PokerAnalyticsFragment(), OnChartValueSelectedListener { diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt index d6ebcdc1..a61e1238 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt @@ -25,9 +25,9 @@ import net.pokeranalytics.android.ui.view.rowrepresentable.SettingRow import net.pokeranalytics.android.util.Preferences import net.pokeranalytics.android.util.URL import net.pokeranalytics.android.util.UserDefaults -import net.pokeranalytics.android.util.extensions.openContactMail -import net.pokeranalytics.android.util.extensions.openPlayStorePage -import net.pokeranalytics.android.util.extensions.openUrl +import net.pokeranalytics.android.ui.openContactMail +import net.pokeranalytics.android.ui.openPlayStorePage +import net.pokeranalytics.android.ui.openUrl import java.util.* diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListGameFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListGameFragment.kt index 919acd05..0b8da921 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListGameFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListGameFragment.kt @@ -14,7 +14,7 @@ import net.pokeranalytics.android.exceptions.RowRepresentableEditDescriptorExcep import net.pokeranalytics.android.model.Limit import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter import net.pokeranalytics.android.ui.view.RowRepresentable -import net.pokeranalytics.android.util.extensions.px +import net.pokeranalytics.android.ui.px /** * Bottom Sheet List Game Fragment diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetTableSizeGridFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetTableSizeGridFragment.kt index e2a7ac37..50625def 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetTableSizeGridFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetTableSizeGridFragment.kt @@ -13,7 +13,7 @@ import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource import net.pokeranalytics.android.ui.view.GridSpacingItemDecoration import net.pokeranalytics.android.ui.view.RowRepresentable -import net.pokeranalytics.android.util.extensions.px +import net.pokeranalytics.android.ui.px class BottomSheetTableSizeGridFragment : BottomSheetFragment(), StaticRowRepresentableDataSource, RowRepresentableDelegate { diff --git a/app/src/main/java/net/pokeranalytics/android/ui/graph/GraphExtensions.kt b/app/src/main/java/net/pokeranalytics/android/ui/graph/GraphExtensions.kt index 12f82a12..dbacb7be 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/graph/GraphExtensions.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/graph/GraphExtensions.kt @@ -6,7 +6,7 @@ import androidx.core.content.ContextCompat import com.github.mikephil.charting.charts.BarLineChartBase import com.github.mikephil.charting.components.XAxis import net.pokeranalytics.android.R -import net.pokeranalytics.android.util.extensions.px +import net.pokeranalytics.android.ui.px fun BarLineChartBase<*>.setStyle(small: Boolean, context: Context) { diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/fields/FieldsExtension.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/fields/FieldsExtension.kt deleted file mode 100644 index 1a7b35c5..00000000 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/fields/FieldsExtension.kt +++ /dev/null @@ -1,10 +0,0 @@ -package net.pokeranalytics.android.ui.view.fields - -import android.content.Context -import androidx.appcompat.widget.AppCompatTextView -import net.pokeranalytics.android.calculus.TextFormat - -fun AppCompatTextView.setTextFormat(textFormat: TextFormat, context: Context) { - this.setTextColor(textFormat.getColor(context)) - this.text = textFormat.text -} \ No newline at end of file From acc019c21f46d623c3ce03bbac2ac0900bbc813d Mon Sep 17 00:00:00 2001 From: Laurent Date: Fri, 12 Apr 2019 15:03:38 +0200 Subject: [PATCH 5/5] Moved UI related extensions in ui.extensions --- .../android/{util => ui}/extensions/ChipGroupExtension.kt | 2 +- .../android/ui/{ => extensions}/UIExtensions.kt | 2 +- .../android/ui/fragment/ComparisonChartFragment.kt | 2 +- .../net/pokeranalytics/android/ui/fragment/GraphFragment.kt | 6 +++--- .../pokeranalytics/android/ui/fragment/SettingsFragment.kt | 6 +++--- .../components/bottomsheet/BottomSheetListGameFragment.kt | 2 +- .../bottomsheet/BottomSheetTableSizeGridFragment.kt | 2 +- .../net/pokeranalytics/android/ui/graph/GraphExtensions.kt | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) rename app/src/main/java/net/pokeranalytics/android/{util => ui}/extensions/ChipGroupExtension.kt (88%) rename app/src/main/java/net/pokeranalytics/android/ui/{ => extensions}/UIExtensions.kt (98%) diff --git a/app/src/main/java/net/pokeranalytics/android/util/extensions/ChipGroupExtension.kt b/app/src/main/java/net/pokeranalytics/android/ui/extensions/ChipGroupExtension.kt similarity index 88% rename from app/src/main/java/net/pokeranalytics/android/util/extensions/ChipGroupExtension.kt rename to app/src/main/java/net/pokeranalytics/android/ui/extensions/ChipGroupExtension.kt index 8a642069..e860242e 100644 --- a/app/src/main/java/net/pokeranalytics/android/util/extensions/ChipGroupExtension.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/extensions/ChipGroupExtension.kt @@ -1,4 +1,4 @@ -package net.pokeranalytics.android.util.extensions +package net.pokeranalytics.android.ui.extensions import com.google.android.material.chip.ChipGroup diff --git a/app/src/main/java/net/pokeranalytics/android/ui/UIExtensions.kt b/app/src/main/java/net/pokeranalytics/android/ui/extensions/UIExtensions.kt similarity index 98% rename from app/src/main/java/net/pokeranalytics/android/ui/UIExtensions.kt rename to app/src/main/java/net/pokeranalytics/android/ui/extensions/UIExtensions.kt index 20b26d1a..e7535db1 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/UIExtensions.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/extensions/UIExtensions.kt @@ -1,4 +1,4 @@ -package net.pokeranalytics.android.ui +package net.pokeranalytics.android.ui.extensions import android.content.ActivityNotFoundException import android.content.Context diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/ComparisonChartFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/ComparisonChartFragment.kt index 2b6648bb..eb2d3041 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/ComparisonChartFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/ComparisonChartFragment.kt @@ -13,7 +13,7 @@ import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.rowrepresentable.MoreTabRow -import net.pokeranalytics.android.ui.toast +import net.pokeranalytics.android.ui.extensions.toast class ComparisonChartFragment : PokerAnalyticsFragment(), StaticRowRepresentableDataSource, RowRepresentableDelegate { diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt index eceea2f8..3e220e22 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt @@ -23,9 +23,9 @@ import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment import net.pokeranalytics.android.ui.graph.PALineDataSet import net.pokeranalytics.android.ui.graph.setStyle import net.pokeranalytics.android.ui.view.LegendView -import net.pokeranalytics.android.util.extensions.ChipGroupExtension -import net.pokeranalytics.android.ui.px -import net.pokeranalytics.android.ui.toast +import net.pokeranalytics.android.ui.extensions.ChipGroupExtension +import net.pokeranalytics.android.ui.extensions.px +import net.pokeranalytics.android.ui.extensions.toast import java.text.DateFormat class GraphFragment : PokerAnalyticsFragment(), OnChartValueSelectedListener { diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt index a61e1238..3d681cee 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt @@ -25,9 +25,9 @@ import net.pokeranalytics.android.ui.view.rowrepresentable.SettingRow import net.pokeranalytics.android.util.Preferences import net.pokeranalytics.android.util.URL import net.pokeranalytics.android.util.UserDefaults -import net.pokeranalytics.android.ui.openContactMail -import net.pokeranalytics.android.ui.openPlayStorePage -import net.pokeranalytics.android.ui.openUrl +import net.pokeranalytics.android.ui.extensions.openContactMail +import net.pokeranalytics.android.ui.extensions.openPlayStorePage +import net.pokeranalytics.android.ui.extensions.openUrl import java.util.* diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListGameFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListGameFragment.kt index 0b8da921..3782f246 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListGameFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListGameFragment.kt @@ -14,7 +14,7 @@ import net.pokeranalytics.android.exceptions.RowRepresentableEditDescriptorExcep import net.pokeranalytics.android.model.Limit import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter import net.pokeranalytics.android.ui.view.RowRepresentable -import net.pokeranalytics.android.ui.px +import net.pokeranalytics.android.ui.extensions.px /** * Bottom Sheet List Game Fragment diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetTableSizeGridFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetTableSizeGridFragment.kt index 50625def..7c199c09 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetTableSizeGridFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetTableSizeGridFragment.kt @@ -13,7 +13,7 @@ import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource import net.pokeranalytics.android.ui.view.GridSpacingItemDecoration import net.pokeranalytics.android.ui.view.RowRepresentable -import net.pokeranalytics.android.ui.px +import net.pokeranalytics.android.ui.extensions.px class BottomSheetTableSizeGridFragment : BottomSheetFragment(), StaticRowRepresentableDataSource, RowRepresentableDelegate { diff --git a/app/src/main/java/net/pokeranalytics/android/ui/graph/GraphExtensions.kt b/app/src/main/java/net/pokeranalytics/android/ui/graph/GraphExtensions.kt index dbacb7be..e5f6e8a9 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/graph/GraphExtensions.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/graph/GraphExtensions.kt @@ -6,7 +6,7 @@ import androidx.core.content.ContextCompat import com.github.mikephil.charting.charts.BarLineChartBase import com.github.mikephil.charting.components.XAxis import net.pokeranalytics.android.R -import net.pokeranalytics.android.ui.px +import net.pokeranalytics.android.ui.extensions.px fun BarLineChartBase<*>.setStyle(small: Boolean, context: Context) {