Remove butterknife dependency.

StephaneBg · Mar 23, 2017 · aaaa99e · aaaa99e
1 parent 101883b
commit aaaa99e
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 38 deletions.
diff --git a/library/build.gradle b/library/build.gradle
@@ -36,7 +36,4 @@ dependencies {
     compile supportDependencies.appCompat
     compile supportDependencies.percent
     compile supportDependencies.grid
-
-    compile butterknifeDependencies.butterknife
-    annotationProcessor butterknifeDependencies.butterknifeCompiler
 }
diff --git a/library/src/main/java/com/sbgapps/simplenumberpicker/decimal/DecimalPickerDialog.java b/library/src/main/java/com/sbgapps/simplenumberpicker/decimal/DecimalPickerDialog.java
@@ -82,12 +82,6 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         setCancelable(false);
     }
 
-    @Override
-    public void onStart() {
-        super.onStart();
-        onNumberChanged();
-    }
-
     @SuppressLint("SetTextI18n")
     @NonNull
     @Override
@@ -206,6 +200,12 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
         return dialog;
     }
 
+    @Override
+    public void onStart() {
+        super.onStart();
+        onNumberChanged();
+    }
+
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
@@ -216,17 +216,6 @@ public void onSaveInstanceState(Bundle outState) {
         outState.putString(ARG_SAVED_VALUE, numberTextView.getText().toString());
     }
 
-    private void assignArguments(Bundle args) {
-        if (args.containsKey(ARG_REFERENCE))
-            reference = args.getInt(ARG_REFERENCE);
-        if (args.containsKey(ARG_RELATIVE))
-            relative = args.getBoolean(ARG_RELATIVE);
-        if (args.containsKey(ARG_NATURAL))
-            natural = args.getBoolean(ARG_NATURAL);
-        if (args.containsKey(ARG_THEME))
-            theme = args.getInt(ARG_THEME);
-    }
-
     private void onNumberChanged() {
         backspaceButton.setEnabled(0 != numberTextView.length());
         if (0 == numberTextView.getText().length()) {
@@ -239,6 +228,17 @@ private void onNumberChanged() {
         }
     }
 
+    private void assignArguments(Bundle args) {
+        if (args.containsKey(ARG_REFERENCE))
+            reference = args.getInt(ARG_REFERENCE);
+        if (args.containsKey(ARG_RELATIVE))
+            relative = args.getBoolean(ARG_RELATIVE);
+        if (args.containsKey(ARG_NATURAL))
+            natural = args.getBoolean(ARG_NATURAL);
+        if (args.containsKey(ARG_THEME))
+            theme = args.getInt(ARG_THEME);
+    }
+
     public static class Builder {
 
         private int reference = DEFAULT_REFERENCE;

diff --git a/library/src/main/java/com/sbgapps/simplenumberpicker/hex/HexaPickerDialog.java b/library/src/main/java/com/sbgapps/simplenumberpicker/hex/HexaPickerDialog.java
@@ -50,7 +50,7 @@ public class HexaPickerDialog extends DialogFragment {
     private static final int NO_MIN_LENGTH = -1;
     private static final int NO_MAX_LENGTH = -1;
 
-    AlertDialog dialog;
+    private AlertDialog dialog;
     private TextView numberTextView;
     private ImageButton backspaceButton;
 
@@ -84,12 +84,6 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         setCancelable(false);
     }
 
-    @Override
-    public void onStart() {
-        super.onStart();
-        onNumberChanged();
-    }
-
     @NonNull
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
@@ -174,6 +168,12 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
         return dialog;
     }
 
+    @Override
+    public void onStart() {
+        super.onStart();
+        onNumberChanged();
+    }
+
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
@@ -184,17 +184,6 @@ public void onSaveInstanceState(Bundle outState) {
         outState.putString(ARG_SAVED_VALUE, numberTextView.getText().toString());
     }
 
-    private void assignArguments(Bundle args) {
-        if (args.containsKey(ARG_REFERENCE))
-            reference = args.getInt(ARG_REFERENCE);
-        if (args.containsKey(ARG_MIN_LENGTH))
-            minLength = args.getInt(ARG_MIN_LENGTH);
-        if (args.containsKey(ARG_MAX_LENGTH))
-            maxLength = args.getInt(ARG_MAX_LENGTH);
-        if (args.containsKey(ARG_THEME))
-            theme = args.getInt(ARG_THEME);
-    }
-
     private void onNumberChanged() {
         backspaceButton.setEnabled(0 != numberTextView.length());
         if (0 == numberTextView.getText().length()) {
@@ -206,6 +195,17 @@ private void onNumberChanged() {
         }
     }
 
+    private void assignArguments(Bundle args) {
+        if (args.containsKey(ARG_REFERENCE))
+            reference = args.getInt(ARG_REFERENCE);
+        if (args.containsKey(ARG_MIN_LENGTH))
+            minLength = args.getInt(ARG_MIN_LENGTH);
+        if (args.containsKey(ARG_MAX_LENGTH))
+            maxLength = args.getInt(ARG_MAX_LENGTH);
+        if (args.containsKey(ARG_THEME))
+            theme = args.getInt(ARG_THEME);
+    }
+
     public static class Builder {
 
         private int reference = DEFAULT_REFERENCE;