1
0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-11-29 13:26:50 +01:00

Extract ShowDurationDialog from ChartsActivity

This commit is contained in:
José Rebelo 2023-05-25 23:45:00 +01:00
parent 79e3df4844
commit b4c2fa21bc
3 changed files with 53 additions and 31 deletions

View File

@ -17,16 +17,13 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */ along with this program. If not, see <http://www.gnu.org/licenses/>. */
package nodomain.freeyourgadget.gadgetbridge.activities.charts; package nodomain.freeyourgadget.gadgetbridge.activities.charts;
import android.app.Dialog;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.os.Bundle; import android.os.Bundle;
import android.util.AttributeSet;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.Button; import android.widget.Button;
@ -76,33 +73,6 @@ public class ChartsActivity extends AbstractGBFragmentActivity implements Charts
LimitedQueue mActivityAmountCache = new LimitedQueue(60); LimitedQueue mActivityAmountCache = new LimitedQueue(60);
ArrayList<String> enabledTabsList; ArrayList<String> 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() { private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {

View File

@ -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 <http://www.gnu.org/licenses/>. */
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("");
}
}
}

View File

@ -341,7 +341,7 @@ public class SleepChartFragment extends AbstractChartFragment {
public void onClick(View v) { public void onClick(View v) {
DecimalFormat df = new DecimalFormat("###.#"); DecimalFormat df = new DecimalFormat("###.#");
String detailedDuration = String.format(getString(R.string.charts_min_max_heartrate_popup), heartRateMin, heartRateMax, df.format(intensityTotal)); 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();
} }
}; };