From a22faf091365fefd7ad2b9e756ab90eb504c3157 Mon Sep 17 00:00:00 2001 From: yuzumone Date: Wed, 8 Feb 2017 10:03:27 +0900 Subject: [PATCH] Remove unused attr close #7 --- README.md | 4 ++-- app/src/main/res/layout/activity_main.xml | 4 ++-- statebutton/build.gradle | 4 ++-- .../main/java/net/yuzumone/statebutton/StateButton.java | 8 -------- statebutton/src/main/res/values/attr.xml | 2 -- 5 files changed, 6 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 262fc94..69da929 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Add this to your app `build.gradle` file. ```gradle dependencies { ... - compile 'com.github.yuzumone:StateButton:0.1.1' + compile 'com.github.yuzumone:StateButton:0.1.2' } ``` @@ -70,7 +70,7 @@ To set text of the button you use the setTrueText or setFalseText functionality ```xml app:trueText="True" or -app:trueTextRes="@string/true_string" +app:trueText="@string/true_string" ``` ### Java diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 2405ace..76f2d14 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -16,7 +16,7 @@ android:id="@+id/button" android:layout_width="match_parent" android:layout_height="wrap_content" - app:trueTextRes="@string/true_string" - app:falseTextRes="@string/false_string" + app:trueText="@string/true_string" + app:falseText="@string/false_string" /> diff --git a/statebutton/build.gradle b/statebutton/build.gradle index f3f7c79..011aa81 100644 --- a/statebutton/build.gradle +++ b/statebutton/build.gradle @@ -10,8 +10,8 @@ android { defaultConfig { minSdkVersion 16 targetSdkVersion 25 - versionCode 1 - versionName "0.1.1" + versionCode 3 + versionName "0.1.2" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/statebutton/src/main/java/net/yuzumone/statebutton/StateButton.java b/statebutton/src/main/java/net/yuzumone/statebutton/StateButton.java index 8f5bf85..c9e9515 100644 --- a/statebutton/src/main/java/net/yuzumone/statebutton/StateButton.java +++ b/statebutton/src/main/java/net/yuzumone/statebutton/StateButton.java @@ -50,15 +50,7 @@ private void init(Context context, AttributeSet attrs, int defStyle) { Boolean state = array.getBoolean(R.styleable.StateButton_state, false); trueText = array.getString(R.styleable.StateButton_trueText); - int trueStringRes = array.getResourceId(R.styleable.StateButton_trueTextRes, 0); - if (trueStringRes != 0) { - trueText = context.getString(trueStringRes); - } falseText = array.getString(R.styleable.StateButton_falseText); - int falseStringRes = array.getResourceId(R.styleable.StateButton_falseTextRes, 0); - if (falseStringRes != 0) { - falseText = context.getString(falseStringRes); - } setState(state); array.recycle(); diff --git a/statebutton/src/main/res/values/attr.xml b/statebutton/src/main/res/values/attr.xml index 2483af1..0e9a8f7 100644 --- a/statebutton/src/main/res/values/attr.xml +++ b/statebutton/src/main/res/values/attr.xml @@ -3,8 +3,6 @@ - - \ No newline at end of file