diff options
Diffstat (limited to 'src/com/google/gct/login/ui/UsersListCellRenderer.java')
| -rw-r--r-- | src/com/google/gct/login/ui/UsersListCellRenderer.java | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/src/com/google/gct/login/ui/UsersListCellRenderer.java b/src/com/google/gct/login/ui/UsersListCellRenderer.java index 5796029..a0534a7 100644 --- a/src/com/google/gct/login/ui/UsersListCellRenderer.java +++ b/src/com/google/gct/login/ui/UsersListCellRenderer.java @@ -15,12 +15,12 @@ */ package com.google.gct.login.ui; -import com.intellij.ui.ColorUtil; import com.google.api.client.util.Maps; import com.google.gct.login.CredentialedUser; import com.google.gct.login.GoogleLogin; import com.intellij.ui.JBColor; import com.intellij.util.ui.UIUtil; +import icons.GoogleLoginIcons; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -36,7 +36,6 @@ import java.awt.GridBagLayout; import java.awt.Image; import java.awt.Point; import java.awt.Toolkit; -import java.net.URL; import java.util.Map; /** @@ -47,8 +46,6 @@ public class UsersListCellRenderer extends JComponent implements ListCellRendere private final static String CLOUD_LABEL_TEXT = "Open Google Developers Console"; private final static String PLAY_LABEL_TEXT = "Open Play Developer Console"; private final static String DEFAULT_AVATAR = "/icons/loginAvatar@2x.png"; - private final static String GOOGLE_IMG_COL = "/icons/googleColored.png"; - private final static String GOOGLE_IMG_WHITE = "/icons/googleWhite.png"; private final static String SIGN_IN_TEXT = "<HTML> Sign in with your Google account to start <br> adding " + "Cloud functionality to your <br> Android applications from Android Studio. </HTML>"; private final static String LEARN_MORE_TEXT = "Learn more"; @@ -58,8 +55,6 @@ public class UsersListCellRenderer extends JComponent implements ListCellRendere private static final int PLAIN_USER_IMAGE_HEIGHT = 48; private static final int ACTIVE_USER_IMAGE_WIDTH = 96; private static final int ACTIVE_USER_IMAGE_HEIGHT = 96; - private static final int GOOGLE_IMAGE_WIDTH = 96; - private static final int GOOGLE_IMAGE_HEIGHT = 35; private static final int GOOGLE_IMAGE_NORTH = 18; private static final int GOOGLE_IMAGE_WEST = 18; private static final int WELCOME_LABEL_NORTH = 15; @@ -76,6 +71,7 @@ public class UsersListCellRenderer extends JComponent implements ListCellRendere private final Dimension myCloudLabelDimension; private final Dimension myPlayLabelDimension; private final Dimension myLearnMoreLabelDimension; + private JLabel myGoogleImageLabel; /** Maps user emails to large user image icons. */ private final Map<String, Image> myUserLargeImageCache = Maps.newHashMap(); @@ -184,7 +180,7 @@ public class UsersListCellRenderer extends JComponent implements ListCellRendere public boolean inLearnMoreUrl(Point point) { // 3 is for the number of labels and row of texts - double urlYStart = GOOGLE_IMAGE_NORTH + GOOGLE_IMAGE_HEIGHT + WELCOME_LABEL_NORTH + double urlYStart = GOOGLE_IMAGE_NORTH + myGoogleImageLabel.getIcon().getIconHeight() + WELCOME_LABEL_NORTH + (myGeneralFontHeight * 3) + 3; double urlYEnd = urlYStart + myLearnMoreLabelDimension.getHeight(); double urlXStart = GOOGLE_IMAGE_WEST; @@ -273,11 +269,7 @@ public class UsersListCellRenderer extends JComponent implements ListCellRendere mainPanel.setBackground(JBColor.WHITE); mainPanel.setBorder(BorderFactory.createEmptyBorder(0, GOOGLE_IMAGE_WEST, 0, 0)); - String googleIcon = UIUtil.isUnderDarcula() ? GOOGLE_IMG_WHITE : GOOGLE_IMG_COL; - URL url = UsersListCellRenderer.class.getResource(googleIcon); - Image image = Toolkit.getDefaultToolkit().getImage(url); - Image scaledImage = image.getScaledInstance(GOOGLE_IMAGE_WIDTH, GOOGLE_IMAGE_HEIGHT, Image.SCALE_SMOOTH); - JLabel imageLabel = new JLabel(new ImageIcon(scaledImage)); + myGoogleImageLabel = new JLabel(GoogleLoginIcons.GOOGLE_LOGO); JLabel signInLabel = new JLabel(SIGN_IN_TEXT); signInLabel.setFont(myGeneralFont); @@ -290,7 +282,7 @@ public class UsersListCellRenderer extends JComponent implements ListCellRendere urlLabel.setPreferredSize(myLearnMoreLabelDimension); mainPanel.add(Box.createVerticalStrut(GOOGLE_IMAGE_NORTH)); - mainPanel.add(imageLabel); + mainPanel.add(myGoogleImageLabel); mainPanel.add(Box.createVerticalStrut(WELCOME_LABEL_NORTH)); mainPanel.add(signInLabel); mainPanel.add(urlLabel); |