Rename DrawCallback.onDraw to prevent ClassLoader errors in AS designer

Innovattic · Feb 10, 2017 · 59e4e4b · 59e4e4b
1 parent 3149b36
commit 59e4e4b
Show file tree

Hide file tree

Showing 21 changed files with 22 additions and 36 deletions.
diff --git a/lib-core/src/main/java/com/innovattic/font/FontChronometer.java b/lib-core/src/main/java/com/innovattic/font/FontChronometer.java
@@ -27,7 +27,7 @@ public FontChronometer(Context context, AttributeSet attrs, int defStyle) {
 
 	private final DrawCallback drawCallback = new DrawCallback() {
 		@SuppressLint("WrongCall")
-		@Override public void onDraw(Canvas canvas) {
+		@Override public void onDrawCall(Canvas canvas) {
 			FontChronometer.super.onDraw(canvas);
 		}
 	};

diff --git a/lib-core/src/main/java/com/innovattic/font/FontExtractEditText.java b/lib-core/src/main/java/com/innovattic/font/FontExtractEditText.java
@@ -29,7 +29,7 @@ public FontExtractEditText(Context context, AttributeSet attrs, int defStyle) {
 
 	private final DrawCallback drawCallback = new DrawCallback() {
 		@SuppressLint("WrongCall")
-		@Override public void onDraw(Canvas canvas) {
+		@Override public void onDrawCall(Canvas canvas) {
 			FontExtractEditText.super.onDraw(canvas);
 		}
 	};

diff --git a/lib-core/src/main/java/com/innovattic/font/FontSwitch.java b/lib-core/src/main/java/com/innovattic/font/FontSwitch.java
@@ -34,7 +34,7 @@ public FontSwitch(Context context, AttributeSet attrs, int defStyle) {
 
 	private final DrawCallback drawCallback = new DrawCallback() {
 		@SuppressLint("WrongCall")
-		@Override public void onDraw(Canvas canvas) {
+		@Override public void onDrawCall(Canvas canvas) {
 			FontSwitch.super.onDraw(canvas);
 		}
 	};

diff --git a/lib-core/src/main/java/com/innovattic/font/FontToggleButton.java b/lib-core/src/main/java/com/innovattic/font/FontToggleButton.java
@@ -27,7 +27,7 @@ public FontToggleButton(Context context, AttributeSet attrs, int defStyle) {
 
 	private final DrawCallback drawCallback = new DrawCallback() {
 		@SuppressLint("WrongCall")
-		@Override public void onDraw(Canvas canvas) {
+		@Override public void onDrawCall(Canvas canvas) {
 			FontToggleButton.super.onDraw(canvas);
 		}
 	};

diff --git a/lib-core/src/main/java/com/innovattic/font/TypefaceManager.java b/lib-core/src/main/java/com/innovattic/font/TypefaceManager.java
@@ -569,28 +569,14 @@ public static void onDrawHelper(Canvas canvas, TextView target, DrawCallback dra
 			target.setTextColor(data.borderColor);
 			paint.setStyle(Paint.Style.STROKE);
 			paint.setStrokeWidth(data.borderWidth);
-			callDrawCallback(drawCallback, canvas);
+			drawCallback.onDrawCall(canvas);
 
 			target.setTextColor(oldTextColors);
 			paint.setStyle(oldStyle);
 			paint.setStrokeWidth(oldStrokeWidth);
 		}
 	}
 
-	/**
-	 * Calls the draw callback with the given canvas. Use this method instead of calling it
-	 * yourself, as lint is fooled by the method name 'onDraw' and thinks we are intervening with
-	 * the render cycle. With this method, we can isolate the suppress lint annotation to the only
-	 * warning we want to suppress.
-	 *
-	 * @param drawCallback
-	 * @param canvas
-	 */
-	@SuppressLint("WrongCall")
-	private static void callDrawCallback(DrawCallback drawCallback, Canvas canvas) {
-		drawCallback.onDraw(canvas);
-	}
-
 	/**
 	 * A data holder in which properties are stored that are not part of the default text view
 	 * attributes, but which are applicable to all custom Font widgets. By storing this data holder
@@ -632,7 +618,7 @@ public static ExtraFontData getFontData(TextView target, boolean createIfMissing
 	}
 
 	public static interface DrawCallback {
-		public void onDraw(Canvas canvas);
+		public void onDrawCall(Canvas canvas);
 	}
 
 }
diff --git a/lib-native/src/main/java/com/innovattic/font/AutoCompleteFontTextView.java b/lib-native/src/main/java/com/innovattic/font/AutoCompleteFontTextView.java
@@ -27,7 +27,7 @@ public AutoCompleteFontTextView(Context context, AttributeSet attrs, int defStyl
 
 	private final DrawCallback drawCallback = new DrawCallback() {
 		@SuppressLint("WrongCall")
-		@Override public void onDraw(Canvas canvas) {
+		@Override public void onDrawCall(Canvas canvas) {
 			AutoCompleteFontTextView.super.onDraw(canvas);
 		}
 	};

diff --git a/lib-native/src/main/java/com/innovattic/font/CheckedFontTextView.java b/lib-native/src/main/java/com/innovattic/font/CheckedFontTextView.java
@@ -27,7 +27,7 @@ public CheckedFontTextView(Context context, AttributeSet attrs, int defStyle) {
 
 	private final DrawCallback drawCallback = new DrawCallback() {
 		@SuppressLint("WrongCall")
-		@Override public void onDraw(Canvas canvas) {
+		@Override public void onDrawCall(Canvas canvas) {
 			CheckedFontTextView.super.onDraw(canvas);
 		}
 	};

diff --git a/lib-native/src/main/java/com/innovattic/font/FontButton.java b/lib-native/src/main/java/com/innovattic/font/FontButton.java
@@ -27,7 +27,7 @@ public FontButton(Context context, AttributeSet attrs, int defStyle) {
 
 	private final DrawCallback drawCallback = new DrawCallback() {
 		@SuppressLint("WrongCall")
-		@Override public void onDraw(Canvas canvas) {
+		@Override public void onDrawCall(Canvas canvas) {
 			FontButton.super.onDraw(canvas);
 		}
 	};

diff --git a/lib-native/src/main/java/com/innovattic/font/FontCheckBox.java b/lib-native/src/main/java/com/innovattic/font/FontCheckBox.java
@@ -27,7 +27,7 @@ public FontCheckBox(Context context, AttributeSet attrs, int defStyle) {
 
 	private final DrawCallback drawCallback = new DrawCallback() {
 		@SuppressLint("WrongCall")
-		@Override public void onDraw(Canvas canvas) {
+		@Override public void onDrawCall(Canvas canvas) {
 			FontCheckBox.super.onDraw(canvas);
 		}
 	};

diff --git a/lib-native/src/main/java/com/innovattic/font/FontEditText.java b/lib-native/src/main/java/com/innovattic/font/FontEditText.java
@@ -27,7 +27,7 @@ public FontEditText(Context context, AttributeSet attrs, int defStyle) {
 
 	private final DrawCallback drawCallback = new DrawCallback() {
 		@SuppressLint("WrongCall")
-		@Override public void onDraw(Canvas canvas) {
+		@Override public void onDrawCall(Canvas canvas) {
 			FontEditText.super.onDraw(canvas);
 		}
 	};

diff --git a/lib-native/src/main/java/com/innovattic/font/FontRadioButton.java b/lib-native/src/main/java/com/innovattic/font/FontRadioButton.java
@@ -27,7 +27,7 @@ public FontRadioButton(Context context, AttributeSet attrs, int defStyle) {
 
 	private final DrawCallback drawCallback = new DrawCallback() {
 		@SuppressLint("WrongCall")
-		@Override public void onDraw(Canvas canvas) {
+		@Override public void onDrawCall(Canvas canvas) {
 			FontRadioButton.super.onDraw(canvas);
 		}
 	};

diff --git a/lib-native/src/main/java/com/innovattic/font/FontTextView.java b/lib-native/src/main/java/com/innovattic/font/FontTextView.java
@@ -27,7 +27,7 @@ public FontTextView(Context context, AttributeSet attrs, int defStyle) {
 
 	private final DrawCallback drawCallback = new DrawCallback() {
 		@SuppressLint("WrongCall")
-		@Override public void onDraw(Canvas canvas) {
+		@Override public void onDrawCall(Canvas canvas) {
 			FontTextView.super.onDraw(canvas);
 		}
 	};

diff --git a/lib-native/src/main/java/com/innovattic/font/MultiAutoCompleteFontTextView.java b/lib-native/src/main/java/com/innovattic/font/MultiAutoCompleteFontTextView.java
@@ -27,7 +27,7 @@ public MultiAutoCompleteFontTextView(Context context, AttributeSet attrs, int de
 
 	private final DrawCallback drawCallback = new DrawCallback() {
 		@SuppressLint("WrongCall")
-		@Override public void onDraw(Canvas canvas) {
+		@Override public void onDrawCall(Canvas canvas) {
 			MultiAutoCompleteFontTextView.super.onDraw(canvas);
 		}
 	};

diff --git a/lib-support/src/main/java/com/innovattic/font/AutoCompleteFontTextView.java b/lib-support/src/main/java/com/innovattic/font/AutoCompleteFontTextView.java
@@ -27,7 +27,7 @@ public AutoCompleteFontTextView(Context context, AttributeSet attrs, int defStyl
 
 	private final DrawCallback drawCallback = new DrawCallback() {
 		@SuppressLint("WrongCall")
-		@Override public void onDraw(Canvas canvas) {
+		@Override public void onDrawCall(Canvas canvas) {
 			AutoCompleteFontTextView.super.onDraw(canvas);
 		}
 	};

diff --git a/lib-support/src/main/java/com/innovattic/font/CheckedFontTextView.java b/lib-support/src/main/java/com/innovattic/font/CheckedFontTextView.java
@@ -27,7 +27,7 @@ public CheckedFontTextView(Context context, AttributeSet attrs, int defStyle) {
 
 	private final DrawCallback drawCallback = new DrawCallback() {
 		@SuppressLint("WrongCall")
-		@Override public void onDraw(Canvas canvas) {
+		@Override public void onDrawCall(Canvas canvas) {
 			CheckedFontTextView.super.onDraw(canvas);
 		}
 	};

diff --git a/lib-support/src/main/java/com/innovattic/font/FontButton.java b/lib-support/src/main/java/com/innovattic/font/FontButton.java
@@ -27,7 +27,7 @@ public FontButton(Context context, AttributeSet attrs, int defStyle) {
 
 	private final DrawCallback drawCallback = new DrawCallback() {
 		@SuppressLint("WrongCall")
-		@Override public void onDraw(Canvas canvas) {
+		@Override public void onDrawCall(Canvas canvas) {
 			FontButton.super.onDraw(canvas);
 		}
 	};

diff --git a/lib-support/src/main/java/com/innovattic/font/FontCheckBox.java b/lib-support/src/main/java/com/innovattic/font/FontCheckBox.java
@@ -27,7 +27,7 @@ public FontCheckBox(Context context, AttributeSet attrs, int defStyle) {
 
 	private final DrawCallback drawCallback = new DrawCallback() {
 		@SuppressLint("WrongCall")
-		@Override public void onDraw(Canvas canvas) {
+		@Override public void onDrawCall(Canvas canvas) {
 			FontCheckBox.super.onDraw(canvas);
 		}
 	};

diff --git a/lib-support/src/main/java/com/innovattic/font/FontEditText.java b/lib-support/src/main/java/com/innovattic/font/FontEditText.java
@@ -27,7 +27,7 @@ public FontEditText(Context context, AttributeSet attrs, int defStyle) {
 
 	private final DrawCallback drawCallback = new DrawCallback() {
 		@SuppressLint("WrongCall")
-		@Override public void onDraw(Canvas canvas) {
+		@Override public void onDrawCall(Canvas canvas) {
 			FontEditText.super.onDraw(canvas);
 		}
 	};

diff --git a/lib-support/src/main/java/com/innovattic/font/FontRadioButton.java b/lib-support/src/main/java/com/innovattic/font/FontRadioButton.java
@@ -27,7 +27,7 @@ public FontRadioButton(Context context, AttributeSet attrs, int defStyle) {
 
 	private final DrawCallback drawCallback = new DrawCallback() {
 		@SuppressLint("WrongCall")
-		@Override public void onDraw(Canvas canvas) {
+		@Override public void onDrawCall(Canvas canvas) {
 			FontRadioButton.super.onDraw(canvas);
 		}
 	};

diff --git a/lib-support/src/main/java/com/innovattic/font/FontTextView.java b/lib-support/src/main/java/com/innovattic/font/FontTextView.java
@@ -27,7 +27,7 @@ public FontTextView(Context context, AttributeSet attrs, int defStyle) {
 
 	private final DrawCallback drawCallback = new DrawCallback() {
 		@SuppressLint("WrongCall")
-		@Override public void onDraw(Canvas canvas) {
+		@Override public void onDrawCall(Canvas canvas) {
 			FontTextView.super.onDraw(canvas);
 		}
 	};

diff --git a/lib-support/src/main/java/com/innovattic/font/MultiAutoCompleteFontTextView.java b/lib-support/src/main/java/com/innovattic/font/MultiAutoCompleteFontTextView.java
@@ -27,7 +27,7 @@ public MultiAutoCompleteFontTextView(Context context, AttributeSet attrs, int de
 
 	private final DrawCallback drawCallback = new DrawCallback() {
 		@SuppressLint("WrongCall")
-		@Override public void onDraw(Canvas canvas) {
+		@Override public void onDrawCall(Canvas canvas) {
 			MultiAutoCompleteFontTextView.super.onDraw(canvas);
 		}
 	};