diff --git a/app/build.gradle b/app/build.gradle index 4884477ea..eff6d8ccf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,4 +1,5 @@ apply plugin: 'com.android.application' +apply plugin: 'android-apt' android { compileSdkVersion 23 @@ -32,7 +33,9 @@ dependencies { compile 'com.android.support:design:23.3.0' compile 'com.github.bumptech.glide:glide:3.7.0' compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.4.1' - compile 'com.jakewharton:butterknife:7.0.1' + compile 'com.jakewharton:butterknife:8.0.1' + + apt 'com.jakewharton:butterknife-compiler:8.0.1' } def Properties props = new Properties() diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 9f53b8848..25ea3346e 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -15,16 +15,3 @@ #-keepclassmembers class fqcn.of.javascript.interface.for.webview { # public *; #} - -# Butterknife --keep class butterknife.** { *; } --dontwarn butterknife.internal.** --keep class **$$ViewBinder { *; } - --keepclasseswithmembernames class * { - @butterknife.* ; -} - --keepclasseswithmembernames class * { - @butterknife.* ; -} diff --git a/app/src/main/java/com/simplemobiletools/gallery/activities/AboutActivity.java b/app/src/main/java/com/simplemobiletools/gallery/activities/AboutActivity.java index 464390750..772936d2a 100644 --- a/app/src/main/java/com/simplemobiletools/gallery/activities/AboutActivity.java +++ b/app/src/main/java/com/simplemobiletools/gallery/activities/AboutActivity.java @@ -12,13 +12,13 @@ import com.simplemobiletools.gallery.R; import java.util.Calendar; -import butterknife.Bind; +import butterknife.BindView; import butterknife.ButterKnife; public class AboutActivity extends AppCompatActivity { - @Bind(R.id.about_copyright) TextView copyright; - @Bind(R.id.about_version) TextView version; - @Bind(R.id.about_email) TextView emailTV; + @BindView(R.id.about_copyright) TextView copyright; + @BindView(R.id.about_version) TextView version; + @BindView(R.id.about_email) TextView emailTV; private Resources res; @Override diff --git a/build.gradle b/build.gradle index 03bced9f3..cc19335cd 100644 --- a/build.gradle +++ b/build.gradle @@ -6,6 +6,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:2.1.0' + classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files