wbrawner/news-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update gradle dependencies

Browse source
This commit is contained in:
David Development 2016-03-06 18:22:14 +01:00
parent de93a0f2f9
commit b68aaeb1fb
16 changed files with 128 additions and 126 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
News-Android-App/build.gradle
View file

@ -62,6 +62,8 @@ repositories {
}
final SUPPORT_VERSION = '23.2.0'
dependencies {
// core android studio module
//compile project(':core')
@ -69,16 +71,16 @@ dependencies {
// The Google Repository (separate from the corresponding library) can be found in the Extras category.
// compile 'com.google.android.gms:play-services:4.2.42'
compile project(':ownCloud-Account-Importer')
compile 'com.android.support:support-v4:23.0.1'
compile 'com.android.support:appcompat-v7:23.0.1'
compile 'com.android.support:design:23.0.1'
compile 'com.android.support:palette-v7:23.0.1'
compile 'com.android.support:recyclerview-v7:23.0.1'
compile 'com.android.support:customtabs:23.0.1'
compile "com.android.support:support-v4:${SUPPORT_VERSION}"
compile "com.android.support:appcompat-v7:${SUPPORT_VERSION}"
compile "com.android.support:design:${SUPPORT_VERSION}"
compile "com.android.support:palette-v7:${SUPPORT_VERSION}"
compile "com.android.support:recyclerview-v7:${SUPPORT_VERSION}"
compile "com.android.support:customtabs:${SUPPORT_VERSION}"
compile 'de.mrmaffen:holocircularprogressbar:1.0.1'
compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.4'
compile 'com.google.code.gson:gson:2.3.1'
compile 'com.jakewharton:butterknife:5.1.+'
compile 'com.google.code.gson:gson:2.4'
compile 'com.jakewharton:butterknife:7.0.1'
compile 'com.sothree.slidinguppanel:library:3.2.1'
compile 'com.squareup.okhttp:okhttp:2.5.0'
compile 'de.greenrobot:eventbus:2.2.1'
@ -91,12 +93,12 @@ dependencies {
compile ('net.rdrei.android.dirchooser:library:3.0@aar') { transitive = true; }
testCompile 'org.robolectric:robolectric:3.0-rc3'
testCompile 'junit:junit:4.+'
testCompile 'junit:junit:4.1'
androidTestCompile 'com.squareup.okhttp:mockwebserver:2.5.0'
androidTestCompile 'com.android.support:support-annotations:23.1.1'
androidTestCompile 'com.android.support.test:runner:0.3'
androidTestCompile 'com.android.support.test:rules:0.3'
androidTestCompile "com.android.support:support-annotations:${SUPPORT_VERSION}"
androidTestCompile 'com.android.support.test:runner:0.4'
androidTestCompile 'com.android.support.test:rules:0.4'
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2'
androidTestCompile('com.android.support.test.espresso:espresso-contrib:2.2') {
// this library uses the newest app compat v22 but the espresso contrib still v21.

18
News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/ListView/PodcastArrayAdapter.java
View file

@ -10,8 +10,8 @@ import android.widget.ProgressBar;
import android.widget.TextView;
import android.widget.Toast;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.InjectView;
import de.greenrobot.event.EventBus;
import de.luhmer.owncloudnewsreader.R;
import de.luhmer.owncloudnewsreader.events.podcast.AudioPodcastClicked;
@ -130,18 +130,18 @@ public class PodcastArrayAdapter extends ArrayAdapter<PodcastItem> {
static class ViewHolder {
@InjectView(R.id.tv_title) TextView tvTitle;
@InjectView(R.id.tv_body) TextView tvBody;
@InjectView(R.id.fl_downloadPodcastWrapper) FrameLayout flDownloadPodcast;
@InjectView(R.id.fl_PlayPodcastWrapper) FrameLayout flPlayPodcast;
@InjectView(R.id.fl_deletePodcastWrapper) FrameLayout flDeletePodcast;
@InjectView(R.id.pbDownloadPodcast) ProgressBar pbDownloadPodcast;
@InjectView(R.id.tvDownloadPodcastProgress) TextView tvDownloadPodcastProgress;
@Bind(R.id.tv_title) TextView tvTitle;
@Bind(R.id.tv_body) TextView tvBody;
@Bind(R.id.fl_downloadPodcastWrapper) FrameLayout flDownloadPodcast;
@Bind(R.id.fl_PlayPodcastWrapper) FrameLayout flPlayPodcast;
@Bind(R.id.fl_deletePodcastWrapper) FrameLayout flDeletePodcast;
@Bind(R.id.pbDownloadPodcast) ProgressBar pbDownloadPodcast;
@Bind(R.id.tvDownloadPodcastProgress) TextView tvDownloadPodcastProgress;
public ViewHolder(View view) {
ButterKnife.inject(this, view);
ButterKnife.bind(this, view);
}
}
}

8
News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/ListView/PodcastFeedArrayAdapter.java
View file

@ -7,8 +7,8 @@ import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.TextView;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.InjectView;
import de.greenrobot.event.EventBus;
import de.luhmer.owncloudnewsreader.R;
import de.luhmer.owncloudnewsreader.events.podcast.PodcastFeedClicked;
@ -54,11 +54,11 @@ public class PodcastFeedArrayAdapter extends ArrayAdapter<PodcastFeedItem> {
static class ViewHolder {
@InjectView(R.id.tv_title) TextView tvTitle;
@InjectView(R.id.tv_body) TextView tvBody;
@Bind(R.id.tv_title) TextView tvTitle;
@Bind(R.id.tv_body) TextView tvBody;
public ViewHolder(View view) {
ButterKnife.inject(this, view);
ButterKnife.bind(this, view);
}
}
}

26
News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/ListView/SubscriptionExpandableListAdapter.java
View file

@ -27,7 +27,7 @@ import android.content.SharedPreferences;
import android.os.AsyncTask;
import android.preference.PreferenceManager;
import android.support.v4.content.ContextCompat;
import android.support.v7.internal.widget.ViewUtils;
import android.support.v7.widget.ViewUtils;
import android.util.Log;
import android.util.SparseArray;
import android.view.LayoutInflater;
@ -47,8 +47,8 @@ import org.apache.commons.lang3.time.StopWatch;
import java.util.ArrayList;
import java.util.List;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.InjectView;
import de.luhmer.owncloudnewsreader.R;
import de.luhmer.owncloudnewsreader.SettingsActivity;
import de.luhmer.owncloudnewsreader.database.DatabaseConnectionOrm;
@ -186,13 +186,13 @@ public class SubscriptionExpandableListAdapter extends BaseExpandableListAdapter
}
static class ChildHolder {
@InjectView(R.id.list_item_layout) View listItemLayout;
@InjectView(R.id.summary) TextView tV_HeaderText;
@InjectView(R.id.tv_unreadCount) TextView tV_UnreadCount;
@InjectView(R.id.iVFavicon) ImageView imgView_FavIcon;
@Bind(R.id.list_item_layout) View listItemLayout;
@Bind(R.id.summary) TextView tV_HeaderText;
@Bind(R.id.tv_unreadCount) TextView tV_UnreadCount;
@Bind(R.id.iVFavicon) ImageView imgView_FavIcon;
public ChildHolder(View view) {
ButterKnife.inject(this, view);
ButterKnife.bind(this, view);
}
}
@ -379,14 +379,14 @@ public class SubscriptionExpandableListAdapter extends BaseExpandableListAdapter
static class GroupHolder
{
@InjectView(R.id.list_item_layout) View listItemLayout;
@InjectView(R.id.summary) TextView txt_Summary;
@InjectView(R.id.tV_feedsCount) TextView txt_UnreadCount;
@InjectView(R.id.img_View_expandable_indicator) ImageButton imgView;
@InjectView(R.id.img_view_favicon) ImageView faviconView;
@Bind(R.id.list_item_layout) View listItemLayout;
@Bind(R.id.summary) TextView txt_Summary;
@Bind(R.id.tV_feedsCount) TextView txt_UnreadCount;
@Bind(R.id.img_View_expandable_indicator) ImageButton imgView;
@Bind(R.id.img_view_favicon) ImageView faviconView;
public GroupHolder(View view) {
ButterKnife.inject(this, view);
ButterKnife.bind(this, view);
}
}

14
News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/LoginDialogFragment.java
View file

@ -49,8 +49,8 @@ import android.widget.ImageView;
import java.net.MalformedURLException;
import java.net.URL;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.InjectView;
import de.luhmer.owncloud.accountimporter.ImportAccountsDialogFragment;
import de.luhmer.owncloud.accountimporter.helper.AccountImporter;
import de.luhmer.owncloud.accountimporter.helper.OwnCloudAccount;
@ -89,11 +89,11 @@ public class LoginDialogFragment extends DialogFragment implements IAccountImpor
private boolean showImportAccountButton;
// UI references.
@InjectView(R.id.username) EditText mUsernameView;
@InjectView(R.id.password) EditText mPasswordView;
@InjectView(R.id.edt_owncloudRootPath) EditText mOc_root_path_View;
@InjectView(R.id.cb_AllowAllSSLCertificates) CheckBox mCbDisableHostnameVerificationView;
@InjectView(R.id.imgView_ShowPassword) ImageView mImageViewShowPwd;
@Bind(R.id.username) EditText mUsernameView;
@Bind(R.id.password) EditText mPasswordView;
@Bind(R.id.edt_owncloudRootPath) EditText mOc_root_path_View;
@Bind(R.id.cb_AllowAllSSLCertificates) CheckBox mCbDisableHostnameVerificationView;
@Bind(R.id.imgView_ShowPassword) ImageView mImageViewShowPwd;
boolean mPasswordVisible = false;
ProgressDialog mDialogLogin;
@ -136,7 +136,7 @@ public class LoginDialogFragment extends DialogFragment implements IAccountImpor
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
LayoutInflater inflater = getActivity().getLayoutInflater();
View view = inflater.inflate(R.layout.dialog_signin, null);
ButterKnife.inject(this, view);
ButterKnife.bind(this, view);
builder.setView(view);
builder.setTitle(getString(R.string.action_sign_in_short));

16
News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewFeedActivity.java
View file

@ -42,8 +42,8 @@ import java.net.URL;
import java.util.HashMap;
import java.util.List;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.InjectView;
import butterknife.OnClick;
import de.luhmer.owncloudnewsreader.database.DatabaseConnectionOrm;
import de.luhmer.owncloudnewsreader.database.model.Folder;
@ -65,12 +65,12 @@ public class NewFeedActivity extends AppCompatActivity {
private AddNewFeedTask mAddFeedTask = null;
// UI references.
@InjectView(R.id.et_feed_url) EditText mFeedUrlView;
@InjectView(R.id.sp_folder) Spinner mFolderView;
@InjectView(R.id.new_feed_progress) View mProgressView;
@InjectView(R.id.new_feed_form) View mLoginFormView;
@InjectView(R.id.btn_addFeed) Button mAddFeedButton;
@InjectView(R.id.toolbar) Toolbar toolbar;
@Bind(R.id.et_feed_url) EditText mFeedUrlView;
@Bind(R.id.sp_folder) Spinner mFolderView;
@Bind(R.id.new_feed_progress) View mProgressView;
@Bind(R.id.new_feed_form) View mLoginFormView;
@Bind(R.id.btn_addFeed) Button mAddFeedButton;
@Bind(R.id.toolbar) Toolbar toolbar;
List<Folder> folders;
@ -80,7 +80,7 @@ public class NewFeedActivity extends AppCompatActivity {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_new_feed);
ButterKnife.inject(this);
ButterKnife.bind(this);
if (toolbar != null) {
setSupportActionBar(toolbar);

8
News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java
View file

@ -57,8 +57,8 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.InjectView;
import de.luhmer.owncloudnewsreader.chrometabs.CustomTabActivityManager;
import de.luhmer.owncloudnewsreader.database.DatabaseConnectionOrm;
import de.luhmer.owncloudnewsreader.database.DatabaseConnectionOrm.SORT_DIRECTION;
@ -81,8 +81,8 @@ public class NewsDetailActivity extends PodcastFragmentActivity {
* {@link android.support.v4.app.FragmentStatePagerAdapter}.
*/
SectionsPagerAdapter mSectionsPagerAdapter;
@InjectView(R.id.toolbar) Toolbar toolbar;
@InjectView(R.id.progressIndicator) ProgressBar progressIndicator;
@Bind(R.id.toolbar) Toolbar toolbar;
@Bind(R.id.progressIndicator) ProgressBar progressIndicator;
/**
* The {@link ViewPager} that will host the section contents.
@ -113,7 +113,7 @@ public class NewsDetailActivity extends PodcastFragmentActivity {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_news_detail);
ButterKnife.inject(this);
ButterKnife.bind(this);
if (toolbar != null) {
setSupportActionBar(toolbar);

10
News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailFragment.java
View file

@ -60,8 +60,8 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.InjectView;
import de.luhmer.owncloudnewsreader.database.model.Feed;
import de.luhmer.owncloudnewsreader.database.model.RssItem;
import de.luhmer.owncloudnewsreader.helper.AsyncTaskHelper;
@ -76,9 +76,9 @@ public class NewsDetailFragment extends Fragment {
public static int background_color = Integer.MIN_VALUE;
@InjectView(R.id.webview) WebView mWebView;
@InjectView(R.id.progressBarLoading) ProgressBar mProgressBarLoading;
@InjectView(R.id.progressbar_webview) ProgressBar mProgressbarWebView;
@Bind(R.id.webview) WebView mWebView;
@Bind(R.id.progressBarLoading) ProgressBar mProgressBarLoading;
@Bind(R.id.progressbar_webview) ProgressBar mProgressbarWebView;
private int section_number;
@ -139,7 +139,7 @@ public class NewsDetailFragment extends Fragment {
section_number = (Integer) getArguments().get(ARG_SECTION_NUMBER);
ButterKnife.inject(this, rootView);
ButterKnife.bind(this, rootView);
startLoadRssItemToWebViewTask();

12
News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderDetailFragment.java
View file

@ -53,8 +53,8 @@ import org.apache.commons.lang3.time.StopWatch;
import java.util.List;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.InjectView;
import de.luhmer.owncloudnewsreader.ListView.SubscriptionExpandableListAdapter;
import de.luhmer.owncloudnewsreader.adapter.DividerItemDecoration;
import de.luhmer.owncloudnewsreader.adapter.NewsListRecyclerAdapter;
@ -109,10 +109,10 @@ public class NewsReaderDetailFragment extends Fragment {
private static final String LAYOUT_MANAGER_STATE = "LAYOUT_MANAGER_STATE";
private boolean mMarkAsReadWhileScrollingEnabled;
@InjectView(R.id.pb_loading) ProgressBar pbLoading;
@InjectView(R.id.tv_no_items_available) View tvNoItemsAvailable;
@InjectView(R.id.list) RecyclerView recyclerView;
@InjectView(R.id.swipeRefresh) SwipeRefreshLayout swipeRefresh;
@Bind(R.id.pb_loading) ProgressBar pbLoading;
@Bind(R.id.tv_no_items_available) View tvNoItemsAvailable;
@Bind(R.id.list) RecyclerView recyclerView;
@Bind(R.id.swipeRefresh) SwipeRefreshLayout swipeRefresh;
/**
* Mandatory empty constructor for the fragment manager to instantiate the
@ -331,7 +331,7 @@ public class NewsReaderDetailFragment extends Fragment {
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
View rootView = inflater.inflate(R.layout.fragment_newsreader_detail, container, false);
ButterKnife.inject(this, rootView);
ButterKnife.bind(this, rootView);
recyclerView.setLayoutManager(new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false));
recyclerView.setItemAnimator(new DefaultItemAnimator());

10
News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java
View file

@ -41,6 +41,7 @@ import android.os.Looper;
import android.os.RemoteException;
import android.preference.PreferenceManager;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.design.widget.Snackbar;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.Fragment;
@ -63,9 +64,8 @@ import android.widget.Toast;
import java.lang.reflect.Field;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.InjectView;
import butterknife.Optional;
import de.greenrobot.event.EventBus;
import de.luhmer.owncloudnewsreader.ListView.SubscriptionExpandableListAdapter;
import de.luhmer.owncloudnewsreader.LoginDialogFragment.LoginSuccessfullListener;
@ -116,11 +116,11 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements
//private Date mLastSyncDate = new Date(0);
private boolean mSyncOnStartupPerformed = false;
@InjectView(R.id.toolbar) Toolbar toolbar;
@Bind(R.id.toolbar) Toolbar toolbar;
private ServiceConnection mConnection = null;
@Optional @InjectView(R.id.drawer_layout)
@Nullable @Bind(R.id.drawer_layout)
protected DrawerLayout drawerLayout;
private ActionBarDrawerToggle drawerToggle;
@ -132,7 +132,7 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_newsreader);
ButterKnife.inject(this);
ButterKnife.bind(this);
if (toolbar != null) {
setSupportActionBar(toolbar);

16
News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListFragment.java
View file

@ -57,8 +57,8 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.InjectView;
import de.luhmer.owncloudnewsreader.ListView.SubscriptionExpandableListAdapter;
import de.luhmer.owncloudnewsreader.database.DatabaseConnectionOrm;
import de.luhmer.owncloudnewsreader.helper.AsyncTaskHelper;
@ -128,12 +128,12 @@ public class NewsReaderListFragment extends Fragment implements OnCreateContextM
private SubscriptionExpandableListAdapter lvAdapter;
@InjectView(R.id.expandableListView) protected ExpandableListView eListView;
@InjectView(R.id.urlTextView) protected TextView urlTextView;
@InjectView(R.id.userTextView) protected TextView userTextView;
@InjectView(R.id.header_view) protected ViewGroup headerView;
@InjectView(R.id.header_logo) protected ImageView headerLogo;
@InjectView(R.id.header_logo_progress) protected View headerLogoProgress;
@Bind(R.id.expandableListView) protected ExpandableListView eListView;
@Bind(R.id.urlTextView) protected TextView urlTextView;
@Bind(R.id.userTextView) protected TextView userTextView;
@Bind(R.id.header_view) protected ViewGroup headerView;
@Bind(R.id.header_logo) protected ImageView headerLogo;
@Bind(R.id.header_logo_progress) protected View headerLogoProgress;
/**
* Mandatory empty constructor for the fragment manager to instantiate the
@ -151,7 +151,7 @@ public class NewsReaderListFragment extends Fragment implements OnCreateContextM
view.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.slider_listview_background_color_light_theme));
}
ButterKnife.inject(this, view);
ButterKnife.bind(this, view);
lvAdapter = new SubscriptionExpandableListAdapter(getActivity(), new DatabaseConnectionOrm(getActivity()), eListView);
lvAdapter.setHandlerListener(expListTextClickedListener);

44
News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/PodcastFragment.java
View file

@ -27,8 +27,8 @@ import com.sothree.slidinguppanel.SlidingUpPanelLayout;
import java.io.File;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.InjectView;
import butterknife.OnClick;
import de.greenrobot.event.EventBus;
import de.luhmer.owncloudnewsreader.ListView.PodcastArrayAdapter;
@ -209,34 +209,34 @@ public class PodcastFragment extends Fragment {
@InjectView(R.id.btn_playPausePodcast) ImageButton btnPlayPausePodcast;
@InjectView(R.id.btn_playPausePodcastSlider) ImageButton btnPlayPausePodcastSlider;
@InjectView(R.id.btn_nextPodcastSlider) ImageButton btnNextPodcastSlider;
@InjectView(R.id.btn_previousPodcastSlider) ImageButton btnPreviousPodcastSlider;
@Bind(R.id.btn_playPausePodcast) ImageButton btnPlayPausePodcast;
@Bind(R.id.btn_playPausePodcastSlider) ImageButton btnPlayPausePodcastSlider;
@Bind(R.id.btn_nextPodcastSlider) ImageButton btnNextPodcastSlider;
@Bind(R.id.btn_previousPodcastSlider) ImageButton btnPreviousPodcastSlider;
@InjectView(R.id.img_feed_favicon) ImageView imgFavIcon;
@Bind(R.id.img_feed_favicon) ImageView imgFavIcon;
@InjectView(R.id.tv_title) TextView tvTitle;
@InjectView(R.id.tv_titleSlider) TextView tvTitleSlider;
@Bind(R.id.tv_title) TextView tvTitle;
@Bind(R.id.tv_titleSlider) TextView tvTitleSlider;
@InjectView(R.id.tv_from) TextView tvFrom;
@InjectView(R.id.tv_to) TextView tvTo;
@InjectView(R.id.tv_fromSlider) TextView tvFromSlider;
@InjectView(R.id.tv_ToSlider) TextView tvToSlider;
@Bind(R.id.tv_from) TextView tvFrom;
@Bind(R.id.tv_to) TextView tvTo;
@Bind(R.id.tv_fromSlider) TextView tvFromSlider;
@Bind(R.id.tv_ToSlider) TextView tvToSlider;
@InjectView(R.id.sb_progress) SeekBar sb_progress;
@InjectView(R.id.pb_progress) ProgressBar pb_progress;
@InjectView(R.id.pb_progress2) ProgressBar pb_progress2;
@Bind(R.id.sb_progress) SeekBar sb_progress;
@Bind(R.id.pb_progress) ProgressBar pb_progress;
@Bind(R.id.pb_progress2) ProgressBar pb_progress2;
@InjectView(R.id.podcastFeedList) ListView /* CardGridView CardListView*/ podcastFeedList;
@InjectView(R.id.rlPodcast) RelativeLayout rlPodcast;
@InjectView(R.id.ll_podcast_header) LinearLayout rlPodcastHeader;
@InjectView(R.id.fl_playPausePodcastWrapper) FrameLayout playPausePodcastWrapper;
@InjectView(R.id.podcastTitleGrid) ListView /*CardGridView*/ podcastTitleGrid;
@Bind(R.id.podcastFeedList) ListView /* CardGridView CardListView*/ podcastFeedList;
@Bind(R.id.rlPodcast) RelativeLayout rlPodcast;
@Bind(R.id.ll_podcast_header) LinearLayout rlPodcastHeader;
@Bind(R.id.fl_playPausePodcastWrapper) FrameLayout playPausePodcastWrapper;
@Bind(R.id.podcastTitleGrid) ListView /*CardGridView*/ podcastTitleGrid;
@InjectView(R.id.viewSwitcherProgress) ViewSwitcher /*CardGridView*/ viewSwitcherProgress;
@Bind(R.id.viewSwitcherProgress) ViewSwitcher /*CardGridView*/ viewSwitcherProgress;
boolean hasTitleInCache = false;
@ -278,7 +278,7 @@ public class PodcastFragment extends Fragment {
//View view = inflater.inflate(R.layout.fragment_podcast, container, false);
ButterKnife.inject(this, view);
ButterKnife.bind(this, view);
if(getActivity() instanceof PodcastFragmentActivity) {

8
News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/PodcastFragmentActivity.java
View file

@ -27,8 +27,8 @@ import com.sothree.slidinguppanel.SlidingUpPanelLayout;
import java.io.File;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.InjectView;
import de.greenrobot.event.EventBus;
import de.luhmer.owncloudnewsreader.database.DatabaseConnectionOrm;
import de.luhmer.owncloudnewsreader.database.model.RssItem;
@ -58,15 +58,15 @@ public class PodcastFragmentActivity extends AppCompatActivity implements IPlayP
private int appHeight;
private int appWidth;
@InjectView(R.id.videoPodcastSurfaceWrapper) ZoomableRelativeLayout rlVideoPodcastSurfaceWrapper;
@InjectView(R.id.sliding_layout) PodcastSlidingUpPanelLayout sliding_layout;
@Bind(R.id.videoPodcastSurfaceWrapper) ZoomableRelativeLayout rlVideoPodcastSurfaceWrapper;
@Bind(R.id.sliding_layout) PodcastSlidingUpPanelLayout sliding_layout;
@Override
protected void onPostCreate(Bundle savedInstanceState) {
eventBus = EventBus.getDefault();
ButterKnife.inject(this);
ButterKnife.bind(this);
ViewTreeObserver vto = rlVideoPodcastSurfaceWrapper.getViewTreeObserver();
vto.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {

2
News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/SettingsActivity.java
View file

@ -141,7 +141,7 @@ public class SettingsActivity extends PreferenceActivity {
Toolbar toolbar = (Toolbar) appBarLayout.getChildAt(0);
final Drawable backarrow = ContextCompat.getDrawable(this, R.drawable.abc_ic_ab_back_mtrl_am_alpha);
final Drawable backarrow = ContextCompat.getDrawable(this, R.drawable.abc_ic_ab_back_material);
backarrow.setColorFilter(ContextCompat.getColor(this, R.color.tintColorDark), PorterDuff.Mode.SRC_ATOP);
toolbar.setNavigationIcon(backarrow);
toolbar.setTitle(R.string.title_activity_settings);

6
News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/SyncIntervalSelectorActivity.java
View file

@ -18,8 +18,8 @@ import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.ListView;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.InjectView;
import de.luhmer.owncloudnewsreader.authentication.AccountGeneral;
@ -28,14 +28,14 @@ public class SyncIntervalSelectorActivity extends AppCompatActivity {
SharedPreferences mPrefs;
PlaceholderFragment mFragment;
String[] items_values;
@InjectView(R.id.toolbar) Toolbar toolbar;
@Bind(R.id.toolbar) Toolbar toolbar;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_sync_interval_selector);
ButterKnife.inject(this);
ButterKnife.bind(this);
if (toolbar != null) {
setSupportActionBar(toolbar);

30
News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/adapter/ViewHolder.java
View file

@ -5,6 +5,7 @@ import android.content.res.TypedArray;
import android.graphics.Color;
import android.graphics.Typeface;
import android.preference.PreferenceManager;
import android.support.annotation.Nullable;
import android.support.v4.content.ContextCompat;
import android.support.v7.widget.RecyclerView;
import android.text.Html;
@ -21,9 +22,8 @@ import android.widget.TextView;
import com.pascalwelsch.holocircularprogressbar.HoloCircularProgressBar;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.InjectView;
import butterknife.Optional;
import de.luhmer.owncloudnewsreader.NewsDetailFragment;
import de.luhmer.owncloudnewsreader.R;
import de.luhmer.owncloudnewsreader.SettingsActivity;
@ -37,40 +37,40 @@ public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickL
private static SparseArray<Integer> downloadProgressList = new SparseArray<>();
@Optional
@InjectView(R.id.star_imageview)
@Nullable
@Bind(R.id.star_imageview)
protected ImageView starImageView;
@InjectView(R.id.summary)
@Bind(R.id.summary)
protected TextView textViewSummary;
@InjectView(R.id.tv_item_date)
@Bind(R.id.tv_item_date)
protected TextView textViewItemDate;
@InjectView(R.id.tv_subscription)
@Bind(R.id.tv_subscription)
protected TextView textViewTitle;
@InjectView(R.id.imgViewFavIcon)
@Bind(R.id.imgViewFavIcon)
protected ImageView imgViewFavIcon;
@InjectView(R.id.color_line_feed)
@Bind(R.id.color_line_feed)
protected View colorLineFeed;
@InjectView(R.id.btn_playPausePodcast)
@Bind(R.id.btn_playPausePodcast)
protected ImageView btnPlayPausePodcast;
@InjectView(R.id.podcastDownloadProgress)
@Bind(R.id.podcastDownloadProgress)
protected HoloCircularProgressBar pbPodcastDownloadProgress;
@InjectView(R.id.podcast_wrapper)
@Bind(R.id.podcast_wrapper)
View flPlayPausePodcastWrapper;
// only in extended layout
@Optional @InjectView(R.id.body)
@Nullable @Bind(R.id.body)
protected TextView textViewBody;
// Only in extended with webview layout
@Optional @InjectView(R.id.webView_body)
@Nullable @Bind(R.id.webView_body)
protected WebView webView_body;
private RecyclerItemClickListener clickListener;
@ -94,7 +94,7 @@ public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickL
if(favIconHandler == null)
favIconHandler = new FavIconHandler(itemView.getContext());
ButterKnife.inject(this, itemView);
ButterKnife.bind(this, itemView);
if(textViewSummary != null)
textViewSummary.setLines(titleLineCount);