bauer/UdacityProject6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

round style

Browse Source
This commit is contained in:
danijoo
2015-12-27 21:25:12 +01:00
parent c6af85ddd5
commit 35711738d0
2 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
wear/src/main/java/com/example/android/sunshine/wear/WatchFaceDrawHelper.java
View File

@@ -37,16 +37,11 @@ public class WatchFaceDrawHelper {
float mTempLowXOffset; float mTempLowXOffset;
public WatchFaceDrawHelper(Resources resources, boolean isRound) { public WatchFaceDrawHelper(Resources resources, boolean isRound) {
mTimeYOffset = resources.getDimension(R.dimen.time_y_offset);
mDateYOffset = resources.getDimension(R.dimen.date_y_offset);
mTempYOffset = resources.getDimension(R.dimen.temp_y_offset);
mWeatherIconYOffset = resources.getDimension(R.dimen.weather_icon_y_offset);
mBackgroundPaint = new Paint(); mBackgroundPaint = new Paint();
mBackgroundPaint.setColor(resources.getColor(R.color.background)); mBackgroundPaint.setColor(resources.getColor(R.color.background));
mIconPaint = new Paint(); mIconPaint = new Paint();
// mIconPaint.setColor(resources.getColor(android.R.color.transparent));
timeTextPaint = createTextPaint(resources.getColor(R.color.textcolor_primary)); timeTextPaint = createTextPaint(resources.getColor(R.color.textcolor_primary));
mDateTextPaint = createTextPaint(resources.getColor(R.color.textcolor_secondary)); mDateTextPaint = createTextPaint(resources.getColor(R.color.textcolor_secondary));
@@ -55,6 +50,12 @@ public class WatchFaceDrawHelper {
mHighestTempPaint.setTypeface(Typeface.create(Typeface.DEFAULT, Typeface.BOLD)); mHighestTempPaint.setTypeface(Typeface.create(Typeface.DEFAULT, Typeface.BOLD));
mLowestTempPaint = createTextPaint(resources.getColor(R.color.textcolor_primary)); mLowestTempPaint = createTextPaint(resources.getColor(R.color.textcolor_primary));
mTimeYOffset = resources.getDimension(isRound? R.dimen.time_y_offset_round : R.dimen.time_y_offset);
mDateYOffset = resources.getDimension(isRound? R.dimen.date_y_offset_round : R.dimen.date_y_offset);
mTempYOffset = resources.getDimension(isRound? R.dimen.temp_y_offset_round : R.dimen.temp_y_offset);
mWeatherIconYOffset = resources.getDimension(isRound? R.dimen.weather_icon_y_offset_round : R.dimen.weather_icon_y_offset);
mTimeXOffset = resources.getDimension(isRound mTimeXOffset = resources.getDimension(isRound
? R.dimen.time_x_offset_round : R.dimen.time_x_offset); ? R.dimen.time_x_offset_round : R.dimen.time_x_offset);
mDateXOffset = resources.getDimension(isRound mDateXOffset = resources.getDimension(isRound
@@ -75,11 +76,11 @@ public class WatchFaceDrawHelper {
mDateTextPaint.setTextSize(dateTextSize); mDateTextPaint.setTextSize(dateTextSize);
float weatherTextSize = resources.getDimension(isRound float weatherTextSize = resources.getDimension(isRound
? R.dimen.weather_text_size_round : R.dimen.weather_text_size); ? R.dimen.temp_high_size_round : R.dimen.temp_high_text_size);
mHighestTempPaint.setTextSize(weatherTextSize); mHighestTempPaint.setTextSize(weatherTextSize);
float weatherTextSize2 = resources.getDimension(isRound float weatherTextSize2 = resources.getDimension(isRound
? R.dimen.weather_text_size_round_2 : R.dimen.weather_text_size_2); ? R.dimen.temp_low_size_round : R.dimen.temp_low_size);
mLowestTempPaint.setTextSize(weatherTextSize2); mLowestTempPaint.setTextSize(weatherTextSize2);
} }
@@ -121,12 +122,12 @@ public class WatchFaceDrawHelper {
canvas.drawText(dateText, mDateXOffset, mDateYOffset, mDateTextPaint); canvas.drawText(dateText, mDateXOffset, mDateYOffset, mDateTextPaint);
// Draw weather // Draw weather
if(!(highestTemp == 0 && lowestTemp == 0)) { // if(!(highestTemp == 0 && lowestTemp == 0)) {
String currentHigh = String.format(TEMP_FORMAT, highestTemp); String currentHigh = String.format(TEMP_FORMAT, highestTemp);
canvas.drawText(currentHigh, mTempHighXOffset, mTempYOffset, mHighestTempPaint); canvas.drawText(currentHigh, mTempHighXOffset, mTempYOffset, mHighestTempPaint);
String currentLow = String.format(TEMP_FORMAT, lowestTemp); String currentLow = String.format(TEMP_FORMAT, lowestTemp);
canvas.drawText(currentLow, mTempLowXOffset, mTempYOffset, mLowestTempPaint); canvas.drawText(currentLow, mTempLowXOffset, mTempYOffset, mLowestTempPaint);
} // }
if(weatherIcon != null) if(weatherIcon != null)
canvas.drawBitmap(weatherIcon, mWeatherIconXOffset, mWeatherIconYOffset, mIconPaint); canvas.drawBitmap(weatherIcon, mWeatherIconXOffset, mWeatherIconYOffset, mIconPaint);

31
wear/src/main/res/values/dimens.xml
View File

@@ -1,31 +1,36 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<dimen name="time_text_size">40dp</dimen> <dimen name="time_text_size">40dp</dimen>
<dimen name="time_text_size_round">45dp</dimen> <dimen name="time_text_size_round">40dp</dimen>
<dimen name="time_x_offset">15dp</dimen> <dimen name="time_x_offset">15dp</dimen>
<dimen name="time_x_offset_round">25dp</dimen> <dimen name="time_x_offset_round">30dp</dimen>
<dimen name="time_y_offset">70dp</dimen> <dimen name="time_y_offset">80dp</dimen>
<dimen name="time_y_offset_round">80dp</dimen>
<dimen name="date_text_size">20dp</dimen> <dimen name="date_text_size">20dp</dimen>
<dimen name="date_text_size_round">25dp</dimen> <dimen name="date_text_size_round">20dp</dimen>
<dimen name="date_x_offset">15dp</dimen> <dimen name="date_x_offset">15dp</dimen>
<dimen name="date_x_offset_round">25dp</dimen> <dimen name="date_x_offset_round">30dp</dimen>
<dimen name="date_y_offset">100dp</dimen> <dimen name="date_y_offset">100dp</dimen>
<dimen name="date_y_offset_round">100dp</dimen>
<dimen name="weather_text_size">20dp</dimen>
<dimen name="weather_text_size_round">25dp</dimen>
<dimen name="weather_text_size_2">15dp</dimen>
<dimen name="weather_text_size_round_2">20dp</dimen>
<dimen name="weather_icon_x_offset">15dp</dimen> <dimen name="weather_icon_x_offset">15dp</dimen>
<dimen name="weather_icon_x_offset_round">55dp</dimen> <dimen name="weather_icon_x_offset_round">35dp</dimen>
<dimen name="weather_icon_y_offset">120dp</dimen> <dimen name="weather_icon_y_offset">120dp</dimen>
<dimen name="weather_icon_y_offset_round">120dp</dimen>
<dimen name="temp_high_text_size">20dp</dimen>
<dimen name="temp_high_size_round">20dp</dimen>
<dimen name="temp_high_x_offset">70dp</dimen> <dimen name="temp_high_x_offset">70dp</dimen>
<dimen name="temp_high_x_offset_round">100dp</dimen> <dimen name="temp_high_x_offset_round">80dp</dimen>
<dimen name="temp_low_size">15dp</dimen>
<dimen name="temp_low_size_round">15dp</dimen>
<dimen name="temp_low_x_offset">125dp</dimen> <dimen name="temp_low_x_offset">125dp</dimen>
<dimen name="temp_low_x_offset_round">140dp</dimen> <dimen name="temp_low_x_offset_round">135dp</dimen>
<dimen name="temp_y_offset">140dp</dimen> <dimen name="temp_y_offset">140dp</dimen>
<dimen name="temp_y_offset_round">140dp</dimen>