From 1d388fa98fd64dc7fada9181779eb86a1eeb7dd0 Mon Sep 17 00:00:00 2001
From: Ruben Amendoeira <ruben.amendoeira@gmail.com>
Date: Sun, 22 Apr 2018 17:37:33 +0100
Subject: [PATCH] News Feed Plugin slight design tweak

- Added a header section, containing a title and a refresh icon button.
- Increased the overall border from 5 to 10 pixels.
- Changed the background color to a darker gray.
---
 .../client/plugins/feed/FeedPanel.java        |  94 ++++++++++++++----
 .../runelite/client/plugins/feed/reset.png    | Bin 0 -> 16069 bytes
 2 files changed, 74 insertions(+), 20 deletions(-)
 create mode 100644 runelite-client/src/main/resources/net/runelite/client/plugins/feed/reset.png

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPanel.java
index 19e2e94c30..9b6d1e2229 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPanel.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2018, Lotto <https://github.com/devLotto>
+ * Copyright (c) 2018, Psikoi <https://github.com/psikoi>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28,6 +29,7 @@ import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Font;
+import java.awt.GridLayout;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.font.FontRenderContext;
@@ -43,13 +45,16 @@ import javax.swing.BoxLayout;
 import javax.swing.ImageIcon;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
+import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 import javax.swing.border.EmptyBorder;
 import lombok.extern.slf4j.Slf4j;
+import net.runelite.client.ui.ColorScheme;
 import net.runelite.client.ui.FontManager;
 import net.runelite.client.ui.PluginPanel;
 import net.runelite.client.util.LinkBrowser;
+import net.runelite.client.util.SwingUtil;
 import net.runelite.http.api.RuneLiteAPI;
 import net.runelite.http.api.feed.FeedItem;
 import net.runelite.http.api.feed.FeedItemType;
@@ -63,8 +68,10 @@ import okhttp3.ResponseBody;
 @Slf4j
 class FeedPanel extends PluginPanel
 {
-	private static BufferedImage RUNELITE_ICON;
-	private static BufferedImage OSRS_ICON;
+	private static final ImageIcon RUNELITE_ICON;
+	private static final ImageIcon OSRS_ICON;
+	private static final ImageIcon RESET_ICON;
+	private static final ImageIcon RESET_ICON_CLICK; //used as a click effect (darker version of the reset icon)
 
 	private static final Color TWEET_BACKGROUND = new Color(15, 15, 15);
 	private static final Color OSRS_NEWS_BACKGROUND = new Color(36, 30, 19);
@@ -74,6 +81,11 @@ class FeedPanel extends PluginPanel
 	private static final int CONTENT_WIDTH = 148;
 	private static final int TIME_WIDTH = 20;
 
+	/**
+	 * Holds all feed items.
+	 */
+	private final JPanel feedContainer = new JPanel();
+
 	private static final Comparator<FeedItem> FEED_ITEM_COMPARATOR = (o1, o2) ->
 	{
 		if (o1.getType() != o2.getType())
@@ -97,24 +109,16 @@ class FeedPanel extends PluginPanel
 		{
 			synchronized (ImageIO.class)
 			{
-				RUNELITE_ICON = ImageIO.read(FeedPanel.class.getResourceAsStream("runelite.png"));
+				BufferedImage reset = ImageIO.read(FeedPanel.class.getResourceAsStream("reset.png"));
+				RUNELITE_ICON = new ImageIcon(ImageIO.read(FeedPanel.class.getResourceAsStream("runelite.png")));
+				OSRS_ICON = new ImageIcon(ImageIO.read(FeedPanel.class.getResourceAsStream("osrs.png")));
+				RESET_ICON = new ImageIcon(reset);
+				RESET_ICON_CLICK = new ImageIcon(SwingUtil.grayscaleOffset(reset, -100));
 			}
 		}
 		catch (IOException e)
 		{
-			log.warn("Client icon failed to load", e);
-		}
-
-		try
-		{
-			synchronized (ImageIO.class)
-			{
-				OSRS_ICON = ImageIO.read(FeedPanel.class.getResourceAsStream("osrs.png"));
-			}
-		}
-		catch (IOException e)
-		{
-			log.warn("OSRS icon failed to load", e);
+			throw new RuntimeException(e);
 		}
 	}
 
@@ -125,6 +129,56 @@ class FeedPanel extends PluginPanel
 	{
 		this.config = config;
 		this.feedSupplier = feedSupplier;
+
+		setBorder(new EmptyBorder(10, 10, 10, 10));
+		setBackground(ColorScheme.DARK_GRAY_COLOR);
+		setLayout(new BorderLayout());
+
+		feedContainer.setLayout(new GridLayout(0, 1, 0, 4));
+		feedContainer.setOpaque(false);
+
+		/**
+		 * This header contains the "News Feed" title and a refresh icon button.
+		 */
+		JPanel header = new JPanel();
+		header.setOpaque(false);
+		header.setLayout(new BorderLayout());
+		header.setBorder(new EmptyBorder(0, 0, 9, 0));
+
+		/**
+		 * A refresh icon button, when clicked, it will swap icons for feedback effect and then call
+		 * the rebuildFeed method.
+		 */
+		JLabel reset = new JLabel();
+		reset.setIcon(RESET_ICON);
+		reset.setVerticalAlignment(SwingConstants.CENTER);
+		reset.setHorizontalAlignment(SwingConstants.CENTER);
+		reset.setToolTipText("Refresh");
+
+		reset.addMouseListener(new MouseAdapter()
+		{
+			@Override
+			public void mousePressed(MouseEvent mouseEvent)
+			{
+				reset.setIcon(RESET_ICON_CLICK);
+				rebuildFeed();
+			}
+
+			@Override
+			public void mouseReleased(MouseEvent mouseEvent)
+			{
+				reset.setIcon(RESET_ICON);
+			}
+		});
+
+		JLabel title = new JLabel("News feed");
+		title.setForeground(Color.WHITE);
+
+		header.add(title, BorderLayout.WEST);
+		header.add(reset, BorderLayout.EAST);
+
+		add(header, BorderLayout.NORTH);
+		add(feedContainer, BorderLayout.CENTER);
 	}
 
 	void rebuildFeed()
@@ -138,7 +192,7 @@ class FeedPanel extends PluginPanel
 
 		SwingUtilities.invokeLater(() ->
 		{
-			removeAll();
+			feedContainer.removeAll();
 
 			feed.getItems()
 				.stream()
@@ -207,14 +261,14 @@ class FeedPanel extends PluginPanel
 			case OSRS_NEWS:
 				if (OSRS_ICON != null)
 				{
-					avatar.setIcon(new ImageIcon(OSRS_ICON));
+					avatar.setIcon(OSRS_ICON);
 				}
 				avatarAndRight.setBackground(OSRS_NEWS_BACKGROUND);
 				break;
 			default:
 				if (RUNELITE_ICON != null)
 				{
-					avatar.setIcon(new ImageIcon(RUNELITE_ICON));
+					avatar.setIcon(RUNELITE_ICON);
 				}
 				avatarAndRight.setBackground(BLOG_POST_BACKGROUND);
 				break;
@@ -296,7 +350,7 @@ class FeedPanel extends PluginPanel
 			}
 		});
 
-		add(avatarAndRight);
+		feedContainer.add(avatarAndRight);
 	}
 
 	private String durationToString(Duration duration)
diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/feed/reset.png b/runelite-client/src/main/resources/net/runelite/client/plugins/feed/reset.png
new file mode 100644
index 0000000000000000000000000000000000000000..e94f6102a5cd22911c1e858557a9eb5c96decb4a
GIT binary patch
literal 16069
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
S`9At1+OR1zwFf3I%KI-(1ve%D

literal 0
HcmV?d00001