diff --git a/README.md b/README.md index 9bcc4d7..c660754 100644 --- a/README.md +++ b/README.md @@ -8,4 +8,4 @@ The tutorial video is available here on Youtube : https://www.youtube.com/watch? Clock Live Wallpaper is also published on Google Play Store : https://play.google.com/store/apps/details?id=com.ssaurel.clocklw ###Screenshot -![Screenshot] (https://github.com/ssaurel/android-clock-livewallpaper/blob/master/screenshot.png) +![Screenshot] (https://github.com/ThomasTraber/android-clock-livewallpaper/blob/master/screenshot.png) diff --git a/gen/com/ssaurel/clocklw/R.java b/gen/com/ssaurel/clocklw/R.java index 060afd0..6446047 100644 --- a/gen/com/ssaurel/clocklw/R.java +++ b/gen/com/ssaurel/clocklw/R.java @@ -11,8 +11,13 @@ public final class R { public static final class attr { } public static final class drawable { - public static final int ic_launcher=0x7f020000; - public static final int widgetdial=0x7f020001; + public static final int clock_michael_breuer_02=0x7f020000; + public static final int ic_launcher=0x7f020001; + public static final int whiteclock=0x7f020002; + public static final int widgetdial=0x7f020003; + public static final int widgetdial_org=0x7f020004; + public static final int woodenclock=0x7f020005; + public static final int woodenclock_src=0x7f020006; } public static final class layout { public static final int main=0x7f030000; diff --git a/res/drawable/whiteclock.png b/res/drawable/whiteclock.png new file mode 100644 index 0000000..21b0a64 Binary files /dev/null and b/res/drawable/whiteclock.png differ diff --git a/res/drawable/widgetdial.png b/res/drawable/widgetdial.png index 80beabe..b80c92b 100644 Binary files a/res/drawable/widgetdial.png and b/res/drawable/widgetdial.png differ diff --git a/res/drawable/widgetdial_org.png b/res/drawable/widgetdial_org.png new file mode 100644 index 0000000..80beabe Binary files /dev/null and b/res/drawable/widgetdial_org.png differ diff --git a/res/drawable/woodenclock.png b/res/drawable/woodenclock.png new file mode 100644 index 0000000..8e1b62a Binary files /dev/null and b/res/drawable/woodenclock.png differ diff --git a/res/drawable/woodenclock_src.xcf b/res/drawable/woodenclock_src.xcf new file mode 100644 index 0000000..dce2664 Binary files /dev/null and b/res/drawable/woodenclock_src.xcf differ diff --git a/screenshot.png b/screenshot.png index 46de9c2..4e52d67 100644 Binary files a/screenshot.png and b/screenshot.png differ diff --git a/src/com/ssaurel/clocklw/AnalogClock.java b/src/com/ssaurel/clocklw/AnalogClock.java index a351dbe..5684cef 100644 --- a/src/com/ssaurel/clocklw/AnalogClock.java +++ b/src/com/ssaurel/clocklw/AnalogClock.java @@ -66,12 +66,16 @@ protected void onDraw(Canvas canvas) { float hour = cal.get(Calendar.HOUR_OF_DAY); //draw hands paint.setColor(colors[0]); - canvas.drawLine(x, y, (float) (x + (radius * 0.5f) * Math.cos(Math.toRadians((hour / 12.0f * 360.0f) - 90f))), - (float) (y + (radius * 0.5f) * Math.sin(Math.toRadians((hour / 12.0f * 360.0f) - 90f))), paint); + paint.setStrokeWidth(13); + paint.setStrokeCap(Paint.Cap.ROUND); + canvas.drawLine(x, y, (float) (x + (radius * 0.4f) * Math.cos(Math.toRadians(((hour + min/60f) / 12.0f * 360.0f) - 90f))), + (float) (y + (radius * 0.4f) * Math.sin(Math.toRadians(((hour + min/60f)/ 12.0f * 360.0f) - 90f))), paint); canvas.save(); paint.setColor(colors[1]); - canvas.drawLine(x, y, (float) (x + (radius * 0.6f) * Math.cos(Math.toRadians((min / 60.0f * 360.0f) - 90f))), - (float) (y + (radius * 0.6f) * Math.sin(Math.toRadians((min / 60.0f * 360.0f) - 90f))), paint); + paint.setStrokeWidth(5); + paint.setStrokeCap(Paint.Cap.ROUND); + canvas.drawLine(x, y, (float) (x + (radius * 0.7f) * Math.cos(Math.toRadians((min / 60.0f * 360.0f) - 90f))), + (float) (y + (radius * 0.7f) * Math.sin(Math.toRadians((min / 60.0f * 360.0f) - 90f))), paint); canvas.save(); if (displayHandSec) { @@ -81,4 +85,4 @@ protected void onDraw(Canvas canvas) { } } } -} \ No newline at end of file +} diff --git a/src/com/ssaurel/clocklw/ClockWallpaperService.java b/src/com/ssaurel/clocklw/ClockWallpaperService.java index 6f04b13..750e3fb 100644 --- a/src/com/ssaurel/clocklw/ClockWallpaperService.java +++ b/src/com/ssaurel/clocklw/ClockWallpaperService.java @@ -38,7 +38,7 @@ public void run() { private Paint paint; /** hands colors for hour, min, sec */ - private int[] colors = { 0xFFFF0000, 0xFF0000FF, 0xFFA2BC13 }; + private int[] colors = { 0xFF777777, 0xFF000000, 0xFFA2BC13 }; private int bgColor; private int width; private int height; @@ -57,6 +57,7 @@ public ClockWallpaperEngine() { paint.setAntiAlias(true); paint.setStyle(Paint.Style.STROKE); paint.setStrokeWidth(5); + paint.setStrokeJoin(Paint.Join.ROUND); bgColor = Color.parseColor("#C0C0C0"); clock = new AnalogClock(getApplicationContext()); handler.post(drawRunner); @@ -110,7 +111,7 @@ private void draw() { private void draw(Canvas canvas) { canvas.drawColor(bgColor); - clock.config(width / 2, height / 2, (int) (width * 0.6f), + clock.config(width / 2, height /2 , (int) (width * 1.0f), new Date(), paint, colors, displayHandSec); clock.draw(canvas); }