diff --git a/app/src/main/java/net/pokeranalytics/android/ui/adapter/FeedSessionRowRepresentableAdapter.kt b/app/src/main/java/net/pokeranalytics/android/ui/adapter/FeedSessionRowRepresentableAdapter.kt index 87fe6a05..7f145e79 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/adapter/FeedSessionRowRepresentableAdapter.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/adapter/FeedSessionRowRepresentableAdapter.kt @@ -40,7 +40,6 @@ class FeedSessionRowRepresentableAdapter( private var allSessions = mutableListOf() - var filter: Filter? = null set(value) { field = value @@ -49,7 +48,7 @@ class FeedSessionRowRepresentableAdapter( } init { - defineSessions() // all sessions + defineSessions() refreshData() } @@ -60,9 +59,6 @@ class FeedSessionRowRepresentableAdapter( this.pendingSessions = requestNewQuery().isNull("startDate").findAll() .sort("creationDate", Sort.DESCENDING) -// Timber.d(">>> startedSessions count = ${startedSessions.size}") -// Timber.d(">>> pendingSessions count = ${pendingSessions.size}") - // listeners this.startedSessions.addChangeListener { _, _ -> refreshData() @@ -162,13 +158,9 @@ class FeedSessionRowRepresentableAdapter( } else { // Else, return the formatted date sortedHeaders[position]?.getMonthAndYear() ?: throw PAIllegalStateException("Null date should not happen there") - -// val realmHeaderPosition = sortedHeaders.keys.indexOf(position) -// distinctHeaders[realmHeaderPosition]?.startDate?.getMonthAndYear() ?: throw PAIllegalStateException("Null date should not happen there") } } throw PAIllegalStateException("Any position should always have a header, position = $position") -// return NULL_TEXT } fun sessionIdForPosition(position: Int): String? { @@ -189,7 +181,6 @@ class FeedSessionRowRepresentableAdapter( break } } -// Timber.d("getSessionForPosition = ${position}, headersBefore = $headersBefore") return allSessions[position - headersBefore] } @@ -202,10 +193,6 @@ class FeedSessionRowRepresentableAdapter( allSessions.addAll(this.pendingSessions) allSessions.addAll(this.startedSessions) -// allSessions.forEach { -// Timber.d(">>> startdate = ${it.startDate}, creationDate = ${it.creationDate}") -// } - val headersPositions = HashMap() val start = System.currentTimeMillis() @@ -217,7 +204,6 @@ class FeedSessionRowRepresentableAdapter( // Add headers if the date doesn't exist yet for ((index, session) in allSessions.withIndex()) { -// Timber.d("/// $index > date = ${session.startDate}") val startDate = session.startDate if (startDate == null) { @@ -225,7 +211,6 @@ class FeedSessionRowRepresentableAdapter( } else { calendar.time = startDate if (checkHeaderCondition(calendar, previousYear, previousMonth)) { -// Timber.d("ADDS HEADER for position= ${index + headersPositions.size}, date = ${session.startDate}") headersPositions[index + headersPositions.size] = startDate previousYear = calendar.get(Calendar.YEAR) previousMonth = calendar.get(Calendar.MONTH) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt index 81d7e256..80fa9e50 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt @@ -33,7 +33,6 @@ import net.pokeranalytics.android.ui.view.ContextMenuRecyclerView import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.SmoothScrollLinearLayoutManager import net.pokeranalytics.android.util.Preferences -import timber.log.Timber import java.text.SimpleDateFormat import java.util.* @@ -60,7 +59,6 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate { private lateinit var feedSessionAdapter: FeedSessionRowRepresentableAdapter private lateinit var feedTransactionAdapter: FeedTransactionRowRepresentableAdapter -// private lateinit var realmSessions: RealmResults private lateinit var realmTransactions: RealmResults private lateinit var betaLimitDate: Date @@ -73,20 +71,8 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate { override fun entitiesChanged(clazz: Class, results: RealmResults) { super.entitiesChanged(clazz, results) - Timber.d("=== results count = ${results.size}") - - results.forEach { model -> - if (model is Session) { - Timber.d("++++ sd = ${model.startDate}, year = ${model.year}, month=${model.month}") - } else { - Timber.d(model.toString()) - } - } when (clazz.kotlin) { - Session::class -> { -// this.feedSessionAdapter.refreshData() - } Transaction::class -> { this.feedTransactionAdapter.refreshData() } @@ -113,8 +99,6 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate { when (item?.itemId) { R.id.duplicate -> { val info = item.menuInfo as ContextMenuRecyclerView.RecyclerViewContextMenuInfo - Timber.d("info = $info") - val sessionId = this.feedSessionAdapter.sessionIdForPosition(info.position) if (sessionId != null) { createNewSession(true, sessionId = sessionId, duplicate = true) @@ -164,18 +148,6 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate { realmTransactions.removeAllChangeListeners() } - /* - override fun setUserVisibleHint(isVisibleToUser: Boolean) { - super.setUserVisibleHint(isVisibleToUser) - if (isVisibleToUser && view != null) { - if (FilterHandler.filterWasUpdated) { - applyFilter() - FilterHandler.filterWasUpdated = false - } - } - } - */ - override fun onRowSelected(position: Int, row: RowRepresentable, fromAction: Boolean) { when (row) { is Session -> SessionActivity.newInstance(requireContext(), sessionId = (row as Editable).id)