archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '111121_sb_ab_test_theme' into 111130_sb_3.9_polish

Browse Source
pull/14/head
Sam Bosley 13 years ago
parent 72bbd6e221 95706b246f
commit a57e01bb4d
5 changed files with 63 additions and 5 deletions
Show Stats Download Patch File Download Diff File

26
astrid/src/com/todoroo/astrid/dao/TaskDao.java
Unescape Escape View File

@ -219,15 +219,33 @@ public class TaskDao extends DatabaseDao<Task> {
ContentValues values = item.getSetValues();
boolean result = super.createNew(item);
if(result) {
if(Preferences.getBoolean(AstridPreferences.P_FIRST_ACTION, false)) {
StatisticsService.reportEvent(StatisticsConstants.USER_FIRST_TASK);
Preferences.setBoolean(AstridPreferences.P_FIRST_ACTION, false);
}
userRetentionMetrics();
afterSave(item, values);
}
return result;
}
private void userRetentionMetrics() {
if(Preferences.getBoolean(AstridPreferences.P_FIRST_ACTION, false)) {
StatisticsService.reportEvent(StatisticsConstants.USER_FIRST_TASK);
Preferences.setBoolean(AstridPreferences.P_FIRST_ACTION, false);
}
long firstLaunchTime = Preferences.getLong(AstridPreferences.P_FIRST_LAUNCH, 0);
long now = DateUtilities.now();
long timeSinceFirst = now - firstLaunchTime;
if (timeSinceFirst < DateUtilities.ONE_WEEK && !Preferences.getBoolean(StatisticsConstants.TASK_ONE_WEEK, false)) {
StatisticsService.reportEvent(StatisticsConstants.TASK_ONE_WEEK);
Preferences.setBoolean(StatisticsConstants.TASK_ONE_WEEK, true);
} else if (timeSinceFirst < 2 * DateUtilities.ONE_WEEK && !Preferences.getBoolean(StatisticsConstants.TASK_TWO_WEEKS, false)) {
StatisticsService.reportEvent(StatisticsConstants.TASK_TWO_WEEKS);
Preferences.setBoolean(StatisticsConstants.TASK_TWO_WEEKS, true);
} else if (timeSinceFirst < 3 * DateUtilities.ONE_WEEK && !Preferences.getBoolean(StatisticsConstants.TASK_THREE_WEEKS, false)) {
StatisticsService.reportEvent(StatisticsConstants.TASK_THREE_WEEKS);
Preferences.setBoolean(StatisticsConstants.TASK_THREE_WEEKS, true);
}
}
/**
* Sets default reminders for the given task if reminders are not set
* @param item

23
astrid/src/com/todoroo/astrid/service/StartupService.java
Unescape Escape View File

@ -28,6 +28,7 @@ import com.todoroo.andlib.service.ContextManager;
import com.todoroo.andlib.service.DependencyInjectionService;
import com.todoroo.andlib.service.ExceptionService;
import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.andlib.utility.Preferences;
import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
import com.todoroo.astrid.actfm.sync.ActFmSyncService;
@ -41,6 +42,8 @@ import com.todoroo.astrid.gtasks.sync.GtasksSyncOnSaveService;
import com.todoroo.astrid.opencrx.OpencrxCoreUtils;
import com.todoroo.astrid.producteev.ProducteevUtilities;
import com.todoroo.astrid.reminders.ReminderStartupReceiver;
import com.todoroo.astrid.service.abtesting.ABChooser;
import com.todoroo.astrid.service.abtesting.ABOptions;
import com.todoroo.astrid.service.abtesting.FeatureFlipper;
import com.todoroo.astrid.utility.AstridPreferences;
import com.todoroo.astrid.utility.Constants;
@ -85,6 +88,8 @@ public class StartupService {
@Autowired FeatureFlipper featureFlipper;
@Autowired ABChooser abChooser;
/**
* bit to prevent multiple initializations
*/
@ -126,6 +131,21 @@ public class StartupService {
exceptionService.reportError("astrid-startup-version-read", e); //$NON-NLS-1$
}
if (latestSetVersion == 0) {
if (Preferences.getLong(AstridPreferences.P_FIRST_LAUNCH, -1) < 0) {
Preferences.setLong(AstridPreferences.P_FIRST_LAUNCH, DateUtilities.now());
}
int defaultTheme = abChooser.getChoiceForOption(ABOptions.AB_THEME_KEY);
if (defaultTheme == 0)
Preferences.setString(R.string.p_theme, "white");
else
Preferences.setString(R.string.p_theme, "black");
} else {
abChooser.setChoiceForOption(ABOptions.AB_THEME_KEY, 0);
Preferences.setLong(AstridPreferences.P_FIRST_LAUNCH, 0);
}
int version = 0;
try {
PackageManager pm = context.getPackageManager();
@ -143,8 +163,9 @@ public class StartupService {
// invoke upgrade service
boolean justUpgraded = latestSetVersion != version;
if(justUpgraded && version > 0) {
if(latestSetVersion > 0)
if(latestSetVersion > 0) {
upgradeService.performUpgrade(context, latestSetVersion);
}
AstridPreferences.setCurrentVersion(version);
}
if(latestSetVersion == 0) {

4
astrid/src/com/todoroo/astrid/service/StatisticsConstants.java
Unescape Escape View File

@ -58,5 +58,9 @@ public class StatisticsConstants {
public static final String REPEAT_TASK_CREATE = "repeat-task-create";
public static final String ACTFM_LIST_SHARED = "actfm-list-shared";
public static final String TASK_ONE_WEEK = "task-created-one-week";
public static final String TASK_TWO_WEEKS = "task-created-two-weeks";
public static final String TASK_THREE_WEEKS = "task-created-three-weeks";
}

13
astrid/src/com/todoroo/astrid/service/abtesting/ABOptions.java
Unescape Escape View File

@ -4,6 +4,8 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import com.todoroo.astrid.service.StatisticsConstants;
/**
* Helper class to define options with their probabilities and descriptions
* @author Sam Bosley <sam@astrid.com>
@ -167,6 +169,17 @@ public class ABOptions {
private void initialize() { // Set up
//Calls to addOption go here
addOption(AB_THEME_KEY, AB_THEME_PROBS, AB_THEME_DESCRIPTIONS, AB_THEME_EVENTS);
}
public static final String AB_THEME_KEY = "ab-theme";
private static final int[] AB_THEME_PROBS = { 9, 1 };
private static final String[] AB_THEME_DESCRIPTIONS = { "ab-theme-white", "ab-theme-black" };
private static final String[] AB_THEME_EVENTS = { StatisticsConstants.USER_FIRST_TASK,
StatisticsConstants.USER_FIRST_LIST,
StatisticsConstants.ACTFM_NEW_USER,
StatisticsConstants.TASK_ONE_WEEK,
StatisticsConstants.TASK_TWO_WEEKS,
StatisticsConstants.TASK_THREE_WEEKS };
}

2
astrid/src/com/todoroo/astrid/utility/AstridPreferences.java
Unescape Escape View File

@ -21,6 +21,8 @@ public class AstridPreferences {
public static final String P_UPGRADE_FROM = "uf"; //$NON-NLS-1$
public static final String P_FIRST_LAUNCH = "fltime"; //$NON-NLS-1$
/** Set preference defaults, if unset. called at startup */
public static void setPreferenceDefaults() {
Context context = ContextManager.getContext();

Write Preview
Loading…
Cancel
Save