diff options
author | Alex Lockwood <alockwood@google.com> | 2014-10-23 15:38:08 -0400 |
---|---|---|
committer | Alex Lockwood <alockwood@google.com> | 2014-10-23 15:56:28 -0400 |
commit | c2f99dc9e24c015f6d420e0b93fec1066e6f66cd (patch) | |
tree | d29cdad28f2076d2f284b76af705ca4a9683bb40 | |
parent | 394bae8e8748f9b2820f5a54c4b8d7407ac59409 (diff) | |
download | login-c2f99dc9e24c015f6d420e0b93fec1066e6f66cd.tar.gz |
Refactor login code to use new GoogleLoginIcons classgradle_0.14.2gradle_0.14.1gradle_0.14.0
Change-Id: I3a17ec2e6a95dfd01be661f8da8b6be1ce0fc36a
-rw-r--r-- | resources/icons/GoogleLoginIcons.java | 3 | ||||
-rw-r--r-- | resources/icons/googleColored.png | bin | 2510 -> 0 bytes | |||
-rw-r--r-- | resources/icons/googleWhite.png | bin | 984 -> 0 bytes | |||
-rw-r--r-- | src/com/google/gct/login/GoogleLogin.java | 5 | ||||
-rw-r--r-- | src/com/google/gct/login/ui/GoogleLoginActionButton.java | 9 |
5 files changed, 7 insertions, 10 deletions
diff --git a/resources/icons/GoogleLoginIcons.java b/resources/icons/GoogleLoginIcons.java index 715ef72..079429d 100644 --- a/resources/icons/GoogleLoginIcons.java +++ b/resources/icons/GoogleLoginIcons.java @@ -40,8 +40,9 @@ import javax.swing.*; * will be used in all themes and resolutions. */ public final class GoogleLoginIcons { - public static final Icon GOOGLE_LOGO = load("/icons/google_logo.png"); + public static final Icon GOOGLE_FAVICON = load("/icons/googleFavicon.png"); + public static final Icon DEFAULT_USER_AVATAR = load("/icons/loginAvatar.png"); private static Icon load(String path) { return IconLoader.getIcon(path, GoogleLoginIcons.class); diff --git a/resources/icons/googleColored.png b/resources/icons/googleColored.png Binary files differdeleted file mode 100644 index c8ae624..0000000 --- a/resources/icons/googleColored.png +++ /dev/null diff --git a/resources/icons/googleWhite.png b/resources/icons/googleWhite.png Binary files differdeleted file mode 100644 index b37179c..0000000 --- a/resources/icons/googleWhite.png +++ /dev/null diff --git a/src/com/google/gct/login/GoogleLogin.java b/src/com/google/gct/login/GoogleLogin.java index 4706947..f598af4 100644 --- a/src/com/google/gct/login/GoogleLogin.java +++ b/src/com/google/gct/login/GoogleLogin.java @@ -45,6 +45,7 @@ import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.wm.ex.ProgressIndicatorEx; import com.intellij.openapi.wm.ex.WindowManagerEx; +import icons.GoogleLoginIcons; import net.jcip.annotations.Immutable; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -566,7 +567,6 @@ public class GoogleLogin { */ private class AndroidUiFacade implements UiFacade { private GoogleLoginActionButton myButton; - private final static String GOOGLE_IMG = "/icons/googleFavicon@2x.png"; private volatile CancellableServerReceiver receiver = null; @Override @@ -649,8 +649,7 @@ public class GoogleLogin { } updatedMessage += "?"; } - Icon icon = IconLoader.getIcon(GOOGLE_IMG); - return (Messages.showYesNoDialog(updatedMessage, title, icon) == Messages.YES); + return (Messages.showYesNoDialog(updatedMessage, title, GoogleLoginIcons.GOOGLE_FAVICON) == Messages.YES); } @Override diff --git a/src/com/google/gct/login/ui/GoogleLoginActionButton.java b/src/com/google/gct/login/ui/GoogleLoginActionButton.java index 3457485..bbd4702 100644 --- a/src/com/google/gct/login/ui/GoogleLoginActionButton.java +++ b/src/com/google/gct/login/ui/GoogleLoginActionButton.java @@ -21,6 +21,7 @@ import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.actionSystem.impl.ActionButton; import com.intellij.openapi.util.IconLoader; +import icons.GoogleLoginIcons; import org.jetbrains.annotations.NotNull; import javax.swing.Icon; @@ -32,15 +33,11 @@ import java.awt.Image; * The Google Login button that appears on the main toolbar. */ public final class GoogleLoginActionButton extends ActionButton { - private Icon defaultIcon; private final static String SIGN_IN_MESSAGE = "Sign in to Google..."; - private final static String DEFAULT_AVATAR = "/icons/loginAvatar.png"; public GoogleLoginActionButton(AnAction action, Presentation presentation, String place, @NotNull Dimension minimumSize) { super(action, presentation, place, minimumSize); - GoogleLogin.getInstance().setLoginMenuItemContribution(this); - defaultIcon = IconLoader.getIcon(DEFAULT_AVATAR); updateUi(); } @@ -53,13 +50,13 @@ public final class GoogleLoginActionButton extends ActionButton { if(activeUser == null) { setToolTipText(SIGN_IN_MESSAGE); myPresentation.setDescription(SIGN_IN_MESSAGE); - myPresentation.setIcon(defaultIcon); + myPresentation.setIcon(GoogleLoginIcons.DEFAULT_USER_AVATAR); } else { setToolTipText(activeUser.getEmail()); myPresentation.setDescription(activeUser.getEmail()); Image image = activeUser.getPicture(); if(image == null) { - myPresentation.setIcon(defaultIcon); + myPresentation.setIcon(GoogleLoginIcons.DEFAULT_USER_AVATAR); } else { Image scaledImage = image.getScaledInstance(16, 16, Image.SCALE_SMOOTH); myPresentation.setIcon(new ImageIcon(scaledImage)); |