From dd9a09aff4d28ccb4b8f7b32c6a879abba758267 Mon Sep 17 00:00:00 2001
From: Reinier Balt <lrbalt@gmail.com>
Date: Wed, 16 Jun 2021 14:17:18 +0200
Subject: [PATCH] use PrimitiveStyle::with_stroke, not PrimitiveStyleBuilder

---
 examples/epd2in13_v2.rs    | 13 ++++---------
 examples/epd2in13bc.rs     | 13 ++++---------
 src/epd1in54/graphics.rs   | 30 +++++-------------------------
 src/epd7in5_v2/graphics.rs |  4 ----
 4 files changed, 13 insertions(+), 47 deletions(-)

diff --git a/examples/epd2in13_v2.rs b/examples/epd2in13_v2.rs
index fef4b6c..5eab890 100644
--- a/examples/epd2in13_v2.rs
+++ b/examples/epd2in13_v2.rs
@@ -3,7 +3,7 @@
 use embedded_graphics::{
     mono_font::MonoTextStyleBuilder,
     prelude::*,
-    primitives::{Circle, Line, PrimitiveStyleBuilder},
+    primitives::{Circle, Line, PrimitiveStyle},
     text::{Baseline, Text, TextStyleBuilder},
 };
 use embedded_hal::prelude::*;
@@ -89,19 +89,14 @@ fn main() -> Result<(), std::io::Error> {
     display.clear_buffer(Color::White);
 
     // draw a analog clock
-    let style = PrimitiveStyleBuilder::new()
-        .stroke_color(Black)
-        .stroke_width(1)
-        .build();
-
     let _ = Circle::new(Point::new(64, 64), 40)
-        .into_styled(style)
+        .into_styled(PrimitiveStyle::with_stroke(Black, 1))
         .draw(&mut display);
     let _ = Line::new(Point::new(64, 64), Point::new(30, 40))
-        .into_styled(style)
+        .into_styled(PrimitiveStyle::with_stroke(Black, 4))
         .draw(&mut display);
     let _ = Line::new(Point::new(64, 64), Point::new(80, 40))
-        .into_styled(style)
+        .into_styled(PrimitiveStyle::with_stroke(Black, 1))
         .draw(&mut display);
 
     // draw white on black background
diff --git a/examples/epd2in13bc.rs b/examples/epd2in13bc.rs
index 68c72a0..8110d79 100644
--- a/examples/epd2in13bc.rs
+++ b/examples/epd2in13bc.rs
@@ -3,7 +3,7 @@
 use embedded_graphics::{
     mono_font::MonoTextStyleBuilder,
     prelude::*,
-    primitives::{Circle, Line, PrimitiveStyleBuilder},
+    primitives::{Circle, Line, PrimitiveStyle},
     text::{Baseline, Text, TextStyleBuilder},
 };
 use embedded_hal::prelude::*;
@@ -104,19 +104,14 @@ fn main() -> Result<(), std::io::Error> {
     display.clear_buffer(TriColor::White);
 
     // draw a analog clock
-    let style = PrimitiveStyleBuilder::new()
-        .stroke_color(TriColor::Black)
-        .stroke_width(1)
-        .build();
-
     let _ = Circle::new(Point::new(64, 64), 40)
-        .into_styled(style)
+        .into_styled(PrimitiveStyle::with_stroke(TriColor::Black, 1))
         .draw(&mut display);
     let _ = Line::new(Point::new(64, 64), Point::new(30, 40))
-        .into_styled(style)
+        .into_styled(PrimitiveStyle::with_stroke(TriColor::Black, 4))
         .draw(&mut display);
     let _ = Line::new(Point::new(64, 64), Point::new(80, 40))
-        .into_styled(style)
+        .into_styled(PrimitiveStyle::with_stroke(TriColor::Black, 1))
         .draw(&mut display);
 
     // draw text white on Red background by using the chromatic buffer
diff --git a/src/epd1in54/graphics.rs b/src/epd1in54/graphics.rs
index 6bc08d7..644ae0f 100644
--- a/src/epd1in54/graphics.rs
+++ b/src/epd1in54/graphics.rs
@@ -67,7 +67,7 @@ mod tests {
     use crate::graphics::{Display, DisplayRotation};
     use embedded_graphics::{
         prelude::*,
-        primitives::{Line, PrimitiveStyleBuilder},
+        primitives::{Line, PrimitiveStyle},
     };
 
     // test buffer length
@@ -90,12 +90,7 @@ mod tests {
     fn graphics_rotation_0() {
         let mut display = Display1in54::default();
         let _ = Line::new(Point::new(0, 0), Point::new(7, 0))
-            .into_styled(
-                PrimitiveStyleBuilder::new()
-                    .stroke_color(Black)
-                    .stroke_width(1)
-                    .build(),
-            )
+            .into_styled(PrimitiveStyle::with_stroke(Black, 1))
             .draw(&mut display);
 
         let buffer = display.buffer();
@@ -112,12 +107,7 @@ mod tests {
         let mut display = Display1in54::default();
         display.set_rotation(DisplayRotation::Rotate90);
         let _ = Line::new(Point::new(0, 192), Point::new(0, 199))
-            .into_styled(
-                PrimitiveStyleBuilder::new()
-                    .stroke_color(Black)
-                    .stroke_width(1)
-                    .build(),
-            )
+            .into_styled(PrimitiveStyle::with_stroke(Black, 1))
             .draw(&mut display);
 
         let buffer = display.buffer();
@@ -134,12 +124,7 @@ mod tests {
         let mut display = Display1in54::default();
         display.set_rotation(DisplayRotation::Rotate180);
         let _ = Line::new(Point::new(192, 199), Point::new(199, 199))
-            .into_styled(
-                PrimitiveStyleBuilder::new()
-                    .stroke_color(Black)
-                    .stroke_width(1)
-                    .build(),
-            )
+            .into_styled(PrimitiveStyle::with_stroke(Black, 1))
             .draw(&mut display);
 
         let buffer = display.buffer();
@@ -159,12 +144,7 @@ mod tests {
         let mut display = Display1in54::default();
         display.set_rotation(DisplayRotation::Rotate270);
         let _ = Line::new(Point::new(199, 0), Point::new(199, 7))
-            .into_styled(
-                PrimitiveStyleBuilder::new()
-                    .stroke_color(Black)
-                    .stroke_width(1)
-                    .build(),
-            )
+            .into_styled(PrimitiveStyle::with_stroke(Black, 1))
             .draw(&mut display);
 
         let buffer = display.buffer();
diff --git a/src/epd7in5_v2/graphics.rs b/src/epd7in5_v2/graphics.rs
index 2d8642a..e9a6ad5 100644
--- a/src/epd7in5_v2/graphics.rs
+++ b/src/epd7in5_v2/graphics.rs
@@ -30,10 +30,6 @@ impl DrawTarget for Display7in5 {
     fn draw_pixel(&mut self, pixel: Pixel<BinaryColor>) -> Result<(), Self::Error> {
         self.draw_helper(WIDTH, HEIGHT, pixel)
     }
-
-//     fn size(&self) -> Size {
-//        Size::new(WIDTH, HEIGHT)
-//    }
 }
 
 impl Display for Display7in5 {