Refactor login code to use new GoogleLoginIcons classgradle_0.14.2gradle_0.14.1gradle_0.14.0

Change-Id: I3a17ec2e6a95dfd01be661f8da8b6be1ce0fc36a

1 files changed, 3 insertions, 6 deletions

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));