material design icon overhaul

org.fox.ttrss/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.fox.ttrss"
-    android:versionCode="329"
-    android:versionName="1.103" >
+    android:versionCode="330"
+    android:versionName="1.104" >
 
     <uses-sdk
         android:minSdkVersion="15"

org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java

@@ -509,18 +509,6 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe
 				tu.setVisibility((cat.unread > 0) ? View.VISIBLE : View.INVISIBLE);
 			}
 			
-			ImageView icon = (ImageView)v.findViewById(R.id.icon);
-			
-			if (icon != null) {
-                if (m_activity.isDarkTheme()) {
-                    icon.setImageResource(R.drawable.ic_published);
-                } else {
-                    icon.setImageResource(R.drawable.ic_menu_published_dark);
-                }
-
-				//icon.setImageResource(cat.unread > 0 ? R.drawable.ic_published : R.drawable.ic_unpublished);
-			}
-
 			ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button);
 			
 			if (ib != null) {

org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java

@@ -680,53 +680,6 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
 				tu.setVisibility((feed.unread > 0) ? View.VISIBLE : View.INVISIBLE);
 			}
 			
-			ImageView icon = (ImageView)v.findViewById(R.id.icon);
-			
-			if (icon != null) {
-
-                if ((feed.is_cat && feed.always_display_as_feed) || (!feed.is_cat && feed.id == -4)) {
-                    icon.setImageResource(R.drawable.ic_published_special);
-                /* } else if (m_enableFeedIcons) {
-					
-					try {
-						File storage = m_activity.getExternalCacheDir();
-						
-						File iconFile = new  File(storage.getAbsolutePath() + ICON_PATH + feed.id + ".ico");
-						if (iconFile.exists()) {
-							Bitmap bmpOrig = BitmapFactory.decodeFile(iconFile.getAbsolutePath());		
-							if (bmpOrig != null) {
-								icon.setImageBitmap(bmpOrig);
-							}
-						} else {
-                            if (m_activity.isDarkTheme()) {
-                                icon.setImageResource(R.drawable.ic_published);
-                            } else {
-                                icon.setImageResource(R.drawable.ic_menu_published_dark);
-                            }
-
-							//icon.setImageResource(feed.unread > 0 ? R.drawable.ic_published : R.drawable.ic_unpublished);
-						}
-					} catch (NullPointerException e) {
-						//icon.setImageResource(feed.unread > 0 ? R.drawable.ic_published : R.drawable.ic_unpublished);
-                        if (m_activity.isDarkTheme()) {
-                            icon.setImageResource(R.drawable.ic_published);
-                        } else {
-                            icon.setImageResource(R.drawable.ic_menu_published_dark);
-                        }
-					} */
-					
-				} else {
-					//icon.setImageResource(feed.unread > 0 ? R.drawable.ic_published : R.drawable.ic_unpublished);
-
-                    if (m_activity.isDarkTheme()) {
-                        icon.setImageResource(R.drawable.ic_published);
-                    } else {
-                        icon.setImageResource(R.drawable.ic_menu_published_dark);
-                    }
-				}
-				
-			}
-			
 			ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button);
 			
 			if (ib != null) {

org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java

@@ -819,7 +819,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 			
 			
 			if (holder.markedView != null) {
-				holder.markedView.setImageResource(article.marked ? R.drawable.ic_star_full : R.drawable.ic_star_empty);
+				holder.markedView.setImageResource(article.marked ? R.drawable.ic_star_dark : R.drawable.ic_star_outline_dark);
 				
 				holder.markedView.setOnClickListener(new OnClickListener() {
 					
@@ -836,7 +836,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 			
 			
 			if (holder.publishedView != null) {
-				holder.publishedView.setImageResource(article.published ? R.drawable.ic_published : R.drawable.ic_unpublished);
+				holder.publishedView.setImageResource(article.published ? R.drawable.ic_checkbox_marked_dark : R.drawable.ic_rss_box_dark);
 				
 				holder.publishedView.setOnClickListener(new OnClickListener() {
 					

org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java

@@ -920,6 +920,14 @@ public class OnlineActivity extends CommonActivity {
 				if (hf != null) hf.notifyUpdated();
 			}
 			return true;
+			case R.id.toggle_unread:
+				if (ap != null & ap.getSelectedArticle() != null) {
+					Article a = ap.getSelectedArticle();
+					a.unread = !a.unread;
+					saveArticleUnread(a);
+					if (hf != null) hf.notifyUpdated();
+				}
+				return true;
 		/* case R.id.selection_select_none:
 			if (hf != null) {
 				ArticleList selected = hf.getSelectedArticles();
@@ -1549,11 +1557,14 @@ public class OnlineActivity extends CommonActivity {
 				Article article = ap.getSelectedArticle();
 				
 				if (article != null) {
-					m_menu.findItem(R.id.toggle_marked).setIcon(article.marked ? R.drawable.ic_important_light :
-						R.drawable.ic_unimportant_light);
+					m_menu.findItem(R.id.toggle_marked).setIcon(article.marked ? R.drawable.ic_star :
+						R.drawable.ic_star_outline);
 
-					m_menu.findItem(R.id.toggle_published).setIcon(article.published ? R.drawable.ic_menu_published_light :
-						R.drawable.ic_menu_unpublished_light);
+					m_menu.findItem(R.id.toggle_published).setIcon(article.published ? R.drawable.ic_checkbox_marked :
+						R.drawable.ic_rss_box);
+
+					m_menu.findItem(R.id.toggle_unread).setIcon(article.unread ? R.drawable.ic_email :
+							R.drawable.ic_email_open);
 				}
 			}
 			

org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java

@@ -586,11 +586,11 @@ public class OfflineActivity extends CommonActivity {
 					boolean marked = article.getInt(article.getColumnIndex("marked")) == 1;
 					boolean published = article.getInt(article.getColumnIndex("published")) == 1;
 
-					m_menu.findItem(R.id.toggle_marked).setIcon(marked ? R.drawable.ic_important_light :
-						R.drawable.ic_unimportant_light);
+					m_menu.findItem(R.id.toggle_marked).setIcon(marked ? R.drawable.ic_star :
+						R.drawable.ic_star_outline);
 
-					m_menu.findItem(R.id.toggle_published).setIcon(published ? R.drawable.ic_menu_published_light :
-						R.drawable.ic_menu_unpublished_light);
+					m_menu.findItem(R.id.toggle_published).setIcon(published ? R.drawable.ic_checkbox_marked :
+						R.drawable.ic_rss_box);
 
 					article.close();
 				}				

org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java

@@ -279,12 +279,6 @@ public class OfflineFeedCategoriesFragment extends Fragment implements OnItemCli
 				tu.setVisibility((cursor.getInt(cursor.getColumnIndex("unread")) > 0) ? View.VISIBLE : View.INVISIBLE);
 			}
 			
-			ImageView icon = (ImageView)v.findViewById(R.id.icon);
-			
-			if (icon != null) {
-				icon.setImageResource(cursor.getInt(cursor.getColumnIndex("unread")) > 0 ? R.drawable.ic_published : R.drawable.ic_unpublished);
-			}
-			
 			ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button);
 			
 			if (ib != null) {

org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java

@@ -316,34 +316,6 @@ public class OfflineFeedsFragment extends Fragment implements OnItemClickListene
 				tu.setText(String.valueOf(cursor.getInt(cursor.getColumnIndex("unread"))));
 				tu.setVisibility((cursor.getInt(cursor.getColumnIndex("unread")) > 0) ? View.VISIBLE : View.INVISIBLE);
 			}
-			
-			ImageView icon = (ImageView)v.findViewById(R.id.icon);
-			
-			if (icon != null) {
-				
-				if (m_enableFeedIcons) {
-					
-					try {
-						File storage = Environment.getExternalStorageDirectory();
-						
-						File iconFile = new File(storage.getAbsolutePath() + ICON_PATH + cursor.getInt(cursor.getColumnIndex(BaseColumns._ID)) + ".ico");
-						if (iconFile.exists()) {
-							Bitmap bmpOrig = BitmapFactory.decodeFile(iconFile.getAbsolutePath());		
-							if (bmpOrig != null) {
-								icon.setImageBitmap(bmpOrig);
-							}
-						} else {
-							icon.setImageResource(cursor.getInt(cursor.getColumnIndex("unread")) > 0 ? R.drawable.ic_published : R.drawable.ic_unpublished);
-						}
-					} catch (NullPointerException e) {
-						icon.setImageResource(cursor.getInt(cursor.getColumnIndex("unread")) > 0 ? R.drawable.ic_published : R.drawable.ic_unpublished);
-					}
-					
-				} else {
-					icon.setImageResource(cursor.getInt(cursor.getColumnIndex("unread")) > 0 ? R.drawable.ic_published : R.drawable.ic_unpublished);
-				}
-				
-			}
 
 			ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button);
 			

org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java

@@ -655,7 +655,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
 			}
 			
 			if (holder.markedView != null) {
-				holder.markedView.setImageResource(article.getInt(article.getColumnIndex("marked")) == 1 ? R.drawable.ic_star_full : R.drawable.ic_star_empty);
+				holder.markedView.setImageResource(article.getInt(article.getColumnIndex("marked")) == 1 ? R.drawable.ic_star_dark : R.drawable.ic_star_outline_dark);
 				
 				holder.markedView.setOnClickListener(new OnClickListener() {
 
@@ -674,7 +674,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
 			}
 			
 			if (holder.publishedView != null) {
-				holder.publishedView.setImageResource(article.getInt(article.getColumnIndex("published")) == 1 ? R.drawable.ic_published : R.drawable.ic_unpublished);
+				holder.publishedView.setImageResource(article.getInt(article.getColumnIndex("published")) == 1 ? R.drawable.ic_checkbox_marked_dark : R.drawable.ic_rss_box_dark);
 				
 				holder.publishedView.setOnClickListener(new OnClickListener() {