Merge pull request #587 from andrew-warrington/watchfaces

Steampunk watch face: Chart readability improvement
This commit is contained in:
AdrianLxM 2018-01-11 20:19:37 +01:00 committed by GitHub
commit 3fc3a61c37
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -178,7 +178,11 @@ public class Steampunk extends BaseWatchFace {
gridColor = ContextCompat.getColor(getApplicationContext(), R.color.grey_steampunk); gridColor = ContextCompat.getColor(getApplicationContext(), R.color.grey_steampunk);
basalBackgroundColor = ContextCompat.getColor(getApplicationContext(), R.color.basal_dark); basalBackgroundColor = ContextCompat.getColor(getApplicationContext(), R.color.basal_dark);
basalCenterColor = ContextCompat.getColor(getApplicationContext(), R.color.basal_dark); basalCenterColor = ContextCompat.getColor(getApplicationContext(), R.color.basal_dark);
if (Integer.parseInt(sharedPrefs.getString("chart_timeframe", "3")) < 3) {
pointSize = 2;
} else {
pointSize = 1; pointSize = 1;
}
setupCharts(); setupCharts();
} }
@ -237,7 +241,12 @@ public class Steampunk extends BaseWatchFace {
private void changeChartTimeframe() { private void changeChartTimeframe() {
int timeframe = Integer.parseInt(sharedPrefs.getString("chart_timeframe", "3")); int timeframe = Integer.parseInt(sharedPrefs.getString("chart_timeframe", "3"));
timeframe = (timeframe%5) + 1; timeframe = (timeframe%5) + 1;
if (timeframe < 3) {
pointSize = 2;
} else {
pointSize = 1;
}
setupCharts();
sharedPrefs.edit().putString("chart_timeframe", "" + timeframe).commit(); sharedPrefs.edit().putString("chart_timeframe", "" + timeframe).commit();
} }
} }