From 285bd334c7a45a2ad25099f9d458b716e0c86f91 Mon Sep 17 00:00:00 2001 From: Laurent Date: Tue, 14 Mar 2023 11:48:46 +0100 Subject: [PATCH] Fixes --- .../android/ui/fragment/Top10Fragment.kt | 7 ++-- .../fragment/report/ProgressReportFragment.kt | 33 ++++++++----------- .../android/ui/modules/feed/FeedFragment.kt | 5 +-- .../ui/modules/session/SessionFragment.kt | 10 ++++-- 4 files changed, 27 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/Top10Fragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/Top10Fragment.kt index 47934d3a..8fdda037 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/Top10Fragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/Top10Fragment.kt @@ -4,6 +4,7 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.recyclerview.widget.LinearLayoutManager import com.google.android.material.tabs.TabLayout import io.realm.RealmResults import io.realm.kotlin.where @@ -15,7 +16,6 @@ import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate import net.pokeranalytics.android.ui.fragment.components.RealmFragment import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowViewType -import net.pokeranalytics.android.ui.view.SmoothScrollLinearLayoutManager class Top10Fragment : RealmFragment(), RowRepresentableDataSource, RowRepresentableDelegate { @@ -98,11 +98,10 @@ class Top10Fragment : RealmFragment(), RowRepresentableDataSource, RowRepresenta } }) - - val viewManager = SmoothScrollLinearLayoutManager(requireContext()) +// val viewManager = SmoothScrollLinearLayoutManager(requireContext()) recyclerView.apply { setHasFixedSize(true) - layoutManager = viewManager + layoutManager = LinearLayoutManager(requireContext()) } } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/ProgressReportFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/ProgressReportFragment.kt index c4a863ce..63601a7f 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/ProgressReportFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/ProgressReportFragment.kt @@ -15,11 +15,11 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch import net.pokeranalytics.android.R -import net.pokeranalytics.android.calculus.calcul.* import net.pokeranalytics.android.calculus.AggregationType import net.pokeranalytics.android.calculus.Calculator import net.pokeranalytics.android.calculus.Report import net.pokeranalytics.android.calculus.Stat +import net.pokeranalytics.android.calculus.calcul.* import net.pokeranalytics.android.databinding.FragmentProgressReportBinding import net.pokeranalytics.android.exceptions.PAIllegalStateException import net.pokeranalytics.android.model.combined @@ -82,12 +82,6 @@ class ProgressReportFragment : AbstractReportFragment() { override fun onDestroyView() { -// childFragmentManager.findFragmentByTag(GRAPH_TAG)?.let { fragment -> -// val fragmentTransaction = childFragmentManager.beginTransaction() -// fragmentTransaction.remove(fragment) -// fragmentTransaction.commit() -// } - AppReviewManager.requestReview() super.onDestroyView() @@ -176,22 +170,23 @@ class ProgressReportFragment : AbstractReportFragment() { val realm = Realm.getDefaultInstance() - val group = selectedReport.results.first().group - - val report = Calculator.computeStatsWithEvolutionByAggregationType(realm, stat, group, aggregationType) - reports[aggregationType] = report + selectedReport.results.firstOrNull()?.group?.let { group -> + val report = Calculator.computeStatsWithEvolutionByAggregationType(realm, stat, group, aggregationType) + reports[aggregationType] = report - realm.close() + realm.close() - val e = Date() - val duration = (e.time - s.time) / 1000.0 - Timber.d(">>> ended in $duration seconds") + val e = Date() + val duration = (e.time - s.time) / 1000.0 + Timber.d(">>> ended in $duration seconds") - launch(Dispatchers.Main) { - setGraphData(report, aggregationType) - progressBar.hideWithAnimation() - graphContainer.showWithAnimation() + launch(Dispatchers.Main) { + setGraphData(report, aggregationType) + progressBar.hideWithAnimation() + graphContainer.showWithAnimation() + } } + } } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedFragment.kt index 614e024c..20033333 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedFragment.kt @@ -8,6 +8,7 @@ import android.widget.Toast import androidx.core.app.ActivityOptionsCompat import androidx.core.view.isVisible import androidx.interpolator.view.animation.FastOutSlowInInterpolator +import androidx.recyclerview.widget.LinearLayoutManager import com.android.billingclient.api.Purchase import com.google.android.material.badge.BadgeDrawable import com.google.android.material.badge.BadgeUtils @@ -254,10 +255,10 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate, PurchaseLis binding.messageBox.isVisible = false } - val viewManager = SmoothScrollLinearLayoutManager(requireContext()) +// val viewManager = SmoothScrollLinearLayoutManager(requireContext()) binding.menuRecyclerView.apply { setHasFixedSize(true) - layoutManager = viewManager + layoutManager = LinearLayoutManager(requireContext()) } // Add button diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/session/SessionFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/session/SessionFragment.kt index feef21fc..97b0a670 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/session/SessionFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/session/SessionFragment.kt @@ -11,6 +11,7 @@ import androidx.appcompat.content.res.AppCompatResources import androidx.interpolator.view.animation.FastOutSlowInInterpolator import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DiffUtil +import androidx.recyclerview.widget.LinearLayoutManager import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.async @@ -36,7 +37,10 @@ import net.pokeranalytics.android.ui.helpers.DateTimePickerManager import net.pokeranalytics.android.ui.modules.data.EditableDataActivity import net.pokeranalytics.android.ui.modules.datalist.DataListActivity import net.pokeranalytics.android.ui.modules.handhistory.HandHistoryActivity -import net.pokeranalytics.android.ui.view.* +import net.pokeranalytics.android.ui.view.RowRepresentable +import net.pokeranalytics.android.ui.view.RowRepresentableDiffCallback +import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor +import net.pokeranalytics.android.ui.view.RowViewType import net.pokeranalytics.android.ui.view.rows.SessionPropertiesRow import net.pokeranalytics.android.util.CrashLogging import net.pokeranalytics.android.util.Preferences @@ -126,10 +130,10 @@ class SessionFragment : RealmFragment(), RowRepresentableDelegate, StaticRowRepr setDisplayHomeAsUpEnabled(true) - val viewManager = SmoothScrollLinearLayoutManager(requireContext()) +// val viewManager = SmoothScrollLinearLayoutManager(requireContext()) binding.recyclerView.apply { setHasFixedSize(true) - layoutManager = viewManager + layoutManager = LinearLayoutManager(requireContext()) } binding.floatingActionButton.setOnClickListener {