Skip to content

Wear OS improvements #1011

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MilosKozak merged 7 commits into from
Dec 6, 2021
Merged

Wear OS improvements #1011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dc7a27b
Wear set focus for rotary input
Andries-Smit Nov 30, 2021
5ae7346
Wear add menu icons and animation
Andries-Smit Nov 30, 2021
8ae63ef
Fix wear page indicator
Andries-Smit Dec 1, 2021
e8e0aa7
Wear improve menu icons
Andries-Smit Dec 1, 2021
d7caa39
Wear improve menu navigation
Andries-Smit Dec 1, 2021
bc05eaa
Wear add title to grid layout
Andries-Smit Dec 1, 2021
6083bb4
Wear improve action menu
Andries-Smit Dec 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions wear/src/main/java/info/nightscout/androidaps/interaction/AAPSPreferences.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ protected void onCreate(Bundle savedInstanceState) {
ViewGroup view = (ViewGroup)getWindow().getDecorView();
removeBackgroundRecursively(view);
view.setBackground(getResources().getDrawable(R.drawable.settings_background));
view.requestFocus();
}

@Override
Expand Down
1 change: 1 addition & 0 deletions wear/src/main/java/info/nightscout/androidaps/interaction/ConfigurationActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ protected void onCreate(Bundle savedInstanceState) {
ViewGroup view = (ViewGroup) getWindow().getDecorView();
removeBackgroundRecursively(view);
view.setBackground(getResources().getDrawable(R.drawable.settings_background));
view.requestFocus();
}

@Override
Expand Down
5 changes: 2 additions & 3 deletions wear/src/main/java/info/nightscout/androidaps/interaction/actions/AcceptActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,8 @@ protected void onCreate(Bundle savedInstanceState) {
}

setContentView(R.layout.grid_layout);
final Resources res = getResources();
final GridViewPager pager = findViewById(R.id.pager);

final GridViewPager pager = findViewById(R.id.pager);
pager.setAdapter(new MyGridViewPagerAdapter());
DotsPageIndicator dotsPageIndicator = findViewById(R.id.page_indicator);
dotsPageIndicator.setPager(pager);
Expand Down Expand Up @@ -99,7 +98,7 @@ public Object instantiateItem(ViewGroup container, int row, int col) {
@Override
public void onClick(View v) {
ListenerService.confirmAction(AcceptActivity.this, actionstring);
finish();
finishAffinity();
}
});
container.addView(view);
Expand Down
28 changes: 24 additions & 4 deletions wear/src/main/java/info/nightscout/androidaps/interaction/actions/BolusActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;

import java.text.DecimalFormat;

Expand All @@ -32,15 +33,33 @@ public class BolusActivity extends ViewSelectorActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.grid_layout);
final Resources res = getResources();
final GridViewPager pager = findViewById(R.id.pager);

final TextView title = findViewById(R.id.title);
title.setText(getString(R.string.menu_bolus));

final GridViewPager pager = findViewById(R.id.pager);
pager.setAdapter(new MyGridViewPagerAdapter());
DotsPageIndicator dotsPageIndicator = findViewById(R.id.page_indicator);
dotsPageIndicator.setPager(pager);
pager.setOnPageChangeListener(new GridViewPager.OnPageChangeListener() {
@Override
public void onPageScrolled(int row, int column, float rowOffset, float columnOffset, int rowOffsetPixels, int columnOffsetPixels) {
dotsPageIndicator.onPageScrolled(row, column, rowOffset, columnOffset, rowOffsetPixels,
columnOffsetPixels);
}
@Override
public void onPageSelected(int row, int column) {
dotsPageIndicator.onPageSelected(row, column);
View view = pager.getChildAt(column);
view.requestFocus();
}
@Override
public void onPageScrollStateChanged(int state) {
dotsPageIndicator.onPageScrollStateChanged(state);
}
});
}


@Override
protected void onPause() {
super.onPause();
Expand Down Expand Up @@ -71,6 +90,7 @@ public Object instantiateItem(ViewGroup container, int row, int col) {
editInsulin = new PlusMinusEditText(view, R.id.amountfield, R.id.plusbutton, R.id.minusbutton, def, 0d, 30d, 0.1d, new DecimalFormat("#0.0"), false);
setLabelToPlusMinusView(view, getString(R.string.action_insulin));
container.addView(view);
view.requestFocus();
return view;
} else if (col == 1) {
final View view = getInflatedPlusMinusView(container);
Expand All @@ -96,7 +116,7 @@ public void onClick(View v) {
String actionstring = "bolus " + SafeParse.stringToDouble(editInsulin.editText.getText().toString())
+ " " + SafeParse.stringToInt(editCarbs.editText.getText().toString());
ListenerService.initiateAction(BolusActivity.this, actionstring);
finish();
finishAffinity();
}
});
container.addView(view);
Expand Down
27 changes: 24 additions & 3 deletions wear/src/main/java/info/nightscout/androidaps/interaction/actions/CPPActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;

import java.text.DecimalFormat;

Expand Down Expand Up @@ -47,12 +48,31 @@ protected void onCreate(Bundle savedInstanceState) {
if (timeshift < 0) timeshift += 24;

setContentView(R.layout.grid_layout);
final Resources res = getResources();
final GridViewPager pager = findViewById(R.id.pager);

final TextView title = findViewById(R.id.title);
title.setText(getString(R.string.status_cpp));

final GridViewPager pager = findViewById(R.id.pager);
pager.setAdapter(new MyGridViewPagerAdapter());
DotsPageIndicator dotsPageIndicator = findViewById(R.id.page_indicator);
dotsPageIndicator.setPager(pager);
pager.setOnPageChangeListener(new GridViewPager.OnPageChangeListener() {
@Override
public void onPageScrolled(int row, int column, float rowOffset, float columnOffset, int rowOffsetPixels, int columnOffsetPixels) {
dotsPageIndicator.onPageScrolled(row, column, rowOffset, columnOffset, rowOffsetPixels,
columnOffsetPixels);
}
@Override
public void onPageSelected(int row, int column) {
dotsPageIndicator.onPageSelected(row, column);
View view = pager.getChildAt(column);
view.requestFocus();
}
@Override
public void onPageScrollStateChanged(int state) {
dotsPageIndicator.onPageScrollStateChanged(state);
}
});
}


Expand Down Expand Up @@ -86,6 +106,7 @@ public Object instantiateItem(ViewGroup container, int row, int col) {
editTimeshift = new PlusMinusEditText(view, R.id.amountfield, R.id.plusbutton, R.id.minusbutton, def, 0d, 23d, 1d, new DecimalFormat("0"), true, true);
setLabelToPlusMinusView(view, getString(R.string.action_timeshift));
container.addView(view);
view.requestFocus();
return view;
} else if (col == 1) {
final View view = getInflatedPlusMinusView(container);
Expand All @@ -111,7 +132,7 @@ public void onClick(View v) {
String actionstring = "cppset " + SafeParse.stringToInt(editTimeshift.editText.getText().toString())
+ " " + SafeParse.stringToInt(editPercentage.editText.getText().toString());
ListenerService.initiateAction(CPPActivity.this, actionstring);
finish();
finishAffinity();
}
});
container.addView(view);
Expand Down
27 changes: 24 additions & 3 deletions wear/src/main/java/info/nightscout/androidaps/interaction/actions/ECarbActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;

import java.text.DecimalFormat;

Expand All @@ -34,12 +35,31 @@ public class ECarbActivity extends ViewSelectorActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.grid_layout);
final Resources res = getResources();
final GridViewPager pager = findViewById(R.id.pager);

final TextView title = findViewById(R.id.title);
title.setText(getString(R.string.menu_ecarb));

final GridViewPager pager = findViewById(R.id.pager);
pager.setAdapter(new MyGridViewPagerAdapter());
DotsPageIndicator dotsPageIndicator = findViewById(R.id.page_indicator);
dotsPageIndicator.setPager(pager);
pager.setOnPageChangeListener(new GridViewPager.OnPageChangeListener() {
@Override
public void onPageScrolled(int row, int column, float rowOffset, float columnOffset, int rowOffsetPixels, int columnOffsetPixels) {
dotsPageIndicator.onPageScrolled(row, column, rowOffset, columnOffset, rowOffsetPixels,
columnOffsetPixels);
}
@Override
public void onPageSelected(int row, int column) {
dotsPageIndicator.onPageSelected(row, column);
View view = pager.getChildAt(column);
view.requestFocus();
}
@Override
public void onPageScrollStateChanged(int state) {
dotsPageIndicator.onPageScrollStateChanged(state);
}
});
}


Expand Down Expand Up @@ -73,6 +93,7 @@ public Object instantiateItem(ViewGroup container, int row, int col) {
editCarbs = new PlusMinusEditText(view, R.id.amountfield, R.id.plusbutton, R.id.minusbutton, def, 0d, 150d, 1d, new DecimalFormat("0"), true);
setLabelToPlusMinusView(view, getString(R.string.action_carbs));
container.addView(view);
view.requestFocus();
return view;
} else if(col == 1){
final View view = getInflatedPlusMinusView(container);
Expand Down Expand Up @@ -109,7 +130,7 @@ public void onClick(View v) {
+ " " + SafeParse.stringToInt(editStartTime.editText.getText().toString())
+ " " + SafeParse.stringToInt(editDuration.editText.getText().toString());
ListenerService.initiateAction(ECarbActivity.this, actionstring);
finish();
finishAffinity();
}
});
container.addView(view);
Expand Down
10 changes: 7 additions & 3 deletions wear/src/main/java/info/nightscout/androidaps/interaction/actions/FillActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;

import java.text.DecimalFormat;

Expand All @@ -31,9 +32,11 @@ public class FillActivity extends ViewSelectorActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.grid_layout);
final Resources res = getResources();
final GridViewPager pager = findViewById(R.id.pager);

final TextView title = findViewById(R.id.title);
title.setText(getString(R.string.menu_prime_fill));

final GridViewPager pager = findViewById(R.id.pager);
pager.setAdapter(new MyGridViewPagerAdapter());
DotsPageIndicator dotsPageIndicator = findViewById(R.id.page_indicator);
dotsPageIndicator.setPager(pager);
Expand Down Expand Up @@ -70,6 +73,7 @@ public Object instantiateItem(ViewGroup container, int row, int col) {
editInsulin = new PlusMinusEditText(view, R.id.amountfield, R.id.plusbutton, R.id.minusbutton, def, 0d, 30d, 0.1d, new DecimalFormat("#0.0"), false);
setLabelToPlusMinusView(view, getString(R.string.action_insulin));
container.addView(view);
view.requestFocus();
return view;
} else {

Expand All @@ -84,7 +88,7 @@ public void onClick(View v) {

String actionstring = "fill " + SafeParse.stringToDouble(editInsulin.editText.getText().toString());
ListenerService.initiateAction(FillActivity.this, actionstring);
finish();
finishAffinity();
}
});
container.addView(view);
Expand Down
26 changes: 23 additions & 3 deletions wear/src/main/java/info/nightscout/androidaps/interaction/actions/TempTargetActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,35 @@ public class TempTargetActivity extends ViewSelectorActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.grid_layout);
final Resources res = getResources();
final GridViewPager pager = findViewById(R.id.pager);

final TextView title = findViewById(R.id.title);
title.setText(getString(R.string.menu_tempt));

final GridViewPager pager = findViewById(R.id.pager);
pager.setAdapter(new MyGridViewPagerAdapter());
DotsPageIndicator dotsPageIndicator = findViewById(R.id.page_indicator);
dotsPageIndicator.setPager(pager);

SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
isMGDL = sp.getBoolean("units_mgdl", true);
isSingleTarget = sp.getBoolean("singletarget", true);
pager.setOnPageChangeListener(new GridViewPager.OnPageChangeListener() {
@Override
public void onPageScrolled(int row, int column, float rowOffset, float columnOffset, int rowOffsetPixels, int columnOffsetPixels) {
dotsPageIndicator.onPageScrolled(row, column, rowOffset, columnOffset, rowOffsetPixels,
columnOffsetPixels);
}
@Override
public void onPageSelected(int row, int column) {
dotsPageIndicator.onPageSelected(row, column);
View view = pager.getChildAt(column);
view.requestFocus();
}
@Override
public void onPageScrollStateChanged(int state) {
dotsPageIndicator.onPageScrollStateChanged(state);
}
});
}


Expand Down Expand Up @@ -84,6 +103,7 @@ public Object instantiateItem(ViewGroup container, int row, int col) {
}
setLabelToPlusMinusView(view, getString(R.string.action_duration));
container.addView(view);
view.requestFocus();
return view;

} else if (col == 1) {
Expand Down Expand Up @@ -144,7 +164,7 @@ public void onClick(View v) {
+ " " + (isSingleTarget ? SafeParse.stringToDouble(lowRange.editText.getText().toString()) : SafeParse.stringToDouble(highRange.editText.getText().toString()));

ListenerService.initiateAction(TempTargetActivity.this, actionstring);
finish();
finishAffinity();
}
});
container.addView(view);
Expand Down
27 changes: 24 additions & 3 deletions wear/src/main/java/info/nightscout/androidaps/interaction/actions/WizardActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;

import java.text.DecimalFormat;

Expand All @@ -37,14 +38,33 @@ public class WizardActivity extends ViewSelectorActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.grid_layout);
final Resources res = getResources();
final GridViewPager pager = findViewById(R.id.pager);

final TextView title = findViewById(R.id.title);
title.setText(getString(R.string.menu_wizard));

final GridViewPager pager = findViewById(R.id.pager);
pager.setAdapter(new MyGridViewPagerAdapter());
DotsPageIndicator dotsPageIndicator = findViewById(R.id.page_indicator);
dotsPageIndicator.setPager(pager);
SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
hasPercentage = sp.getBoolean("wizardpercentage", false);
pager.setOnPageChangeListener(new GridViewPager.OnPageChangeListener() {
@Override
public void onPageScrolled(int row, int column, float rowOffset, float columnOffset, int rowOffsetPixels, int columnOffsetPixels) {
dotsPageIndicator.onPageScrolled(row, column, rowOffset, columnOffset, rowOffsetPixels,
columnOffsetPixels);
}
@Override
public void onPageSelected(int row, int column) {
dotsPageIndicator.onPageSelected(row, column);
View view = pager.getChildAt(column);
view.requestFocus();
}
@Override
public void onPageScrollStateChanged(int state) {
dotsPageIndicator.onPageScrollStateChanged(state);
}
});
}


Expand Down Expand Up @@ -80,6 +100,7 @@ public Object instantiateItem(ViewGroup container, int row, int col) {
}
setLabelToPlusMinusView(view, getString(R.string.action_carbs));
container.addView(view);
view.requestFocus();
return view;
} else if (col == 1 && hasPercentage) {
final View view = getInflatedPlusMinusView(container);
Expand Down Expand Up @@ -111,7 +132,7 @@ public void onClick(View v) {
String actionstring = "wizard2 " + SafeParse.stringToInt(editCarbs.editText.getText().toString())
+ " " + percentage;
ListenerService.initiateAction(WizardActivity.this, actionstring);
finish();
finishAffinity();
}
});
container.addView(view);
Expand Down
Loading