From 87b92f9aa521da187cce1a5ace959556a990b6fd Mon Sep 17 00:00:00 2001 From: geilala Date: Wed, 29 May 2024 14:05:09 +0800 Subject: [PATCH 1/2] update color --- .../java/edu/project/components/TimeForecast.java | 9 +++++++-- .../java/edu/project/components/WeatherCard.java | 2 +- .../project/components/WeatherForecastPanel.java | 13 +++++++++---- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/main/java/edu/project/components/TimeForecast.java b/src/main/java/edu/project/components/TimeForecast.java index 8c62670..731bd12 100644 --- a/src/main/java/edu/project/components/TimeForecast.java +++ b/src/main/java/edu/project/components/TimeForecast.java @@ -4,6 +4,9 @@ import edu.project.api.WeatherForecast5Data; import javax.swing.*; + +import com.formdev.flatlaf.FlatClientProperties; + import java.awt.*; import java.awt.geom.RoundRectangle2D; import java.time.LocalDateTime; @@ -13,9 +16,10 @@ import java.util.Locale; public class TimeForecast extends JPanel { + private static final DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern("h a") .withLocale(Locale.ENGLISH); // Abbreviate the hour - private static final Color PANEL_COLOR = new Color(169, 169, 169); // Light gray color + private static final Color PANEL_COLOR = new Color(224, 224, 224); // Light gray color private static final int ARC_WIDTH = 20; // Adjust the arc width for rounded corners private static final int ARC_HEIGHT = 20; // Adjust the arc height for rounded corners private static final int SPACING = 10; // Horizontal spacing between each hour panel @@ -25,8 +29,9 @@ public class TimeForecast extends JPanel { private final List hourForecasts = new ArrayList<>(); public TimeForecast(Context context) { + putClientProperty(FlatClientProperties.STYLE, + "border: 10,10,10,10,shade(@background,10%),,16"); setOpaque(false); - setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); setLayout(new BorderLayout()); JPanel mainPanel = new JPanel(new BorderLayout()); diff --git a/src/main/java/edu/project/components/WeatherCard.java b/src/main/java/edu/project/components/WeatherCard.java index 30e31ad..f4d74ca 100644 --- a/src/main/java/edu/project/components/WeatherCard.java +++ b/src/main/java/edu/project/components/WeatherCard.java @@ -57,7 +57,7 @@ public void setValue(String value) { protected void paintComponent(Graphics graphics) { Graphics2D graphics2d = (Graphics2D) graphics; graphics2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - graphics2d.setColor(Color.LIGHT_GRAY); + graphics2d.setColor(new Color(224, 224, 224)); graphics2d.fillRoundRect(0, 0, getWidth(), getHeight(), 16, 16); super.paintComponent(graphics); } diff --git a/src/main/java/edu/project/components/WeatherForecastPanel.java b/src/main/java/edu/project/components/WeatherForecastPanel.java index 7ade4dd..7208205 100644 --- a/src/main/java/edu/project/components/WeatherForecastPanel.java +++ b/src/main/java/edu/project/components/WeatherForecastPanel.java @@ -4,6 +4,9 @@ import edu.project.api.WeatherForecast5Data; import javax.swing.*; + +import com.formdev.flatlaf.FlatClientProperties; + import java.awt.*; import java.awt.geom.RoundRectangle2D; import java.time.LocalDate; @@ -15,17 +18,19 @@ public class WeatherForecastPanel extends JPanel { private static final DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("EEE") .withLocale(Locale.ENGLISH); - private static final Color PANEL_COLOR = new Color(169, 169, 169); // Light gray color - private static final int ARC_WIDTH = 20; - private static final int ARC_HEIGHT = 20; + private static final Color PANEL_COLOR = new Color(224, 224, 224); // Light gray color + private static final int ARC_WIDTH = 16; + private static final int ARC_HEIGHT = 16; private static final int SPACING = 20; private final JPanel contentPanel; private final List dayForecasts = new ArrayList<>(); public WeatherForecastPanel(Context context) { + putClientProperty(FlatClientProperties.STYLE, + "border: 10,20,10,19,shade(@background,10%),,16"); + setOpaque(false); - setBorder(BorderFactory.createEmptyBorder(10, 20, 10, 19)); setLayout(new BorderLayout()); JPanel mainPanel = new JPanel(new BorderLayout()); From 2cd6c0390a6d15ba69278a3f2ef005bc49ce748f Mon Sep 17 00:00:00 2001 From: geilala Date: Wed, 29 May 2024 14:20:39 +0800 Subject: [PATCH 2/2] change pannel --- src/main/java/edu/project/components/TimeForecast.java | 2 +- src/main/java/edu/project/components/WeatherForecastPanel.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/edu/project/components/TimeForecast.java b/src/main/java/edu/project/components/TimeForecast.java index 731bd12..30f93a2 100644 --- a/src/main/java/edu/project/components/TimeForecast.java +++ b/src/main/java/edu/project/components/TimeForecast.java @@ -30,7 +30,7 @@ public class TimeForecast extends JPanel { public TimeForecast(Context context) { putClientProperty(FlatClientProperties.STYLE, - "border: 10,10,10,10,shade(@background,10%),,16"); + "border: 16,16,16,16,shade(@background,10%),,16"); setOpaque(false); setLayout(new BorderLayout()); diff --git a/src/main/java/edu/project/components/WeatherForecastPanel.java b/src/main/java/edu/project/components/WeatherForecastPanel.java index 7208205..fa3778d 100644 --- a/src/main/java/edu/project/components/WeatherForecastPanel.java +++ b/src/main/java/edu/project/components/WeatherForecastPanel.java @@ -28,7 +28,7 @@ public class WeatherForecastPanel extends JPanel { public WeatherForecastPanel(Context context) { putClientProperty(FlatClientProperties.STYLE, - "border: 10,20,10,19,shade(@background,10%),,16"); + "border: 16,16,16,16,shade(@background,10%),,16"); setOpaque(false); setLayout(new BorderLayout());