fenix/Simple-Calculator
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calculator.git synced 2025-06-05 21:49:13 +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 18:00:18 +02:00
parent 09cb1a6d8c
commit 14279ddac4
6 changed files with 22 additions and 31 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
@ -30,10 +31,12 @@ android {
dependencies { dependencies {
compile fileTree(dir: 'libs', include: ['*.jar']) compile fileTree(dir: 'libs', include: ['*.jar'])
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 'me.grantland:autofittextview:0.2.1' compile 'me.grantland:autofittextview:0.2.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'
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
testCompile 'org.robolectric:robolectric:3.0' testCompile 'org.robolectric:robolectric:3.0'

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/calculator/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/calculator/MainActivity.java
View File

@ -10,15 +10,15 @@ import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.widget.TextView; import android.widget.TextView;
import butterknife.Bind; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import butterknife.OnLongClick; import butterknife.OnLongClick;
import me.grantland.widget.AutofitHelper; import me.grantland.widget.AutofitHelper;
public class MainActivity extends AppCompatActivity implements Calculator { public class MainActivity extends AppCompatActivity implements Calculator {
@Bind(R.id.result) TextView result; @BindView(R.id.result) TextView result;
@Bind(R.id.formula) TextView formula; @BindView(R.id.formula) TextView formula;
private CalculatorImpl calc; private CalculatorImpl calc;

18
app/src/main/java/com/simplemobiletools/calculator/MyWidgetConfigure.java
View File

@ -13,20 +13,20 @@ import android.widget.RemoteViews;
import android.widget.SeekBar; import android.widget.SeekBar;
import android.widget.TextView; import android.widget.TextView;
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;
public class MyWidgetConfigure extends AppCompatActivity { public class MyWidgetConfigure extends AppCompatActivity {
@Bind(R.id.btn_reset) View resetBtn; @BindView(R.id.btn_reset) View resetBtn;
@Bind(R.id.config_bg_color) View bgColorPicker; @BindView(R.id.config_bg_color) View bgColorPicker;
@Bind(R.id.config_bg_seekbar) SeekBar bgSeekBar; @BindView(R.id.config_bg_seekbar) SeekBar bgSeekBar;
@Bind(R.id.config_text_color) View textColorPicker; @BindView(R.id.config_text_color) View textColorPicker;
@Bind(R.id.config_calc) View background; @BindView(R.id.config_calc) View background;
@Bind(R.id.config_save) Button saveBtn; @BindView(R.id.config_save) Button saveBtn;
@Bind(R.id.result) TextView result; @BindView(R.id.result) TextView result;
@Bind(R.id.formula) TextView formula; @BindView(R.id.formula) TextView formula;
private int widgetId; private int widgetId;
private int bgColor; private int bgColor;

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