From 4dcbbd3df23f246de41b6e1c2fcb6b748d9595f6 Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Thu, 9 Feb 2017 16:29:46 +0100 Subject: [PATCH] wear cleanup --- wear/src/main/AndroidManifest.xml | 17 ---- .../actions/ActionsDefinitions.java | 5 -- .../actions/bolus/BolusActivity.java | 26 ------ .../actions/bolus/GridActivity.java | 80 ------------------- wear/src/main/res/layout/activity_bolus.xml | 11 --- .../main/res/layout/rect_activity_bolus.xml | 54 ------------- .../main/res/layout/round_activity_bolus.xml | 16 ---- 7 files changed, 209 deletions(-) delete mode 100644 wear/src/main/java/info/nightscout/androidaps/actions/bolus/BolusActivity.java delete mode 100644 wear/src/main/java/info/nightscout/androidaps/actions/bolus/GridActivity.java delete mode 100644 wear/src/main/res/layout/activity_bolus.xml delete mode 100644 wear/src/main/res/layout/rect_activity_bolus.xml delete mode 100644 wear/src/main/res/layout/round_activity_bolus.xml diff --git a/wear/src/main/AndroidManifest.xml b/wear/src/main/AndroidManifest.xml index 2c1a9f01eb..a530067e91 100644 --- a/wear/src/main/AndroidManifest.xml +++ b/wear/src/main/AndroidManifest.xml @@ -112,23 +112,6 @@ - - - - - - - - - - - - - diff --git a/wear/src/main/java/info/nightscout/androidaps/actions/ActionsDefinitions.java b/wear/src/main/java/info/nightscout/androidaps/actions/ActionsDefinitions.java index 150edb7d66..7b814bf48d 100644 --- a/wear/src/main/java/info/nightscout/androidaps/actions/ActionsDefinitions.java +++ b/wear/src/main/java/info/nightscout/androidaps/actions/ActionsDefinitions.java @@ -5,8 +5,6 @@ import android.content.Intent; import info.nightscout.androidaps.ListenerService; import info.nightscout.androidaps.NWPreferences; -import info.nightscout.androidaps.actions.bolus.BolusActivity; -import info.nightscout.androidaps.actions.bolus.GridActivity; import info.nightscout.androidaps.actions.wizard.WizardActivity; /** @@ -55,9 +53,6 @@ final class ActionsDefinitions { ListenerService.initiateAction(ctx, "fillpreset 3"); break; case 7: - intent = new Intent(ctx, GridActivity.class); - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - ctx.startActivity(intent); break; } diff --git a/wear/src/main/java/info/nightscout/androidaps/actions/bolus/BolusActivity.java b/wear/src/main/java/info/nightscout/androidaps/actions/bolus/BolusActivity.java deleted file mode 100644 index 9157468562..0000000000 --- a/wear/src/main/java/info/nightscout/androidaps/actions/bolus/BolusActivity.java +++ /dev/null @@ -1,26 +0,0 @@ -package info.nightscout.androidaps.actions.bolus; - -import android.app.Activity; -import android.os.Bundle; -import android.support.wearable.view.WatchViewStub; -import android.widget.TextView; - -import info.nightscout.androidaps.R; - -public class BolusActivity extends Activity { - - private TextView mTextView; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_bolus); - final WatchViewStub stub = (WatchViewStub) findViewById(R.id.watch_view_stub); - stub.setOnLayoutInflatedListener(new WatchViewStub.OnLayoutInflatedListener() { - @Override - public void onLayoutInflated(WatchViewStub stub) { - //bmTextView = (TextView) stub.findViewById(R.id.text); - } - }); - } -} diff --git a/wear/src/main/java/info/nightscout/androidaps/actions/bolus/GridActivity.java b/wear/src/main/java/info/nightscout/androidaps/actions/bolus/GridActivity.java deleted file mode 100644 index e18d2e839e..0000000000 --- a/wear/src/main/java/info/nightscout/androidaps/actions/bolus/GridActivity.java +++ /dev/null @@ -1,80 +0,0 @@ -package info.nightscout.androidaps.actions.bolus; - - -import android.app.Activity; -import android.content.res.Resources; -import android.os.Bundle; -import android.support.wearable.view.DotsPageIndicator; -import android.support.wearable.view.GridPagerAdapter; -import android.support.wearable.view.GridViewPager; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import info.nightscout.androidaps.R; - -/** - * Created by adrian on 09/02/17. - */ - - -public class GridActivity extends Activity { - - - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.grid_layout); - final Resources res = getResources(); - final GridViewPager pager = (GridViewPager) findViewById(R.id.pager); - - pager.setAdapter(new MyGridViewPagerAdapter()); - DotsPageIndicator dotsPageIndicator = (DotsPageIndicator) findViewById(R.id.page_indicator); - dotsPageIndicator.setPager(pager); - - } - - - - @Override - protected void onPause() { - super.onPause(); - finish(); - } - - - private class MyGridViewPagerAdapter extends GridPagerAdapter { - @Override - public int getColumnCount(int arg0) { - return 3; - } - - @Override - public int getRowCount() { - return 1; - } - - @Override - public Object instantiateItem(ViewGroup container, int row, int col) { - final View view = LayoutInflater.from(getApplicationContext()).inflate(R.layout.action_editplusminus_item, container, false); - final TextView textView = (TextView) view.findViewById(R.id.label); - textView.setText("label: " + col); - container.addView(view); - return view; - } - - @Override - public void destroyItem(ViewGroup container, int row, int col, Object view) { - container.removeView((View)view); - } - - @Override - public boolean isViewFromObject(View view, Object object) { - return view==object; - } - - - } -} \ No newline at end of file diff --git a/wear/src/main/res/layout/activity_bolus.xml b/wear/src/main/res/layout/activity_bolus.xml deleted file mode 100644 index 33eb156f99..0000000000 --- a/wear/src/main/res/layout/activity_bolus.xml +++ /dev/null @@ -1,11 +0,0 @@ - - diff --git a/wear/src/main/res/layout/rect_activity_bolus.xml b/wear/src/main/res/layout/rect_activity_bolus.xml deleted file mode 100644 index 90d343ba4f..0000000000 --- a/wear/src/main/res/layout/rect_activity_bolus.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - diff --git a/wear/src/main/res/layout/round_activity_bolus.xml b/wear/src/main/res/layout/round_activity_bolus.xml deleted file mode 100644 index eead135de3..0000000000 --- a/wear/src/main/res/layout/round_activity_bolus.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - -