From 8a103fe8911847f7c6c5ab0b2c7c74e8d15315cc Mon Sep 17 00:00:00 2001 From: Jonathan Caryl Date: Wed, 1 Feb 2017 10:12:35 +0000 Subject: [PATCH 01/11] Get it building with recent stuff --- app/build.gradle | 6 ++++-- build.gradle | 2 +- gradle.properties | 10 +++++----- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 34fb290..a25278a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -154,9 +154,11 @@ dependencies { // Espresso 2 Dependencies androidTestCompile 'com.android.support.test:testing-support-lib:0.1' - androidTestCompile 'com.android.support.test.espresso:espresso-core:2.0' + androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2' androidTestCompile ('com.android.support.test.espresso:espresso-contrib:2.0') { - exclude module: 'support-annotations' + exclude group: 'com.android.support', module: 'appcompat' + exclude group: 'com.android.support', module: 'support-v4' + exclude module: 'recyclerview-v7' } } diff --git a/build.gradle b/build.gradle index 8ffc6a2..00f16d3 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.5.0' + classpath 'com.android.tools.build:gradle:2.2.3' // Lombok placed here due to https://github.com/evant/android-retrolambda-lombok/issues/10 classpath 'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2' } diff --git a/gradle.properties b/gradle.properties index 76061e9..6db5365 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,11 +20,11 @@ #org.gradle.java.home=/Library/Java/JavaVirtualMachines/jdk1.8.0_60.jdk/Contents/Home #Build versions -COMPILE_SDK_VERSION=23 -BUILD_TOOLS_VERSION=23.0.2 +COMPILE_SDK_VERSION=25 +BUILD_TOOLS_VERSION=25.0.1 MIN_SDK_VERSION=15 -TARGET_SDK_VERSION=23 +TARGET_SDK_VERSION=25 #Library versions -SUPPORT_V4_VERSION=23.2.0 -SUPPORT_V7_VERSION=23.2.0 +SUPPORT_V4_VERSION=25.1.1 +SUPPORT_V7_VERSION=25.1.1 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bafa714..eeb5210 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Jan 05 14:20:20 NOVT 2015 +#Wed Feb 01 10:08:00 GMT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip From 4878b16f1acbe6133611eb02dddadf8225cea240 Mon Sep 17 00:00:00 2001 From: Jonathan Caryl Date: Wed, 1 Feb 2017 10:35:43 +0000 Subject: [PATCH 02/11] Update butterknife --- app/build.gradle | 9 +- .../ltst/u2020mvp/tests/util/ViewActions.java | 6 +- .../u2020mvp/ui/bugreport/BugReportView.java | 10 +- .../u2020mvp/ui/ExternalIntentActivity.java | 12 +-- .../ru/ltst/u2020mvp/ui/debug/DebugView.java | 98 +++++++++---------- .../u2020mvp/ui/debug/DebugViewContainer.java | 10 +- .../ru/ltst/u2020mvp/ui/logs/LogAdapter.java | 8 +- .../u2020mvp/ui/TelescopeViewContainer.java | 6 +- .../ui/gallery/view/GalleryItemView.java | 6 +- .../u2020mvp/ui/gallery/view/GalleryView.java | 12 +-- .../u2020mvp/ui/image/ImgurImageActivity.java | 4 +- .../u2020mvp/ui/image/ImgurImageView.java | 4 +- build.gradle | 4 + 13 files changed, 96 insertions(+), 93 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a25278a..d343306 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,7 +4,6 @@ buildscript { jcenter() } dependencies { - classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' classpath 'me.tatarka:gradle-retrolambda:3.2.3' } } @@ -16,7 +15,6 @@ def versionPatch = 0 def versionBuild = 0 // bump for dogfood builds, public betas, etc. apply plugin: 'com.android.application' -apply plugin: 'com.neenbedankt.android-apt' apply plugin: 'me.tatarka.retrolambda' repositories { @@ -122,8 +120,8 @@ dependencies { compile "com.android.support:cardview-v7:${SUPPORT_V7_VERSION}" compile 'com.google.dagger:dagger:2.0.1' - apt 'com.google.dagger:dagger-compiler:2.0.1' - provided 'org.glassfish:javax.annotation:10.0-b28' + annotationProcessor 'com.google.dagger:dagger-compiler:2.0.1' + annotationProcessor 'org.glassfish:javax.annotation:10.0-b28' compile 'com.squareup.okhttp3:okhttp:3.1.1' compile 'com.squareup.okhttp3:logging-interceptor:3.1.1' @@ -134,7 +132,8 @@ dependencies { compile 'com.squareup.retrofit2:adapter-rxjava:2.0.0-beta4' internalDebugCompile 'com.squareup.retrofit2:retrofit-mock:2.0.0-beta4' - compile 'com.jakewharton:butterknife:7.0.1' + compile "com.jakewharton:butterknife:${butterKnifeVersion}" + annotationProcessor "com.jakewharton:butterknife-compiler:${butterKnifeVersion}" compile 'com.jakewharton.timber:timber:4.0.1' compile 'com.jakewharton.byteunits:byteunits:0.9.1' compile 'com.jakewharton.rxbinding:rxbinding:0.3.0' diff --git a/app/src/androidTest/java/ru/ltst/u2020mvp/tests/util/ViewActions.java b/app/src/androidTest/java/ru/ltst/u2020mvp/tests/util/ViewActions.java index 740d701..6510d63 100644 --- a/app/src/androidTest/java/ru/ltst/u2020mvp/tests/util/ViewActions.java +++ b/app/src/androidTest/java/ru/ltst/u2020mvp/tests/util/ViewActions.java @@ -13,12 +13,12 @@ import org.hamcrest.Matcher; +import org.hamcrest.core.IsAnything; import java.util.concurrent.TimeoutException; import static android.support.test.espresso.matcher.ViewMatchers.isRoot; import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static org.hamcrest.CoreMatchers.anything; public class ViewActions { @@ -87,7 +87,7 @@ public static ViewAction waitAtLeast(final long millis) { return new ViewAction() { @Override public Matcher getConstraints() { - return anything(); + return new IsAnything<>(); } @Override @@ -123,7 +123,7 @@ public static ViewAction waitUntilIdle() { return new ViewAction() { @Override public Matcher getConstraints() { - return anything(); + return new IsAnything<>(); } @Override diff --git a/app/src/internal/java/ru/ltst/u2020mvp/ui/bugreport/BugReportView.java b/app/src/internal/java/ru/ltst/u2020mvp/ui/bugreport/BugReportView.java index a7f9413..edd69a9 100644 --- a/app/src/internal/java/ru/ltst/u2020mvp/ui/bugreport/BugReportView.java +++ b/app/src/internal/java/ru/ltst/u2020mvp/ui/bugreport/BugReportView.java @@ -7,20 +7,20 @@ import android.widget.EditText; import android.widget.LinearLayout; -import butterknife.Bind; +import butterknife.BindView; import butterknife.ButterKnife; import ru.ltst.u2020mvp.R; import ru.ltst.u2020mvp.ui.misc.EmptyTextWatcher; import ru.ltst.u2020mvp.util.Strings; public final class BugReportView extends LinearLayout { - @Bind(R.id.title) + @BindView(R.id.title) EditText titleView; - @Bind(R.id.description) + @BindView(R.id.description) EditText descriptionView; - @Bind(R.id.screenshot) + @BindView(R.id.screenshot) CheckBox screenshotView; - @Bind(R.id.logs) + @BindView(R.id.logs) CheckBox logsView; public interface ReportDetailsListener { diff --git a/app/src/internalDebug/java/ru/ltst/u2020mvp/ui/ExternalIntentActivity.java b/app/src/internalDebug/java/ru/ltst/u2020mvp/ui/ExternalIntentActivity.java index b610f68..c357d8f 100644 --- a/app/src/internalDebug/java/ru/ltst/u2020mvp/ui/ExternalIntentActivity.java +++ b/app/src/internalDebug/java/ru/ltst/u2020mvp/ui/ExternalIntentActivity.java @@ -13,7 +13,7 @@ import java.lang.reflect.Field; import java.util.Arrays; -import butterknife.Bind; +import butterknife.BindView; import butterknife.ButterKnife; import ru.ltst.u2020mvp.R; import ru.ltst.u2020mvp.ui.misc.Truss; @@ -32,11 +32,11 @@ public static Intent createIntent(Intent baseIntent) { return intent; } - @Bind(R.id.toolbar) Toolbar toolbarView; - @Bind(R.id.action) TextView actionView; - @Bind(R.id.data) TextView dataView; - @Bind(R.id.extras) TextView extrasView; - @Bind(R.id.flags) TextView flagsView; + @BindView(R.id.toolbar) Toolbar toolbarView; + @BindView(R.id.action) TextView actionView; + @BindView(R.id.data) TextView dataView; + @BindView(R.id.extras) TextView extrasView; + @BindView(R.id.flags) TextView flagsView; private Intent baseIntent; diff --git a/app/src/internalDebug/java/ru/ltst/u2020mvp/ui/debug/DebugView.java b/app/src/internalDebug/java/ru/ltst/u2020mvp/ui/debug/DebugView.java index 1199460..3463211 100644 --- a/app/src/internalDebug/java/ru/ltst/u2020mvp/ui/debug/DebugView.java +++ b/app/src/internalDebug/java/ru/ltst/u2020mvp/ui/debug/DebugView.java @@ -38,7 +38,7 @@ import javax.inject.Inject; import javax.inject.Named; -import butterknife.Bind; +import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; import okhttp3.Cache; @@ -77,54 +77,54 @@ public final class DebugView extends FrameLayout { private static final DateTimeFormatter DATE_DISPLAY_FORMAT = DateTimeFormatter.ofPattern("yyyy-MM-dd hh:mm a", Locale.US).withZone(ZoneId.systemDefault()); - @Bind(R.id.debug_contextual_title) View contextualTitleView; - @Bind(R.id.debug_contextual_list) LinearLayout contextualListView; - - @Bind(R.id.debug_network_endpoint) Spinner endpointView; - @Bind(R.id.debug_network_endpoint_edit) View endpointEditView; - @Bind(R.id.debug_network_delay) Spinner networkDelayView; - @Bind(R.id.debug_network_variance) Spinner networkVarianceView; - @Bind(R.id.debug_network_error) Spinner networkErrorView; - @Bind(R.id.debug_network_proxy) Spinner networkProxyView; - @Bind(R.id.debug_network_logging) Spinner networkLoggingView; - - @Bind(R.id.debug_capture_intents) Switch captureIntentsView; - @Bind(R.id.debug_repositories_response) Spinner repositoriesResponseView; - - @Bind(R.id.debug_ui_animation_speed) Spinner uiAnimationSpeedView; - @Bind(R.id.debug_ui_pixel_grid) Switch uiPixelGridView; - @Bind(R.id.debug_ui_pixel_ratio) Switch uiPixelRatioView; - @Bind(R.id.debug_ui_scalpel) Switch uiScalpelView; - @Bind(R.id.debug_ui_scalpel_wireframe) Switch uiScalpelWireframeView; - @Bind(R.id.debug_build_name) TextView buildNameView; - - @Bind(R.id.debug_build_code) TextView buildCodeView; - @Bind(R.id.debug_build_sha) TextView buildShaView; - @Bind(R.id.debug_build_date) TextView buildDateView; - @Bind(R.id.debug_device_make) TextView deviceMakeView; - - @Bind(R.id.debug_device_model) TextView deviceModelView; - @Bind(R.id.debug_device_resolution) TextView deviceResolutionView; - @Bind(R.id.debug_device_density) TextView deviceDensityView; - @Bind(R.id.debug_device_release) TextView deviceReleaseView; - @Bind(R.id.debug_device_api) TextView deviceApiView; - @Bind(R.id.debug_picasso_indicators) Switch picassoIndicatorView; - - @Bind(R.id.debug_picasso_cache_size) TextView picassoCacheSizeView; - @Bind(R.id.debug_picasso_cache_hit) TextView picassoCacheHitView; - @Bind(R.id.debug_picasso_cache_miss) TextView picassoCacheMissView; - @Bind(R.id.debug_picasso_decoded) TextView picassoDecodedView; - @Bind(R.id.debug_picasso_decoded_total) TextView picassoDecodedTotalView; - @Bind(R.id.debug_picasso_decoded_avg) TextView picassoDecodedAvgView; - @Bind(R.id.debug_picasso_transformed) TextView picassoTransformedView; - @Bind(R.id.debug_picasso_transformed_total) TextView picassoTransformedTotalView; - @Bind(R.id.debug_picasso_transformed_avg) TextView picassoTransformedAvgView; - @Bind(R.id.debug_okhttp_cache_max_size) TextView okHttpCacheMaxSizeView; - - @Bind(R.id.debug_okhttp_cache_write_error) TextView okHttpCacheWriteErrorView; - @Bind(R.id.debug_okhttp_cache_request_count) TextView okHttpCacheRequestCountView; - @Bind(R.id.debug_okhttp_cache_network_count) TextView okHttpCacheNetworkCountView; - @Bind(R.id.debug_okhttp_cache_hit_count) TextView okHttpCacheHitCountView; + @BindView(R.id.debug_contextual_title) View contextualTitleView; + @BindView(R.id.debug_contextual_list) LinearLayout contextualListView; + + @BindView(R.id.debug_network_endpoint) Spinner endpointView; + @BindView(R.id.debug_network_endpoint_edit) View endpointEditView; + @BindView(R.id.debug_network_delay) Spinner networkDelayView; + @BindView(R.id.debug_network_variance) Spinner networkVarianceView; + @BindView(R.id.debug_network_error) Spinner networkErrorView; + @BindView(R.id.debug_network_proxy) Spinner networkProxyView; + @BindView(R.id.debug_network_logging) Spinner networkLoggingView; + + @BindView(R.id.debug_capture_intents) Switch captureIntentsView; + @BindView(R.id.debug_repositories_response) Spinner repositoriesResponseView; + + @BindView(R.id.debug_ui_animation_speed) Spinner uiAnimationSpeedView; + @BindView(R.id.debug_ui_pixel_grid) Switch uiPixelGridView; + @BindView(R.id.debug_ui_pixel_ratio) Switch uiPixelRatioView; + @BindView(R.id.debug_ui_scalpel) Switch uiScalpelView; + @BindView(R.id.debug_ui_scalpel_wireframe) Switch uiScalpelWireframeView; + @BindView(R.id.debug_build_name) TextView buildNameView; + + @BindView(R.id.debug_build_code) TextView buildCodeView; + @BindView(R.id.debug_build_sha) TextView buildShaView; + @BindView(R.id.debug_build_date) TextView buildDateView; + @BindView(R.id.debug_device_make) TextView deviceMakeView; + + @BindView(R.id.debug_device_model) TextView deviceModelView; + @BindView(R.id.debug_device_resolution) TextView deviceResolutionView; + @BindView(R.id.debug_device_density) TextView deviceDensityView; + @BindView(R.id.debug_device_release) TextView deviceReleaseView; + @BindView(R.id.debug_device_api) TextView deviceApiView; + @BindView(R.id.debug_picasso_indicators) Switch picassoIndicatorView; + + @BindView(R.id.debug_picasso_cache_size) TextView picassoCacheSizeView; + @BindView(R.id.debug_picasso_cache_hit) TextView picassoCacheHitView; + @BindView(R.id.debug_picasso_cache_miss) TextView picassoCacheMissView; + @BindView(R.id.debug_picasso_decoded) TextView picassoDecodedView; + @BindView(R.id.debug_picasso_decoded_total) TextView picassoDecodedTotalView; + @BindView(R.id.debug_picasso_decoded_avg) TextView picassoDecodedAvgView; + @BindView(R.id.debug_picasso_transformed) TextView picassoTransformedView; + @BindView(R.id.debug_picasso_transformed_total) TextView picassoTransformedTotalView; + @BindView(R.id.debug_picasso_transformed_avg) TextView picassoTransformedAvgView; + @BindView(R.id.debug_okhttp_cache_max_size) TextView okHttpCacheMaxSizeView; + + @BindView(R.id.debug_okhttp_cache_write_error) TextView okHttpCacheWriteErrorView; + @BindView(R.id.debug_okhttp_cache_request_count) TextView okHttpCacheRequestCountView; + @BindView(R.id.debug_okhttp_cache_network_count) TextView okHttpCacheNetworkCountView; + @BindView(R.id.debug_okhttp_cache_hit_count) TextView okHttpCacheHitCountView; @Inject OkHttpClient client; @Inject @Named("Api") OkHttpClient apiClient; diff --git a/app/src/internalDebug/java/ru/ltst/u2020mvp/ui/debug/DebugViewContainer.java b/app/src/internalDebug/java/ru/ltst/u2020mvp/ui/debug/DebugViewContainer.java index c53985e..c2790de 100644 --- a/app/src/internalDebug/java/ru/ltst/u2020mvp/ui/debug/DebugViewContainer.java +++ b/app/src/internalDebug/java/ru/ltst/u2020mvp/ui/debug/DebugViewContainer.java @@ -17,7 +17,7 @@ import javax.inject.Inject; -import butterknife.Bind; +import butterknife.BindView; import butterknife.ButterKnife; import ru.ltst.u2020mvp.ApplicationScope; import ru.ltst.u2020mvp.R; @@ -49,10 +49,10 @@ public final class DebugViewContainer implements ViewContainer { private final Preference scalpelWireframeEnabled; static class ViewHolder { - @Bind(R.id.debug_drawer_layout) DrawerLayout drawerLayout; - @Bind(R.id.debug_drawer) ViewGroup debugDrawer; - @Bind(R.id.madge_container) MadgeFrameLayout madgeFrameLayout; - @Bind(R.id.debug_content) ScalpelFrameLayout content; + @BindView(R.id.debug_drawer_layout) DrawerLayout drawerLayout; + @BindView(R.id.debug_drawer) ViewGroup debugDrawer; + @BindView(R.id.madge_container) MadgeFrameLayout madgeFrameLayout; + @BindView(R.id.debug_content) ScalpelFrameLayout content; } @Inject diff --git a/app/src/internalDebug/java/ru/ltst/u2020mvp/ui/logs/LogAdapter.java b/app/src/internalDebug/java/ru/ltst/u2020mvp/ui/logs/LogAdapter.java index 7f3d7ab..9c3b1e2 100644 --- a/app/src/internalDebug/java/ru/ltst/u2020mvp/ui/logs/LogAdapter.java +++ b/app/src/internalDebug/java/ru/ltst/u2020mvp/ui/logs/LogAdapter.java @@ -12,8 +12,8 @@ import java.util.Collections; import java.util.List; +import butterknife.BindView; import butterknife.ButterKnife; -import butterknife.Bind; import ru.ltst.u2020mvp.R; import ru.ltst.u2020mvp.data.LumberYard.Entry; import ru.ltst.u2020mvp.ui.misc.BindableAdapter; @@ -69,11 +69,11 @@ public void bindView(Entry item, int position, View view) { static final class LogItemViewHolder { private final View rootView; - @Bind(R.id.debug_log_level) + @BindView(R.id.debug_log_level) TextView levelView; - @Bind(R.id.debug_log_tag) + @BindView(R.id.debug_log_tag) TextView tagView; - @Bind(R.id.debug_log_message) + @BindView(R.id.debug_log_message) TextView messageView; public LogItemViewHolder(View rootView) { diff --git a/app/src/internalRelease/java/ru/ltst/u2020mvp/ui/TelescopeViewContainer.java b/app/src/internalRelease/java/ru/ltst/u2020mvp/ui/TelescopeViewContainer.java index 6ca356f..6742832 100644 --- a/app/src/internalRelease/java/ru/ltst/u2020mvp/ui/TelescopeViewContainer.java +++ b/app/src/internalRelease/java/ru/ltst/u2020mvp/ui/TelescopeViewContainer.java @@ -3,14 +3,14 @@ import android.app.Activity; import android.support.v7.app.AlertDialog; import android.content.Context; -import android.content.SharedPreferences; import android.view.ContextThemeWrapper; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Toast; -import butterknife.Bind; + +import butterknife.BindView; import butterknife.ButterKnife; import com.f2prateek.rx.preferences.Preference; import com.f2prateek.rx.preferences.RxSharedPreferences; @@ -33,7 +33,7 @@ public final class TelescopeViewContainer implements ViewContainer { this.seenTelescopeDialog = preferences.getBoolean("internal-seen-telescope-dialog", false); } - @Bind(R.id.telescope_container) TelescopeLayout telescopeLayout; + @BindView(R.id.telescope_container) TelescopeLayout telescopeLayout; @Override public ViewGroup forActivity(final Activity activity) { activity.setContentView(R.layout.internal_activity_frame); diff --git a/app/src/main/java/ru/ltst/u2020mvp/ui/gallery/view/GalleryItemView.java b/app/src/main/java/ru/ltst/u2020mvp/ui/gallery/view/GalleryItemView.java index 25dda94..6536fb4 100644 --- a/app/src/main/java/ru/ltst/u2020mvp/ui/gallery/view/GalleryItemView.java +++ b/app/src/main/java/ru/ltst/u2020mvp/ui/gallery/view/GalleryItemView.java @@ -8,16 +8,16 @@ import com.squareup.picasso.Picasso; -import butterknife.Bind; +import butterknife.BindView; import butterknife.ButterKnife; import ru.ltst.u2020mvp.R; import ru.ltst.u2020mvp.data.api.model.response.Image; import ru.ltst.u2020mvp.ui.misc.AspectRatioImageView; public class GalleryItemView extends CardView { - @Bind(R.id.gallery_image_image) + @BindView(R.id.gallery_image_image) AspectRatioImageView image; - @Bind(R.id.gallery_image_title) + @BindView(R.id.gallery_image_title) TextView title; public GalleryItemView(Context context, AttributeSet attrs) { diff --git a/app/src/main/java/ru/ltst/u2020mvp/ui/gallery/view/GalleryView.java b/app/src/main/java/ru/ltst/u2020mvp/ui/gallery/view/GalleryView.java index 444b817..bd80702 100644 --- a/app/src/main/java/ru/ltst/u2020mvp/ui/gallery/view/GalleryView.java +++ b/app/src/main/java/ru/ltst/u2020mvp/ui/gallery/view/GalleryView.java @@ -20,7 +20,7 @@ import javax.inject.Inject; -import butterknife.Bind; +import butterknife.BindView; import butterknife.ButterKnife; import ru.ltst.u2020mvp.R; import ru.ltst.u2020mvp.base.ComponentFinder; @@ -38,11 +38,11 @@ public class GalleryView extends LinearLayout implements BaseView { public static final int COLUMNS_COUNT = 2; - @Bind(R.id.gallery_grid) RecyclerView galleryView; - @Bind(R.id.gallery_animator) BetterViewAnimator animator; - @Bind(R.id.gallery_toolbar) Toolbar toolbar; - @Bind(R.id.gallery_swipe_refresh) SwipeRefreshLayout swipeRefreshLayout; - @Bind(R.id.trending_loading_message) TextView loadingMessageView; + @BindView(R.id.gallery_grid) RecyclerView galleryView; + @BindView(R.id.gallery_animator) BetterViewAnimator animator; + @BindView(R.id.gallery_toolbar) Toolbar toolbar; + @BindView(R.id.gallery_swipe_refresh) SwipeRefreshLayout swipeRefreshLayout; + @BindView(R.id.trending_loading_message) TextView loadingMessageView; @Inject Picasso picasso; @Inject GalleryActivity.Presenter presenter; diff --git a/app/src/main/java/ru/ltst/u2020mvp/ui/image/ImgurImageActivity.java b/app/src/main/java/ru/ltst/u2020mvp/ui/image/ImgurImageActivity.java index ebcf7ad..8ca2c93 100644 --- a/app/src/main/java/ru/ltst/u2020mvp/ui/image/ImgurImageActivity.java +++ b/app/src/main/java/ru/ltst/u2020mvp/ui/image/ImgurImageActivity.java @@ -8,7 +8,7 @@ import javax.inject.Inject; -import butterknife.Bind; +import butterknife.BindView; import butterknife.ButterKnife; import ru.ltst.u2020mvp.R; import ru.ltst.u2020mvp.U2020Component; @@ -25,7 +25,7 @@ public class ImgurImageActivity extends BaseActivity implements HasComponent Date: Wed, 1 Feb 2017 10:59:08 +0000 Subject: [PATCH 03/11] Update more things --- app/build.gradle | 18 +++++++++--------- app/src/internalDebug/AndroidManifest.xml | 10 ---------- .../ru/ltst/u2020mvp/data/api/Results.java | 2 +- build.gradle | 2 ++ 4 files changed, 12 insertions(+), 20 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d343306..d389136 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -127,21 +127,21 @@ dependencies { compile 'com.squareup.okhttp3:logging-interceptor:3.1.1' compile 'com.squareup.picasso:picasso:2.5.2' compile 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.0.1' - compile 'com.squareup.retrofit2:retrofit:2.0.0-beta4' - compile 'com.squareup.retrofit2:converter-moshi:2.0.0-beta4' - compile 'com.squareup.retrofit2:adapter-rxjava:2.0.0-beta4' + compile "com.squareup.retrofit2:retrofit:${retrofit2Version}" + compile "com.squareup.retrofit2:converter-moshi:${retrofit2Version}" + compile "com.squareup.retrofit2:adapter-rxjava:${retrofit2Version}" internalDebugCompile 'com.squareup.retrofit2:retrofit-mock:2.0.0-beta4' compile "com.jakewharton:butterknife:${butterKnifeVersion}" annotationProcessor "com.jakewharton:butterknife-compiler:${butterKnifeVersion}" - compile 'com.jakewharton.timber:timber:4.0.1' + compile 'com.jakewharton.timber:timber:4.5.1' compile 'com.jakewharton.byteunits:byteunits:0.9.1' compile 'com.jakewharton.rxbinding:rxbinding:0.3.0' - internalDebugCompile 'com.jakewharton.madge:madge:1.1.3' + internalDebugCompile 'com.jakewharton.madge:madge:1.1.4' internalDebugCompile 'com.jakewharton.scalpel:scalpel:1.1.2' - internalDebugCompile 'com.jakewharton:process-phoenix:1.0.2' - internalCompile 'com.squareup.leakcanary:leakcanary-android:1.3.1' - productionCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.3.1' + internalDebugCompile 'com.jakewharton:process-phoenix:1.1.1' + internalCompile "com.squareup.leakcanary:leakcanary-android:${leakCanaryVersion}" + productionCompile "com.squareup.leakcanary:leakcanary-android-no-op:${leakCanaryVersion}" compile 'io.reactivex:rxjava:1.1.0' compile 'io.reactivex:rxandroid:1.1.0' @@ -149,7 +149,7 @@ dependencies { compile 'com.jakewharton.threetenabp:threetenabp:1.0.2' internalCompile 'com.mattprecious.telescope:telescope:1.5.0@aar' - compile 'com.f2prateek.rx.preferences:rx-preferences:1.0.0' + compile 'com.f2prateek.rx.preferences:rx-preferences:1.0.2' // Espresso 2 Dependencies androidTestCompile 'com.android.support.test:testing-support-lib:0.1' diff --git a/app/src/internalDebug/AndroidManifest.xml b/app/src/internalDebug/AndroidManifest.xml index 63f877b..1989eb0 100644 --- a/app/src/internalDebug/AndroidManifest.xml +++ b/app/src/internalDebug/AndroidManifest.xml @@ -17,15 +17,5 @@ android:process=":phoenix" /> - - - - diff --git a/app/src/main/java/ru/ltst/u2020mvp/data/api/Results.java b/app/src/main/java/ru/ltst/u2020mvp/data/api/Results.java index 2e39969..c335ec2 100644 --- a/app/src/main/java/ru/ltst/u2020mvp/data/api/Results.java +++ b/app/src/main/java/ru/ltst/u2020mvp/data/api/Results.java @@ -5,7 +5,7 @@ public final class Results { private static final Func1, Boolean> SUCCESS = - result -> !result.isError() && result.response().isSuccess(); + result -> !result.isError() && result.response().isSuccessful(); public static Func1, Boolean> isSuccess() { return SUCCESS; diff --git a/build.gradle b/build.gradle index e60898c..5921313 100644 --- a/build.gradle +++ b/build.gradle @@ -19,6 +19,8 @@ allprojects { ext { butterKnifeVersion = '8.5.1' + leakCanaryVersion = '1.5' + retrofit2Version = '2.1.0' } task clean(type: Delete) { From f1ccdc59454105f3121a0a79ae4d0907f9b81134 Mon Sep 17 00:00:00 2001 From: Jonathan Caryl Date: Wed, 1 Feb 2017 11:03:21 +0000 Subject: [PATCH 04/11] update rxjava/rxandroid --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d389136..da4508c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -143,8 +143,8 @@ dependencies { internalCompile "com.squareup.leakcanary:leakcanary-android:${leakCanaryVersion}" productionCompile "com.squareup.leakcanary:leakcanary-android-no-op:${leakCanaryVersion}" - compile 'io.reactivex:rxjava:1.1.0' - compile 'io.reactivex:rxandroid:1.1.0' + compile 'io.reactivex:rxjava:1.2.3' + compile 'io.reactivex:rxandroid:1.2.1' compile 'com.jakewharton.threetenabp:threetenabp:1.0.2' internalCompile 'com.mattprecious.telescope:telescope:1.5.0@aar' From b661cc2481a5aed40f662b3d21450bca7f3190a2 Mon Sep 17 00:00:00 2001 From: Jonathan Caryl Date: Wed, 1 Feb 2017 11:08:42 +0000 Subject: [PATCH 05/11] Update okhttp --- app/build.gradle | 6 +++--- build.gradle | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index da4508c..75e5341 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -123,10 +123,10 @@ dependencies { annotationProcessor 'com.google.dagger:dagger-compiler:2.0.1' annotationProcessor 'org.glassfish:javax.annotation:10.0-b28' - compile 'com.squareup.okhttp3:okhttp:3.1.1' - compile 'com.squareup.okhttp3:logging-interceptor:3.1.1' + compile "com.squareup.okhttp3:okhttp:${okhttpVersion}" + compile "com.squareup.okhttp3:logging-interceptor:${okhttpVersion}" compile 'com.squareup.picasso:picasso:2.5.2' - compile 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.0.1' + compile 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0' compile "com.squareup.retrofit2:retrofit:${retrofit2Version}" compile "com.squareup.retrofit2:converter-moshi:${retrofit2Version}" compile "com.squareup.retrofit2:adapter-rxjava:${retrofit2Version}" diff --git a/build.gradle b/build.gradle index 5921313..2d4cecd 100644 --- a/build.gradle +++ b/build.gradle @@ -20,6 +20,7 @@ allprojects { ext { butterKnifeVersion = '8.5.1' leakCanaryVersion = '1.5' + okhttpVersion = '3.5.0' retrofit2Version = '2.1.0' } From 40c16724ff4743563286618bf32fa49e1f3db57c Mon Sep 17 00:00:00 2001 From: Jonathan Caryl Date: Wed, 1 Feb 2017 11:36:14 +0000 Subject: [PATCH 06/11] missed from retrofit2 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 75e5341..1d306cf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -130,7 +130,7 @@ dependencies { compile "com.squareup.retrofit2:retrofit:${retrofit2Version}" compile "com.squareup.retrofit2:converter-moshi:${retrofit2Version}" compile "com.squareup.retrofit2:adapter-rxjava:${retrofit2Version}" - internalDebugCompile 'com.squareup.retrofit2:retrofit-mock:2.0.0-beta4' + internalDebugCompile "com.squareup.retrofit2:retrofit-mock:${retrofit2Version}" compile "com.jakewharton:butterknife:${butterKnifeVersion}" annotationProcessor "com.jakewharton:butterknife-compiler:${butterKnifeVersion}" From dbe5fe6dbc4a371513b6a6cfd16e149776d78a24 Mon Sep 17 00:00:00 2001 From: Jonathan Caryl Date: Wed, 1 Feb 2017 11:36:20 +0000 Subject: [PATCH 07/11] rebinding --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 1d306cf..22cff86 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -136,7 +136,7 @@ dependencies { annotationProcessor "com.jakewharton:butterknife-compiler:${butterKnifeVersion}" compile 'com.jakewharton.timber:timber:4.5.1' compile 'com.jakewharton.byteunits:byteunits:0.9.1' - compile 'com.jakewharton.rxbinding:rxbinding:0.3.0' + compile 'com.jakewharton.rxbinding:rxbinding:1.0.0' internalDebugCompile 'com.jakewharton.madge:madge:1.1.4' internalDebugCompile 'com.jakewharton.scalpel:scalpel:1.1.2' internalDebugCompile 'com.jakewharton:process-phoenix:1.1.1' From a5f5ffb107ae5d34015dcfff88fd77e1e46918e1 Mon Sep 17 00:00:00 2001 From: Jonathan Caryl Date: Wed, 1 Feb 2017 11:41:55 +0000 Subject: [PATCH 08/11] 310 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 22cff86..adb7ab2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -146,8 +146,8 @@ dependencies { compile 'io.reactivex:rxjava:1.2.3' compile 'io.reactivex:rxandroid:1.2.1' - compile 'com.jakewharton.threetenabp:threetenabp:1.0.2' internalCompile 'com.mattprecious.telescope:telescope:1.5.0@aar' + compile 'com.jakewharton.threetenabp:threetenabp:1.0.4' compile 'com.f2prateek.rx.preferences:rx-preferences:1.0.2' From 92c4ed619393e80a200b8b00c18073e8269c7448 Mon Sep 17 00:00:00 2001 From: Jonathan Caryl Date: Wed, 1 Feb 2017 12:27:48 +0000 Subject: [PATCH 09/11] telescope --- app/build.gradle | 2 +- .../java/ru/ltst/u2020mvp/ui/bugreport/BugReportLens.java | 2 +- app/src/internalRelease/res/layout/internal_activity_frame.xml | 2 +- .../internalRelease/res/layout/telescope_tutorial_dialog.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index adb7ab2..16123e1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -146,8 +146,8 @@ dependencies { compile 'io.reactivex:rxjava:1.2.3' compile 'io.reactivex:rxandroid:1.2.1' - internalCompile 'com.mattprecious.telescope:telescope:1.5.0@aar' compile 'com.jakewharton.threetenabp:threetenabp:1.0.4' + internalCompile 'com.mattprecious.telescope:telescope:2.1.0' compile 'com.f2prateek.rx.preferences:rx-preferences:1.0.2' diff --git a/app/src/internal/java/ru/ltst/u2020mvp/ui/bugreport/BugReportLens.java b/app/src/internal/java/ru/ltst/u2020mvp/ui/bugreport/BugReportLens.java index f82f407..d520e6a 100644 --- a/app/src/internal/java/ru/ltst/u2020mvp/ui/bugreport/BugReportLens.java +++ b/app/src/internal/java/ru/ltst/u2020mvp/ui/bugreport/BugReportLens.java @@ -24,7 +24,7 @@ * Pops a dialog asking for more information about the bug report and then creates an email with a * JIRA-formatted body. */ -public final class BugReportLens implements Lens, BugReportDialog.ReportListener { +public final class BugReportLens extends Lens implements BugReportDialog.ReportListener { private final Context context; private final LumberYard lumberYard; diff --git a/app/src/internalRelease/res/layout/internal_activity_frame.xml b/app/src/internalRelease/res/layout/internal_activity_frame.xml index ec30ef3..52f90ec 100644 --- a/app/src/internalRelease/res/layout/internal_activity_frame.xml +++ b/app/src/internalRelease/res/layout/internal_activity_frame.xml @@ -6,5 +6,5 @@ android:id="@+id/telescope_container" android:layout_width="match_parent" android:layout_height="match_parent" - app:progressColor="@color/bugreport_frame" + app:telescope_progressColor="@color/bugreport_frame" /> diff --git a/app/src/internalRelease/res/layout/telescope_tutorial_dialog.xml b/app/src/internalRelease/res/layout/telescope_tutorial_dialog.xml index 4ab025f..064da4f 100644 --- a/app/src/internalRelease/res/layout/telescope_tutorial_dialog.xml +++ b/app/src/internalRelease/res/layout/telescope_tutorial_dialog.xml @@ -5,7 +5,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - app:progressColor="@color/bugreport_frame" + app:telescope_progressColor="@color/bugreport_frame" > Date: Wed, 1 Feb 2017 12:58:02 +0000 Subject: [PATCH 10/11] Update dagger --- app/build.gradle | 4 ++-- build.gradle | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 16123e1..c8afe3d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -119,8 +119,8 @@ dependencies { compile "com.android.support:recyclerview-v7:${SUPPORT_V7_VERSION}" compile "com.android.support:cardview-v7:${SUPPORT_V7_VERSION}" - compile 'com.google.dagger:dagger:2.0.1' - annotationProcessor 'com.google.dagger:dagger-compiler:2.0.1' + compile "com.google.dagger:dagger:${dagger2Version}" + annotationProcessor "com.google.dagger:dagger-compiler:${dagger2Version}" annotationProcessor 'org.glassfish:javax.annotation:10.0-b28' compile "com.squareup.okhttp3:okhttp:${okhttpVersion}" diff --git a/build.gradle b/build.gradle index 2d4cecd..99139ac 100644 --- a/build.gradle +++ b/build.gradle @@ -22,6 +22,7 @@ ext { leakCanaryVersion = '1.5' okhttpVersion = '3.5.0' retrofit2Version = '2.1.0' + dagger2Version = '2.8' } task clean(type: Delete) { From 56c3fe78eaad2f4535b5a9dba7b60dfc9cfda022 Mon Sep 17 00:00:00 2001 From: Jonathan Caryl Date: Wed, 1 Feb 2017 13:02:46 +0000 Subject: [PATCH 11/11] Retrolambda --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index c8afe3d..ed4dd91 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'me.tatarka:gradle-retrolambda:3.2.3' + classpath 'me.tatarka:gradle-retrolambda:3.5.0' } }