diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/ProgressReportActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/activity/ProgressReportActivity.kt index c01a5f83..1dd47196 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/activity/ProgressReportActivity.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/activity/ProgressReportActivity.kt @@ -3,13 +3,11 @@ package net.pokeranalytics.android.ui.activity import android.content.Context import android.content.Intent import android.os.Bundle -import androidx.fragment.app.Fragment import net.pokeranalytics.android.R import net.pokeranalytics.android.calculus.Report import net.pokeranalytics.android.calculus.Stat import net.pokeranalytics.android.ui.activity.components.ReportActivity import net.pokeranalytics.android.ui.activity.components.ReportParameters -import net.pokeranalytics.android.ui.activity.components.RequestCode import net.pokeranalytics.android.ui.fragment.report.ProgressReportFragment import net.pokeranalytics.android.ui.viewmodel.ReportViewModel @@ -28,12 +26,12 @@ class ProgressReportActivity : ReportActivity() { context.startActivity(intent) } - fun newInstanceForResult(fragment: Fragment, report: Report, title: String, stat: Stat? = null, displayAggregationChoices: Boolean = true) { - val parameters = ReportParameters(report, title, stat, showAggregationChoices = displayAggregationChoices) - ReportViewModel.defineParameters(parameters) - val intent = Intent(fragment.context, ProgressReportActivity::class.java) - fragment.startActivityForResult(intent, RequestCode.DEFAULT.value) - } +// fun newInstanceForResult(fragment: Fragment, report: Report, title: String, stat: Stat? = null, displayAggregationChoices: Boolean = true) { +// val parameters = ReportParameters(report, title, stat, showAggregationChoices = displayAggregationChoices) +// ReportViewModel.defineParameters(parameters) +// val intent = Intent(fragment.context, ProgressReportActivity::class.java) +// fragment.startActivityForResult(intent, RequestCode.DEFAULT.value) +// } } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/components/ReportActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/activity/components/ReportActivity.kt index 45794f6d..83eabf2f 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/activity/components/ReportActivity.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/activity/components/ReportActivity.kt @@ -5,6 +5,7 @@ import android.content.Intent import android.os.Bundle import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProviders +import com.crashlytics.android.Crashlytics import net.pokeranalytics.android.calculus.Report import net.pokeranalytics.android.calculus.Stat import net.pokeranalytics.android.ui.viewmodel.ReportViewModel @@ -45,14 +46,17 @@ abstract class ReportActivity : PokerAnalyticsActivity() { this.initViewModelWithParameters() } - fun initViewModelWithParameters() { + private fun initViewModelWithParameters() { ReportViewModel.parameters?.let { this.viewModel.report = it.report this.viewModel.title = it.title - this.viewModel.stat = it.stat ?: it.report.options.stats.first() + val stat = it.stat ?: it.report.options.stats.first() + this.viewModel.stat = stat this.viewModel.showAggregationChoices = it.showAggregationChoices + Crashlytics.log("initViewModelWithParameters, stat = ${stat.uniqueIdentifier}") + ReportViewModel.resetParameters() } }