fixed styleable bug (halfhp#5)

daberni · halfhp · commit 10e4ad2f728e · 2016-09-15T10:34:13.000-05:00
diff --git a/androidplot-core/src/main/java/com/androidplot/Plot.java b/androidplot-core/src/main/java/com/androidplot/Plot.java
@@ -454,73 +454,54 @@ private void loadAttrs(AttributeSet attrs, int defStyle) {
 
             Field styleableFieldInR = null;
             TypedArray typedAttrs = null;
-
-            final String appPkg = getContext().getPackageName();
-            Class styleableClass = null;
+            
+            Class styleableClass = R.styleable.class;
+            String styleableName = getClass().getName().substring(BASE_PACKAGE.length());
+            styleableName = styleableName.replace('.', '_');
             try {
                 /**
-                 * Need to retrieve R$styleable.class dynamically to avoid exceptions
-                 * in environments where this class does not exist, such as .jar users
-                 * that have not merged the library's attrs.xml with their own.
+                 * Use reflection to safely check for the existence of styleable defs for Plot
+                 * and it's derivatives.  This safety check is necessary to avoid runtime exceptions
+                 * in apps that don't include Androidplot as a .aar and won't have access to
+                 * the resources defined in the core library.
                  */
-                styleableClass = Class.forName(appPkg + ".R$styleable");
-
-            } catch (ClassNotFoundException e) {
-                // when running as a preview in IntelliJ or AndroidStudio it seems that the package of R is
-                // something else; this fixes that issue:
-                if(isInEditMode()) {
-                    styleableClass = R.styleable.class;
-                }
+                styleableFieldInR = styleableClass.getField(styleableName);
+            } catch (NoSuchFieldException e) {
+                Log.d(TAG, "Styleable definition not found for: " + styleableName);
             }
-
-            if(styleableClass != null) {
-                String styleableName = getClass().getName().substring(BASE_PACKAGE.length());
-                styleableName = styleableName.replace('.', '_');
-                try {
-                    /**
-                     * Use reflection to safely check for the existence of styleable defs for Plot
-                     * and it's derivatives.  This safety check is necessary to avoid runtime exceptions
-                     * in apps that don't include Androidplot as a .aar and won't have access to
-                     * the resources defined in the core library.
-                     */
-                    styleableFieldInR = styleableClass.getField(styleableName);
-                } catch (NoSuchFieldException e) {
-                    Log.d(TAG, "Styleable definition not found for: " + styleableName);
-                }
-                if (styleableFieldInR != null) {
-                    try {
-                        int[] resIds = (int[]) styleableFieldInR.get(null);
-                        typedAttrs = getContext().obtainStyledAttributes(attrs, resIds, defStyle, 0);
-                    } catch (IllegalAccessException e) {
-                        // nothing to do
-                    } finally {
-                        if (typedAttrs != null) {
-                            // apply derived class' attrs:
-                            processAttrs(typedAttrs);
-                            typedAttrs.recycle();
-                        }
-                    }
-                }
-
+            if (styleableFieldInR != null) {
                 try {
-                    styleableFieldInR = styleableClass.getField(Plot.class.getSimpleName());
-                    if (styleableFieldInR != null) {
-                        int[] resIds = (int[]) styleableFieldInR.get(null);
-                        typedAttrs = getContext().obtainStyledAttributes(attrs, resIds, defStyle, 0);
-                    }
+                    int[] resIds = (int[]) styleableFieldInR.get(null);
+                    typedAttrs = getContext().obtainStyledAttributes(attrs, resIds, defStyle, 0);
                 } catch (IllegalAccessException e) {
                     // nothing to do
-                } catch (NoSuchFieldException e) {
-                    Log.d(TAG, "Styleable definition not found for: " + Plot.class.getSimpleName());
                 } finally {
                     if (typedAttrs != null) {
-                        // apply base attrs:
-                        processBaseAttrs(typedAttrs);
+                        // apply derived class' attrs:
+                        processAttrs(typedAttrs);
                         typedAttrs.recycle();
                     }
                 }
             }
 
+            try {
+                styleableFieldInR = styleableClass.getField(Plot.class.getSimpleName());
+                if (styleableFieldInR != null) {
+                    int[] resIds = (int[]) styleableFieldInR.get(null);
+                    typedAttrs = getContext().obtainStyledAttributes(attrs, resIds, defStyle, 0);
+                }
+            } catch (IllegalAccessException e) {
+                // nothing to do
+            } catch (NoSuchFieldException e) {
+                Log.d(TAG, "Styleable definition not found for: " + Plot.class.getSimpleName());
+            } finally {
+                if (typedAttrs != null) {
+                    // apply base attrs:
+                    processBaseAttrs(typedAttrs);
+                    typedAttrs.recycle();
+                }
+            }
+
             // apply "configurator" attrs: (overrides any previously applied styleable attrs)
             // filter out androidplot prefixed attrs:
             HashMap<String, String> attrHash = new HashMap<String, String>();
