From 94091939351e937ff4d88eaf7c4e3b579f4201b5 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Fri, 22 Jan 2021 14:20:56 +0100 Subject: [PATCH] -> jetpack --- .../androidaps/activities/StatsActivity.kt | 21 +++++++++++-------- app/src/main/res/layout/activity_stats.xml | 8 +++---- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/activities/StatsActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/StatsActivity.kt index 805ea291af..d18f9c5c82 100644 --- a/app/src/main/java/info/nightscout/androidaps/activities/StatsActivity.kt +++ b/app/src/main/java/info/nightscout/androidaps/activities/StatsActivity.kt @@ -2,11 +2,11 @@ package info.nightscout.androidaps.activities import android.os.Bundle import info.nightscout.androidaps.R +import info.nightscout.androidaps.databinding.ActivityStatsBinding import info.nightscout.androidaps.utils.ActivityMonitor import info.nightscout.androidaps.utils.alertDialogs.OKDialog import info.nightscout.androidaps.utils.stats.TddCalculator import info.nightscout.androidaps.utils.stats.TirCalculator -import kotlinx.android.synthetic.main.activity_stats.* import javax.inject.Inject class StatsActivity : NoSplashAppCompatActivity() { @@ -15,20 +15,23 @@ class StatsActivity : NoSplashAppCompatActivity() { @Inject lateinit var tirCalculator: TirCalculator @Inject lateinit var activityMonitor: ActivityMonitor + private lateinit var binding: ActivityStatsBinding + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.activity_stats) + binding = ActivityStatsBinding.inflate(layoutInflater) + setContentView(binding.root) - stats_tdds.text = tddCalculator.stats() - stats_tir.text = tirCalculator.stats() - stats_activity.text = activityMonitor.stats() + binding.tdds.text = tddCalculator.stats() + binding.tir.text = tirCalculator.stats() + binding.activity.text = activityMonitor.stats() - ok.setOnClickListener { finish() } - stats_reset.setOnClickListener { - OKDialog.showConfirmation(this, resourceHelper.gs(R.string.doyouwantresetstats), Runnable { + binding.ok.setOnClickListener { finish() } + binding.reset.setOnClickListener { + OKDialog.showConfirmation(this, resourceHelper.gs(R.string.doyouwantresetstats)) { activityMonitor.reset() recreate() - }) + } } } } diff --git a/app/src/main/res/layout/activity_stats.xml b/app/src/main/res/layout/activity_stats.xml index bd720bc5fc..6335214899 100644 --- a/app/src/main/res/layout/activity_stats.xml +++ b/app/src/main/res/layout/activity_stats.xml @@ -48,21 +48,21 @@ android:padding="5dp" />