From d0db3359fe6bab4f43e0a8996852ff75668a201b Mon Sep 17 00:00:00 2001 From: Alinson Xavier Date: Wed, 3 Aug 2016 22:27:49 -0400 Subject: [PATCH] Allow StyledResources to receive a fixed theme for testing --- .../java/org/isoron/uhabits/BaseAndroidTest.java | 1 + .../widgets/views/CheckmarkWidgetViewTest.java | 1 + .../org/isoron/uhabits/utils/StyledResources.java | 12 +++++++++--- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java b/app/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java index f8a4045a2..edb28d55d 100644 --- a/app/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java +++ b/app/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java @@ -116,6 +116,7 @@ public class BaseAndroidTest protected void setTheme(@StyleRes int themeId) { targetContext.setTheme(themeId); + StyledResources.setFixedTheme(themeId); } protected void sleep(int time) diff --git a/app/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.java b/app/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.java index 726e8bdf1..bb151334b 100644 --- a/app/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.java +++ b/app/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.java @@ -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); diff --git a/app/src/main/java/org/isoron/uhabits/utils/StyledResources.java b/app/src/main/java/org/isoron/uhabits/utils/StyledResources.java index 2cf9f2032..1297f8962 100644 --- a/app/src/main/java/org/isoron/uhabits/utils/StyledResources.java +++ b/app/src/main/java/org/isoron/uhabits/utils/StyledResources.java @@ -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); }