update Butterknife to 8.0.1
This commit is contained in:
parent
09cb1a6d8c
commit
14279ddac4
|
@ -1,4 +1,5 @@
|
|||
apply plugin: 'com.android.application'
|
||||
apply plugin: 'android-apt'
|
||||
|
||||
android {
|
||||
compileSdkVersion 23
|
||||
|
@ -30,10 +31,12 @@ android {
|
|||
dependencies {
|
||||
compile fileTree(dir: 'libs', include: ['*.jar'])
|
||||
compile 'com.android.support:appcompat-v7:23.3.0'
|
||||
compile 'com.jakewharton:butterknife:7.0.1'
|
||||
compile 'com.jakewharton:butterknife:8.0.1'
|
||||
compile 'me.grantland:autofittextview:0.2.1'
|
||||
compile 'com.github.yukuku:ambilwarna:2.0.1'
|
||||
|
||||
apt 'com.jakewharton:butterknife-compiler:8.0.1'
|
||||
|
||||
testCompile 'junit:junit:4.12'
|
||||
testCompile 'org.robolectric:robolectric:3.0'
|
||||
|
||||
|
|
|
@ -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.* <fields>;
|
||||
}
|
||||
|
||||
-keepclasseswithmembernames class * {
|
||||
@butterknife.* <methods>;
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -10,15 +10,15 @@ import android.view.MenuItem;
|
|||
import android.view.View;
|
||||
import android.widget.TextView;
|
||||
|
||||
import butterknife.Bind;
|
||||
import butterknife.BindView;
|
||||
import butterknife.ButterKnife;
|
||||
import butterknife.OnClick;
|
||||
import butterknife.OnLongClick;
|
||||
import me.grantland.widget.AutofitHelper;
|
||||
|
||||
public class MainActivity extends AppCompatActivity implements Calculator {
|
||||
@Bind(R.id.result) TextView result;
|
||||
@Bind(R.id.formula) TextView formula;
|
||||
@BindView(R.id.result) TextView result;
|
||||
@BindView(R.id.formula) TextView formula;
|
||||
|
||||
private CalculatorImpl calc;
|
||||
|
||||
|
@ -55,7 +55,7 @@ public class MainActivity extends AppCompatActivity implements Calculator {
|
|||
private void setupResultView() {
|
||||
final Resources res = getResources();
|
||||
result.setBackgroundColor(res.getColor(android.R.color.white));
|
||||
result.setTextColor( res.getColor(R.color.text_grey));
|
||||
result.setTextColor(res.getColor(R.color.text_grey));
|
||||
|
||||
formula.setBackgroundColor(res.getColor(android.R.color.white));
|
||||
formula.setTextColor(res.getColor(R.color.text_grey));
|
||||
|
|
|
@ -13,20 +13,20 @@ import android.widget.RemoteViews;
|
|||
import android.widget.SeekBar;
|
||||
import android.widget.TextView;
|
||||
|
||||
import butterknife.Bind;
|
||||
import butterknife.BindView;
|
||||
import butterknife.ButterKnife;
|
||||
import butterknife.OnClick;
|
||||
import yuku.ambilwarna.AmbilWarnaDialog;
|
||||
|
||||
public class MyWidgetConfigure extends AppCompatActivity {
|
||||
@Bind(R.id.btn_reset) View resetBtn;
|
||||
@Bind(R.id.config_bg_color) View bgColorPicker;
|
||||
@Bind(R.id.config_bg_seekbar) SeekBar bgSeekBar;
|
||||
@Bind(R.id.config_text_color) View textColorPicker;
|
||||
@Bind(R.id.config_calc) View background;
|
||||
@Bind(R.id.config_save) Button saveBtn;
|
||||
@Bind(R.id.result) TextView result;
|
||||
@Bind(R.id.formula) TextView formula;
|
||||
@BindView(R.id.btn_reset) View resetBtn;
|
||||
@BindView(R.id.config_bg_color) View bgColorPicker;
|
||||
@BindView(R.id.config_bg_seekbar) SeekBar bgSeekBar;
|
||||
@BindView(R.id.config_text_color) View textColorPicker;
|
||||
@BindView(R.id.config_calc) View background;
|
||||
@BindView(R.id.config_save) Button saveBtn;
|
||||
@BindView(R.id.result) TextView result;
|
||||
@BindView(R.id.formula) TextView formula;
|
||||
private int widgetId;
|
||||
|
||||
private int bgColor;
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue