From ade60ea83e2ac6337e74b60cc48b8481cba65b76 Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Sun, 9 Aug 2015 14:54:16 +0200
Subject: [PATCH] Upgrade iconify

---
 app/build.gradle                              |  2 +-
 .../java/de/danoeh/antennapod/PodcastApp.java |  4 ++++
 .../antennapod/activity/FeedInfoActivity.java |  2 +-
 .../adapter/DownloadLogAdapter.java           |  2 +-
 .../antennapod/adapter/NavListAdapter.java    |  2 +-
 .../dialog/EpisodesApplyActionFragment.java   | 19 ++++++++++---------
 .../antennapod/fragment/ItemlistFragment.java |  9 +++++----
 .../main/res/layout/feeditemlist_header.xml   |  2 +-
 app/src/main/res/layout/nav_feedlistitem.xml  |  2 +-
 9 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ed02fa642..5dce7b71d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -22,8 +22,8 @@ dependencies {
     compile 'com.squareup.okhttp:okhttp-urlconnection:2.4.0'
     compile 'com.squareup.okio:okio:1.2.0'
     compile 'de.greenrobot:eventbus:2.4.0'
-    compile 'com.joanzapata.android:android-iconify:1.0.9'
     compile 'io.reactivex:rxandroid:1.0.1'
+    compile 'com.joanzapata.iconify:android-iconify-fontawesome:2.0.3'
     
     compile project(':core')
     compile project(':library:drag-sort-listview')
diff --git a/app/src/main/java/de/danoeh/antennapod/PodcastApp.java b/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
index 026e3b087..5442c6988 100644
--- a/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
+++ b/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
@@ -3,6 +3,9 @@ package de.danoeh.antennapod;
 import android.app.Application;
 import android.content.res.Configuration;
 
+import com.joanzapata.iconify.Iconify;
+import com.joanzapata.iconify.fonts.FontAwesomeModule;
+
 import de.danoeh.antennapod.core.feed.EventDistributor;
 import de.danoeh.antennapod.core.preferences.PlaybackPreferences;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
@@ -42,6 +45,7 @@ public class PodcastApp extends Application {
 		PlaybackPreferences.init(this);
 		NetworkUtils.init(this);
 		EventDistributor.getInstance();
+		Iconify.with(new FontAwesomeModule());
 
         SPAUtil.sendSPAppsQueryFeedsIntent(this);
 	}
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
index 9cdaf2fc6..cc4d459c8 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
@@ -27,7 +27,7 @@ import android.widget.Toast;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.joanzapata.android.iconify.Iconify;
+import com.joanzapata.iconify.Iconify;
 
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.dialog.ConfirmationDialog;
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java
index 0eb15da8c..6961cf5c1 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java
@@ -11,7 +11,7 @@ import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.joanzapata.android.iconify.Iconify;
+import com.joanzapata.iconify.Iconify;
 
 import java.util.Date;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
index 3c91cbbbb..c3bf8faa5 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
@@ -10,13 +10,13 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
-import android.widget.IconTextView;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.joanzapata.iconify.widget.IconTextView;
 
 import org.apache.commons.lang3.ArrayUtils;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java b/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
index 8a4a4efbf..0751ee602 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
@@ -17,8 +17,9 @@ import android.widget.Button;
 import android.widget.ListView;
 import android.widget.Toast;
 
-import com.joanzapata.android.iconify.IconDrawable;
-import com.joanzapata.android.iconify.Iconify;
+import com.joanzapata.iconify.Icon;
+import com.joanzapata.iconify.IconDrawable;
+import com.joanzapata.iconify.fonts.FontAwesomeIcons;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -149,7 +150,7 @@ public class EpisodesApplyActionFragment extends Fragment {
         ta.recycle();
 
         menu.findItem(R.id.sort).setIcon(new IconDrawable(getActivity(),
-                Iconify.IconValue.fa_sort).color(textColor).actionBarSize());
+                FontAwesomeIcons.fa_sort).color(textColor).actionBarSize());
 
         mSelectToggle = menu.findItem(R.id.select_toggle);
         mSelectToggle.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
@@ -165,20 +166,20 @@ public class EpisodesApplyActionFragment extends Fragment {
         });
 
         menu.findItem(R.id.select_options).setIcon(new IconDrawable(getActivity(),
-                Iconify.IconValue.fa_caret_down).color(textColor).actionBarSize());
+                FontAwesomeIcons.fa_caret_down).color(textColor).actionBarSize());
     }
 
     @Override
     public void onPrepareOptionsMenu (Menu menu) {
-        Iconify.IconValue iVal;
+        Icon icon;
         if(checkedIds.size() == episodes.size()) {
-            iVal = Iconify.IconValue.fa_check_square_o;
+            icon = FontAwesomeIcons.fa_check_square_o;
         } else if(checkedIds.size() == 0) {
-            iVal = Iconify.IconValue.fa_square_o;
+            icon = FontAwesomeIcons.fa_square_o;
         } else {
-            iVal = Iconify.IconValue.fa_minus_square_o;
+            icon = FontAwesomeIcons.fa_minus_square_o;
         }
-        mSelectToggle.setIcon(new IconDrawable(getActivity(), iVal).color(textColor).actionBarSize());
+        mSelectToggle.setIcon(new IconDrawable(getActivity(), icon).color(textColor).actionBarSize());
 
     }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
index 63ebf234e..23f52915e 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
@@ -24,7 +24,6 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
-import android.widget.IconTextView;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.ListAdapter;
@@ -34,8 +33,10 @@ import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.joanzapata.android.iconify.IconDrawable;
-import com.joanzapata.android.iconify.Iconify;
+import com.joanzapata.iconify.IconDrawable;
+import com.joanzapata.iconify.Iconify;
+import com.joanzapata.iconify.fonts.FontAwesomeIcons;
+import com.joanzapata.iconify.widget.IconTextView;
 
 import org.apache.commons.lang3.Validate;
 
@@ -234,7 +235,7 @@ public class ItemlistFragment extends ListFragment {
             ta.recycle();
 
             menu.findItem(R.id.episode_actions).setIcon(new IconDrawable(getActivity(),
-                    Iconify.IconValue.fa_gears).color(textColor).actionBarSize());
+                    FontAwesomeIcons.fa_gears).color(textColor).actionBarSize());
 
             isUpdatingFeed = MenuItemUtils.updateRefreshMenuItem(menu, R.id.refresh_item, updateRefreshMenuItemChecker);
         }
diff --git a/app/src/main/res/layout/feeditemlist_header.xml b/app/src/main/res/layout/feeditemlist_header.xml
index 667f777af..361b583c9 100644
--- a/app/src/main/res/layout/feeditemlist_header.xml
+++ b/app/src/main/res/layout/feeditemlist_header.xml
@@ -78,7 +78,7 @@
         tools:text="Podcast author"
         tools:background="@android:color/holo_green_dark" />
 
-    <IconTextView
+    <com.joanzapata.iconify.widget.IconTextView
         android:id="@+id/txtvFailure"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/nav_feedlistitem.xml b/app/src/main/res/layout/nav_feedlistitem.xml
index b9958257c..f0cbb56c1 100644
--- a/app/src/main/res/layout/nav_feedlistitem.xml
+++ b/app/src/main/res/layout/nav_feedlistitem.xml
@@ -37,7 +37,7 @@
         tools:text="23"
         tools:background="@android:color/holo_green_dark"/>
 
-    <IconTextView
+    <com.joanzapata.iconify.widget.IconTextView
         android:id="@+id/itxtvFailure"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"