From fc87620f91eaf921b583a1863e2042feee4530ab Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Tue, 5 Mar 2019 18:34:10 +0100 Subject: [PATCH] Fix currencies display --- .../android/ui/fragment/CurrenciesFragment.kt | 7 +---- .../android/ui/view/RowViewType.kt | 28 +++++-------------- 2 files changed, 8 insertions(+), 27 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/CurrenciesFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/CurrenciesFragment.kt index 9665c990..29e460c3 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/CurrenciesFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/CurrenciesFragment.kt @@ -1,17 +1,13 @@ package net.pokeranalytics.android.ui.fragment -import android.content.Context import android.os.Bundle -import android.preference.Preference import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.LinearLayoutManager import kotlinx.android.synthetic.main.fragment_data_list.* import net.pokeranalytics.android.R -import net.pokeranalytics.android.model.LiveData import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity -import net.pokeranalytics.android.ui.adapter.LiveRowRepresentableDataSource import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource @@ -20,7 +16,6 @@ import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowViewType import net.pokeranalytics.android.ui.view.rowrepresentable.HeaderRowRepresentable import java.util.* -import java.util.prefs.Preferences class CurrenciesFragment : PokerAnalyticsFragment(), StaticRowRepresentableDataSource, RowRepresentableDelegate { @@ -45,7 +40,7 @@ class CurrenciesFragment : PokerAnalyticsFragment(), StaticRowRepresentableDataS private class CurrencyRow(var currency:Currency) : RowRepresentable { - override fun localizedTitle(context: Context): String { + override fun getDisplayName(): String { return currency.getDisplayName(Locale.getDefault()) } 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 69c3f4af..1412de0e 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 @@ -58,54 +58,40 @@ enum class RowViewType { HEADER_TITLE -> { HeaderViewHolder( LayoutInflater.from(parent.context).inflate( - R.layout.row_header_title, - parent, - false + R.layout.row_header_title, parent, false ) ) } HEADER_TITLE_VALUE -> HeaderViewHolder( LayoutInflater.from(parent.context).inflate( - R.layout.row_header_title_value, - parent, - false + R.layout.row_header_title_value, parent, false ) ) HEADER_TITLE_AMOUNT -> HeaderViewHolder( LayoutInflater.from(parent.context).inflate( - R.layout.row_header_title_amount, - parent, - false + R.layout.row_header_title_amount, parent, false ) ) HEADER_TITLE_AMOUNT_BIG -> HeaderViewHolder( LayoutInflater.from(parent.context).inflate( - R.layout.row_header_title_amount_big, - parent, - false + R.layout.row_header_title_amount_big, parent, false ) ) // Row View Holder TITLE -> RowViewHolder( LayoutInflater.from(parent.context).inflate( - R.layout.row_title, - parent, - false + R.layout.row_title, parent, false ) ) TITLE_ARROW -> RowViewHolder( LayoutInflater.from(parent.context).inflate( - R.layout.row_title_arrow, - parent, - false + R.layout.row_title_arrow, parent, false ) ) TITLE_GRID -> RowViewHolder( LayoutInflater.from(parent.context).inflate( - R.layout.row_bottom_sheet_grid_title, - parent, - false + R.layout.row_bottom_sheet_grid_title, parent, false ) ) DATA -> RowViewHolder(