diff --git a/app/build.gradle b/app/build.gradle index f0425f6..2750a3f 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,8 +30,10 @@ 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' compile 'com.github.yukuku:ambilwarna:2.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 9f53b88..25ea334 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/draw/AboutActivity.java b/app/src/main/java/com/simplemobiletools/draw/AboutActivity.java index 1b42cba..1ec070e 100644 --- a/app/src/main/java/com/simplemobiletools/draw/AboutActivity.java +++ b/app/src/main/java/com/simplemobiletools/draw/AboutActivity.java @@ -9,13 +9,13 @@ import android.widget.TextView; 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/app/src/main/java/com/simplemobiletools/draw/MainActivity.java b/app/src/main/java/com/simplemobiletools/draw/MainActivity.java index be54395..eecfca8 100644 --- a/app/src/main/java/com/simplemobiletools/draw/MainActivity.java +++ b/app/src/main/java/com/simplemobiletools/draw/MainActivity.java @@ -27,7 +27,7 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; -import butterknife.Bind; +import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; import yuku.ambilwarna.AmbilWarnaDialog; @@ -39,8 +39,8 @@ public class MainActivity extends AppCompatActivity { private static final String SAVE_FOLDER_NAME = "Simple Draw"; private static final int STORAGE_PERMISSION = 1; - @Bind(R.id.my_canvas) MyCanvas myCanvas; - @Bind(R.id.color_picker) View colorPicker; + @BindView(R.id.my_canvas) MyCanvas myCanvas; + @BindView(R.id.color_picker) View colorPicker; private int color; private String curFileName; diff --git a/build.gradle b/build.gradle index 03bced9..cc19335 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