fix #141 drawable cleanup and update

.gitattributes

@@ -1,5 +1,6 @@
 * text=auto
 *.sh text eol=lf
+*.py text eol=lf
 *.bat text eol=crlf
 *.png binary
 *.jpg binary

WordPress/src/main/java/org/wordpress/android/GCMIntentService.java

@@ -6,7 +6,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
@@ -171,7 +170,7 @@ protected void handleDefaultPush(Context context, Bundle extras) {
                 }
                 PendingIntent commentReplyPendingIntent = PendingIntent.getActivity(context, 0, commentReplyIntent,
                         PendingIntent.FLAG_CANCEL_CURRENT);
-                mBuilder.addAction(R.drawable.ab_icon_reply, context.getText(R.string.reply),
+                mBuilder.addAction(R.drawable.ic_action_refresh, context.getText(R.string.reply),
                         commentReplyPendingIntent);
             }
 
@@ -207,7 +206,7 @@ protected void handleDefaultPush(Context context, Bundle extras) {
             String subject = String.format(getString(R.string.new_notifications), mActiveNotificationsMap.size());
 
             mBuilder = new NotificationCompat.Builder(this)
-                    .setLargeIcon(BitmapFactory.decodeResource(context.getResources(), R.drawable.notification_multi))
+                    .setLargeIcon(BitmapFactory.decodeResource(context.getResources(), R.drawable.noticon_notification))
                     .setSmallIcon(R.drawable.notification_icon)
                     .setContentTitle("WordPress")
                     .setContentText(subject)

WordPress/src/main/java/org/wordpress/android/ui/AppLogViewerActivity.java

@@ -121,7 +121,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
         MenuItem item = menu.add(Menu.NONE, ID_SHARE, Menu.NONE, R.string.reader_btn_share);
         item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-        item.setIcon(R.drawable.ab_icon_share);
+        item.setIcon(R.drawable.ic_action_share);
         return true;
     }
 

WordPress/src/main/java/org/wordpress/android/ui/WPActionBarActivity.java

@@ -248,7 +248,7 @@ private MenuDrawer attachMenuDrawer() {
         int shadowSizeInPixels = getResources().getDimensionPixelSize(R.dimen.menu_shadow_width);
         menuDrawer.setDropShadowSize(shadowSizeInPixels);
         menuDrawer.setDropShadowColor(getResources().getColor(R.color.md__shadowColor));
-        menuDrawer.setSlideDrawable(R.drawable.ic_drawer);
+        menuDrawer.setSlideDrawable(R.drawable.ic_navigation_drawer);
         return menuDrawer;
     }
 
@@ -786,7 +786,7 @@ public void onConfigurationChanged(Configuration newConfig) {
 
     private class ReaderMenuItem extends MenuDrawerItem {
         ReaderMenuItem(){
-            super(ActivityId.READER, R.string.reader, R.drawable.dashboard_icon_subs);
+            super(ActivityId.READER, R.string.reader, R.drawable.noticon_reader_alt_black);
         }
 
         @Override
@@ -811,7 +811,7 @@ public void onSelectItem(){
 
     private class PostsMenuItem extends MenuDrawerItem {
         PostsMenuItem() {
-            super(ActivityId.POSTS, R.string.posts, R.drawable.dashboard_icon_posts);
+            super(ActivityId.POSTS, R.string.posts, R.drawable.dashicon_admin_post_black);
         }
 
         @Override
@@ -839,7 +839,7 @@ public Boolean isVisible() {
 
     private class MediaMenuItem extends MenuDrawerItem {
         MediaMenuItem(){
-            super(ActivityId.MEDIA, R.string.media, R.drawable.dashboard_icon_media);
+            super(ActivityId.MEDIA, R.string.media, R.drawable.dashicon_admin_media_black);
         }
         @Override
         public Boolean isSelected(){
@@ -863,7 +863,7 @@ public Boolean isVisible() {
 
     private class PagesMenuItem extends MenuDrawerItem {
         PagesMenuItem(){
-            super(ActivityId.PAGES, R.string.pages, R.drawable.dashboard_icon_pages);
+            super(ActivityId.PAGES, R.string.pages, R.drawable.dashicon_admin_page_black);
         }
         @Override
         public Boolean isSelected(){
@@ -892,7 +892,7 @@ public Boolean isVisible() {
 
     private class CommentsMenuItem extends MenuDrawerItem {
         CommentsMenuItem(){
-            super(ActivityId.COMMENTS, R.string.tab_comments, R.drawable.dashboard_icon_comments);
+            super(ActivityId.COMMENTS, R.string.tab_comments, R.drawable.dashicon_admin_comments_black);
         }
         @Override
         public Boolean isSelected(){
@@ -960,7 +960,7 @@ public Boolean isVisible() {
 
     private class StatsMenuItem extends MenuDrawerItem {
         StatsMenuItem(){
-            super(ActivityId.STATS, R.string.tab_stats, R.drawable.dashboard_icon_stats);
+            super(ActivityId.STATS, R.string.tab_stats, R.drawable.dashicon_chart_area_black);
         }
         @Override
         public Boolean isSelected(){
@@ -986,7 +986,7 @@ public Boolean isVisible() {
 
     private class QuickPhotoMenuItem extends MenuDrawerItem {
         QuickPhotoMenuItem(){
-            super(R.string.quick_photo, R.drawable.dashboard_icon_photo);
+            super(R.string.quick_photo, R.drawable.dashicon_camera_black);
         }
         @Override
         public void onSelectItem(){
@@ -1006,7 +1006,7 @@ public Boolean isVisible() {
 
     private class QuickVideoMenuItem extends MenuDrawerItem {
         QuickVideoMenuItem(){
-            super(R.string.quick_video, R.drawable.dashboard_icon_video);
+            super(R.string.quick_video, R.drawable.dashicon_video_alt2_black);
         }
         @Override
         public void onSelectItem(){
@@ -1026,7 +1026,7 @@ public Boolean isVisible() {
 
     private class ViewSiteMenuItem extends MenuDrawerItem {
         ViewSiteMenuItem(){
-            super(ActivityId.VIEW_SITE, R.string.view_site, R.drawable.dashboard_icon_view);
+            super(ActivityId.VIEW_SITE, R.string.view_site, R.drawable.noticon_show_black);
         }
         @Override
         public Boolean isSelected(){
@@ -1050,7 +1050,7 @@ public Boolean isVisible() {
 
     private class NotificationsMenuItem extends MenuDrawerItem {
         NotificationsMenuItem(){
-            super(ActivityId.NOTIFICATIONS, R.string.notifications, R.drawable.dashboard_icon_notifications);
+            super(ActivityId.NOTIFICATIONS, R.string.notifications, R.drawable.noticon_notification_black);
         }
         @Override
         public Boolean isVisible(){

WordPress/src/main/java/org/wordpress/android/ui/accounts/NewAccountAbstractPageFragment.java

@@ -130,7 +130,7 @@ protected void showError(int messageId) {
     protected void showError(String message) {
         FragmentTransaction ft = getFragmentManager().beginTransaction();
         NUXDialogFragment nuxAlert = NUXDialogFragment.newInstance(getString(R.string.error), message, getString(
-                R.string.nux_tap_continue), R.drawable.nux_icon_alert);
+                R.string.nux_tap_continue), R.drawable.noticon_alert_big);
         ft.add(nuxAlert, "alert");
         ft.commitAllowingStateLoss();
     }

WordPress/src/main/java/org/wordpress/android/ui/accounts/WelcomeFragmentSignIn.java

@@ -564,7 +564,7 @@ private void signInError() {
             NUXDialogFragment nuxAlert;
             if (mErrorMsgId == R.string.account_two_step_auth_enabled) {
                 nuxAlert = NUXDialogFragment.newInstance(getString(R.string.nux_cannot_log_in), getString(
-                                mErrorMsgId), getString(R.string.nux_tap_continue), R.drawable.nux_icon_alert, true,
+                                mErrorMsgId), getString(R.string.nux_tap_continue), R.drawable.noticon_alert_big, true,
                         getString(R.string.visit_security_settings), NUXDialogFragment.ACTION_OPEN_URL,
                         "https://wordpress.com/settings/security/?ssl=forced");
             } else {
@@ -578,7 +578,7 @@ private void signInError() {
                     return;
                 } else {
                     nuxAlert = NUXDialogFragment.newInstance(getString(R.string.nux_cannot_log_in), getString(
-                            mErrorMsgId), getString(R.string.nux_tap_continue), R.drawable.nux_icon_alert);
+                            mErrorMsgId), getString(R.string.nux_tap_continue), R.drawable.noticon_alert_big);
                 }
             }
             ft.add(nuxAlert, "alert");

WordPress/src/main/java/org/wordpress/android/ui/comments/CommentUtils.java

@@ -47,10 +47,11 @@ public static void displayHtmlComment(TextView textView, String content, int max
         // now convert to HTML with an image getter that enforces a max image size
         final Spanned html;
         if (maxImageSize > 0 && content.contains("<img")) {
-            Drawable loading = textView.getContext().getResources().getDrawable(R.drawable.remote_image);
-            Drawable failed = textView.getContext().getResources().getDrawable(R.drawable.remote_failed);
-            html = HtmlUtils.fromHtml(content, new WPImageGetter(textView, maxImageSize, WordPress.imageLoader,
-                    loading, failed));
+            Drawable loading = textView.getContext().getResources().getDrawable(
+                    R.drawable.dashicon_format_image_big_grey);
+            Drawable failed = textView.getContext().getResources().getDrawable(R.drawable.noticon_warning_big_grey);
+            html = HtmlUtils.fromHtml(content, new WPImageGetter(textView, maxImageSize, WordPress.imageLoader, loading,
+                    failed));
         } else {
             html = HtmlUtils.fromHtml(content);
         }

WordPress/src/main/java/org/wordpress/android/ui/media/MediaUtils.java

@@ -280,7 +280,8 @@ public static WPImageSpan prepareWPImageSpan(Context context, String blogId, fin
         boolean isVideo = mimeType != null && mimeType.contains("video");
 
         Uri uri = Uri.parse(url);
-        WPImageSpan imageSpan = new WPImageSpan(context, isVideo ? R.drawable.media_movieclip : R.drawable.remote_image, uri);
+        WPImageSpan imageSpan = new WPImageSpan(context,
+                isVideo ? R.drawable.media_movieclip : R.drawable.dashicon_format_image_big_grey, uri);
         MediaFile mediaFile = imageSpan.getMediaFile();
         mediaFile.setMediaId(mediaId);
         mediaFile.setBlogId(blogId);

WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/CommentUserNoteBlock.java

@@ -70,7 +70,7 @@ public View configureView(View view) {
                 noteBlockHolder.avatarImageView.setOnTouchListener(null);
             }
         } else {
-            noteBlockHolder.avatarImageView.setImageResource(R.drawable.placeholder);
+            noteBlockHolder.avatarImageView.setImageResource(R.drawable.gravatar_placeholder);
             noteBlockHolder.avatarImageView.setOnTouchListener(null);
         }
 

WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/UserNoteBlock.java

@@ -112,7 +112,7 @@ public View configureView(View view) {
                 noteBlockHolder.rootView.setOnClickListener(null);
             }
         } else {
-            noteBlockHolder.avatarImageView.setImageResource(R.drawable.placeholder);
+            noteBlockHolder.avatarImageView.setImageResource(R.drawable.gravatar_placeholder);
             noteBlockHolder.avatarImageView.setOnTouchListener(null);
         }
 

WordPress/src/main/java/org/wordpress/android/ui/notifications/utils/NotificationsUtils.java

@@ -282,8 +282,8 @@ private static void addImageSpansForBlockMedia(TextView textView, JSONObject sub
             return;
         }
 
-        Drawable loading = context.getResources().getDrawable(R.drawable.remote_image);
-        Drawable failed = context.getResources().getDrawable(R.drawable.remote_failed);
+        Drawable loading = context.getResources().getDrawable(R.drawable.dashicon_format_image_big_grey);
+        Drawable failed = context.getResources().getDrawable(R.drawable.noticon_warning_big_grey);
         // Note: notifications_max_image_size seems to be the max size an ImageSpan can handle,
         // otherwise it would load blank white
         WPImageGetter imageGetter = new WPImageGetter(

WordPress/src/main/java/org/wordpress/android/ui/prefs/AboutActivity.java

@@ -1,20 +1,18 @@
 package org.wordpress.android.ui.prefs;
 
-import android.app.ActionBar;
 import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.TextView;
-
-import org.wordpress.passcodelock.AppLockManager;
+import android.view.Window;
 
 import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
+import org.wordpress.android.widgets.WPTextView;
+import org.wordpress.passcodelock.AppLockManager;
 
 public class AboutActivity extends Activity implements OnClickListener {
     private static final String URL_TOS = "http://en.wordpress.com/tos";
@@ -24,21 +22,17 @@ public class AboutActivity extends Activity implements OnClickListener {
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
+        requestWindowFeature(Window.FEATURE_NO_TITLE);
         setContentView(R.layout.about);
 
-        ActionBar actionBar = getActionBar();
-        if (actionBar != null) {
-            actionBar.setDisplayHomeAsUpEnabled(true);
-        }
-
-        TextView version = (TextView) findViewById(R.id.about_version);
+        WPTextView version = (WPTextView) findViewById(R.id.about_version);
         version.setText(getString(R.string.version) + " "
                 + WordPress.versionName);
 
-        Button tos = (Button) findViewById(R.id.about_tos);
+        WPTextView tos = (WPTextView) findViewById(R.id.about_tos);
         tos.setOnClickListener(this);
 
-        Button pp = (Button) findViewById(R.id.about_privacy);
+        WPTextView pp = (WPTextView) findViewById(R.id.about_privacy);
         pp.setOnClickListener(this);
     }
 

WordPress/src/main/java/org/wordpress/android/widgets/WPNetworkImageView.java

@@ -302,7 +302,7 @@ void showErrorImage() {
                 break;
             case AVATAR:
                 // "mystery man" for failed avatars
-                setImageResource(R.drawable.placeholder);
+                setImageResource(R.drawable.gravatar_placeholder);
                 break;
             default :
                 // medium grey box for all others