From b4c2fa21bc7d4181bb0bc11e6424e38156d89359 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= Date: Thu, 25 May 2023 23:45:00 +0100 Subject: [PATCH] Extract ShowDurationDialog from ChartsActivity --- .../activities/charts/ChartsActivity.java | 30 ----------- .../activities/charts/ShowDurationDialog.java | 52 +++++++++++++++++++ .../activities/charts/SleepChartFragment.java | 2 +- 3 files changed, 53 insertions(+), 31 deletions(-) create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ShowDurationDialog.java diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ChartsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ChartsActivity.java index 629109bc1a..2ec2381692 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ChartsActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ChartsActivity.java @@ -17,16 +17,13 @@ along with this program. If not, see . */ package nodomain.freeyourgadget.gadgetbridge.activities.charts; -import android.app.Dialog; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.os.Bundle; -import android.util.AttributeSet; import android.view.Menu; import android.view.MenuItem; -import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; import android.widget.Button; @@ -76,33 +73,6 @@ public class ChartsActivity extends AbstractGBFragmentActivity implements Charts LimitedQueue mActivityAmountCache = new LimitedQueue(60); ArrayList enabledTabsList; - public static class ShowDurationDialog extends Dialog { - private final String mDuration; - private TextView durationLabel; - - ShowDurationDialog(String duration, Context context) { - super(context); - mDuration = duration; - } - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_charts_durationdialog); - - durationLabel = findViewById(R.id.charts_duration_label); - setDuration(mDuration); - } - - public void setDuration(String duration) { - if (mDuration != null) { - durationLabel.setText(duration); - } else { - durationLabel.setText(""); - } - } - } - private final BroadcastReceiver mReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ShowDurationDialog.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ShowDurationDialog.java new file mode 100644 index 0000000000..f11957a2d4 --- /dev/null +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ShowDurationDialog.java @@ -0,0 +1,52 @@ +/* Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, vanous, Vebryn + + This file is part of Gadgetbridge. + + Gadgetbridge is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Gadgetbridge is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ +package nodomain.freeyourgadget.gadgetbridge.activities.charts; + +import android.app.Dialog; +import android.content.Context; +import android.os.Bundle; +import android.widget.TextView; + +import nodomain.freeyourgadget.gadgetbridge.R; + +public class ShowDurationDialog extends Dialog { + private final String mDuration; + private TextView durationLabel; + + ShowDurationDialog(final String duration, final Context context) { + super(context); + mDuration = duration; + } + + @Override + protected void onCreate(final Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_charts_durationdialog); + + durationLabel = findViewById(R.id.charts_duration_label); + setDuration(mDuration); + } + + public void setDuration(final String duration) { + if (mDuration != null) { + durationLabel.setText(duration); + } else { + durationLabel.setText(""); + } + } +} diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SleepChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SleepChartFragment.java index d7ec9ec005..2d571137b8 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SleepChartFragment.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SleepChartFragment.java @@ -341,7 +341,7 @@ public class SleepChartFragment extends AbstractChartFragment { public void onClick(View v) { DecimalFormat df = new DecimalFormat("###.#"); String detailedDuration = String.format(getString(R.string.charts_min_max_heartrate_popup), heartRateMin, heartRateMax, df.format(intensityTotal)); - new ChartsActivity.ShowDurationDialog(detailedDuration, getContext()).show(); + new ShowDurationDialog(detailedDuration, getContext()).show(); } };