From 91790f15ecba1ead32def6e976cf491386faeaf2 Mon Sep 17 00:00:00 2001 From: Laurent Date: Fri, 12 Apr 2019 15:01:17 +0200 Subject: [PATCH] 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