diff --git a/app/build.gradle b/app/build.gradle index 112c494e..f3fc4028 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 @@ -29,7 +30,9 @@ dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' compile 'com.android.support:appcompat-v7:23.3.0' - 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 9f53b884..25ea3346 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/camera/MainActivity.java b/app/src/main/java/com/simplemobiletools/camera/MainActivity.java index f923f0e9..945b2acf 100644 --- a/app/src/main/java/com/simplemobiletools/camera/MainActivity.java +++ b/app/src/main/java/com/simplemobiletools/camera/MainActivity.java @@ -11,14 +11,14 @@ import android.view.WindowManager; import android.widget.ImageView; import android.widget.RelativeLayout; -import butterknife.Bind; +import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; public class MainActivity extends AppCompatActivity { - @Bind(R.id.viewHolder) RelativeLayout viewHolder; - @Bind(R.id.toggle_camera) View toggleCameraBtn; - @Bind(R.id.toggle_flash) ImageView toggleFlashBtn; + @BindView(R.id.viewHolder) RelativeLayout viewHolder; + @BindView(R.id.toggle_camera) View toggleCameraBtn; + @BindView(R.id.toggle_flash) ImageView toggleFlashBtn; private Preview preview; private int currCamera; diff --git a/build.gradle b/build.gradle index 03bced9f..cc19335c 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