Add star shape type

zadeviggers · Apr 15, 2024 · b031ebe · b031ebe
1 parent 4f6ead3
commit b031ebe
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/app/src/main/java/net/viggers/zade/wallpaper/WallpaperService.kt b/app/src/main/java/net/viggers/zade/wallpaper/WallpaperService.kt
@@ -406,6 +406,17 @@ class WallpaperService : WallpaperService() {
  angle
  )
 
+ "star" -> drawPolygon(
+ canvas,
+ paint,
+ x,
+ y,
+ size,
+ 10f,
+ angle,
+ true
+ )
+
  else -> canvas.drawCircle(x, y, size, paint)
  }
  }
@@ -423,11 +434,13 @@ class WallpaperService : WallpaperService() {
  radius: Float,
  sides: Float,
  startAngle: Float,
+ starMode: Boolean = false
  ) {
  // From https://stackoverflow.com/a/36792553
  if (sides < 3) {
  return
  }
+ val innerRadius = radius * 0.4f
  val a = Math.PI.toFloat() * 2 / sides
  mCanvas.save()
  mCanvas.translate(x, y)
@@ -436,10 +449,13 @@ class WallpaperService : WallpaperService() {
  path.moveTo(radius, 0f)
  var i = 1
  while (i < sides) {
+ val pointRadius = if (starMode && i % 2 != 0) innerRadius else radius;
+
  path.lineTo(
- radius * cos((a * i).toDouble()).toFloat(),
- radius * sin((a * i).toDouble()).toFloat()
+ pointRadius * cos((a * i).toDouble()).toFloat(),
+ pointRadius * sin((a * i).toDouble()).toFloat()
  )
+
  i++
  }
  path.close()

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
@@ -6,6 +6,7 @@
  <item>@string/shape_option_label_triangle</item>
  <item>@string/shape_option_label_pentagon</item>
  <item>@string/shape_option_label_hexagon</item>
+ <item>@string/shape_option_label_star</item>
  </array>
 
  <array name="shape_types">
@@ -14,6 +15,7 @@
  <item>triangle</item>
  <item>pentagon</item>
  <item>hexagon</item>
+ <item>star</item>
  </array>
 
  <string-array name="colourPalette" translatable="false">

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -49,4 +49,5 @@
  <string name="enable_random_shape_rotations_preference_title">Rotate shapes randomly</string>
  <string name="enable_random_shape_rotations_preference_summary">Shapes will spawn with random rotation. You probably won\'t notice this with circles though.</string>
  <string name="none_selected_multiselect_input_toast">Select at least one option</string>
+ <string name="shape_option_label_star">Star</string>
 </resources>