isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 17:18:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove warning when palette cannot be found

Browse Source
This commit is contained in:
Alinson S. Xavier
2016-04-15 18:26:01 -04:00
parent 728c9557f0
commit 90e513e778
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/org/isoron/uhabits/helpers/ColorHelper.java
View File

@@ -20,9 +20,7 @@
package org.isoron.uhabits.helpers; package org.isoron.uhabits.helpers;
import android.content.Context; import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Color; import android.graphics.Color;
import android.util.Log;
import org.isoron.uhabits.R; import org.isoron.uhabits.R;
@@ -57,16 +55,8 @@ public class ColorHelper
public static int[] getPalette(Context context) public static int[] getPalette(Context context)
{ {
int[] attr = new int[] { R.attr.palette }; int resourceId = UIHelper.getStyleResource(context, R.attr.palette);
TypedArray array = context.obtainStyledAttributes(attr); if(resourceId < 0) return CSV_PALETTE;
int resourceId = array.getResourceId(0, -1);
array.recycle();
if(resourceId < 0)
{
Log.w("ColorHelper", "could not find palette resource. Returning CSV palette");
return CSV_PALETTE;
}
return context.getResources().getIntArray(resourceId); return context.getResources().getIntArray(resourceId);
} }

10
app/src/main/java/org/isoron/uhabits/helpers/UIHelper.java
View File

@@ -208,6 +208,16 @@ public abstract class UIHelper
return bool; return bool;
} }
static int getStyleResource(Context context, int attrId)
{
int[] attr = new int[] { attrId };
TypedArray array = context.obtainStyledAttributes(attr);
int resourceId = array.getResourceId(0, -1);
array.recycle();
return resourceId;
}
public static void applyCurrentTheme(Activity activity) public static void applyCurrentTheme(Activity activity)
{ {
switch(getCurrentTheme()) switch(getCurrentTheme())