fenix/Simple-Draw
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Draw.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

update Butterknife to 8.0.1

Browse Source
This commit is contained in:
tibbi
2016-06-01 17:57:33 +02:00
parent 522e34edfe
commit aa56e863cf
5 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/build.gradle
View File

@@ -1,4 +1,5 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
apply plugin: 'android-apt'
android { android {
compileSdkVersion 23 compileSdkVersion 23
@@ -29,8 +30,10 @@ dependencies {
compile fileTree(dir: 'libs', include: ['*.jar']) compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:23.3.0' 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' compile 'com.github.yukuku:ambilwarna:2.0.1'
apt 'com.jakewharton:butterknife-compiler:8.0.1'
} }
def Properties props = new Properties() def Properties props = new Properties()

13
app/proguard-rules.pro vendored
View File

@@ -15,16 +15,3 @@
#-keepclassmembers class fqcn.of.javascript.interface.for.webview { #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *; # public *;
#} #}
# Butterknife
-keep class butterknife.** { *; }
-dontwarn butterknife.internal.**
-keep class **$$ViewBinder { *; }
-keepclasseswithmembernames class * {
@butterknife.* <fields>;
}
-keepclasseswithmembernames class * {
@butterknife.* <methods>;
}

8
app/src/main/java/com/simplemobiletools/draw/AboutActivity.java
View File

@@ -9,13 +9,13 @@ import android.widget.TextView;
import java.util.Calendar; import java.util.Calendar;
import butterknife.Bind; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
public class AboutActivity extends AppCompatActivity { public class AboutActivity extends AppCompatActivity {
@Bind(R.id.about_copyright) TextView copyright; @BindView(R.id.about_copyright) TextView copyright;
@Bind(R.id.about_version) TextView version; @BindView(R.id.about_version) TextView version;
@Bind(R.id.about_email) TextView emailTV; @BindView(R.id.about_email) TextView emailTV;
private Resources res; private Resources res;
@Override @Override

6
app/src/main/java/com/simplemobiletools/draw/MainActivity.java
View File

@@ -27,7 +27,7 @@ import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import butterknife.Bind; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import yuku.ambilwarna.AmbilWarnaDialog; 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 String SAVE_FOLDER_NAME = "Simple Draw";
private static final int STORAGE_PERMISSION = 1; private static final int STORAGE_PERMISSION = 1;
@Bind(R.id.my_canvas) MyCanvas myCanvas; @BindView(R.id.my_canvas) MyCanvas myCanvas;
@Bind(R.id.color_picker) View colorPicker; @BindView(R.id.color_picker) View colorPicker;
private int color; private int color;
private String curFileName; private String curFileName;

1
build.gradle
View File

@@ -6,6 +6,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.1.0' 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 // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files