Allow StyledResources to receive a fixed theme for testing

pull/157/head
Alinson S. Xavier 9 years ago
parent 11378e07bf
commit d0db3359fe

@ -116,6 +116,7 @@ public class BaseAndroidTest
protected void setTheme(@StyleRes int themeId)
{
targetContext.setTheme(themeId);
StyledResources.setFixedTheme(themeId);
}
protected void sleep(int time)

@ -45,6 +45,7 @@ public class CheckmarkWidgetViewTest extends BaseViewTest
public void setUp()
{
super.setUp();
setTheme(R.style.TransparentWidgetTheme);
habit = fixtures.createShortHabit();
view = new CheckmarkWidgetView(targetContext);

@ -28,6 +28,8 @@ import org.isoron.uhabits.*;
public class StyledResources
{
private static Integer fixedTheme;
private final Context context;
public StyledResources(@NonNull Context context)
@ -35,6 +37,11 @@ public class StyledResources
this.context = context;
}
public static void setFixedTheme(Integer theme)
{
fixedTheme = theme;
}
public boolean getBoolean(@AttrRes int attrId)
{
TypedArray ta = getTypedArray(attrId);
@ -92,9 +99,8 @@ public class StyledResources
{
int[] attrs = new int[]{ attrId };
// Integer fixedTheme = ThemeSwitcher.fixedTheme;
// if (fixedTheme != null)
// return context.getTheme().obtainStyledAttributes(fixedTheme, attrs);
if (fixedTheme != null)
return context.getTheme().obtainStyledAttributes(fixedTheme, attrs);
return context.obtainStyledAttributes(attrs);
}

Loading…
Cancel
Save