Added a DEMO mode to enable all the features without their timing log…

…ic on
2017398956 · Nov 21, 2015 · b6db26f · b6db26f
1 parent c737b9d
commit b6db26f
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 20 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -21,8 +21,8 @@ android {
  applicationId "com.morristaedt.mirror"
  minSdkVersion 14
  targetSdkVersion 22
- versionCode 1
- versionName "1.0"
+ versionCode 2
+ versionName "1.1"
  }
  buildTypes {
  debug {

diff --git a/app/src/main/java/com/morristaedt/mirror/MirrorActivity.java b/app/src/main/java/com/morristaedt/mirror/MirrorActivity.java
@@ -34,8 +34,6 @@
 
 public class MirrorActivity extends ActionBarActivity {
 
- private static final boolean DEMO_MODE = false;
-
  @NonNull
  private ConfigurationSettings mConfigSettings;
 
@@ -244,7 +242,7 @@ private void setViewState() {
  mCalendarDetailsText.setVisibility(View.GONE);
  }
 
- if (mConfigSettings.showStock() && WeekUtil.isWeekday() && WeekUtil.afterFive()) {
+ if (mConfigSettings.showStock() && (ConfigurationSettings.isDemoMode() || WeekUtil.isWeekdayAfterFive())) {
  YahooFinanceModule.getStockForToday(mConfigSettings.getStockTickerSymbol(), mStockListener);
  } else {
  mStockText.setVisibility(View.GONE);
@@ -258,15 +256,6 @@ private void setViewState() {
  }
  }
 
- private void showDemoMode() {
- if (DEMO_MODE) {
- mBikeTodayText.setVisibility(View.VISIBLE);
- mStockText.setVisibility(View.VISIBLE);
- mWaterPlants.setVisibility(View.VISIBLE);
- mGroceryList.setVisibility(View.VISIBLE);
- }
- }
-
  @Override
  public void onBackPressed() {
  super.onBackPressed();

diff --git a/app/src/main/java/com/morristaedt/mirror/configuration/ConfigurationSettings.java b/app/src/main/java/com/morristaedt/mirror/configuration/ConfigurationSettings.java
@@ -13,6 +13,11 @@
  */
 public class ConfigurationSettings {
 
+ /**
+ * Hardcode on to enable features outside of their regularly scheduled hours
+ */
+ private static final boolean DEMO_MODE = false;
+
  private static final String PREFS_MIRROR = "MirrorPrefs";
 
  private static final String FORECAST_UNITS = "forecast_units";
@@ -175,4 +180,13 @@ public String getStockTickerSymbol() {
  public static boolean isDebugBuild() {
  return BuildConfig.DEBUG;
  }
+
+ /**
+ * Whether we're ignoring timing rules for features
+ *
+ * @return
+ */
+ public static boolean isDemoMode() {
+ return DEMO_MODE;
+ }
 }
diff --git a/app/src/main/java/com/morristaedt/mirror/modules/ForecastModule.java b/app/src/main/java/com/morristaedt/mirror/modules/ForecastModule.java
@@ -5,6 +5,7 @@
 import android.util.Log;
 
 import com.morristaedt.mirror.R;
+import com.morristaedt.mirror.configuration.ConfigurationSettings;
 import com.morristaedt.mirror.requests.ForecastRequest;
 import com.morristaedt.mirror.requests.ForecastResponse;
 import com.morristaedt.mirror.utils.WeekUtil;
@@ -53,7 +54,7 @@ protected void onPostExecute(ForecastResponse forecastResponse) {
  listener.onWeatherToday(forecastResponse.currently.getDisplayTemperature() + " " + forecastResponse.currently.summary);
  }
 
- if (WeekUtil.isWeekday() && !WeekUtil.afterFive() && forecastResponse.hourly != null && forecastResponse.hourly.data != null) {
+ if (forecastResponse.hourly != null && forecastResponse.hourly.data != null && (ConfigurationSettings.isDemoMode() || WeekUtil.isWeekdayBeforeFive())) {
  listener.onShouldBike(true, shouldBikeToday(forecastResponse.hourly.data));
  } else {
  listener.onShouldBike(false, true);

diff --git a/app/src/main/java/com/morristaedt/mirror/modules/XKCDModule.java b/app/src/main/java/com/morristaedt/mirror/modules/XKCDModule.java
@@ -1,10 +1,12 @@
 package com.morristaedt.mirror.modules;
 
 import android.os.AsyncTask;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Log;
 
+import com.morristaedt.mirror.configuration.ConfigurationSettings;
 import com.morristaedt.mirror.requests.XKCDRequest;
 import com.morristaedt.mirror.requests.XKCDResponse;
 
@@ -47,15 +49,19 @@ protected XKCDResponse doInBackground(Void... params) {
 
  @Override
  protected void onPostExecute(@Nullable XKCDResponse xkcdResponse) {
- if (xkcdResponse != null) {
- Calendar today = Calendar.getInstance();
- if (!TextUtils.isEmpty(xkcdResponse.img) && xkcdResponse.day == today.get(Calendar.DAY_OF_MONTH) && xkcdResponse.month == (today.get(Calendar.MONTH) + 1) && xkcdResponse.year == today.get(Calendar.YEAR)) {
+ if (xkcdResponse != null && !TextUtils.isEmpty(xkcdResponse.img)) {
+ if (ConfigurationSettings.isDemoMode() || isTodaysXKCD(xkcdResponse)) {
  listener.onNewXKCDToday(xkcdResponse.img);
  return;
  }
  }
  listener.onNewXKCDToday(null);
  }
+
+ private boolean isTodaysXKCD(@NonNull XKCDResponse xkcdResponse) {
+ Calendar today = Calendar.getInstance();
+ return xkcdResponse.day == today.get(Calendar.DAY_OF_MONTH) && xkcdResponse.month == (today.get(Calendar.MONTH) + 1) && xkcdResponse.year == today.get(Calendar.YEAR);
+ }
  }.execute();
 
  }

diff --git a/app/src/main/java/com/morristaedt/mirror/modules/YahooFinanceModule.java b/app/src/main/java/com/morristaedt/mirror/modules/YahooFinanceModule.java
@@ -4,6 +4,7 @@
 import android.support.annotation.Nullable;
 import android.util.Log;
 
+import com.morristaedt.mirror.configuration.ConfigurationSettings;
 import com.morristaedt.mirror.requests.YahooFinanceRequest;
 import com.morristaedt.mirror.requests.YahooStockResponse;
 
@@ -53,7 +54,7 @@ protected YahooStockResponse doInBackground(Void... params) {
  protected void onPostExecute(@Nullable YahooStockResponse stockResponse) {
  if (stockResponse != null && stockResponse.getQuoteResponse() != null) {
  YahooStockResponse.YahooQuoteResponse quoteResponse = stockResponse.getQuoteResponse();
- if (quoteResponse.getPercentageChange().abs().compareTo(BigDecimal.valueOf(0.03)) >= 0) {
+ if (ConfigurationSettings.isDemoMode() || quoteResponse.getPercentageChange().abs().compareTo(BigDecimal.valueOf(0.03)) >= 0) {
  listener.onNewStockPrice(quoteResponse);
  return;
  }

diff --git a/app/src/main/java/com/morristaedt/mirror/utils/WeekUtil.java b/app/src/main/java/com/morristaedt/mirror/utils/WeekUtil.java
@@ -12,8 +12,16 @@ public static boolean isWeekday() {
  return dayOfWeek != Calendar.SATURDAY && dayOfWeek != Calendar.SUNDAY;
  }
 
- public static boolean afterFive(){
+ public static boolean afterFive() {
  int hourOfDay = Calendar.getInstance().get(Calendar.HOUR_OF_DAY);
  return hourOfDay >= 17;
  }
+
+ public static boolean isWeekdayBeforeFive() {
+ return isWeekday() && !afterFive();
+ }
+
+ public static boolean isWeekdayAfterFive() {
+ return isWeekday() && afterFive();
+ }
 }