Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1074 from mfietz/upgrade_iconify

Browse Source 
Upgrade Iconify to v2
This commit is contained in:
Tom Hennen 2015-08-29 11:49:35 -04:00
commit ad0212c039
12 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -22,8 +22,8 @@ dependencies {
compile 'com.squareup.okhttp:okhttp-urlconnection:2.4.0' compile 'com.squareup.okhttp:okhttp-urlconnection:2.4.0'
compile 'com.squareup.okio:okio:1.2.0' compile 'com.squareup.okio:okio:1.2.0'
compile 'de.greenrobot:eventbus:2.4.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 'io.reactivex:rxandroid:1.0.1'
compile 'com.joanzapata.iconify:android-iconify-fontawesome:2.0.3'
compile project(':core') compile project(':core')
compile project(':library:drag-sort-listview') compile project(':library:drag-sort-listview')

4
app/src/main/java/de/danoeh/antennapod/PodcastApp.java
View File

@ -3,6 +3,9 @@ package de.danoeh.antennapod;
import android.app.Application; import android.app.Application;
import android.content.res.Configuration; 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.feed.EventDistributor;
import de.danoeh.antennapod.core.preferences.PlaybackPreferences; import de.danoeh.antennapod.core.preferences.PlaybackPreferences;
import de.danoeh.antennapod.core.preferences.UserPreferences; import de.danoeh.antennapod.core.preferences.UserPreferences;
@ -42,6 +45,7 @@ public class PodcastApp extends Application {
PlaybackPreferences.init(this); PlaybackPreferences.init(this);
NetworkUtils.init(this); NetworkUtils.init(this);
EventDistributor.getInstance(); EventDistributor.getInstance();
Iconify.with(new FontAwesomeModule());
SPAUtil.sendSPAppsQueryFeedsIntent(this); SPAUtil.sendSPAppsQueryFeedsIntent(this);
} }

2
app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
View File

@ -27,7 +27,7 @@ import android.widget.Toast;
import com.bumptech.glide.Glide; import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy; 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.R;
import de.danoeh.antennapod.core.dialog.ConfirmationDialog; import de.danoeh.antennapod.core.dialog.ConfirmationDialog;

2
app/src/main/java/de/danoeh/antennapod/adapter/AdapterUtils.java
View File

@ -4,7 +4,7 @@ import android.view.View;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import android.widget.TextView; import android.widget.TextView;
import com.joanzapata.android.iconify.Iconify; import com.joanzapata.iconify.Iconify;
import de.danoeh.antennapod.core.feed.FeedItem; import de.danoeh.antennapod.core.feed.FeedItem;
import de.danoeh.antennapod.core.feed.FeedMedia; import de.danoeh.antennapod.core.feed.FeedMedia;

2
app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesListAdapter.java
View File

@ -17,7 +17,7 @@ import com.bumptech.glide.Glide;
import com.bumptech.glide.load.resource.drawable.GlideDrawable; import com.bumptech.glide.load.resource.drawable.GlideDrawable;
import com.bumptech.glide.request.animation.GlideAnimation; import com.bumptech.glide.request.animation.GlideAnimation;
import com.bumptech.glide.request.target.GlideDrawableImageViewTarget; import com.bumptech.glide.request.target.GlideDrawableImageViewTarget;
import com.joanzapata.android.iconify.Iconify; import com.joanzapata.iconify.Iconify;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;

2
app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java
View File

@ -11,7 +11,7 @@ import android.widget.Button;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import com.joanzapata.android.iconify.Iconify; import com.joanzapata.iconify.Iconify;
import java.util.Date; import java.util.Date;

2
app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
View File

@ -10,13 +10,13 @@ import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.BaseAdapter; import android.widget.BaseAdapter;
import android.widget.IconTextView;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import com.bumptech.glide.Glide; import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.joanzapata.iconify.widget.IconTextView;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;

2
app/src/main/java/de/danoeh/antennapod/adapter/QueueListAdapter.java
View File

@ -17,7 +17,7 @@ import com.bumptech.glide.Glide;
import com.bumptech.glide.load.resource.drawable.GlideDrawable; import com.bumptech.glide.load.resource.drawable.GlideDrawable;
import com.bumptech.glide.request.animation.GlideAnimation; import com.bumptech.glide.request.animation.GlideAnimation;
import com.bumptech.glide.request.target.GlideDrawableImageViewTarget; import com.bumptech.glide.request.target.GlideDrawableImageViewTarget;
import com.joanzapata.android.iconify.Iconify; import com.joanzapata.iconify.Iconify;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;

19
app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
View File

@ -17,8 +17,9 @@ import android.widget.Button;
import android.widget.ListView; import android.widget.ListView;
import android.widget.Toast; import android.widget.Toast;
import com.joanzapata.android.iconify.IconDrawable; import com.joanzapata.iconify.Icon;
import com.joanzapata.android.iconify.Iconify; import com.joanzapata.iconify.IconDrawable;
import com.joanzapata.iconify.fonts.FontAwesomeIcons;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@ -149,7 +150,7 @@ public class EpisodesApplyActionFragment extends Fragment {
ta.recycle(); ta.recycle();
menu.findItem(R.id.sort).setIcon(new IconDrawable(getActivity(), 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 = menu.findItem(R.id.select_toggle);
mSelectToggle.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { mSelectToggle.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
@ -165,20 +166,20 @@ public class EpisodesApplyActionFragment extends Fragment {
}); });
menu.findItem(R.id.select_options).setIcon(new IconDrawable(getActivity(), 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 @Override
public void onPrepareOptionsMenu (Menu menu) { public void onPrepareOptionsMenu (Menu menu) {
Iconify.IconValue iVal; Icon icon;
if(checkedIds.size() == episodes.size()) { if(checkedIds.size() == episodes.size()) {
iVal = Iconify.IconValue.fa_check_square_o; icon = FontAwesomeIcons.fa_check_square_o;
} else if(checkedIds.size() == 0) { } else if(checkedIds.size() == 0) {
iVal = Iconify.IconValue.fa_square_o; icon = FontAwesomeIcons.fa_square_o;
} else { } 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());
} }

9
app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
View File

@ -24,7 +24,6 @@ import android.view.MenuInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.widget.AdapterView; import android.widget.AdapterView;
import android.widget.IconTextView;
import android.widget.ImageButton; import android.widget.ImageButton;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.ListAdapter; import android.widget.ListAdapter;
@ -34,8 +33,10 @@ import android.widget.TextView;
import com.bumptech.glide.Glide; import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.joanzapata.android.iconify.IconDrawable; import com.joanzapata.iconify.IconDrawable;
import com.joanzapata.android.iconify.Iconify; import com.joanzapata.iconify.Iconify;
import com.joanzapata.iconify.fonts.FontAwesomeIcons;
import com.joanzapata.iconify.widget.IconTextView;
import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.Validate;
@ -234,7 +235,7 @@ public class ItemlistFragment extends ListFragment {
ta.recycle(); ta.recycle();
menu.findItem(R.id.episode_actions).setIcon(new IconDrawable(getActivity(), 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); isUpdatingFeed = MenuItemUtils.updateRefreshMenuItem(menu, R.id.refresh_item, updateRefreshMenuItemChecker);
} }

2
app/src/main/res/layout/feeditemlist_header.xml
View File

@ -78,7 +78,7 @@
tools:text="Podcast author" tools:text="Podcast author"
tools:background="@android:color/holo_green_dark" /> tools:background="@android:color/holo_green_dark" />
<IconTextView <com.joanzapata.iconify.widget.IconTextView
android:id="@+id/txtvFailure" android:id="@+id/txtvFailure"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"

2
app/src/main/res/layout/nav_feedlistitem.xml
View File

@ -37,7 +37,7 @@
tools:text="23" tools:text="23"
tools:background="@android:color/holo_green_dark"/> tools:background="@android:color/holo_green_dark"/>
<IconTextView <com.joanzapata.iconify.widget.IconTextView
android:id="@+id/itxtvFailure" android:id="@+id/itxtvFailure"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"