caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Automatically scroll to currently active objective

Browse source
This commit is contained in:
TebbeUbben 2018-06-11 15:45:28 +02:00
parent 97984f8ef3
commit 31cb68240b
2 changed files with 41 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/ObjectivesFragment.java
View file

@ -1,13 +1,16 @@
package info.nightscout.androidaps.plugins.ConstraintsObjectives; package info.nightscout.androidaps.plugins.ConstraintsObjectives;
import android.animation.LayoutTransition;
import android.app.Activity; import android.app.Activity;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
import android.support.v7.widget.CardView; import android.support.v7.widget.CardView;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.LinearSmoothScroller;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.text.Html; import android.text.Html;
import android.util.DisplayMetrics;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -51,8 +54,10 @@ public class ObjectivesFragment extends SubscriberFragment {
reset.setOnClickListener(v -> { reset.setOnClickListener(v -> {
ObjectivesPlugin.getPlugin().reset(); ObjectivesPlugin.getPlugin().reset();
ObjectivesPlugin.saveProgress(); ObjectivesPlugin.saveProgress();
updateGUI(); recyclerView.getAdapter().notifyDataSetChanged();
scrollToCurrentObjective();
}); });
scrollToCurrentObjective();
return view; return view;
} catch (Exception e) { } catch (Exception e) {
@ -62,6 +67,28 @@ public class ObjectivesFragment extends SubscriberFragment {
return null; return null;
} }
private void scrollToCurrentObjective() {
for (int i = 0; i < ObjectivesPlugin.getObjectives().size(); i++) {
Objective objective = ObjectivesPlugin.getObjectives().get(i);
if (!objective.isStarted() || !objective.isAccomplished()) {
RecyclerView.SmoothScroller smoothScroller = new LinearSmoothScroller(getContext()) {
@Override
protected int getVerticalSnapPreference() {
return LinearSmoothScroller.SNAP_TO_START;
}
@Override
protected int calculateTimeForScrolling(int dx) {
return super.calculateTimeForScrolling(dx) * 4;
}
};
smoothScroller.setTargetPosition(i);
recyclerView.getLayoutManager().startSmoothScroll(smoothScroller);
break;
}
}
}
private class ObjectivesAdapter extends RecyclerView.Adapter<ObjectivesAdapter.ViewHolder> { private class ObjectivesAdapter extends RecyclerView.Adapter<ObjectivesAdapter.ViewHolder> {
@NonNull @NonNull
@ -97,7 +124,7 @@ public class ObjectivesFragment extends SubscriberFragment {
} else if (objective.isStarted()) { } else if (objective.isStarted()) {
holder.gate.setTextColor(0xFFFFFFFF); holder.gate.setTextColor(0xFFFFFFFF);
holder.verify.setVisibility(View.VISIBLE); holder.verify.setVisibility(View.VISIBLE);
holder.verify.setEnabled(objective.isAccomplished() || enableFake.isChecked()); holder.verify.setEnabled(objective.isCompleted() || enableFake.isChecked());
holder.start.setVisibility(View.GONE); holder.start.setVisibility(View.GONE);
holder.progress.setVisibility(View.VISIBLE); holder.progress.setVisibility(View.VISIBLE);
holder.progress.removeAllViews(); holder.progress.removeAllViews();
@ -113,11 +140,13 @@ public class ObjectivesFragment extends SubscriberFragment {
} }
holder.verify.setOnClickListener((view) -> { holder.verify.setOnClickListener((view) -> {
objective.setAccomplishedOn(new Date()); objective.setAccomplishedOn(new Date());
updateGUI(); notifyDataSetChanged();
scrollToCurrentObjective();
}); });
holder.start.setOnClickListener((view) -> { holder.start.setOnClickListener((view) -> {
objective.setStartedOn(new Date()); objective.setStartedOn(new Date());
updateGUI(); notifyDataSetChanged();
scrollToCurrentObjective();
}); });
} }

13
app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective.java
View file

@ -33,15 +33,16 @@ public abstract class Objective {
for (Task task : tasks) task.objective = this; for (Task task : tasks) task.objective = this;
} }
public boolean isAccomplished() { public boolean isCompleted() {
boolean completed = true;
for (Task task : tasks) { for (Task task : tasks) {
if (!task.shouldBeIgnored() && !task.isCompleted()) { if (!task.shouldBeIgnored() && !task.isCompleted())
completed = false; return false;
break;
} }
return true;
} }
return startedOn != null && (accomplishedOn != null || completed);
public boolean isAccomplished() {
return accomplishedOn != null;
} }
public boolean isStarted() { public boolean isStarted() {