update to Android Studio 3 / update gradle to v.3.0.0 / update butterknife to v.8.8.1
This commit is contained in:
parent
3dfcf947e1
commit
a8adef498f
19 changed files with 116 additions and 110 deletions
|
@ -1 +1 @@
|
|||
Subproject commit 43790c7401afdb869cf3fe60e2b004f66067b6d4
|
||||
Subproject commit 89411a169c89af5034372b4ec287477f277c4027
|
|
@ -1,5 +1,4 @@
|
|||
apply plugin: 'com.android.application'
|
||||
apply plugin: 'com.neenbedankt.android-apt'
|
||||
|
||||
android {
|
||||
|
||||
|
@ -24,6 +23,7 @@ android {
|
|||
buildTypes {
|
||||
debug {
|
||||
minifyEnabled true
|
||||
// TODO check if proguard-android.txt is used at all.. it's supposed to get it from the sdk. so we can delete it in this repo!
|
||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
|
||||
testProguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
|
||||
pseudoLocalesEnabled true
|
||||
|
@ -36,12 +36,18 @@ android {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
flavorDimensions "default"
|
||||
|
||||
productFlavors {
|
||||
// 100% Open-Source Edition
|
||||
oss {
|
||||
dimension "default"
|
||||
}
|
||||
// 99% Open-source edition: uses the YouTube Player Jar
|
||||
extra {
|
||||
dimension "default"
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -92,7 +98,7 @@ dependencies {
|
|||
// You must install or update the Google Repository through the SDK manager to use this dependency.
|
||||
// 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 project(path: ':ownCloud-Account-Importer', configuration: 'default')
|
||||
compile "com.android.support:support-v4:${SUPPORT_VERSION}"
|
||||
compile "com.android.support:support-compat:${SUPPORT_VERSION}"
|
||||
compile "com.android.support:appcompat-v7:${SUPPORT_VERSION}"
|
||||
|
@ -103,8 +109,9 @@ dependencies {
|
|||
compile 'de.mrmaffen:holocircularprogressbar:1.0.1'
|
||||
compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.4'
|
||||
compile 'com.google.code.gson:gson:2.8.0'
|
||||
compile 'com.jakewharton:butterknife:7.0.1'
|
||||
//compile group: 'com.jakewharton', name: 'butterknife', version: '8.5.1'
|
||||
compile 'com.jakewharton:butterknife:8.8.1'
|
||||
annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
|
||||
annotationProcessor 'com.google.auto.value:auto-value:1.1'
|
||||
compile 'com.sothree.slidinguppanel:library:3.2.1'
|
||||
|
||||
compile 'org.greenrobot:eventbus:3.0.0'
|
||||
|
@ -118,7 +125,6 @@ dependencies {
|
|||
|
||||
|
||||
compile 'com.google.dagger:dagger:2.9'
|
||||
apt "com.google.dagger:dagger-compiler:2.9"
|
||||
annotationProcessor "com.google.dagger:dagger-compiler:2.9"
|
||||
provided 'javax.annotation:jsr250-api:1.0'
|
||||
|
||||
|
@ -133,13 +139,13 @@ dependencies {
|
|||
compile 'com.squareup.okhttp3:okhttp:3.8.0'
|
||||
compile 'com.squareup.okhttp3:logging-interceptor:3.8.0'
|
||||
|
||||
compile project(':MaterialShowcaseView:library')
|
||||
compile project(path: ':MaterialShowcaseView:library', configuration: 'default')
|
||||
compile 'com.nbsp:library:1.02' // MaterialFilePicker
|
||||
|
||||
extraCompile 'com.github.tommus:youtube-android-player-api:1.2.2'
|
||||
|
||||
testCompile 'org.robolectric:robolectric:3.0-rc3'
|
||||
testCompile 'junit:junit:4.1'
|
||||
testCompile 'junit:junit:4.12'
|
||||
testCompile("org.mockito:mockito-core:1.10.19") {
|
||||
exclude group: 'org.hamcrest'
|
||||
}
|
||||
|
@ -153,9 +159,9 @@ dependencies {
|
|||
|
||||
|
||||
androidTestCompile "com.android.support:support-annotations:${SUPPORT_VERSION}"
|
||||
androidTestCompile 'com.android.support.test:runner:0.5'
|
||||
androidTestCompile 'com.android.support.test:rules:0.5'
|
||||
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
|
||||
androidTestCompile 'com.android.support.test:runner:1.0.1'
|
||||
androidTestCompile 'com.android.support.test:rules:1.0.1'
|
||||
androidTestCompile 'com.android.support.test.espresso:espresso-core:3.0.1'
|
||||
androidTestCompile('com.android.support.test.espresso:espresso-contrib:2.2') {
|
||||
// this library uses the newest app compat v22 but the espresso contrib still v21.
|
||||
// you have to specifically exclude the older versions of the contrib library or
|
||||
|
|
|
@ -12,7 +12,7 @@ import android.widget.Toast;
|
|||
|
||||
import org.greenrobot.eventbus.EventBus;
|
||||
|
||||
import butterknife.Bind;
|
||||
import butterknife.BindView;
|
||||
import butterknife.ButterKnife;
|
||||
import de.luhmer.owncloudnewsreader.R;
|
||||
import de.luhmer.owncloudnewsreader.events.podcast.AudioPodcastClicked;
|
||||
|
@ -131,13 +131,13 @@ public class PodcastArrayAdapter extends ArrayAdapter<PodcastItem> {
|
|||
|
||||
|
||||
static class ViewHolder {
|
||||
@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;
|
||||
@BindView(R.id.tv_title) TextView tvTitle;
|
||||
@BindView(R.id.tv_body) TextView tvBody;
|
||||
@BindView(R.id.fl_downloadPodcastWrapper) FrameLayout flDownloadPodcast;
|
||||
@BindView(R.id.fl_PlayPodcastWrapper) FrameLayout flPlayPodcast;
|
||||
@BindView(R.id.fl_deletePodcastWrapper) FrameLayout flDeletePodcast;
|
||||
@BindView(R.id.pbDownloadPodcast) ProgressBar pbDownloadPodcast;
|
||||
@BindView(R.id.tvDownloadPodcastProgress) TextView tvDownloadPodcastProgress;
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@ import android.widget.TextView;
|
|||
|
||||
import org.greenrobot.eventbus.EventBus;
|
||||
|
||||
import butterknife.Bind;
|
||||
import butterknife.BindView;
|
||||
import butterknife.ButterKnife;
|
||||
import de.luhmer.owncloudnewsreader.R;
|
||||
import de.luhmer.owncloudnewsreader.events.podcast.PodcastFeedClicked;
|
||||
|
@ -55,8 +55,8 @@ public class PodcastFeedArrayAdapter extends ArrayAdapter<PodcastFeedItem> {
|
|||
|
||||
|
||||
static class ViewHolder {
|
||||
@Bind(R.id.tv_title) TextView tvTitle;
|
||||
@Bind(R.id.tv_body) TextView tvBody;
|
||||
@BindView(R.id.tv_title) TextView tvTitle;
|
||||
@BindView(R.id.tv_body) TextView tvBody;
|
||||
|
||||
public ViewHolder(View view) {
|
||||
ButterKnife.bind(this, view);
|
||||
|
|
|
@ -47,7 +47,7 @@ import org.apache.commons.lang3.time.StopWatch;
|
|||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import butterknife.Bind;
|
||||
import butterknife.BindView;
|
||||
import butterknife.ButterKnife;
|
||||
import de.luhmer.owncloudnewsreader.R;
|
||||
import de.luhmer.owncloudnewsreader.SettingsActivity;
|
||||
|
@ -186,10 +186,10 @@ public class SubscriptionExpandableListAdapter extends BaseExpandableListAdapter
|
|||
}
|
||||
|
||||
static class ChildHolder {
|
||||
@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;
|
||||
@BindView(R.id.list_item_layout) View listItemLayout;
|
||||
@BindView(R.id.summary) TextView tV_HeaderText;
|
||||
@BindView(R.id.tv_unreadCount) TextView tV_UnreadCount;
|
||||
@BindView(R.id.iVFavicon) ImageView imgView_FavIcon;
|
||||
|
||||
public ChildHolder(View view) {
|
||||
ButterKnife.bind(this, view);
|
||||
|
@ -379,11 +379,11 @@ public class SubscriptionExpandableListAdapter extends BaseExpandableListAdapter
|
|||
|
||||
static class GroupHolder
|
||||
{
|
||||
@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;
|
||||
@BindView(R.id.list_item_layout) View listItemLayout;
|
||||
@BindView(R.id.summary) TextView txt_Summary;
|
||||
@BindView(R.id.tV_feedsCount) TextView txt_UnreadCount;
|
||||
@BindView(R.id.img_View_expandable_indicator) ImageButton imgView;
|
||||
@BindView(R.id.img_view_favicon) ImageView faviconView;
|
||||
|
||||
public GroupHolder(View view) {
|
||||
ButterKnife.bind(this, view);
|
||||
|
|
|
@ -55,7 +55,7 @@ import java.net.URL;
|
|||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import butterknife.Bind;
|
||||
import butterknife.BindView;
|
||||
import butterknife.ButterKnife;
|
||||
import de.luhmer.owncloud.accountimporter.ImportAccountsDialogFragment;
|
||||
import de.luhmer.owncloud.accountimporter.helper.AccountImporter;
|
||||
|
@ -102,11 +102,11 @@ public class LoginDialogFragment extends DialogFragment implements IAccountImpor
|
|||
private boolean showImportAccountButton;
|
||||
|
||||
// UI references.
|
||||
@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;
|
||||
@BindView(R.id.username) EditText mUsernameView;
|
||||
@BindView(R.id.password) EditText mPasswordView;
|
||||
@BindView(R.id.edt_owncloudRootPath) EditText mOc_root_path_View;
|
||||
@BindView(R.id.cb_AllowAllSSLCertificates) CheckBox mCbDisableHostnameVerificationView;
|
||||
@BindView(R.id.imgView_ShowPassword) ImageView mImageViewShowPwd;
|
||||
|
||||
boolean mPasswordVisible = false;
|
||||
|
||||
|
|
|
@ -43,7 +43,7 @@ import java.util.Map;
|
|||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import butterknife.Bind;
|
||||
import butterknife.BindView;
|
||||
import butterknife.ButterKnife;
|
||||
import butterknife.OnClick;
|
||||
import de.luhmer.owncloudnewsreader.database.DatabaseConnectionOrm;
|
||||
|
@ -64,12 +64,12 @@ import retrofit2.Response;
|
|||
public class NewFeedActivity extends AppCompatActivity {
|
||||
|
||||
// UI references.
|
||||
@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;
|
||||
@BindView(R.id.et_feed_url) EditText mFeedUrlView;
|
||||
@BindView(R.id.sp_folder) Spinner mFolderView;
|
||||
@BindView(R.id.new_feed_progress) View mProgressView;
|
||||
@BindView(R.id.new_feed_form) View mLoginFormView;
|
||||
@BindView(R.id.btn_addFeed) Button mAddFeedButton;
|
||||
@BindView(R.id.toolbar) Toolbar toolbar;
|
||||
|
||||
private List<Folder> folders;
|
||||
@Inject ApiProvider mApi;
|
||||
|
|
|
@ -57,7 +57,7 @@ import java.util.HashSet;
|
|||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import butterknife.Bind;
|
||||
import butterknife.BindView;
|
||||
import butterknife.ButterKnife;
|
||||
import de.luhmer.owncloudnewsreader.chrometabs.CustomTabActivityManager;
|
||||
import de.luhmer.owncloudnewsreader.database.DatabaseConnectionOrm;
|
||||
|
@ -81,8 +81,8 @@ public class NewsDetailActivity extends PodcastFragmentActivity {
|
|||
* {@link android.support.v4.app.FragmentStatePagerAdapter}.
|
||||
*/
|
||||
SectionsPagerAdapter mSectionsPagerAdapter;
|
||||
@Bind(R.id.toolbar) Toolbar toolbar;
|
||||
@Bind(R.id.progressIndicator) ProgressBar progressIndicator;
|
||||
@BindView(R.id.toolbar) Toolbar toolbar;
|
||||
@BindView(R.id.progressIndicator) ProgressBar progressIndicator;
|
||||
|
||||
/**
|
||||
* The {@link ViewPager} that will host the section contents.
|
||||
|
|
|
@ -62,7 +62,7 @@ import java.util.List;
|
|||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import butterknife.Bind;
|
||||
import butterknife.BindView;
|
||||
import butterknife.ButterKnife;
|
||||
import de.luhmer.owncloudnewsreader.database.model.Feed;
|
||||
import de.luhmer.owncloudnewsreader.database.model.RssItem;
|
||||
|
@ -78,9 +78,9 @@ public class NewsDetailFragment extends Fragment {
|
|||
|
||||
public static int background_color = Integer.MIN_VALUE;
|
||||
|
||||
@Bind(R.id.webview) WebView mWebView;
|
||||
@Bind(R.id.progressBarLoading) ProgressBar mProgressBarLoading;
|
||||
@Bind(R.id.progressbar_webview) ProgressBar mProgressbarWebView;
|
||||
@BindView(R.id.webview) WebView mWebView;
|
||||
@BindView(R.id.progressBarLoading) ProgressBar mProgressBarLoading;
|
||||
@BindView(R.id.progressbar_webview) ProgressBar mProgressbarWebView;
|
||||
|
||||
|
||||
private int section_number;
|
||||
|
|
|
@ -53,7 +53,7 @@ import org.apache.commons.lang3.time.StopWatch;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import butterknife.Bind;
|
||||
import butterknife.BindView;
|
||||
import butterknife.ButterKnife;
|
||||
import de.luhmer.owncloudnewsreader.ListView.SubscriptionExpandableListAdapter;
|
||||
import de.luhmer.owncloudnewsreader.adapter.DividerItemDecoration;
|
||||
|
@ -110,10 +110,10 @@ public class NewsReaderDetailFragment extends Fragment {
|
|||
private static final String LAYOUT_MANAGER_STATE = "LAYOUT_MANAGER_STATE";
|
||||
private boolean mMarkAsReadWhileScrollingEnabled;
|
||||
|
||||
@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;
|
||||
@BindView(R.id.pb_loading) ProgressBar pbLoading;
|
||||
@BindView(R.id.tv_no_items_available) View tvNoItemsAvailable;
|
||||
@BindView(R.id.list) RecyclerView recyclerView;
|
||||
@BindView(R.id.swipeRefresh) SwipeRefreshLayout swipeRefresh;
|
||||
|
||||
/**
|
||||
* Mandatory empty constructor for the fragment manager to instantiate the
|
||||
|
|
|
@ -67,7 +67,7 @@ import org.greenrobot.eventbus.ThreadMode;
|
|||
import java.lang.reflect.Field;
|
||||
import java.util.List;
|
||||
|
||||
import butterknife.Bind;
|
||||
import butterknife.BindView;
|
||||
import butterknife.ButterKnife;
|
||||
import de.luhmer.owncloudnewsreader.ListView.SubscriptionExpandableListAdapter;
|
||||
import de.luhmer.owncloudnewsreader.LoginDialogFragment.LoginSuccessfullListener;
|
||||
|
@ -123,11 +123,11 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements
|
|||
//private Date mLastSyncDate = new Date(0);
|
||||
private boolean mSyncOnStartupPerformed = false;
|
||||
|
||||
@Bind(R.id.toolbar) Toolbar toolbar;
|
||||
@BindView(R.id.toolbar) Toolbar toolbar;
|
||||
|
||||
private ServiceConnection mConnection = null;
|
||||
|
||||
@Nullable @Bind(R.id.drawer_layout)
|
||||
@Nullable @BindView(R.id.drawer_layout)
|
||||
protected DrawerLayout drawerLayout;
|
||||
|
||||
private ActionBarDrawerToggle drawerToggle;
|
||||
|
|
|
@ -51,7 +51,7 @@ import java.io.Serializable;
|
|||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import butterknife.Bind;
|
||||
import butterknife.BindView;
|
||||
import butterknife.ButterKnife;
|
||||
import de.luhmer.owncloudnewsreader.ListView.SubscriptionExpandableListAdapter;
|
||||
import de.luhmer.owncloudnewsreader.database.DatabaseConnectionOrm;
|
||||
|
@ -129,12 +129,12 @@ public class NewsReaderListFragment extends Fragment implements OnCreateContextM
|
|||
|
||||
private SubscriptionExpandableListAdapter lvAdapter;
|
||||
|
||||
@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;
|
||||
@BindView(R.id.expandableListView) protected ExpandableListView eListView;
|
||||
@BindView(R.id.urlTextView) protected TextView urlTextView;
|
||||
@BindView(R.id.userTextView) protected TextView userTextView;
|
||||
@BindView(R.id.header_view) protected ViewGroup headerView;
|
||||
@BindView(R.id.header_logo) protected ImageView headerLogo;
|
||||
@BindView(R.id.header_logo_progress) protected View headerLogoProgress;
|
||||
|
||||
/**
|
||||
* Mandatory empty constructor for the fragment manager to instantiate the
|
||||
|
|
|
@ -30,7 +30,7 @@ import org.greenrobot.eventbus.Subscribe;
|
|||
|
||||
import java.io.File;
|
||||
|
||||
import butterknife.Bind;
|
||||
import butterknife.BindView;
|
||||
import butterknife.ButterKnife;
|
||||
import butterknife.OnClick;
|
||||
import de.luhmer.owncloudnewsreader.ListView.PodcastArrayAdapter;
|
||||
|
@ -216,34 +216,34 @@ public class PodcastFragment extends Fragment {
|
|||
|
||||
|
||||
|
||||
@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;
|
||||
@BindView(R.id.btn_playPausePodcast) ImageButton btnPlayPausePodcast;
|
||||
@BindView(R.id.btn_playPausePodcastSlider) ImageButton btnPlayPausePodcastSlider;
|
||||
@BindView(R.id.btn_nextPodcastSlider) ImageButton btnNextPodcastSlider;
|
||||
@BindView(R.id.btn_previousPodcastSlider) ImageButton btnPreviousPodcastSlider;
|
||||
|
||||
@Bind(R.id.img_feed_favicon) ImageView imgFavIcon;
|
||||
@BindView(R.id.img_feed_favicon) ImageView imgFavIcon;
|
||||
|
||||
@Bind(R.id.tv_title) TextView tvTitle;
|
||||
@Bind(R.id.tv_titleSlider) TextView tvTitleSlider;
|
||||
@BindView(R.id.tv_title) TextView tvTitle;
|
||||
@BindView(R.id.tv_titleSlider) TextView tvTitleSlider;
|
||||
|
||||
|
||||
@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;
|
||||
@BindView(R.id.tv_from) TextView tvFrom;
|
||||
@BindView(R.id.tv_to) TextView tvTo;
|
||||
@BindView(R.id.tv_fromSlider) TextView tvFromSlider;
|
||||
@BindView(R.id.tv_ToSlider) TextView tvToSlider;
|
||||
|
||||
@Bind(R.id.sb_progress) SeekBar sb_progress;
|
||||
@Bind(R.id.pb_progress) ProgressBar pb_progress;
|
||||
@Bind(R.id.pb_progress2) ProgressBar pb_progress2;
|
||||
@BindView(R.id.sb_progress) SeekBar sb_progress;
|
||||
@BindView(R.id.pb_progress) ProgressBar pb_progress;
|
||||
@BindView(R.id.pb_progress2) ProgressBar pb_progress2;
|
||||
|
||||
|
||||
@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;
|
||||
@BindView(R.id.podcastFeedList) ListView /* CardGridView CardListView*/ podcastFeedList;
|
||||
@BindView(R.id.rlPodcast) RelativeLayout rlPodcast;
|
||||
@BindView(R.id.ll_podcast_header) LinearLayout rlPodcastHeader;
|
||||
@BindView(R.id.fl_playPausePodcastWrapper) FrameLayout playPausePodcastWrapper;
|
||||
@BindView(R.id.podcastTitleGrid) ListView /*CardGridView*/ podcastTitleGrid;
|
||||
|
||||
@Bind(R.id.viewSwitcherProgress) ViewSwitcher /*CardGridView*/ viewSwitcherProgress;
|
||||
@BindView(R.id.viewSwitcherProgress) ViewSwitcher /*CardGridView*/ viewSwitcherProgress;
|
||||
|
||||
|
||||
boolean hasTitleInCache = false;
|
||||
|
|
|
@ -36,7 +36,7 @@ import java.io.File;
|
|||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import butterknife.Bind;
|
||||
import butterknife.BindView;
|
||||
import butterknife.ButterKnife;
|
||||
import de.luhmer.owncloudnewsreader.database.DatabaseConnectionOrm;
|
||||
import de.luhmer.owncloudnewsreader.database.model.RssItem;
|
||||
|
@ -74,8 +74,8 @@ public class PodcastFragmentActivity extends AppCompatActivity implements IPlayP
|
|||
private int appHeight;
|
||||
private int appWidth;
|
||||
|
||||
@Bind(R.id.videoPodcastSurfaceWrapper) ZoomableRelativeLayout rlVideoPodcastSurfaceWrapper;
|
||||
@Bind(R.id.sliding_layout) PodcastSlidingUpPanelLayout sliding_layout;
|
||||
@BindView(R.id.videoPodcastSurfaceWrapper) ZoomableRelativeLayout rlVideoPodcastSurfaceWrapper;
|
||||
@BindView(R.id.sliding_layout) PodcastSlidingUpPanelLayout sliding_layout;
|
||||
//YouTubePlayerFragment youtubeplayerfragment;
|
||||
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@ import android.view.ViewGroup;
|
|||
import android.widget.ArrayAdapter;
|
||||
import android.widget.ListView;
|
||||
|
||||
import butterknife.Bind;
|
||||
import butterknife.BindView;
|
||||
import butterknife.ButterKnife;
|
||||
import de.luhmer.owncloudnewsreader.authentication.AccountGeneral;
|
||||
|
||||
|
@ -28,7 +28,7 @@ public class SyncIntervalSelectorActivity extends AppCompatActivity {
|
|||
SharedPreferences mPrefs;
|
||||
PlaceholderFragment mFragment;
|
||||
String[] items_values;
|
||||
@Bind(R.id.toolbar) Toolbar toolbar;
|
||||
@BindView(R.id.toolbar) Toolbar toolbar;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
|
|
|
@ -24,7 +24,7 @@ import com.pascalwelsch.holocircularprogressbar.HoloCircularProgressBar;
|
|||
|
||||
import org.greenrobot.eventbus.Subscribe;
|
||||
|
||||
import butterknife.Bind;
|
||||
import butterknife.BindView;
|
||||
import butterknife.ButterKnife;
|
||||
import de.luhmer.owncloudnewsreader.NewsDetailFragment;
|
||||
import de.luhmer.owncloudnewsreader.R;
|
||||
|
@ -40,39 +40,39 @@ public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickL
|
|||
private static SparseArray<Integer> downloadProgressList = new SparseArray<>();
|
||||
|
||||
@Nullable
|
||||
@Bind(R.id.star_imageview)
|
||||
@BindView(R.id.star_imageview)
|
||||
protected ImageView starImageView;
|
||||
|
||||
@Bind(R.id.summary)
|
||||
@BindView(R.id.summary)
|
||||
protected TextView textViewSummary;
|
||||
|
||||
@Bind(R.id.tv_item_date)
|
||||
@BindView(R.id.tv_item_date)
|
||||
protected TextView textViewItemDate;
|
||||
|
||||
@Bind(R.id.tv_subscription)
|
||||
@BindView(R.id.tv_subscription)
|
||||
protected TextView textViewTitle;
|
||||
|
||||
@Bind(R.id.imgViewFavIcon)
|
||||
@BindView(R.id.imgViewFavIcon)
|
||||
protected ImageView imgViewFavIcon;
|
||||
|
||||
@Bind(R.id.color_line_feed)
|
||||
@BindView(R.id.color_line_feed)
|
||||
protected View colorLineFeed;
|
||||
|
||||
@Bind(R.id.btn_playPausePodcast)
|
||||
@BindView(R.id.btn_playPausePodcast)
|
||||
protected ImageView btnPlayPausePodcast;
|
||||
|
||||
@Bind(R.id.podcastDownloadProgress)
|
||||
@BindView(R.id.podcastDownloadProgress)
|
||||
protected HoloCircularProgressBar pbPodcastDownloadProgress;
|
||||
|
||||
@Bind(R.id.podcast_wrapper)
|
||||
@BindView(R.id.podcast_wrapper)
|
||||
View flPlayPausePodcastWrapper;
|
||||
|
||||
// only in extended layout
|
||||
@Nullable @Bind(R.id.body)
|
||||
@Nullable @BindView(R.id.body)
|
||||
protected TextView textViewBody;
|
||||
|
||||
// Only in extended with webview layout
|
||||
@Nullable @Bind(R.id.webView_body)
|
||||
@Nullable @BindView(R.id.webView_body)
|
||||
protected WebView webView_body;
|
||||
|
||||
private RecyclerItemClickListener clickListener;
|
||||
|
|
|
@ -5,13 +5,13 @@ buildscript {
|
|||
jcenter()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:2.3.3'
|
||||
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
|
||||
classpath 'com.android.tools.build:gradle:3.0.0'
|
||||
}
|
||||
}
|
||||
|
||||
allprojects {
|
||||
repositories {
|
||||
google()
|
||||
jcenter()
|
||||
maven { url "https://jitpack.io" }
|
||||
maven { url "https://maven.google.com" }
|
||||
|
|
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
|
@ -1,6 +1,6 @@
|
|||
#Fri Mar 10 18:52:43 CET 2017
|
||||
#Tue Nov 07 15:51:44 CET 2017
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 862eac52d8f5b32451f4082dd80bedc01ec4fa83
|
||||
Subproject commit 242635e41c437cc67eb26b03b7ca0514a21f1874
|
Loading…
Reference in a new issue