Merge pull request #22 from bdbergeron/master

Default to Roboto Regular instead of Thin when no typeface is specified.
johnkil · Apr 28, 2014 · 8d1c046 · 8d1c046
2 parents a3a6326 + d21aa94
commit 8d1c046
Show file tree

Hide file tree

Showing 16 changed files with 91 additions and 61 deletions.
diff --git a/robototextview/src/main/java/com/devspark/robototextview/RobotoTypefaceManager.java b/robototextview/src/main/java/com/devspark/robototextview/RobotoTypefaceManager.java
@@ -65,7 +65,7 @@ public class RobotoTypefaceManager {
      * @return specify {@link Typeface}
      * @throws IllegalArgumentException if unknown `typeface` attribute value.
      */
-    public static Typeface obtaintTypeface(Context context, int typefaceValue) throws IllegalArgumentException {
+    public static Typeface obtainTypeface (Context context, int typefaceValue) throws IllegalArgumentException {
         Typeface typeface = mTypefaces.get(typefaceValue);
         if (typeface == null) {
             typeface = createTypeface(context, typefaceValue);

diff --git a/...textview/src/main/java/com/devspark/robototextview/widget/RobotoAutoCompleteTextView.java b/...textview/src/main/java/com/devspark/robototextview/widget/RobotoAutoCompleteTextView.java
@@ -98,14 +98,16 @@ private void onInitTypeface(Context context, AttributeSet attrs, int defStyle) {
             return;
         }
 
-        int typefaceValue = 0;
+        int typefaceValue = RobotoTypefaceManager.ROBOTO_REGULAR;
         if (attrs != null) {
             TypedArray values = context.obtainStyledAttributes(attrs, R.styleable.RobotoTextView, defStyle, 0);
-            typefaceValue = values.getInt(R.styleable.RobotoTextView_typeface, 0);
-            values.recycle();
+            if (values != null) {
+                typefaceValue = values.getInt(R.styleable.RobotoTextView_typeface, typefaceValue);
+                values.recycle();
+            }
         }
 
-        Typeface robotoTypeface = RobotoTypefaceManager.obtaintTypeface(context, typefaceValue);
+        Typeface robotoTypeface = RobotoTypefaceManager.obtainTypeface(context, typefaceValue);
         setTypeface(robotoTypeface);
     }
 

diff --git a/robototextview/src/main/java/com/devspark/robototextview/widget/RobotoButton.java b/robototextview/src/main/java/com/devspark/robototextview/widget/RobotoButton.java
@@ -98,14 +98,16 @@ private void onInitTypeface(Context context, AttributeSet attrs, int defStyle) {
             return;
         }
 
-        int typefaceValue = 0;
+        int typefaceValue = RobotoTypefaceManager.ROBOTO_REGULAR;
         if (attrs != null) {
             TypedArray values = context.obtainStyledAttributes(attrs, R.styleable.RobotoTextView, defStyle, 0);
-            typefaceValue = values.getInt(R.styleable.RobotoTextView_typeface, 0);
-            values.recycle();
+            if (values != null) {
+                typefaceValue = values.getInt(R.styleable.RobotoTextView_typeface, typefaceValue);
+                values.recycle();
+            }
         }
 
-        Typeface robotoTypeface = RobotoTypefaceManager.obtaintTypeface(context, typefaceValue);
+        Typeface robotoTypeface = RobotoTypefaceManager.obtainTypeface(context, typefaceValue);
         setTypeface(robotoTypeface);
     }
 

diff --git a/robototextview/src/main/java/com/devspark/robototextview/widget/RobotoCheckBox.java b/robototextview/src/main/java/com/devspark/robototextview/widget/RobotoCheckBox.java
@@ -98,14 +98,16 @@ private void onInitTypeface(Context context, AttributeSet attrs, int defStyle) {
             return;
         }
 
-        int typefaceValue = 0;
+        int typefaceValue = RobotoTypefaceManager.ROBOTO_REGULAR;
         if (attrs != null) {
             TypedArray values = context.obtainStyledAttributes(attrs, R.styleable.RobotoTextView, defStyle, 0);
-            typefaceValue = values.getInt(R.styleable.RobotoTextView_typeface, 0);
-            values.recycle();
+            if (values != null) {
+                typefaceValue = values.getInt(R.styleable.RobotoTextView_typeface, typefaceValue);
+                values.recycle();
+            }
         }
 
-        Typeface robotoTypeface = RobotoTypefaceManager.obtaintTypeface(context, typefaceValue);
+        Typeface robotoTypeface = RobotoTypefaceManager.obtainTypeface(context, typefaceValue);
         setTypeface(robotoTypeface);
     }
 

diff --git a/robototextview/src/main/java/com/devspark/robototextview/widget/RobotoCheckedTextView.java b/robototextview/src/main/java/com/devspark/robototextview/widget/RobotoCheckedTextView.java
@@ -98,14 +98,16 @@ private void onInitTypeface(Context context, AttributeSet attrs, int defStyle) {
             return;
         }
 
-        int typefaceValue = 0;
+        int typefaceValue = RobotoTypefaceManager.ROBOTO_REGULAR;
         if (attrs != null) {
             TypedArray values = context.obtainStyledAttributes(attrs, R.styleable.RobotoTextView, defStyle, 0);
-            typefaceValue = values.getInt(R.styleable.RobotoTextView_typeface, 0);
-            values.recycle();
+            if (values != null) {
+                typefaceValue = values.getInt(R.styleable.RobotoTextView_typeface, typefaceValue);
+                values.recycle();
+            }
         }
 
-        Typeface robotoTypeface = RobotoTypefaceManager.obtaintTypeface(context, typefaceValue);
+        Typeface robotoTypeface = RobotoTypefaceManager.obtainTypeface(context, typefaceValue);
         setTypeface(robotoTypeface);
     }
 

diff --git a/robototextview/src/main/java/com/devspark/robototextview/widget/RobotoChronometer.java b/robototextview/src/main/java/com/devspark/robototextview/widget/RobotoChronometer.java
@@ -98,14 +98,16 @@ private void onInitTypeface(Context context, AttributeSet attrs, int defStyle) {
             return;
         }
 
-        int typefaceValue = 0;
+        int typefaceValue = RobotoTypefaceManager.ROBOTO_REGULAR;
         if (attrs != null) {
             TypedArray values = context.obtainStyledAttributes(attrs, R.styleable.RobotoTextView, defStyle, 0);
-            typefaceValue = values.getInt(R.styleable.RobotoTextView_typeface, 0);
-            values.recycle();
+            if (values != null) {
+                typefaceValue = values.getInt(R.styleable.RobotoTextView_typeface, typefaceValue);
+                values.recycle();
+            }
         }
 
-        Typeface robotoTypeface = RobotoTypefaceManager.obtaintTypeface(context, typefaceValue);
+        Typeface robotoTypeface = RobotoTypefaceManager.obtainTypeface(context, typefaceValue);
         setTypeface(robotoTypeface);
     }
 

diff --git a/robototextview/src/main/java/com/devspark/robototextview/widget/RobotoCompoundButton.java b/robototextview/src/main/java/com/devspark/robototextview/widget/RobotoCompoundButton.java
@@ -98,14 +98,16 @@ private void onInitTypeface(Context context, AttributeSet attrs, int defStyle) {
             return;
         }
 
-        int typefaceValue = 0;
+        int typefaceValue = RobotoTypefaceManager.ROBOTO_REGULAR;
         if (attrs != null) {
             TypedArray values = context.obtainStyledAttributes(attrs, R.styleable.RobotoTextView, defStyle, 0);
-            typefaceValue = values.getInt(R.styleable.RobotoTextView_typeface, 0);
-            values.recycle();
+            if (values != null) {
+                typefaceValue = values.getInt(R.styleable.RobotoTextView_typeface, typefaceValue);
+                values.recycle();
+            }
         }
 
-        Typeface robotoTypeface = RobotoTypefaceManager.obtaintTypeface(context, typefaceValue);
+        Typeface robotoTypeface = RobotoTypefaceManager.obtainTypeface(context, typefaceValue);
         setTypeface(robotoTypeface);
     }
 

diff --git a/robototextview/src/main/java/com/devspark/robototextview/widget/RobotoDigitalClock.java b/robototextview/src/main/java/com/devspark/robototextview/widget/RobotoDigitalClock.java
@@ -76,14 +76,16 @@ private void onInitTypeface(Context context, AttributeSet attrs) {
             return;
         }
 
-        int typefaceValue = 0;
+        int typefaceValue = RobotoTypefaceManager.ROBOTO_REGULAR;
         if (attrs != null) {
             TypedArray values = context.obtainStyledAttributes(attrs, R.styleable.RobotoTextView);
-            typefaceValue = values.getInt(R.styleable.RobotoTextView_typeface, 0);
-            values.recycle();
+            if (values != null) {
+                typefaceValue = values.getInt(R.styleable.RobotoTextView_typeface, typefaceValue);
+                values.recycle();
+            }
         }
 
-        Typeface robotoTypeface = RobotoTypefaceManager.obtaintTypeface(context, typefaceValue);
+        Typeface robotoTypeface = RobotoTypefaceManager.obtainTypeface(context, typefaceValue);
         setTypeface(robotoTypeface);
     }
 

diff --git a/robototextview/src/main/java/com/devspark/robototextview/widget/RobotoEditText.java b/robototextview/src/main/java/com/devspark/robototextview/widget/RobotoEditText.java
@@ -98,14 +98,16 @@ private void onInitTypeface(Context context, AttributeSet attrs, int defStyle) {
             return;
         }
 
-        int typefaceValue = 0;
+        int typefaceValue = RobotoTypefaceManager.ROBOTO_REGULAR;
         if (attrs != null) {
             TypedArray values = context.obtainStyledAttributes(attrs, R.styleable.RobotoTextView, defStyle, 0);
-            typefaceValue = values.getInt(R.styleable.RobotoTextView_typeface, 0);
-            values.recycle();
+            if (values != null) {
+                typefaceValue = values.getInt(R.styleable.RobotoTextView_typeface, typefaceValue);
+                values.recycle();
+            }
         }
 
-        Typeface robotoTypeface = RobotoTypefaceManager.obtaintTypeface(context, typefaceValue);
+        Typeface robotoTypeface = RobotoTypefaceManager.obtainTypeface(context, typefaceValue);
         setTypeface(robotoTypeface);
     }
 

diff --git a/robototextview/src/main/java/com/devspark/robototextview/widget/RobotoExtractEditText.java b/robototextview/src/main/java/com/devspark/robototextview/widget/RobotoExtractEditText.java
@@ -98,14 +98,16 @@ private void onInitTypeface(Context context, AttributeSet attrs, int defStyle) {
             return;
         }
 
-        int typefaceValue = 0;
+        int typefaceValue = RobotoTypefaceManager.ROBOTO_REGULAR;
         if (attrs != null) {
             TypedArray values = context.obtainStyledAttributes(attrs, R.styleable.RobotoTextView, defStyle, 0);
-            typefaceValue = values.getInt(R.styleable.RobotoTextView_typeface, 0);
-            values.recycle();
+            if (values != null) {
+                typefaceValue = values.getInt(R.styleable.RobotoTextView_typeface, typefaceValue);
+                values.recycle();
+            }
         }
 
-        Typeface robotoTypeface = RobotoTypefaceManager.obtaintTypeface(context, typefaceValue);
+        Typeface robotoTypeface = RobotoTypefaceManager.obtainTypeface(context, typefaceValue);
         setTypeface(robotoTypeface);
     }
 

diff --git a/...iew/src/main/java/com/devspark/robototextview/widget/RobotoMultiAutoCompleteTextView.java b/...iew/src/main/java/com/devspark/robototextview/widget/RobotoMultiAutoCompleteTextView.java
@@ -98,14 +98,16 @@ private void onInitTypeface(Context context, AttributeSet attrs, int defStyle) {
             return;
         }
 
-        int typefaceValue = 0;
+        int typefaceValue = RobotoTypefaceManager.ROBOTO_REGULAR;
         if (attrs != null) {
             TypedArray values = context.obtainStyledAttributes(attrs, R.styleable.RobotoTextView, defStyle, 0);
-            typefaceValue = values.getInt(R.styleable.RobotoTextView_typeface, 0);
-            values.recycle();
+            if (values != null) {
+                typefaceValue = values.getInt(R.styleable.RobotoTextView_typeface, typefaceValue);
+                values.recycle();
+            }
         }
 
-        Typeface robotoTypeface = RobotoTypefaceManager.obtaintTypeface(context, typefaceValue);
+        Typeface robotoTypeface = RobotoTypefaceManager.obtainTypeface(context, typefaceValue);
         setTypeface(robotoTypeface);
     }
 

diff --git a/robototextview/src/main/java/com/devspark/robototextview/widget/RobotoRadioButton.java b/robototextview/src/main/java/com/devspark/robototextview/widget/RobotoRadioButton.java
@@ -98,14 +98,16 @@ private void onInitTypeface(Context context, AttributeSet attrs, int defStyle) {
             return;
         }
 
-        int typefaceValue = 0;
+        int typefaceValue = RobotoTypefaceManager.ROBOTO_REGULAR;
         if (attrs != null) {
             TypedArray values = context.obtainStyledAttributes(attrs, R.styleable.RobotoTextView, defStyle, 0);
-            typefaceValue = values.getInt(R.styleable.RobotoTextView_typeface, 0);
-            values.recycle();
+            if (values != null) {
+                typefaceValue = values.getInt(R.styleable.RobotoTextView_typeface, typefaceValue);
+                values.recycle();
+            }
         }
 
-        Typeface robotoTypeface = RobotoTypefaceManager.obtaintTypeface(context, typefaceValue);
+        Typeface robotoTypeface = RobotoTypefaceManager.obtainTypeface(context, typefaceValue);
         setTypeface(robotoTypeface);
     }
 

diff --git a/robototextview/src/main/java/com/devspark/robototextview/widget/RobotoSwitch.java b/robototextview/src/main/java/com/devspark/robototextview/widget/RobotoSwitch.java
@@ -101,14 +101,16 @@ private void onInitTypeface(Context context, AttributeSet attrs, int defStyle) {
             return;
         }
 
-        int typefaceValue = 0;
+        int typefaceValue = RobotoTypefaceManager.ROBOTO_REGULAR;
         if (attrs != null) {
             TypedArray values = context.obtainStyledAttributes(attrs, R.styleable.RobotoTextView, defStyle, 0);
-            typefaceValue = values.getInt(R.styleable.RobotoTextView_typeface, 0);
-            values.recycle();
+            if (values != null) {
+                typefaceValue = values.getInt(R.styleable.RobotoTextView_typeface, typefaceValue);
+                values.recycle();
+            }
         }
 
-        Typeface robotoTypeface = RobotoTypefaceManager.obtaintTypeface(context, typefaceValue);
+        Typeface robotoTypeface = RobotoTypefaceManager.obtainTypeface(context, typefaceValue);
         setTypeface(robotoTypeface);
     }
 

diff --git a/robototextview/src/main/java/com/devspark/robototextview/widget/RobotoTextClock.java b/robototextview/src/main/java/com/devspark/robototextview/widget/RobotoTextClock.java
@@ -98,14 +98,16 @@ private void onInitTypeface(Context context, AttributeSet attrs, int defStyle) {
             return;
         }
 
-        int typefaceValue = 0;
+        int typefaceValue = RobotoTypefaceManager.ROBOTO_REGULAR;
         if (attrs != null) {
             TypedArray values = context.obtainStyledAttributes(attrs, R.styleable.RobotoTextView, defStyle, 0);
-            typefaceValue = values.getInt(R.styleable.RobotoTextView_typeface, 0);
-            values.recycle();
+            if (values != null) {
+                typefaceValue = values.getInt(R.styleable.RobotoTextView_typeface, typefaceValue);
+                values.recycle();
+            }
         }
 
-        Typeface robotoTypeface = RobotoTypefaceManager.obtaintTypeface(context, typefaceValue);
+        Typeface robotoTypeface = RobotoTypefaceManager.obtainTypeface(context, typefaceValue);
         setTypeface(robotoTypeface);
     }
 

diff --git a/robototextview/src/main/java/com/devspark/robototextview/widget/RobotoTextView.java b/robototextview/src/main/java/com/devspark/robototextview/widget/RobotoTextView.java
@@ -98,14 +98,16 @@ private void onInitTypeface(Context context, AttributeSet attrs, int defStyle) {
             return;
         }
 
-        int typefaceValue = 0;
+        int typefaceValue = RobotoTypefaceManager.ROBOTO_REGULAR;
         if (attrs != null) {
             TypedArray values = context.obtainStyledAttributes(attrs, R.styleable.RobotoTextView, defStyle, 0);
-            typefaceValue = values.getInt(R.styleable.RobotoTextView_typeface, 0);
-            values.recycle();
+            if (values != null) {
+                typefaceValue = values.getInt(R.styleable.RobotoTextView_typeface, typefaceValue);
+                values.recycle();
+            }
         }
 
-        Typeface robotoTypeface = RobotoTypefaceManager.obtaintTypeface(context, typefaceValue);
+        Typeface robotoTypeface = RobotoTypefaceManager.obtainTypeface(context, typefaceValue);
         setTypeface(robotoTypeface);
     }
 

diff --git a/robototextview/src/main/java/com/devspark/robototextview/widget/RobotoToggleButton.java b/robototextview/src/main/java/com/devspark/robototextview/widget/RobotoToggleButton.java
@@ -98,14 +98,16 @@ private void onInitTypeface(Context context, AttributeSet attrs, int defStyle) {
             return;
         }
 
-        int typefaceValue = 0;
+        int typefaceValue = RobotoTypefaceManager.ROBOTO_REGULAR;
         if (attrs != null) {
             TypedArray values = context.obtainStyledAttributes(attrs, R.styleable.RobotoTextView, defStyle, 0);
-            typefaceValue = values.getInt(R.styleable.RobotoTextView_typeface, 0);
-            values.recycle();
+            if (values != null) {
+                typefaceValue = values.getInt(R.styleable.RobotoTextView_typeface, typefaceValue);
+                values.recycle();
+            }
         }
 
-        Typeface robotoTypeface = RobotoTypefaceManager.obtaintTypeface(context, typefaceValue);
+        Typeface robotoTypeface = RobotoTypefaceManager.obtainTypeface(context, typefaceValue);
         setTypeface(robotoTypeface);
     }