From 1c8ff102c68a6ca7174560e22bc0b95c9c436c5a Mon Sep 17 00:00:00 2001
From: Aurelien Hubert <aurelien@MacBook-Pro-Aurelien.local>
Date: Fri, 24 May 2019 10:33:33 +0200
Subject: [PATCH] Clean code

---
 .../ui/fragment/FilterDetailsFragment.kt      |  1 -
 .../android/ui/fragment/FiltersFragment.kt    | 22 ++++++-------------
 .../fragment/components/FilterableFragment.kt | 10 +++------
 3 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FilterDetailsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FilterDetailsFragment.kt
index e752e1eb..7fe858e8 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FilterDetailsFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FilterDetailsFragment.kt
@@ -55,7 +55,6 @@ open class FilterDetailsFragment : RealmFragment(), StaticRowRepresentableDataSo
 
 	override fun onBackPressed() {
 		super.onBackPressed()
-		println("<<<<< back pressed")
 		saveData()
 	}
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FiltersFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FiltersFragment.kt
index c1cfe849..ad66cd84 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FiltersFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FiltersFragment.kt
@@ -27,13 +27,13 @@ import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.rowrepresentable.FilterCategoryRow
 import net.pokeranalytics.android.util.Preferences
 import net.pokeranalytics.android.util.extensions.sorted
-import timber.log.Timber
 
 
 open class FiltersFragment : RealmFragment(), StaticRowRepresentableDataSource, RowRepresentableDelegate {
 
 	companion object {
 		const val REQUEST_CODE_FILTER_DETAILS = 100
+		const val MOST_USED_FILTERS_DISPLAYED = 6
 
 		var currentFilter: Filter? = null
 
@@ -196,19 +196,19 @@ open class FiltersFragment : RealmFragment(), StaticRowRepresentableDataSource,
 	 */
 	private fun updateMostUsedFilters() {
 
-		if (isUpdating) {
+		var nbChips = 0
+		val filters = getRealm().sorted(Filter::class.java)
+		val currentFilterId = Preferences.getActiveFilterId(requireContext())
+
+		if (isUpdating || filters.isEmpty() || (filters.size == 1 && filters.first()?.id == currentFilterId)) {
 			mostUsedFiltersLayout.visibility = View.GONE
 			return
 		}
 
-		val filters = getRealm().sorted(Filter::class.java)
-		val currentFilterId = Preferences.getActiveFilterId(requireContext())
-
 		mostUsedFilters.removeAllViews()
 
-		var nbChips = 0
 		filters.forEach { filter ->
-			if (nbChips < 3) {
+			if (nbChips < MOST_USED_FILTERS_DISPLAYED) {
 
 				if (filter.id != currentFilterId) {
 					val chip = Chip(requireContext())
@@ -220,7 +220,6 @@ open class FiltersFragment : RealmFragment(), StaticRowRepresentableDataSource,
 
 					chip.isChecked = filter.id == currentFilterId
 					chip.setOnCloseIconClickListener {
-
 						chip.isChecked = false
 					}
 					chip.setOnClickListener {
@@ -235,7 +234,6 @@ open class FiltersFragment : RealmFragment(), StaticRowRepresentableDataSource,
 				}
 			}
 		}
-
 	}
 
 	/**
@@ -250,13 +248,10 @@ open class FiltersFragment : RealmFragment(), StaticRowRepresentableDataSource,
 	 * Validate the  updates of the queryWith
 	 */
 	private fun validateUpdates() {
-		Timber.d("Validate queryWith updates")
-
 		val realm = getRealm()
 		realm.beginTransaction()
 		currentFilter?.let {
 			it.name = it.query.getName(requireContext())
-			Timber.d("name: ${it.name}")
 			realm.copyToRealmOrUpdate(it)
 		}
 		realm.commitTransaction()
@@ -269,10 +264,7 @@ open class FiltersFragment : RealmFragment(), StaticRowRepresentableDataSource,
 	 * Cancel the latest updates of the queryWith
 	 */
 	private fun cancelUpdates() {
-		Timber.d("Cancel queryWith updates")
-
 		val filterId = filterCopy?.id ?: ""
-
 		val realm = getRealm()
 		realm.beginTransaction()
 		filterCopy?.let {
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/FilterableFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/FilterableFragment.kt
index 40987b84..8a3d3eee 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/FilterableFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/FilterableFragment.kt
@@ -22,9 +22,9 @@ import timber.log.Timber
 
 /**
  * A class which define the fragment as Filterable
- * - Add an filter icon menu
- * - Access to the filters actions (new, select, modify, remove)
- * - ...
+ * - Add a filter icon menu
+ * - Listen for INTENT_FILTER_UPDATE_FILTER_UI
+ * -
  */
 open class FilterableFragment : RealmFragment(), FilterHandler {
 
@@ -46,13 +46,11 @@ open class FilterableFragment : RealmFragment(), FilterHandler {
 
 	override fun onActivityCreated(savedInstanceState: Bundle?) {
 		super.onActivityCreated(savedInstanceState)
-		Timber.d("onActivityCreated: $parentActivity")
 		parentActivity?.registerReceiver(updateFilterUIBroadcast, IntentFilter(INTENT_FILTER_UPDATE_FILTER_UI))
 	}
 
 	override fun onDestroy() {
 		super.onDestroy()
-		Timber.d("onDestroy: $parentActivity")
 		parentActivity?.unregisterReceiver(updateFilterUIBroadcast)
 	}
 
@@ -84,12 +82,10 @@ open class FilterableFragment : RealmFragment(), FilterHandler {
 	}
 
 	override fun applyFilter() {
-		Timber.d("applyFilter")
 		updateFilterUI()
 	}
 
 	override fun removeFilter() {
-		Timber.d("removeFilter")
 		hideSelectedFilter()
 	}