From 0fbe773cc01a72d745084712f8bfa6af1a4815b3 Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Thu, 21 Feb 2019 11:22:46 +0100 Subject: [PATCH 1/8] Update BottomSheet value management --- .../android/model/realm/Session.kt | 2 +- .../android/ui/fragment/EditableDataFragment.kt | 2 +- .../android/ui/fragment/SessionFragment.kt | 2 +- .../BottomSheetDoubleEditTextFragment.kt | 2 +- .../bottomsheet/BottomSheetEditTextFragment.kt | 2 +- .../bottomsheet/BottomSheetFragment.kt | 16 ++++++++-------- .../bottomsheet/BottomSheetSumFragment.kt | 2 +- .../BottomSheetTableSizeGridFragment.kt | 10 ++++++++++ 8 files changed, 24 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt index 7f328946..b0b405c0 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt @@ -293,7 +293,7 @@ open class Session : RealmObject(), SessionInterface, RowRepresentableDataSource data.add(BottomSheetData("", inputType = InputType.TYPE_CLASS_NUMBER)) data.add(BottomSheetData("", inputType = InputType.TYPE_CLASS_NUMBER)) } - SessionRow.TABLE_SIZE -> {} + SessionRow.TABLE_SIZE -> {data.add(BottomSheetData(tableSize))} SessionRow.GAME -> { // Add current game & games list data.add(BottomSheetData(game, data = LiveData.GAME.items(realm))) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt index 97bc80e7..5580934e 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt @@ -55,7 +55,7 @@ class EditableDataFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, rowRepresentableAdapter.refreshRow(row) } - override fun setValue(value: Any, row: RowRepresentable) { + override fun setValue(value: Any?, row: RowRepresentable) { (this.item as RowEditable).updateValue(value, row) this.getRealm().executeTransaction { it.copyToRealmOrUpdate(this.item) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt index a71988a4..da726c7a 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt @@ -93,7 +93,7 @@ class SessionFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, Bott sessionAdapter.refreshRow(row) } - override fun setValue(value: Any, row: RowRepresentable) { + override fun setValue(value: Any?, row: RowRepresentable) { currentSession.updateValue(value, row) sessionAdapter.refreshRow(row) } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt index 13f12ff3..066693d8 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt @@ -26,7 +26,7 @@ class BottomSheetDoubleEditTextFragment : BottomSheetFragment() { editText1.requestFocus() } - override fun getValue(): Any { + override fun getValue(): Any? { return values } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt index 0420957c..b9fdb024 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt @@ -26,7 +26,7 @@ class BottomSheetEditTextFragment : BottomSheetFragment() { editText1.requestFocus() } - override fun getValue(): Any { + override fun getValue(): Any? { return value } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt index bf079696..b529e346 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt @@ -24,7 +24,7 @@ enum class BottomSheetType { interface BottomSheetDelegate { fun clickOnAdd(row: RowRepresentable) fun clickOnClear(row: RowRepresentable) - fun setValue(value: Any, row: RowRepresentable) + fun setValue(value: Any?, row: RowRepresentable) } @@ -37,10 +37,10 @@ open class BottomSheetFragment : BottomSheetDialogFragment() { companion object { fun create( - fragmentManager: FragmentManager?, - row: RowRepresentable, - bottomSheetDelegate: BottomSheetDelegate, - data: ArrayList + fragmentManager: FragmentManager?, + row: RowRepresentable, + bottomSheetDelegate: BottomSheetDelegate, + data: ArrayList ): BottomSheetFragment { val bottomSheetFragment = when (row.bottomSheetType) { @@ -62,7 +62,7 @@ open class BottomSheetFragment : BottomSheetDialogFragment() { } override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { - return inflater.inflate(R.layout.fragment_bottom_sheet,container,false) + return inflater.inflate(R.layout.fragment_bottom_sheet, container, false) } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { @@ -114,8 +114,8 @@ open class BottomSheetFragment : BottomSheetDialogFragment() { return data } - open fun getValue(): Any { - return Any() + open fun getValue(): Any? { + return null } /** diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt index a4ed4188..b1e5ca3e 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt @@ -28,7 +28,7 @@ class BottomSheetSumFragment : BottomSheetFragment() { editText1.requestFocus() } - override fun getValue(): Any { + override fun getValue(): Any? { return value } 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 33b6c63e..868d17e7 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 @@ -15,6 +15,7 @@ class BottomSheetTableSizeGridFragment : BottomSheetFragment() { private var dataList: ArrayList = ArrayList() private lateinit var dataAdapter: TableSizeGridAdapter + private var defaultSize: Int? = null override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) @@ -27,11 +28,20 @@ class BottomSheetTableSizeGridFragment : BottomSheetFragment() { dataAdapter.notifyDataSetChanged() } + override fun getValue(): Any? { + return defaultSize + } + /** * Init data */ private fun initData() { + val bottomSheetData = getData() + if (bottomSheetData.isNotEmpty() && bottomSheetData.first().defaultValue != null) { + defaultSize = bottomSheetData.first().defaultValue as Int? + } + dataList.add(getString(net.pokeranalytics.android.R.string.heads_up)) for (i in 3..10) { dataList.add("$i-max") From 3ec46b368e3645d82e7a9df609c4cd345b37da31 Mon Sep 17 00:00:00 2001 From: Razmig Sarkissian Date: Thu, 21 Feb 2019 11:46:48 +0100 Subject: [PATCH 2/8] handle save and deletion of settings objects --- .../net/pokeranalytics/android/model/LiveData.kt | 7 ++++++- .../android/model/realm/Bankroll.kt | 4 ++++ .../pokeranalytics/android/model/realm/Game.kt | 5 +---- .../android/model/realm/Location.kt | 6 +++++- .../android/model/realm/TournamentFeature.kt | 7 ++++++- .../android/model/realm/TransactionType.kt | 6 +++++- .../android/ui/fragment/EditableDataFragment.kt | 15 ++++++++++++--- 7 files changed, 39 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/model/LiveData.kt b/app/src/main/java/net/pokeranalytics/android/model/LiveData.kt index f4cc0770..802726e4 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/LiveData.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/LiveData.kt @@ -6,6 +6,7 @@ import io.realm.RealmResults import io.realm.Sort import net.pokeranalytics.android.R import net.pokeranalytics.android.model.realm.* +import net.pokeranalytics.android.ui.adapter.components.LiveDataDataSource import net.pokeranalytics.android.ui.view.Localizable /** @@ -65,10 +66,14 @@ enum class LiveData : Localizable { return proxyItem } + fun deleteData(realm:Realm, data:LiveDataDataSource) { + realm.where(this.relatedEntity).equalTo("id", data.primaryKey).findAll().deleteAllFromRealm() + } + fun updateOrCreate(realm:Realm, primaryKey:String?): RealmObject { val proxyItem: RealmObject? = this.getData(realm, primaryKey) proxyItem?.let { - return realm.copyFromRealm(it) + return proxyItem } ?: run { return this.newEntity() /* realm.beginTransaction() diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt index d33a9174..240ce6de 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt @@ -81,4 +81,8 @@ open class Bankroll(name: String = "") : RealmObject(), RowRepresentableDataSour SimpleRow.NAME -> this.name = value as String? ?: "" } } + + override fun isValidForSave(): Boolean { + return this.name.isNotEmpty() + } } \ No newline at end of file diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt index ed6a31a1..2171bfb4 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt @@ -59,9 +59,6 @@ open class Game : RealmObject(), RowRepresentableDataSource, LiveDataDataSource, } override fun isValidForSave(): Boolean { - TODO("not implemented") //To change body of created functions use File | Settings | File Templates. + return this.name.isNotEmpty() } - - - } diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Location.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Location.kt index 528ec9a4..e5d24908 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Location.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Location.kt @@ -3,6 +3,7 @@ package net.pokeranalytics.android.model.realm import android.text.InputType import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import net.pokeranalytics.android.model.ObjectSavable import net.pokeranalytics.android.ui.adapter.components.* import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetData import net.pokeranalytics.android.ui.view.RowEditable @@ -12,7 +13,7 @@ import net.pokeranalytics.android.ui.view.SimpleRow import java.util.* -open class Location : RealmObject(), RowRepresentableDataSource, LiveDataDataSource, RowEditable { +open class Location : RealmObject(), RowRepresentableDataSource, LiveDataDataSource, RowEditable, ObjectSavable { @PrimaryKey var id = UUID.randomUUID().toString() @@ -57,4 +58,7 @@ open class Location : RealmObject(), RowRepresentableDataSource, LiveDataDataSou } } + override fun isValidForSave(): Boolean { + return this.name.isNotEmpty() + } } diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentFeature.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentFeature.kt index a92a3e76..b90c304b 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentFeature.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentFeature.kt @@ -3,6 +3,7 @@ package net.pokeranalytics.android.model.realm import android.text.InputType import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import net.pokeranalytics.android.model.ObjectSavable import net.pokeranalytics.android.ui.adapter.components.* import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetData import net.pokeranalytics.android.ui.view.RowEditable @@ -11,7 +12,7 @@ import net.pokeranalytics.android.ui.view.SimpleRow import net.pokeranalytics.android.ui.view.TournamentFeatureRow import java.util.* -open class TournamentFeature : RealmObject(), RowRepresentableDataSource, LiveDataDataSource, RowEditable { +open class TournamentFeature : RealmObject(), RowRepresentableDataSource, LiveDataDataSource, RowEditable, ObjectSavable { @PrimaryKey var id = UUID.randomUUID().toString() @@ -50,4 +51,8 @@ open class TournamentFeature : RealmObject(), RowRepresentableDataSource, LiveDa SimpleRow.NAME -> this.name = value as String? ?: "" } } + + override fun isValidForSave(): Boolean { + return this.name.isNotEmpty() + } } \ No newline at end of file diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/TransactionType.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/TransactionType.kt index c38f3942..f569440e 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/TransactionType.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/TransactionType.kt @@ -3,6 +3,7 @@ package net.pokeranalytics.android.model.realm import android.text.InputType import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import net.pokeranalytics.android.model.ObjectSavable import net.pokeranalytics.android.ui.adapter.components.* import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetData import net.pokeranalytics.android.ui.view.RowEditable @@ -12,7 +13,7 @@ import net.pokeranalytics.android.ui.view.TransactionTypeRow import java.util.* -open class TransactionType : RealmObject(), RowRepresentableDataSource, LiveDataDataSource, RowEditable { +open class TransactionType : RealmObject(), RowRepresentableDataSource, LiveDataDataSource, RowEditable, ObjectSavable { @PrimaryKey var id = UUID.randomUUID().toString() @@ -60,6 +61,9 @@ open class TransactionType : RealmObject(), RowRepresentableDataSource, LiveData } } + override fun isValidForSave(): Boolean { + return this.name.isNotEmpty() + } } enum class TransactionKind { diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt index 97bc80e7..f684d2b8 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt @@ -21,6 +21,7 @@ import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheet import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetFragment import net.pokeranalytics.android.ui.view.RowEditable import net.pokeranalytics.android.ui.view.RowRepresentable +import timber.log.Timber class EditableDataFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, BottomSheetDelegate { @@ -93,7 +94,7 @@ class EditableDataFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, } } else { val builder = AlertDialog.Builder(it.context) - builder.setTitle(R.string.warning) + .setMessage(R.string.empty_name_for_br_error) .setNegativeButton(R.string.ok, null) builder.show() } @@ -106,8 +107,16 @@ class EditableDataFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, .setMessage(R.string.are_you_sure_you_want_to_do_that_) .setNeutralButton(R.string.no, null) .setNegativeButton(R.string.yes, DialogInterface.OnClickListener { dialog, id -> - this.getRealm().executeTransaction { - this.item.deleteFromRealm() + + if (this.item.isManaged) { + Toast.makeText(requireContext(), "isManaged", Toast.LENGTH_SHORT).show() + Timber.d("is managed") + this.getRealm().executeTransaction { + this.liveDataType.deleteData(it, (this.item as LiveDataDataSource)) + } + } else { + Toast.makeText(requireContext(), "isNotManaged", Toast.LENGTH_SHORT).show() + Timber.d("is not managed") } this.activity?.let { it.finish() From 75556b28026ba926baa87109bb203232667178da Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Thu, 21 Feb 2019 15:44:07 +0100 Subject: [PATCH 3/8] Add data in resources --- ...ment.kt => BottomSheetListGameFragment.kt} | 30 +++++++++---- ...le_list.xml => bottom_sheet_game_list.xml} | 0 app/src/main/res/values/array_blind.xml | 44 +++++++++++++++++++ app/src/main/res/values/array_limit.xml | 17 +++++++ app/src/main/res/values/array_variant.xml | 21 +++++++++ 5 files changed, 104 insertions(+), 8 deletions(-) rename app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/{BottomSheetDoubleListFragment.kt => BottomSheetListGameFragment.kt} (60%) rename app/src/main/res/layout/{bottom_sheet_double_list.xml => bottom_sheet_game_list.xml} (100%) create mode 100644 app/src/main/res/values/array_blind.xml create mode 100644 app/src/main/res/values/array_limit.xml create mode 100644 app/src/main/res/values/array_variant.xml diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleListFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListGameFragment.kt similarity index 60% rename from app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleListFragment.kt rename to app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListGameFragment.kt index 672817f2..595f25f0 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleListFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListGameFragment.kt @@ -4,17 +4,17 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import androidx.recyclerview.widget.LinearLayoutManager -import kotlinx.android.synthetic.main.bottom_sheet_double_list.* +import kotlinx.android.synthetic.main.bottom_sheet_game_list.* import kotlinx.android.synthetic.main.fragment_bottom_sheet.view.* import net.pokeranalytics.android.R import net.pokeranalytics.android.model.realm.Game +import net.pokeranalytics.android.ui.adapter.LimitTypesAdapter import net.pokeranalytics.android.ui.adapter.components.LiveDataAdapter import net.pokeranalytics.android.ui.adapter.components.LiveDataDataSource import net.pokeranalytics.android.ui.adapter.components.LiveDataDelegate -class BottomSheetDoubleListFragment : BottomSheetFragment(), LiveDataDelegate { - +class BottomSheetGameListFragment : BottomSheetFragment(), LiveDataDelegate { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) @@ -47,15 +47,29 @@ class BottomSheetDoubleListFragment : BottomSheetFragment(), LiveDataDelegate { * Init UI */ private fun initUI() { - LayoutInflater.from(requireContext()).inflate(R.layout.bottom_sheet_double_list, view?.bottomSheetContainer, true) + LayoutInflater.from(requireContext()).inflate(R.layout.bottom_sheet_game_list, view?.bottomSheetContainer, true) + + val limits = ArrayList() + limits.add("--") + limits.addAll(resources.getStringArray(R.array.limit_short_name)) - val viewManager = LinearLayoutManager(requireContext()) - val dataAdapter = LiveDataAdapter(this, R.layout.row_bottom_sheet_title) + val viewManager1 = LinearLayoutManager(requireContext()) + val gameDataAdapter1 = LimitTypesAdapter(limits) reyclerView1.apply { setHasFixedSize(true) - layoutManager = viewManager - adapter = dataAdapter + layoutManager = viewManager1 + adapter = gameDataAdapter1 + } + + + val viewManager2 = LinearLayoutManager(requireContext()) + val gameDataAdapter2 = LiveDataAdapter(this, R.layout.row_bottom_sheet_title) + + reyclerView2.apply { + setHasFixedSize(true) + layoutManager = viewManager2 + adapter = gameDataAdapter2 } } diff --git a/app/src/main/res/layout/bottom_sheet_double_list.xml b/app/src/main/res/layout/bottom_sheet_game_list.xml similarity index 100% rename from app/src/main/res/layout/bottom_sheet_double_list.xml rename to app/src/main/res/layout/bottom_sheet_game_list.xml diff --git a/app/src/main/res/values/array_blind.xml b/app/src/main/res/values/array_blind.xml new file mode 100644 index 00000000..ec11808d --- /dev/null +++ b/app/src/main/res/values/array_blind.xml @@ -0,0 +1,44 @@ + + + + 2 + 4 + 6 + 10 + 20 + 40 + 50 + 60 + 80 + 100 + 150 + 200 + 250 + 300 + 400 + 500 + 600 + 800 + 1000 + 1200 + 1600 + 2000 + 2500 + 3000 + 4000 + 5000 + 6000 + 8000 + 10000 + 12000 + 15000 + 20000 + 25000 + 30000 + 40000 + 50000 + 60000 + 80000 + 100000 + + \ No newline at end of file diff --git a/app/src/main/res/values/array_limit.xml b/app/src/main/res/values/array_limit.xml new file mode 100644 index 00000000..096fef29 --- /dev/null +++ b/app/src/main/res/values/array_limit.xml @@ -0,0 +1,17 @@ + + + + No Limit + Pot Limit + Fixed Limit + Spread Limit + Mixed Limit + + + NL + PL + FL + SL + ML + + \ No newline at end of file diff --git a/app/src/main/res/values/array_variant.xml b/app/src/main/res/values/array_variant.xml new file mode 100644 index 00000000..3f6dd1b0 --- /dev/null +++ b/app/src/main/res/values/array_variant.xml @@ -0,0 +1,21 @@ + + + + Hold\'em + Omaha + Omaha Hi-Low + Seven Card Stud + Seven Card Stud Hi-Low + H.O.R.S.E. + Seven Card Razz + + + HE + OH + OH8 + 7S + Stud8 + HORSE + Razz + + \ No newline at end of file From 8fe25094de5965922ecb87422876218b0e1eb96a Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Thu, 21 Feb 2019 15:44:42 +0100 Subject: [PATCH 4/8] Fix string bug --- app/src/main/res/values/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bb83197b..12798b39 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -18,7 +18,6 @@ Standard deviation hourly Hands played - Save