dev
Aurelien Hubert 7 years ago
parent 3489dca202
commit 988af98d8e
  1. 2
      app/src/main/java/net/pokeranalytics/android/ui/fragment/BankrollFragment.kt
  2. 4
      app/src/main/java/net/pokeranalytics/android/ui/fragment/ComparisonChartFragment.kt
  3. 48
      app/src/main/java/net/pokeranalytics/android/ui/interfaces/FilterHandler.kt

@ -215,7 +215,7 @@ class BankrollFragment : DeletableItemFragment(), StaticRowRepresentableDataSour
override fun updateUIAfterUndoDeletion(newItem: RealmObject) {
// TODO: Improve that
// We are recreating a Bankroll report because the last one if invalid => the bankroll of the setup has been deleted
// We are recreating a Bankroll report because the last one is invalid => the bankroll of the setup has been deleted
deletedRow?.let { row ->
val bankrollReportSetup = BankrollReportSetup(newItem as Bankroll)

@ -93,9 +93,7 @@ class ComparisonChartFragment : PokerAnalyticsFragment(), StaticRowRepresentable
private fun initUI() {
setDisplayHomeAsUpEnabled(true)
//TODO: Localize title
setToolbarTitle("Comparison chart")
setToolbarTitle(getString(R.string.comparison_chart))
parentActivity?.let {
viewPagerAdapter = ComparisonChartPagerAdapter(requireContext(), it.supportFragmentManager)

@ -57,54 +57,6 @@ interface FilterHandler {
* Manage filters
*/
fun manageFilters(fragment: Fragment) {
val context = fragment.requireContext()
val filterId = Preferences.getActiveFilterId(context)
FiltersActivity.newInstanceForResult(fragment = fragment, currentFilterable = currentFilterable)
//TODO: Clean
/*
val filterSelected = filterId != null
val realm = Realm.getDefaultInstance()
val count = realm.where<Filter>().count().toInt()
realm.close()
val choices = ArrayList<CharSequence>()
choices.add(fragment.getString(R.string.new_str))
if (count > 0) {
choices.add(fragment.getString(R.string.load_from_db))
}
if (filterSelected) {
choices.add(fragment.getString(R.string.modify_current_filter))
choices.add(fragment.getString(R.string.remove_filter))
}
val builder = AlertDialog.Builder(context)
builder.setTitle(R.string.filter_selection)
.setCancelable(true)
.setItems(choices.toTypedArray()) { _, which ->
Timber.d("Click on $which")
when (which) {
0 -> FiltersActivity.newInstanceForResult(fragment = fragment, currentFilterable = currentFilterable)
1 -> DataListActivity.newSelectInstance(fragment, LiveData.FILTER.ordinal)
2 -> FiltersActivity.newInstanceForResult(fragment = fragment, filterId = filterId, currentFilterable = currentFilterable)
3 -> {
Preferences.removeActiveFilterId(context)
filterWasUpdated = true
removeFilter()
}
}
}
.setNegativeButton(R.string.cancel) { _, _ ->
Timber.d("Click on cancel")
}
builder.show()
*/
}
}
Loading…
Cancel
Save