diff --git a/wear/src/main/java/info/nightscout/androidaps/data/ListenerService.java b/wear/src/main/java/info/nightscout/androidaps/data/ListenerService.java index fc25ab6341..ffb6db7d6e 100644 --- a/wear/src/main/java/info/nightscout/androidaps/data/ListenerService.java +++ b/wear/src/main/java/info/nightscout/androidaps/data/ListenerService.java @@ -28,6 +28,7 @@ import java.util.concurrent.TimeUnit; import info.nightscout.androidaps.interaction.AAPSPreferences; import info.nightscout.androidaps.R; +import info.nightscout.androidaps.interaction.actions.AcceptActivity; import info.nightscout.androidaps.interaction.actions.CPPActivity; import info.nightscout.androidaps.interaction.utils.SafeParse; @@ -345,6 +346,16 @@ public class ListenerService extends WearableListenerService implements GoogleAp private void showConfirmationDialog(String title, String message, String actionstring) { + Intent intent = new Intent(this, AcceptActivity.class); + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + Bundle params = new Bundle(); + params.putString("title", title); + params.putString("message", message); + params.putString("actionstring", actionstring); + intent.putExtras(params); + startActivity(intent); + + /* if(confirmThread != null){ confirmThread.invalidate(); } @@ -375,7 +386,7 @@ public class ListenerService extends WearableListenerService implements GoogleAp // keep the confirmation dialog open for one minute. scheduleDismissConfirm(60); - + */ } private void scheduleDismissConfirm(final int seconds) { diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/AcceptActivity.java b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/AcceptActivity.java index c4b0436cc1..4562700ae7 100644 --- a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/AcceptActivity.java +++ b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/AcceptActivity.java @@ -12,12 +12,8 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; -import java.text.DecimalFormat; - import info.nightscout.androidaps.R; import info.nightscout.androidaps.data.ListenerService; -import info.nightscout.androidaps.interaction.utils.PlusMinusEditText; -import info.nightscout.androidaps.interaction.utils.SafeParse; /** * Created by adrian on 09/02/17. @@ -27,7 +23,8 @@ import info.nightscout.androidaps.interaction.utils.SafeParse; public class AcceptActivity extends ViewSelectorActivity { - String text = ""; + String title = ""; + String message = ""; String actionstring = ""; @Override @@ -35,10 +32,11 @@ public class AcceptActivity extends ViewSelectorActivity { super.onCreate(savedInstanceState); Bundle extras = getIntent().getExtras(); - text = extras.getString("text", ""); + title = extras.getString("title", ""); + message = extras.getString("message", ""); actionstring = extras.getString("actionstring", ""); - if ("".equals(text) || "".equals(actionstring) ){ + if ("".equals(message) || "".equals(actionstring) ){ finish(); return; } @@ -75,8 +73,10 @@ public class AcceptActivity extends ViewSelectorActivity { if(col == 0){ final View view = LayoutInflater.from(getApplicationContext()).inflate(R.layout.action_confirm_text, container, false); - final TextView textView = (TextView) view.findViewById(R.id.confirmtext); - textView.setText(text); + final TextView headingView = (TextView) view.findViewById(R.id.title); + headingView.setText(title); + final TextView textView = (TextView) view.findViewById(R.id.message); + textView.setText(message); container.addView(view); return view; } else { diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/menus/MainMenuActivity.java b/wear/src/main/java/info/nightscout/androidaps/interaction/menus/MainMenuActivity.java index 490ed77c08..6ffc826016 100644 --- a/wear/src/main/java/info/nightscout/androidaps/interaction/menus/MainMenuActivity.java +++ b/wear/src/main/java/info/nightscout/androidaps/interaction/menus/MainMenuActivity.java @@ -85,17 +85,19 @@ public class MainMenuActivity extends MenuListActivity { intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); this.startActivity(intent); } else if ("Prime/Fill".equals(action)) { - /*intent = new Intent(this, FillMenuActivity.class); + intent = new Intent(this, FillMenuActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); this.startActivity(intent); - */ + /* intent = new Intent(this, AcceptActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); Bundle params = new Bundle(); + params.putString("heading", "Confirm"); params.putString("text", "dies\nist ein\nhoffentlich\n langer text\n\ndies\nist ein\nhoffentlich\n langer text\n\ndies\nist ein\nhoffentlich\n langer text\n\ndies\nist ein\nhoffentlich\n langer text\n\n"); params.putString("actionstring", "blablubb"); intent.putExtras(params); startActivity(intent); + */ } else if ("eCarb".equals(action)) { intent = new Intent(this, ECarbActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); diff --git a/wear/src/main/res/layout/action_confirm_text.xml b/wear/src/main/res/layout/action_confirm_text.xml index 23472260bd..18c8933470 100644 --- a/wear/src/main/res/layout/action_confirm_text.xml +++ b/wear/src/main/res/layout/action_confirm_text.xml @@ -14,12 +14,25 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:orientation="vertical"> + + +