From 988af98d8e69beb4eb116921690a7834d501bffb Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Fri, 24 May 2019 12:25:18 +0200 Subject: [PATCH] Clean code --- .../android/ui/fragment/BankrollFragment.kt | 2 +- .../ui/fragment/ComparisonChartFragment.kt | 4 +- .../android/ui/interfaces/FilterHandler.kt | 48 ------------------- 3 files changed, 2 insertions(+), 52 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/BankrollFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/BankrollFragment.kt index 3af69812..5d07aaf4 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/BankrollFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/BankrollFragment.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) 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 629129bb..f044678b 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 @@ -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) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/interfaces/FilterHandler.kt b/app/src/main/java/net/pokeranalytics/android/ui/interfaces/FilterHandler.kt index 12c1b91e..85b301d5 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/interfaces/FilterHandler.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/interfaces/FilterHandler.kt @@ -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().count().toInt() - realm.close() - - val choices = ArrayList() - 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() - */ } } \ No newline at end of file