From d7adbe95e3afe5d2537b0699204d3efbbab62cac Mon Sep 17 00:00:00 2001
From: Brad McDermott <bradmcdermott@gmail.com>
Date: Fri, 15 Apr 2016 13:55:41 -0400
Subject: [PATCH 01/53] Initial commit

---
 .gitignore                                    |  38 ++
 app/.gitignore                                |   1 +
 app/build.gradle                              |  27 ++
 app/proguard-rules.pro                        |  17 +
 .../backboneapp/ApplicationTest.java          |  15 +
 app/src/main/AndroidManifest.xml              |  33 ++
 .../researchstack/backboneapp/AppPrefs.java   |  58 +++
 .../backboneapp/CoreApplication.java          |  42 ++
 .../backboneapp/MainActivity.java             | 392 ++++++++++++++++++
 app/src/main/res/layout/activity_main.xml     |  82 ++++
 app/src/main/res/mipmap-hdpi/ic_launcher.png  | Bin 0 -> 3418 bytes
 app/src/main/res/mipmap-mdpi/ic_launcher.png  | Bin 0 -> 2206 bytes
 app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 4842 bytes
 .../main/res/mipmap-xxhdpi/ic_launcher.png    | Bin 0 -> 7718 bytes
 .../main/res/mipmap-xxxhdpi/ic_launcher.png   | Bin 0 -> 10486 bytes
 app/src/main/res/values-w820dp/dimens.xml     |   6 +
 app/src/main/res/values/colors.xml            |   6 +
 app/src/main/res/values/dimens.xml            |   5 +
 app/src/main/res/values/strings.xml           |   7 +
 app/src/main/res/values/styles.xml            |  24 ++
 .../backboneapp/ExampleUnitTest.java          |  18 +
 build.gradle                                  |  25 ++
 gradle.properties                             |  18 +
 gradle/wrapper/gradle-wrapper.jar             | Bin 0 -> 53636 bytes
 gradle/wrapper/gradle-wrapper.properties      |   6 +
 gradlew                                       | 160 +++++++
 gradlew.bat                                   |  90 ++++
 settings.gradle                               |   1 +
 28 files changed, 1071 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 app/.gitignore
 create mode 100644 app/build.gradle
 create mode 100644 app/proguard-rules.pro
 create mode 100644 app/src/androidTest/java/org/researchstack/backboneapp/ApplicationTest.java
 create mode 100644 app/src/main/AndroidManifest.xml
 create mode 100644 app/src/main/java/org/researchstack/backboneapp/AppPrefs.java
 create mode 100644 app/src/main/java/org/researchstack/backboneapp/CoreApplication.java
 create mode 100644 app/src/main/java/org/researchstack/backboneapp/MainActivity.java
 create mode 100644 app/src/main/res/layout/activity_main.xml
 create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.png
 create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.png
 create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.png
 create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.png
 create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
 create mode 100644 app/src/main/res/values-w820dp/dimens.xml
 create mode 100644 app/src/main/res/values/colors.xml
 create mode 100644 app/src/main/res/values/dimens.xml
 create mode 100644 app/src/main/res/values/strings.xml
 create mode 100644 app/src/main/res/values/styles.xml
 create mode 100644 app/src/test/java/org/researchstack/backboneapp/ExampleUnitTest.java
 create mode 100644 build.gradle
 create mode 100644 gradle.properties
 create mode 100644 gradle/wrapper/gradle-wrapper.jar
 create mode 100644 gradle/wrapper/gradle-wrapper.properties
 create mode 100755 gradlew
 create mode 100644 gradlew.bat
 create mode 100644 settings.gradle

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..fb215cd1f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,38 @@
+# Built application files
+*.apk
+*.ap_
+
+# Files for the Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+
+# Gradle files
+.gradle/
+build/
+/*/build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+app/crashlytics.properties
+/.idea/*
+/captures
+.DS_Store
+/tmp/
+*.gz
+com_crashlytics_export_strings.xml
+*.iml
+
+app/gradle.properties
diff --git a/app/.gitignore b/app/.gitignore
new file mode 100644
index 000000000..796b96d1c
--- /dev/null
+++ b/app/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/app/build.gradle b/app/build.gradle
new file mode 100644
index 000000000..44341a570
--- /dev/null
+++ b/app/build.gradle
@@ -0,0 +1,27 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 23
+    buildToolsVersion "23.0.2"
+
+    defaultConfig {
+        applicationId "org.researchstack.backboneapp"
+        minSdkVersion 16
+        targetSdkVersion 23
+        versionCode 1
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    testCompile 'junit:junit:4.12'
+    compile 'com.android.support:appcompat-v7:23.2.1'
+    compile 'org.researchstack:backbone:0.9.0b2'
+}
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
new file mode 100644
index 000000000..2b8673663
--- /dev/null
+++ b/app/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Users/bradleymcdermott/Library/Android/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/app/src/androidTest/java/org/researchstack/backboneapp/ApplicationTest.java b/app/src/androidTest/java/org/researchstack/backboneapp/ApplicationTest.java
new file mode 100644
index 000000000..a299254bb
--- /dev/null
+++ b/app/src/androidTest/java/org/researchstack/backboneapp/ApplicationTest.java
@@ -0,0 +1,15 @@
+package org.researchstack.backboneapp;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+/**
+ * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
+ */
+public class ApplicationTest extends ApplicationTestCase<Application>
+{
+    public ApplicationTest()
+    {
+        super(Application.class);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..817338463
--- /dev/null
+++ b/app/src/main/AndroidManifest.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest
+    package="org.researchstack.backboneapp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application
+        android:name="org.researchstack.backboneapp.CoreApplication"
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@style/CoreAppTheme">
+
+        <activity android:name="org.researchstack.backboneapp.MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name="org.researchstack.backbone.ui.ViewTaskActivity"
+        />
+
+        <activity
+            android:name="org.researchstack.backbone.ui.ViewWebDocumentActivity"
+            android:label="@string/app_name"
+        />
+
+    </application>
+
+</manifest>
diff --git a/app/src/main/java/org/researchstack/backboneapp/AppPrefs.java b/app/src/main/java/org/researchstack/backboneapp/AppPrefs.java
new file mode 100644
index 000000000..921009c87
--- /dev/null
+++ b/app/src/main/java/org/researchstack/backboneapp/AppPrefs.java
@@ -0,0 +1,58 @@
+package org.researchstack.backboneapp;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+
+
+public class AppPrefs
+{
+    public static final String HAS_CONSENTED     = "HAS_CONSENTED";
+    public static final String CONSENT_NAME      = "CONSENT_NAME";
+    public static final String CONSENT_SIGNATURE = "CONSENT_SIGNATURE";
+    public static final String HAS_SURVEYED      = "HAS_SURVEYED";
+    public static final String SURVEY_RESULT     = "SURVEY_RESULT";
+
+    //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+    // Statics
+    //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+    private static AppPrefs instance;
+
+    //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+    // Field Vars
+    //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+    private final SharedPreferences prefs;
+
+    AppPrefs(Context context)
+    {
+        prefs = PreferenceManager.getDefaultSharedPreferences(context);
+    }
+
+    public static synchronized AppPrefs getInstance(Context context)
+    {
+        if(instance == null)
+        {
+            instance = new AppPrefs(context);
+        }
+        return instance;
+    }
+
+    public boolean hasConsented()
+    {
+        return prefs.getBoolean(HAS_CONSENTED, false);
+    }
+
+    public void setHasConsented(boolean consented)
+    {
+        prefs.edit().putBoolean(HAS_CONSENTED, consented).apply();
+    }
+
+    public boolean hasSurveyed()
+    {
+        return prefs.getBoolean(HAS_SURVEYED, false);
+    }
+
+    public void setHasSurveyed(boolean surveyed)
+    {
+        prefs.edit().putBoolean(HAS_SURVEYED, surveyed).apply();
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/researchstack/backboneapp/CoreApplication.java b/app/src/main/java/org/researchstack/backboneapp/CoreApplication.java
new file mode 100644
index 000000000..6b80f7095
--- /dev/null
+++ b/app/src/main/java/org/researchstack/backboneapp/CoreApplication.java
@@ -0,0 +1,42 @@
+package org.researchstack.backboneapp;
+
+import android.app.Application;
+
+import org.researchstack.backbone.StorageAccess;
+import org.researchstack.backbone.storage.database.AppDatabase;
+import org.researchstack.backbone.storage.database.sqlite.DatabaseHelper;
+import org.researchstack.backbone.storage.file.EncryptionProvider;
+import org.researchstack.backbone.storage.file.FileAccess;
+import org.researchstack.backbone.storage.file.PinCodeConfig;
+import org.researchstack.backbone.storage.file.SimpleFileAccess;
+import org.researchstack.backbone.storage.file.UnencryptedProvider;
+
+
+public class CoreApplication extends Application
+{
+    @Override
+    public void onCreate()
+    {
+        super.onCreate();
+
+        // Customize your pin code preferences
+        PinCodeConfig pinCodeConfig = new PinCodeConfig(); // default pin config (4-digit, 1 min lockout)
+
+        // Customize encryption preferences
+        EncryptionProvider encryptionProvider = new UnencryptedProvider(); // No pin, no encryption
+        // pin/encryption only working properly in Skin right now, fix it (onDataReady called when no pincode has been create
+        // EncryptionProvider encryptionProvider = new UnencryptedPinProvider(); // Pin, no encryption
+        // EncryptionProvider encryptionProvider = new AesProvider(); // Pin + AES encryption
+
+        // If you have special file handling needs, implement FileAccess
+        FileAccess fileAccess = new SimpleFileAccess();
+
+        // If you have your own custom database, implement AppDatabase
+        AppDatabase database = new DatabaseHelper(this,
+                DatabaseHelper.DEFAULT_NAME,
+                null,
+                DatabaseHelper.DEFAULT_VERSION);
+
+        StorageAccess.getInstance().init(pinCodeConfig, encryptionProvider, fileAccess, database);
+    }
+}
diff --git a/app/src/main/java/org/researchstack/backboneapp/MainActivity.java b/app/src/main/java/org/researchstack/backboneapp/MainActivity.java
new file mode 100644
index 000000000..24d1d2deb
--- /dev/null
+++ b/app/src/main/java/org/researchstack/backboneapp/MainActivity.java
@@ -0,0 +1,392 @@
+package org.researchstack.backboneapp;
+
+import android.content.Intent;
+import android.graphics.BitmapFactory;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v7.widget.AppCompatButton;
+import android.util.Base64;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import org.researchstack.backbone.StorageAccess;
+import org.researchstack.backbone.answerformat.AnswerFormat;
+import org.researchstack.backbone.answerformat.BooleanAnswerFormat;
+import org.researchstack.backbone.answerformat.ChoiceAnswerFormat;
+import org.researchstack.backbone.answerformat.DateAnswerFormat;
+import org.researchstack.backbone.answerformat.IntegerAnswerFormat;
+import org.researchstack.backbone.answerformat.TextAnswerFormat;
+import org.researchstack.backbone.answerformat.UnknownAnswerFormat;
+import org.researchstack.backbone.model.Choice;
+import org.researchstack.backbone.model.ConsentDocument;
+import org.researchstack.backbone.model.ConsentSection;
+import org.researchstack.backbone.model.ConsentSignature;
+import org.researchstack.backbone.result.StepResult;
+import org.researchstack.backbone.result.TaskResult;
+import org.researchstack.backbone.step.ConsentDocumentStep;
+import org.researchstack.backbone.step.ConsentSignatureStep;
+import org.researchstack.backbone.step.ConsentVisualStep;
+import org.researchstack.backbone.step.FormStep;
+import org.researchstack.backbone.step.InstructionStep;
+import org.researchstack.backbone.step.QuestionStep;
+import org.researchstack.backbone.task.OrderedTask;
+import org.researchstack.backbone.task.Task;
+import org.researchstack.backbone.ui.PinCodeActivity;
+import org.researchstack.backbone.ui.ViewTaskActivity;
+import org.researchstack.backbone.ui.step.layout.ConsentSignatureStepLayout;
+
+import java.util.ArrayList;
+import java.util.Collections;
+
+public class MainActivity extends PinCodeActivity
+{
+    // Activity Request Codes
+    private static final int REQUEST_CONSENT = 0;
+    private static final int REQUEST_SURVEY  = 1;
+
+    // Task/Step Identifiers
+    public static final  String FORM_STEP                 = "form_step";
+    public static final  String AGE                       = "age";
+    public static final  String INSTRUCTION               = "identifier";
+    public static final  String BASIC_INFO_HEADER         = "basic_info_header";
+    public static final  String FORM_AGE                  = "form_age";
+    public static final  String FORM_GENDER               = "gender";
+    public static final  String FORM_MULTI_CHOICE         = "multi_choice";
+    public static final  String FORM_DATE_OF_BIRTH        = "date_of_birth";
+    public static final  String NUTRITION                 = "nutrition";
+    public static final  String SIGNATURE                 = "signature";
+    public static final  String SIGNATURE_DATE            = "signature_date";
+    public static final  String VISUAL_CONSENT_IDENTIFIER = "visual_consent_identifier";
+    public static final  String CONSENT_DOC               = "consent_doc";
+    public static final  String SIGNATURE_FORM_STEP       = "form_step";
+    public static final  String NAME                      = "name";
+    public static final  String CONSENT                   = "consent";
+    public static final  String MULTI_STEP                = "multi_step";
+    public static final  String DATE                      = "date";
+    public static final  String DECIMAL                   = "decimal";
+    private static final String FORM_NAME                 = "form_name";
+    public static final  String SAMPLE_SURVEY             = "sample_survey";
+
+    // Views
+    private AppCompatButton consentButton;
+    private AppCompatButton surveyButton;
+    private AppCompatButton clearButton;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        consentButton = (AppCompatButton) findViewById(R.id.consent_button);
+        consentButton.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View v)
+            {
+                launchConsent();
+            }
+        });
+        surveyButton = (AppCompatButton) findViewById(R.id.survey_button);
+        surveyButton.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View v)
+            {
+                launchSurvey();
+            }
+        });
+        clearButton = (AppCompatButton) findViewById(R.id.clear_button);
+        clearButton.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View v)
+            {
+                clearData();
+            }
+        });
+
+    }
+
+    private void clearData()
+    {
+        AppPrefs appPrefs = AppPrefs.getInstance(this);
+        appPrefs.setHasSurveyed(false);
+        appPrefs.setHasConsented(false);
+
+        finish();
+    }
+
+    @Override
+    public void onDataReady()
+    {
+        super.onDataReady();
+        initViews();
+    }
+
+    private void initViews()
+    {
+        AppPrefs prefs = AppPrefs.getInstance(this);
+        if(prefs.hasConsented())
+        {
+            consentButton.setEnabled(false);
+            consentButton.setText(R.string.consent_button_done);
+            surveyButton.setEnabled(true);
+
+            printConsentInfo();
+        }
+        else
+        {
+            consentButton.setEnabled(true);
+            consentButton.setText(R.string.consent_button);
+            surveyButton.setEnabled(false);
+        }
+
+        if(prefs.hasSurveyed())
+        {
+            printSurveyInfo();
+        }
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data)
+    {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        if(requestCode == REQUEST_CONSENT && resultCode == RESULT_OK)
+        {
+            processConsentResult((TaskResult) data.getSerializableExtra(ViewTaskActivity.EXTRA_TASK_RESULT));
+        }
+        else if(requestCode == REQUEST_SURVEY && resultCode == RESULT_OK)
+        {
+            processSurveyResult((TaskResult) data.getSerializableExtra(ViewTaskActivity.EXTRA_TASK_RESULT));
+        }
+    }
+
+    // Consent stuff
+
+    private void launchConsent()
+    {
+        ConsentDocument document = new ConsentDocument();
+        document.setTitle("Demo Consent");
+        document.setSignaturePageTitle(R.string.rsb_consent);
+
+        // Create consent visual sections
+        ConsentSection section1 = new ConsentSection(ConsentSection.Type.DataGathering);
+        section1.setTitle("The title of the section goes here ...");
+        section1.setSummary("The summary about the section goes here ...");
+        section1.setContent("The content to show in learn more ...");
+
+        // ...add more sections as needed, then create a visual consent step
+        ConsentVisualStep visualStep = new ConsentVisualStep(VISUAL_CONSENT_IDENTIFIER);
+        visualStep.setSection(section1);
+        visualStep.setNextButtonString(getString(R.string.rsb_next));
+
+        // Create consent signature object and set what info is required
+        ConsentSignature signature = new ConsentSignature();
+        signature.setRequiresName(true);
+        signature.setRequiresSignatureImage(true);
+
+        // Create our HTML to show the user and have them accept or decline.
+        StringBuilder docBuilder = new StringBuilder(
+                "</br><div style=\"padding: 10px 10px 10px 10px;\" class='header'>");
+        String title = getString(R.string.rsb_consent_review_title);
+        docBuilder.append(String.format(
+                "<h1 style=\"text-align: center; font-family:sans-serif-light;\">%1$s</h1>",
+                title));
+        String detail = getString(R.string.rsb_consent_review_instruction);
+        docBuilder.append(String.format("<p style=\"text-align: center\">%1$s</p>", detail));
+        docBuilder.append("</div></br>");
+        docBuilder.append("<div><h2> HTML Consent Doc goes here </h2></div>");
+
+        // Create the Consent doc step, pass in our HTML doc
+        ConsentDocumentStep documentStep = new ConsentDocumentStep(CONSENT_DOC);
+        documentStep.setConsentHTML(docBuilder.toString());
+        documentStep.setConfirmMessage(getString(R.string.rsb_consent_review_reason));
+
+        // Create Consent form step, to get users first & last name
+        FormStep formStep = new FormStep(SIGNATURE_FORM_STEP,
+                "Form Title",
+                "Form step description");
+        formStep.setStepTitle(R.string.rsb_consent);
+
+        TextAnswerFormat format = new TextAnswerFormat();
+        format.setIsMultipleLines(false);
+
+        QuestionStep fullName = new QuestionStep(NAME, "Full name", format);
+        formStep.setFormSteps(Collections.singletonList(fullName));
+
+        // Create Consent signature step, user can sign their name
+        ConsentSignatureStep signatureStep = new ConsentSignatureStep(SIGNATURE);
+        signatureStep.setStepTitle(R.string.rsb_consent);
+        signatureStep.setTitle(getString(R.string.rsb_consent_signature_title));
+        signatureStep.setText(getString(R.string.rsb_consent_signature_instruction));
+        signatureStep.setSignatureDateFormat(signature.getSignatureDateFormatString());
+        signatureStep.setOptional(false);
+        signatureStep.setStepLayoutClass(ConsentSignatureStepLayout.class);
+
+        // Finally, create and present a task including these steps.
+        Task consentTask = new OrderedTask(CONSENT,
+                visualStep,
+                documentStep,
+                formStep,
+                signatureStep);
+
+        // Launch using hte ViewTaskActivity and make sure to listen for the activity result
+        Intent intent = ViewTaskActivity.newIntent(this, consentTask);
+        startActivityForResult(intent, REQUEST_CONSENT);
+    }
+
+    private void processConsentResult(TaskResult result)
+    {
+        boolean consented = (boolean) result.getStepResult(CONSENT_DOC).getResult();
+
+        if(consented)
+        {
+            StorageAccess.getInstance().getAppDatabase().saveTaskResult(result);
+
+            AppPrefs prefs = AppPrefs.getInstance(this);
+            prefs.setHasConsented(true);
+
+            initViews();
+        }
+    }
+
+    private void printConsentInfo()
+    {
+        TaskResult result = StorageAccess.getInstance()
+                .getAppDatabase()
+                .loadLatestTaskResult(CONSENT);
+
+        String fullName = "";
+        //            String fullName = ((StepResult<String>) result.getStepResult(SIGNATURE_FORM_STEP)
+        //                    .getResultForIdentifier(NAME)).getResult();
+
+        String signatureBase64 = (String) result.getStepResult(SIGNATURE)
+                .getResultForIdentifier(ConsentSignatureStepLayout.KEY_SIGNATURE);
+
+        String signatureDate = (String) result.getStepResult(SIGNATURE)
+                .getResultForIdentifier(ConsentSignatureStepLayout.KEY_SIGNATURE_DATE);
+
+        ((TextView) findViewById(R.id.consented_name)).setText(fullName);
+        ((TextView) findViewById(R.id.consented_date)).setText(signatureDate);
+
+        byte[] signatureBytes = Base64.decode(signatureBase64, Base64.DEFAULT);
+        ((ImageView) findViewById(R.id.consented_signature)).setImageBitmap(BitmapFactory.decodeByteArray(
+                signatureBytes,
+                0,
+                signatureBytes.length));
+    }
+
+
+    // Survey Stuff
+
+    private void launchSurvey()
+    {
+        InstructionStep instructionStep = new InstructionStep(INSTRUCTION,
+                "Selection Survey",
+                "This survey can help us understand your eligibility for the fitness study");
+
+        TextAnswerFormat format = new TextAnswerFormat();
+        QuestionStep ageStep = new QuestionStep(NAME, "What is your name?", format);
+
+        DateAnswerFormat dateFormat = new DateAnswerFormat(AnswerFormat.DateAnswerStyle.Date);
+        QuestionStep dateStep = new QuestionStep(DATE, "Enter a date", dateFormat);
+
+        // Create a Boolean step to include in the task.
+        QuestionStep booleanStep = new QuestionStep(NUTRITION);
+        booleanStep.setTitle("Do you take nutritional supplements?");
+        booleanStep.setAnswerFormat(new BooleanAnswerFormat(getString(R.string.rsb_yes),
+                getString(R.string.rsb_no)));
+        booleanStep.setOptional(false);
+
+        QuestionStep multiStep = new QuestionStep(MULTI_STEP);
+        AnswerFormat multiFormat = new ChoiceAnswerFormat(AnswerFormat.ChoiceAnswerStyle.MultipleChoice,
+                new Choice<>("Zero", 0),
+                new Choice<>("One", 1),
+                new Choice<>("Two", 2));
+        multiStep.setTitle("Select multiple");
+        multiStep.setAnswerFormat(multiFormat);
+        multiStep.setOptional(false);
+
+        // off until formstep result saving is fixed
+        //        FormStep formStep = createFormStep();
+
+        // Create a task wrapping the steps.
+        OrderedTask task = new OrderedTask(SAMPLE_SURVEY, instructionStep, ageStep, dateStep,
+                // formStep,
+                booleanStep, multiStep);
+
+        // Create an activity using the task and set a delegate.
+        Intent intent = ViewTaskActivity.newIntent(this, task);
+        startActivityForResult(intent, REQUEST_SURVEY);
+    }
+
+    @NonNull
+    private FormStep createFormStep()
+    {
+        FormStep formStep = new FormStep(FORM_STEP, "Form", "Form groups multi-entry in one page");
+        ArrayList<QuestionStep> formItems = new ArrayList<>();
+
+        QuestionStep basicInfoHeader = new QuestionStep(BASIC_INFO_HEADER,
+                "Basic Information",
+                new UnknownAnswerFormat());
+        formItems.add(basicInfoHeader);
+
+        TextAnswerFormat format = new TextAnswerFormat();
+        format.setIsMultipleLines(false);
+        QuestionStep nameItem = new QuestionStep(FORM_NAME, "Name", format);
+        formItems.add(nameItem);
+
+        QuestionStep ageItem = new QuestionStep(FORM_AGE, "Age", new IntegerAnswerFormat(18, 90));
+        formItems.add(ageItem);
+
+        AnswerFormat genderFormat = new ChoiceAnswerFormat(AnswerFormat.ChoiceAnswerStyle.SingleChoice,
+                new Choice<>("Male", 0),
+                new Choice<>("Female", 1));
+        QuestionStep genderFormItem = new QuestionStep(FORM_GENDER, "Gender", genderFormat);
+        formItems.add(genderFormItem);
+
+        AnswerFormat multiFormat = new ChoiceAnswerFormat(AnswerFormat.ChoiceAnswerStyle.MultipleChoice,
+                new Choice<>("Zero", 0),
+                new Choice<>("One", 1),
+                new Choice<>("Two", 2));
+        QuestionStep multiFormItem = new QuestionStep(FORM_MULTI_CHOICE, "Test Multi", multiFormat);
+        formItems.add(multiFormItem);
+
+        AnswerFormat dateOfBirthFormat = new DateAnswerFormat(AnswerFormat.DateAnswerStyle.Date);
+        QuestionStep dateOfBirthFormItem = new QuestionStep(FORM_DATE_OF_BIRTH,
+                "Birthdate",
+                dateOfBirthFormat);
+        formItems.add(dateOfBirthFormItem);
+
+        // ... And so on, adding additional items
+        formStep.setFormSteps(formItems);
+        return formStep;
+    }
+
+    private void processSurveyResult(TaskResult result)
+    {
+        StorageAccess.getInstance().getAppDatabase().saveTaskResult(result);
+
+        AppPrefs prefs = AppPrefs.getInstance(this);
+        prefs.setHasSurveyed(true);
+        initViews();
+    }
+
+    private void printSurveyInfo()
+    {
+        TaskResult taskResult = StorageAccess.getInstance()
+                .getAppDatabase()
+                .loadLatestTaskResult(SAMPLE_SURVEY);
+
+        String results = "";
+        for(String id : taskResult.getResults().keySet())
+        {
+            StepResult stepResult = taskResult.getStepResult(id);
+            results += id + ": " + stepResult.getResult().toString() + "\n";
+        }
+        ((TextView) findViewById(R.id.survey_results)).setText(results);
+    }
+}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
new file mode 100644
index 000000000..33005b01a
--- /dev/null
+++ b/app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    tools:context="org.researchstack.backboneapp.MainActivity"
+>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:orientation="vertical"
+    >
+
+        <android.support.v7.widget.AppCompatButton
+            android:id="@+id/consent_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/consent_button"
+        />
+
+        <TextView
+            android:id="@+id/consented_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+        />
+
+        <ImageView
+            android:id="@+id/consented_signature"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+        />
+
+        <TextView
+            android:id="@+id/consented_date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+        />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:orientation="vertical"
+    >
+
+        <android.support.v7.widget.AppCompatButton
+            android:id="@+id/survey_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/survey_button"
+        />
+
+        <TextView
+            android:id="@+id/survey_results"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+        />
+    </LinearLayout>
+
+    <android.support.v7.widget.AppCompatButton
+        android:id="@+id/clear_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="@string/clear_button"
+    />
+
+</LinearLayout>
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..cde69bcccec65160d92116f20ffce4fce0b5245c
GIT binary patch
literal 3418
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..c133a0cbd379f5af6dbf1a899a0293ca5eccfad0
GIT binary patch
literal 2206
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..bfa42f0e7b91d006d22352c9ff2f134e504e3c1d
GIT binary patch
literal 4842
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..324e72cdd7480cb983fa1bcc7ce686e51ef87fe7
GIT binary patch
literal 7718
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..aee44e138434630332d88b1680f33c4b24c70ab3
GIT binary patch
literal 10486
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
acChvT-wm8jF7_S`fH(4La<wuRVgChb86-jg

literal 0
HcmV?d00001

diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml
new file mode 100644
index 000000000..63fc81644
--- /dev/null
+++ b/app/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
new file mode 100644
index 000000000..3ab3e9cbc
--- /dev/null
+++ b/app/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+</resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
new file mode 100644
index 000000000..47c822467
--- /dev/null
+++ b/app/src/main/res/values/dimens.xml
@@ -0,0 +1,5 @@
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
new file mode 100644
index 000000000..54f768685
--- /dev/null
+++ b/app/src/main/res/values/strings.xml
@@ -0,0 +1,7 @@
+<resources>
+    <string name="app_name">Backbone App</string>
+    <string name="consent_button">Consent</string>
+    <string name="survey_button">Take Survey</string>
+    <string name="consent_button_done">Consented</string>
+    <string name="clear_button">Clear</string>
+</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
new file mode 100644
index 000000000..2b66fb071
--- /dev/null
+++ b/app/src/main/res/values/styles.xml
@@ -0,0 +1,24 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="CoreAppTheme" parent="Theme.Backbone">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/rsb_colorPrimary</item>
+        <item name="colorPrimaryDark">@color/rsb_colorPrimaryDark</item>
+        <item name="colorAccent">@color/rsb_colorAccent</item>
+        <item name="alertDialogTheme">@style/CoreAppTheme.Dialog</item>
+    </style>
+
+    <style name="CoreAppTheme.Dialog" parent="Theme.AppCompat.Light">
+        <item name="android:windowIsFloating">false</item>
+        <item name="android:windowBackground">@android:color/white</item>
+        <item name="android:windowSoftInputMode">stateAlwaysVisible</item>
+        <!-- Used for the buttons -->
+        <item name="colorAccent">@color/rsb_colorAccent</item>
+        <!-- Used for the title and text -->
+        <item name="android:textColorPrimary">@color/rsb_black</item>
+        <!-- Used for the background -->
+        <item name="android:background">@android:color/white</item>
+    </style>
+
+</resources>
diff --git a/app/src/test/java/org/researchstack/backboneapp/ExampleUnitTest.java b/app/src/test/java/org/researchstack/backboneapp/ExampleUnitTest.java
new file mode 100644
index 000000000..3132a0438
--- /dev/null
+++ b/app/src/test/java/org/researchstack/backboneapp/ExampleUnitTest.java
@@ -0,0 +1,18 @@
+package org.researchstack.backboneapp;
+
+import org.junit.Test;
+
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * To work on unit tests, switch the Test Artifact in the Build Variants view.
+ */
+public class ExampleUnitTest
+{
+    @Test
+    public void addition_isCorrect() throws Exception
+    {
+        assertEquals(4, 2 + 2);
+    }
+}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 000000000..7f69adb9e
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,25 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.0.0'
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+        mavenCentral()
+        maven { url "https://jitpack.io" } // for MPAndroidChart dependency, not on jcenter yet
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 000000000..1d3591c8a
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,18 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000000000000000000000000000000000..13372aef5e24af05341d49695ee84e5f9b594659
GIT binary patch
literal 53636
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
H-+%o-(+5aQ

literal 0
HcmV?d00001

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000..122a0dca2
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Dec 28 10:00:20 PST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
diff --git a/gradlew b/gradlew
new file mode 100755
index 000000000..9d82f7891
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 000000000..8a0b282aa
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 000000000..e7b4def49
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+include ':app'

From 935ed12df7bf7b897bde3d39848d65ef6f6c9d05 Mon Sep 17 00:00:00 2001
From: wdziemia <wdziemia@gmail.com>
Date: Fri, 15 Apr 2016 14:03:56 -0400
Subject: [PATCH 02/53] Create README.md

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 000000000..5476cedf0
--- /dev/null
+++ b/README.md
@@ -0,0 +1,5 @@
+# Backbone Example App
+
+This repo serves as an using only the Backbone module. This include but is not limited to:
+- How to present a Consent document and a survey to the user
+- How to use StorageAccess to save and load consent, surveys, and files

From 8a2584789c8c6a500885b8372aaa1657bcca6376 Mon Sep 17 00:00:00 2001
From: wdziemia <wdziemia@gmail.com>
Date: Fri, 15 Apr 2016 14:58:35 -0400
Subject: [PATCH 03/53] Update README.md

---
 README.md | 195 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 195 insertions(+)

diff --git a/README.md b/README.md
index 5476cedf0..a590c1def 100644
--- a/README.md
+++ b/README.md
@@ -3,3 +3,198 @@
 This repo serves as an using only the Backbone module. This include but is not limited to:
 - How to present a Consent document and a survey to the user
 - How to use StorageAccess to save and load consent, surveys, and files
+
+# License
+
+This repo and its content use the following license unless otherwise stated
+
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   Copyright 2015-2016 Cornell Tech
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this software except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

From bbe01e1164cbfabb7430e45237afa23ee23e167d Mon Sep 17 00:00:00 2001
From: Brad McDermott <bradmcdermott@gmail.com>
Date: Fri, 15 Apr 2016 15:17:15 -0400
Subject: [PATCH 04/53] Updates dependency version, removes some commented out
 code, renames Application class

---
 app/build.gradle                                          | 2 +-
 app/src/main/AndroidManifest.xml                          | 2 +-
 .../{CoreApplication.java => BackboneApplication.java}    | 5 +----
 .../java/org/researchstack/backboneapp/MainActivity.java  | 8 --------
 4 files changed, 3 insertions(+), 14 deletions(-)
 rename app/src/main/java/org/researchstack/backboneapp/{CoreApplication.java => BackboneApplication.java} (79%)

diff --git a/app/build.gradle b/app/build.gradle
index 44341a570..76ff1a2c2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,5 +23,5 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:23.2.1'
-    compile 'org.researchstack:backbone:0.9.0b2'
+    compile 'org.researchstack:backbone:1.0.0.rc1'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 817338463..1181b4e37 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,7 +4,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
-        android:name="org.researchstack.backboneapp.CoreApplication"
+        android:name=".BackboneApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
diff --git a/app/src/main/java/org/researchstack/backboneapp/CoreApplication.java b/app/src/main/java/org/researchstack/backboneapp/BackboneApplication.java
similarity index 79%
rename from app/src/main/java/org/researchstack/backboneapp/CoreApplication.java
rename to app/src/main/java/org/researchstack/backboneapp/BackboneApplication.java
index 6b80f7095..89803d86e 100644
--- a/app/src/main/java/org/researchstack/backboneapp/CoreApplication.java
+++ b/app/src/main/java/org/researchstack/backboneapp/BackboneApplication.java
@@ -12,7 +12,7 @@
 import org.researchstack.backbone.storage.file.UnencryptedProvider;
 
 
-public class CoreApplication extends Application
+public class BackboneApplication extends Application
 {
     @Override
     public void onCreate()
@@ -24,9 +24,6 @@ public void onCreate()
 
         // Customize encryption preferences
         EncryptionProvider encryptionProvider = new UnencryptedProvider(); // No pin, no encryption
-        // pin/encryption only working properly in Skin right now, fix it (onDataReady called when no pincode has been create
-        // EncryptionProvider encryptionProvider = new UnencryptedPinProvider(); // Pin, no encryption
-        // EncryptionProvider encryptionProvider = new AesProvider(); // Pin + AES encryption
 
         // If you have special file handling needs, implement FileAccess
         FileAccess fileAccess = new SimpleFileAccess();
diff --git a/app/src/main/java/org/researchstack/backboneapp/MainActivity.java b/app/src/main/java/org/researchstack/backboneapp/MainActivity.java
index 24d1d2deb..517ea796e 100644
--- a/app/src/main/java/org/researchstack/backboneapp/MainActivity.java
+++ b/app/src/main/java/org/researchstack/backboneapp/MainActivity.java
@@ -259,17 +259,12 @@ private void printConsentInfo()
                 .getAppDatabase()
                 .loadLatestTaskResult(CONSENT);
 
-        String fullName = "";
-        //            String fullName = ((StepResult<String>) result.getStepResult(SIGNATURE_FORM_STEP)
-        //                    .getResultForIdentifier(NAME)).getResult();
-
         String signatureBase64 = (String) result.getStepResult(SIGNATURE)
                 .getResultForIdentifier(ConsentSignatureStepLayout.KEY_SIGNATURE);
 
         String signatureDate = (String) result.getStepResult(SIGNATURE)
                 .getResultForIdentifier(ConsentSignatureStepLayout.KEY_SIGNATURE_DATE);
 
-        ((TextView) findViewById(R.id.consented_name)).setText(fullName);
         ((TextView) findViewById(R.id.consented_date)).setText(signatureDate);
 
         byte[] signatureBytes = Base64.decode(signatureBase64, Base64.DEFAULT);
@@ -310,9 +305,6 @@ private void launchSurvey()
         multiStep.setAnswerFormat(multiFormat);
         multiStep.setOptional(false);
 
-        // off until formstep result saving is fixed
-        //        FormStep formStep = createFormStep();
-
         // Create a task wrapping the steps.
         OrderedTask task = new OrderedTask(SAMPLE_SURVEY, instructionStep, ageStep, dateStep,
                 // formStep,

From 93c4473cb2af999a24d9bad919d9f2d2271f6e7b Mon Sep 17 00:00:00 2001
From: wdziemia <wdziemia@gmail.com>
Date: Fri, 15 Apr 2016 16:18:58 -0400
Subject: [PATCH 05/53] Cleans up backbone app UI

---
 app/src/main/AndroidManifest.xml              |   5 +-
 .../backboneapp/MainActivity.java             |  92 +++++++++++++-----
 app/src/main/res/layout/activity_main.xml     |  64 +++++++-----
 app/src/main/res/menu/activity_main.xml       |  11 +++
 app/src/main/res/mipmap-hdpi/ic_launcher.png  | Bin 3418 -> 3450 bytes
 app/src/main/res/mipmap-mdpi/ic_launcher.png  | Bin 2206 -> 2140 bytes
 app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 4842 -> 5050 bytes
 .../main/res/mipmap-xxhdpi/ic_launcher.png    | Bin 7718 -> 8694 bytes
 .../main/res/mipmap-xxxhdpi/ic_launcher.png   | Bin 10486 -> 12668 bytes
 app/src/main/res/values-v21/styles.xml        |  14 +++
 app/src/main/res/values/colors.xml            |   1 +
 app/src/main/res/values/strings.xml           |   6 +-
 app/src/main/res/values/styles.xml            |  55 +++++++++--
 13 files changed, 190 insertions(+), 58 deletions(-)
 create mode 100644 app/src/main/res/menu/activity_main.xml
 create mode 100644 app/src/main/res/values-v21/styles.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1181b4e37..0c72435bc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,7 +9,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/CoreAppTheme">
+        android:theme="@style/Theme.BackboneApp">
 
         <activity android:name="org.researchstack.backboneapp.MainActivity">
             <intent-filter>
@@ -21,11 +21,14 @@
 
         <activity
             android:name="org.researchstack.backbone.ui.ViewTaskActivity"
+            android:windowSoftInputMode="adjustResize"
+            android:theme="@style/Theme.BackboneApp.Survey"
         />
 
         <activity
             android:name="org.researchstack.backbone.ui.ViewWebDocumentActivity"
             android:label="@string/app_name"
+            android:theme="@style/Theme.BackboneApp.Survey"
         />
 
     </application>
diff --git a/app/src/main/java/org/researchstack/backboneapp/MainActivity.java b/app/src/main/java/org/researchstack/backboneapp/MainActivity.java
index 517ea796e..1eabaa0f8 100644
--- a/app/src/main/java/org/researchstack/backboneapp/MainActivity.java
+++ b/app/src/main/java/org/researchstack/backboneapp/MainActivity.java
@@ -4,11 +4,16 @@
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
+import android.support.v7.app.ActionBar;
 import android.support.v7.widget.AppCompatButton;
+import android.support.v7.widget.Toolbar;
 import android.util.Base64;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import org.researchstack.backbone.StorageAccess;
 import org.researchstack.backbone.answerformat.AnswerFormat;
@@ -71,7 +76,6 @@ public class MainActivity extends PinCodeActivity
     // Views
     private AppCompatButton consentButton;
     private AppCompatButton surveyButton;
-    private AppCompatButton clearButton;
 
     @Override
     protected void onCreate(Bundle savedInstanceState)
@@ -79,6 +83,11 @@ protected void onCreate(Bundle savedInstanceState)
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        ActionBar actionBar = getSupportActionBar();
+        actionBar.setDisplayShowTitleEnabled(true);
+
         consentButton = (AppCompatButton) findViewById(R.id.consent_button);
         consentButton.setOnClickListener(new View.OnClickListener()
         {
@@ -88,6 +97,7 @@ public void onClick(View v)
                 launchConsent();
             }
         });
+
         surveyButton = (AppCompatButton) findViewById(R.id.survey_button);
         surveyButton.setOnClickListener(new View.OnClickListener()
         {
@@ -97,16 +107,28 @@ public void onClick(View v)
                 launchSurvey();
             }
         });
-        clearButton = (AppCompatButton) findViewById(R.id.clear_button);
-        clearButton.setOnClickListener(new View.OnClickListener()
-        {
-            @Override
-            public void onClick(View v)
-            {
-                clearData();
-            }
-        });
+    }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu)
+    {
+        getMenuInflater().inflate(R.menu.activity_main, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item)
+    {
+        if (item.getItemId() == R.id.menu_clear)
+        {
+            clearData();
+            Toast.makeText(this, R.string.menu_data_cleared, Toast.LENGTH_SHORT).show();
+            return true;
+        }
+        else
+        {
+            return super.onOptionsItemSelected(item);
+        }
     }
 
     private void clearData()
@@ -115,7 +137,7 @@ private void clearData()
         appPrefs.setHasSurveyed(false);
         appPrefs.setHasConsented(false);
 
-        finish();
+        initViews();
     }
 
     @Override
@@ -128,24 +150,43 @@ public void onDataReady()
     private void initViews()
     {
         AppPrefs prefs = AppPrefs.getInstance(this);
+
+        View lblConsentedDate = findViewById(R.id.consented_date_lbl);
+        TextView consentedDate = (TextView)findViewById(R.id.consented_date);
+        ImageView consentedSig = (ImageView) findViewById(R.id.consented_signature);
+
         if(prefs.hasConsented())
         {
-            consentButton.setEnabled(false);
-            consentButton.setText(R.string.consent_button_done);
+            consentButton.setVisibility(View.GONE);
             surveyButton.setEnabled(true);
 
-            printConsentInfo();
+            consentedSig.setVisibility(View.VISIBLE);
+            consentedDate.setVisibility(View.VISIBLE);
+            lblConsentedDate.setVisibility(View.VISIBLE);
+
+            printConsentInfo(consentedDate, consentedSig);
         }
         else
         {
-            consentButton.setEnabled(true);
-            consentButton.setText(R.string.consent_button);
+            consentButton.setVisibility(View.VISIBLE);
             surveyButton.setEnabled(false);
+
+            consentedSig.setVisibility(View.INVISIBLE);
+            consentedSig.setImageBitmap(null);
+            consentedDate.setVisibility(View.INVISIBLE);
+            lblConsentedDate.setVisibility(View.INVISIBLE);
         }
 
+        TextView surveyAnswer = (TextView) findViewById(R.id.survey_results);
+
         if(prefs.hasSurveyed())
         {
-            printSurveyInfo();
+            surveyAnswer.setVisibility(View.VISIBLE);
+            printSurveyInfo(surveyAnswer);
+        }
+        else
+        {
+            surveyAnswer.setVisibility(View.GONE);
         }
     }
 
@@ -180,6 +221,7 @@ private void launchConsent()
 
         // ...add more sections as needed, then create a visual consent step
         ConsentVisualStep visualStep = new ConsentVisualStep(VISUAL_CONSENT_IDENTIFIER);
+        visualStep.setStepTitle(R.string.rsb_consent);
         visualStep.setSection(section1);
         visualStep.setNextButtonString(getString(R.string.rsb_next));
 
@@ -253,7 +295,7 @@ private void processConsentResult(TaskResult result)
         }
     }
 
-    private void printConsentInfo()
+    private void printConsentInfo(TextView consentedDate, ImageView consentedSig)
     {
         TaskResult result = StorageAccess.getInstance()
                 .getAppDatabase()
@@ -265,10 +307,10 @@ private void printConsentInfo()
         String signatureDate = (String) result.getStepResult(SIGNATURE)
                 .getResultForIdentifier(ConsentSignatureStepLayout.KEY_SIGNATURE_DATE);
 
-        ((TextView) findViewById(R.id.consented_date)).setText(signatureDate);
+        consentedDate.setText(signatureDate);
 
         byte[] signatureBytes = Base64.decode(signatureBase64, Base64.DEFAULT);
-        ((ImageView) findViewById(R.id.consented_signature)).setImageBitmap(BitmapFactory.decodeByteArray(
+        consentedSig.setImageBitmap(BitmapFactory.decodeByteArray(
                 signatureBytes,
                 0,
                 signatureBytes.length));
@@ -282,21 +324,26 @@ private void launchSurvey()
         InstructionStep instructionStep = new InstructionStep(INSTRUCTION,
                 "Selection Survey",
                 "This survey can help us understand your eligibility for the fitness study");
+        instructionStep.setStepTitle(R.string.survey);
 
         TextAnswerFormat format = new TextAnswerFormat();
         QuestionStep ageStep = new QuestionStep(NAME, "What is your name?", format);
+        ageStep.setStepTitle(R.string.survey);
 
         DateAnswerFormat dateFormat = new DateAnswerFormat(AnswerFormat.DateAnswerStyle.Date);
         QuestionStep dateStep = new QuestionStep(DATE, "Enter a date", dateFormat);
+        dateStep.setStepTitle(R.string.survey);
 
         // Create a Boolean step to include in the task.
         QuestionStep booleanStep = new QuestionStep(NUTRITION);
+        booleanStep.setStepTitle(R.string.survey);
         booleanStep.setTitle("Do you take nutritional supplements?");
         booleanStep.setAnswerFormat(new BooleanAnswerFormat(getString(R.string.rsb_yes),
                 getString(R.string.rsb_no)));
         booleanStep.setOptional(false);
 
         QuestionStep multiStep = new QuestionStep(MULTI_STEP);
+        multiStep.setStepTitle(R.string.survey);
         AnswerFormat multiFormat = new ChoiceAnswerFormat(AnswerFormat.ChoiceAnswerStyle.MultipleChoice,
                 new Choice<>("Zero", 0),
                 new Choice<>("One", 1),
@@ -367,7 +414,7 @@ private void processSurveyResult(TaskResult result)
         initViews();
     }
 
-    private void printSurveyInfo()
+    private void printSurveyInfo(TextView surveyAnswer)
     {
         TaskResult taskResult = StorageAccess.getInstance()
                 .getAppDatabase()
@@ -379,6 +426,7 @@ private void printSurveyInfo()
             StepResult stepResult = taskResult.getStepResult(id);
             results += id + ": " + stepResult.getResult().toString() + "\n";
         }
-        ((TextView) findViewById(R.id.survey_results)).setText(results);
+
+        surveyAnswer.setText(results);
     }
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 33005b01a..449f8124d 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -5,48 +5,64 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
     tools:context="org.researchstack.backboneapp.MainActivity"
 >
 
-    <LinearLayout
+    <include layout="@layout/rsb_layout_toolbar"/>
+
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
-        android:gravity="center"
-        android:orientation="vertical"
+        android:padding="16dp"
     >
 
         <android.support.v7.widget.AppCompatButton
+            style="@style/Widget.AppCompat.Button.Borderless.Colored"
             android:id="@+id/consent_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
+            android:textSize="24sp"
+            android:layout_centerInParent="true"
             android:text="@string/consent_button"
-        />
-
-        <TextView
-            android:id="@+id/consented_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:visibility="visible"
         />
 
         <ImageView
             android:id="@+id/consented_signature"
+            android:layout_width="match_parent"
+            android:layout_height="100dp"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentRight="true" android:layout_alignParentStart="true"
+            android:scaleType="centerInside" tools:src="@mipmap/ic_launcher"/>
+
+        <TextView
+            android:id="@+id/consented_date_lbl"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-        />
+            android:layout_below="@+id/consented_signature"
+            android:gravity="center"
+            android:minHeight="48dp"
+            android:text="@string/date_consented"/>
 
         <TextView
             android:id="@+id/consented_date"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-        />
+            android:layout_alignParentRight="true"
+            android:layout_below="@+id/consented_signature"
+            android:gravity="center"
+            android:minHeight="48dp"
+            tools:text="Date"/>
 
-    </LinearLayout>
+    </RelativeLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/dark_gray"/>
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -57,26 +73,26 @@
     >
 
         <android.support.v7.widget.AppCompatButton
+            style="@style/Widget.AppCompat.Button.Borderless.Colored"
             android:id="@+id/survey_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
+            android:textSize="24sp"
+            android:layout_centerInParent="true"
             android:text="@string/survey_button"
         />
 
+
         <TextView
             android:id="@+id/survey_results"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:textSize="16sp"
+            android:layout_marginTop="20dp"
+            android:lineSpacingExtra="8dp"
+            android:visibility="gone"
         />
     </LinearLayout>
 
-    <android.support.v7.widget.AppCompatButton
-        android:id="@+id/clear_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:text="@string/clear_button"
-    />
-
 </LinearLayout>
diff --git a/app/src/main/res/menu/activity_main.xml b/app/src/main/res/menu/activity_main.xml
new file mode 100644
index 000000000..abc9d8bf9
--- /dev/null
+++ b/app/src/main/res/menu/activity_main.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item android:id="@+id/menu_clear"
+          android:icon="@drawable/rsb_ic_x"
+          android:title="@string/clear_button"
+          app:showAsAction="ifRoom"
+    />
+
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
index cde69bcccec65160d92116f20ffce4fce0b5245c..aa46eebdca2fbd81e4da18515ef4d92bbb45f219 100644
GIT binary patch
delta 3430
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
IM6N<$f=5<|EC2ui

delta 3395
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
ZEigAaFfh%U`BDG?002ovPDHLkV1g*WNIw7o

diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
index c133a0cbd379f5af6dbf1a899a0293ca5eccfad0..cbab2b190250e4fadc2ed845ea82974965a20fca 100644
GIT binary patch
delta 2110
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

delta 2174
zcmV-^2!Z$95S|f`BufNmK}|sb0I`n?{9y$E001CkNK#Dz0D2|>0Dy!50Qvv`0D$NK
z0Cg|`0P0`>06Lfe02gqax=}m;000JJOGiWi000000Qp0^e~}><e+QsRL_t(&-tAdk
zY!ufO{?475^{#i<U=!EaCO8Be(i+oXS)r6PF*2ag5}^b{(w3%DP#+ovDG80B5=tvU
z5Rs}@sc5UTN~9KoNYW~8qm(9<k_h@>MS-S8v^6viCUNk(br)=}e|C26>BG$I&hPFl
z0n`T$T6T8sx%YnGfBCuR-fQ57+>q-c;^Dmy#{tlFn2UDq+?oI&A_0q{^MgM=w4=Lk
z=F+#H+R}85Nzenk*L<dJi_GqS?f!2?!54|Z`|o51NT8<u&YBkhsMnByx}taPAt{ZT
zci*@$5XD$g2*|?+-gxhma}&qnb-dxJ=O0`jp&x~O%3|5|f82fR<7uqB@b`&Ve|zw~
z(*U><xTxU}Uwm70=c7Nr>o_T5=IGNOF6#e7|Ab=#vPg+1p80xx<E`mdQfB8HQcnY5
zB4vW7F>>*IZusDyUuUg;(%FCI%8vBr1IvaC$*~_j^v<f$;Y$MmX0H|j0x)OWcl#b$
zwW;api41<Se|yuB#{kHC?rGQ7Y+rpxY>wQfCgoNV##{y$v9ZI51Ojx*&gRsY3YYnp
zhxY#U)R{A93IN2u-`)Rgsu7QzIQq#Gzxi?h3joHirUw8(jmP7ydyZ^)t-htU>%uA7
z*DzmcPc+efq3H9#Heg%)1OR}Ui|uSEqvILgH8Elgf3<egTVo$ho!tAtu}uIn018np
z8&wEEqPutLUE2?I9|H&s=|omF0sDWl^nUu-$-cAi4)p_=iV8}phQRXWO|h*{uHGH5
z!{<Gy0>M`+?Mqu`E)Qnk92uF6Wc_Lg(7pGrN^Smr&zrS3$&Epl4U#B2PD#|Gr}ORw
zt1~09e^)YtnMfp}5TK14SEbfHx#-VYLiYGkMhEE)pFltwZdumTus$;ydolAtWfB$Z
zKu1SMY|W!>zgKH`xoy>=WjQElsvzWjvc}U==y~w*#jhYj(X2#3*?ypBPkb)*x`2m*
zcY?dJJh1yF>UhKVUf#456{4hEBkg*2YgglEf5j0WL<W}B-;Fz(zl!G6=kV|8LFjS@
z<*e@wpQJVqUu^v*I_Iqek-*r@kgrd?POQDTWx>%?#|Ov4#x3U}ZGM+Hgn)2akiH#X
zXxRn;XvAWqWApI(;Qp$tzjomcG$h&p08Pmy$mwGko;dCE#o{}YzXGrtKt5=kun-d8
ze>u3hS4(ggn0<-blx%nXzA14l1Sz55+0$PYu_E~5n6*m+`^VGNv*U+fS&5LE6-Gd9
zT0;ALK&;P5Zou_^bn0J_Y(xNWKI<}%|4e`A(z}@ZXCM#;qxm*<9{??=Jtzn0YmcvO
zThyI=CWIWu^P`w5WD!$pF_IfV|HZ?|f6Hl<7dN?&Cr=};q>z_WI5qkzE{vZH?WxAm
zme=Z^JAd-yNncxlzG&-8uB!y%T=oRcWlt2X6sR3gBkVUheGJEke_<<@9R~nz?@IT*
z4IK7bA}EBEM5B6NDPWu*FBpyp-n-RsDTab})|+Ir*b-#$AOc!4MPCXV(D^TPf8qe}
z-jPDVhRB?`T5lu*D^_&WYH_M%aAd$v;9=kc%U+q#@m71KMx>W6ZAnxjK&_qisftKL
zz=v76+RzD92T-@7p%$Ly)aR0TN{!{Rg<(UI5M;QNB`e`sS^Q~)E3kQfAY$`$20((?
z-<N$|NnzQba*cO-9|2}2!=Toge@XMGLFSCbi2(+L`HBGuB7nGL7E2doKN3g~zziY*
zB0$=ho&6XfsGe{tJqv}vv6#<(J_3p&xVDa<Xh43NO@MGZjzGczj@Y_$u*eDv44G{V
z1_@i&HiC5$BY$yq2cG36Hs=$Cye|U$S*-{u6d;izsG2~2id~l?M5g7Of4|Aw?$9f?
zqx8(o7C|p~%Ojqhu4+9gil|JWP|%sI)Q%<08THxH*_Q|)L9hdi1cTT@Mh=3ug-cCV
zT(R}uO~3?CE;p2XP;|aeDjsNJaX_oFa{%@U9K_ai><AwOEs0KRGT7rOUmuQEH$pvN
zC#O@ixM?kYmTml2a&z%Uf5B@ZBIz1~nTwutL#uR1D!<%Dx&a0NwT7U@MKN?hr2<EQ
z!?Mn`uLRy@a_jkOobW;pG$G0{6ICJ4r6tg{#Ck@tlhqN;WRZymzVaq7vIm?bw3vCV
z1v0<6n6$RpWf8p7=(d+Y(ZN^56YPNUofXYQWauU+dueoeqF6p0f8oOt>`3@1;Dc^J
zK9vWG9aTVR))dSR>%&?)-PV_0t5*ZQ8V}@kougifD5{B07Od3v<N+0zP1`GWJ_G?T
z1KuL5>$8;$SwM9!PeL(kf|RAuAv;N_6#FElv!a!a_aN|W5AG3P2<ZX)jY=X^YqMo-
zG0dg4w1U{+=~ICRfAqqv^v&&k@wYz>U7FQ(-{Cn(oQEA!7>Z(V7})h~gZCdy**8`g
z_?a0w@t0%gFMBcgZY9RYXGt2`KNfbTzpQG)zke+wWNp~&g@?&p_t_CTQLXOO%1!E%
zum5b|8y~!X=_~-<J*Qt30QH)Nn-?x?Zc-HGidQPbC|vOcf2m;@Y=4iO{clFs@ezP5
z09P1=rK|u@gKPUI)u_TS|J;=Kf-grPYWwvhaYOzu<$og|U;;R}vW)-$03~!qSaf7z
zbY(hYa%Ew3WdJfTF*GeOIV~_XR536*H8(mnI4v+YIxsN2$3gA@001R)MObuXVRU6W
zZEs|0W_bWIC@?WJEigGPFf~*$Fgi6iIyE>gFgH3dFwL6zQUCw|07*qoM6N<$g4vP>
AsQ>@~

diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index bfa42f0e7b91d006d22352c9ff2f134e504e3c1d..82a75e8014f747c07cd24d3b8a6f06d9a7036bc2 100644
GIT binary patch
delta 5043
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
JPDHLkV1hp6=&}F+

delta 4831
zcmZ{ocQD)!@b^E*>BK1)e6^G4T@WF{9j6n$g(%TNbfU-S5WTlka!T|lM-oAlXwjma
z5D^5?C3=nS$vn@@GxPi7xAUIao!xoO>>s-`JKN0nhbM(w3+jZ@K>@(qWU32W5&!@Y
zcIpN?01(6r0GO8maP}{SSqFgU;sEf+1_0!;0f5O9*Q_u9uR!`lOAY<c|Fcu&7BH2I
z38dT9K%<NTrnepkXE09WT)#M4-*%1)B#3vXEWlw=(FjLW1U)$mqq;Ux1^R2c^xiKQ
zY$9G&_m-eWQtz_sB1f^PZ0`f~um&PF7XR!U4PG@l9MezEuMf4w*mmTE<>ZGN&0ZE)
zHdk(ZeNojM)G-`_Q$SAC1h?<}eXvsuwqUsaEBgOxS1U?6e|Ow>NVp~w%yE4ZLrv*c
zHT}h8{(~?5EqJ*?z&Wu)3Q7=82iSfeGk*&<x43n^sSjyhn!O=iJrY@$jSHUodGhX+
z>K2E>pXHGinWVtA3o)EE{x4@)7R}v%*wqC~cl*`sK#Ncx?{w`)@DkTpK2q@LCf3qc
z0Ga)u)+;26rk-CL6?LX+?Xz)sAJT6t5fl{z^v8R=dUv<@IMHN6it)QlsNYQgSK9%2
z6cIV#X4$^-qvQ9G#!``GPP4->Emk-D=Bh%hCIT3f*>QQ6XvEv@W~q(S<P1J5ul3{N
z-nlVI?CH6Kau}2Z)pl%xTnuvJC=Q}LDypjDBYQRx^blBYVwLEtJMDkGdh30AjiM$)
zeGVH&Mn1h4Bx8o7&SVsWPiy-W*Fh1XNF2`ZfH(`^#V5u{2b@knr@}|#@?9<En`(DT
zoj7J1;7C#~V<lT-6zTYrzTg*I??s)>1>(2?WJ#O|_cu_n!K3f$(=BG+LAAQe`6~#{
zp?LmnNzbInQ<prZYccwN<3oJ;dl{VDUp;DjaH$5t5v7PK<qJo`!?Q<5f4|t`WDg1U
znIxWqK+#Niwo8PR*e@0WWj!#gjt1y4F;}sF3bL;xt~`Eb2@_Z@cLmV^?DQgTT20-6
zXKAqkTx$spSw~LVvR@c6|6=WmQVACg`5-)~^VjukY)4QH-N)SRyIIJi*t)RCwBRP|
zC&a|3Q<*Miage!M#(URXl*xil--0A8k&kYeNbfeK3$;yu#Uh5%kDij<1m0R+_Efjh
zdiKTgXvf?dN9clQaIn*Vm`aejwVMnQ^Yd&J%#6=<D!C>X$4KDhb3^=R-#OJnJsFXW
zc#PgY@`sl>6h@}!zmWF(ef#n3n|9vWRTX1}vyR3_?Wu#_d@CUC1_tg+hiO{9f{QSe
zO^6nGA64ngzR=GdQ&N>y5@l<W&{gJE=SI=r&hb@j!~J29*_s(U=u-CgkS|I0FeL>c
zFsBimUfUlh$z$?&22_ByZGf-azZDohZy;VLN*OJnjqEZ3P*l?0kOZ@X10H`}obku5
zrm0Ez<$#+Orv=q`BnhziK}M|R{&iZaDSB{E#F&jaT|fOMX6thmaH$}<GpNMakDlXP
z@71*q@+OoiJ~$0(RAGT4ymvTF!8uctf(xgmoY~rfi;1&W*3C>vK8#g1#Ywdh;Hzf`
zR7T5utFL|$vhaS7@(m>r1KkY4U$<U2ZTt;}{7ND-)nR@h?N<&X2<yI~z`(;>?va=k
zB*%F1zgS!fZp{1ix6?vqiwraISJ>UnjrF*!GAr+L_BX?P`x%(U{qUFrB=V$3(sM;}
zM08b$vl*0~(euY=`X>~a`%usU6&36(1rP8Jhu=3s?|HnKc)HTZBJs7dF2SFV1P|qj
zEbT1$b{HkGpO}Te7)qF?dmdaSR{gUBUCJ@)a>c~?;G}lPUAB&@qmLhQg8c2`6OK(0
zf=JE1T^OWI&Sh>N1@ss}dw!Q`=e8mDSwHU<`XS=Y>vSj!%S1KpjqUB(3y=8#FPi$#
zGx0DXPNB>%#MRu-Hy?ah3-7tzu3Du2AO8Zg0oU$jipxT5se$Wdu1J;c5pPllRMB^X
zOvy6NvxiLYzdosV8{lX|?k&16ZRTe+M7`mOs8s%%s{tl_t$U>jXlvri^V%R10m1lo
z`(qolub*@uRAw-50OiONh-NBg_H6f)Smj>(<;p-e)%EV^>h00W0$ubC7|{QW^Rl<P
zY~c5rF_-j^KoONV$x=IOKu-^tFGQ3cOxso}+;rWm)1pVj^O8Lr3he(aIO&TVPG_iX
z3fl=|)GbaiUoixu<BWRBM;NTzFBjlGo$a_qsygxWw4LC^S6Sb6)D_d|j3z$?K2a=?
zBeiWYm!VeC(YWn2dj0dN|H~=4Ifd>2ZG5u0O4J<}#bh*5g%@KBs`ryO)nvV%4PY>;
zi1vFI_;>#B+s&7ZNnQNP6qt~~WPG;NANd6bRm%1iA25tC#nflmlct#vC8L6OcXv74
zN-|YgzfnB?<Z&zzqh%^waeb)rwjF829ZXzy?X}oB80@U1vukCT>YQcdapgL5;_|X?
z_E7>6IY!Ugn$yB}ydtqOrE(aa5@;c~^u{aPu<mTWPf{u9v#Cek5qJGmsQye%k0A2X
z7L(RhBv|x@irM>m8Pykka%HD@?_A(Q{VL5grd$Ce^bUF;Q)g;WJ^&=e{n6hQpIj$(
zRu&J@vB=7pyHB1B%O})akQrrtC{!Ge$QbK`*xgg;0*q8uZ48D(5^8f3bIqveb2zwV
z1L_Rq@xs+L%%`7cJT`YwNU|H1vTyNt(a^~qkf~iW^;>-x{i{};nifV$wGa|}mRt$=
z%zZHW7{BHwJ{7jaZ!23_;QTyZqRQ)IM6^t@+h;uf+HV)<;fl>@oNu*R>H$b$HpRR#
zWKUl^UA}YZ{xe>6fLLgfYVf|hn$Rk!<_REfB?uRUZ`+dvrK!QJ*29Wxy)u0~Z4abD
zyu4JFZciU^^ymZ6Y))zox7^Uqj7F>AAc6vvU+Z!eAVNIMfAFytuX5@y?nd}_w4^l7
zie25h_!(8oPa2ZH9PHkmwLe$z)iY;j?-ju|If3J`@lAk$)G%wlurRC*uQoajRKK}Y
zks!6|X2{M?q8~$QGZ60`79Znfr1A>fSI}oT&+y>LuJ~>lNN9zRKD0Zb+z5pu>g$cL
z6G^F)aH=SONs!8Y)lOcEtu)tA{9AJAd1d9V8LA5@USQ04-lE<NmZ_=GJEW_rQFuR)
z+v7Z)m=k3yFpt^ewpy1DkssC1j>aiNLgdNmt3LY8Iuu0citQEy5TyNQD0q6`#OC0|
zX8rpE-9WM*ffvs6;Rk77XDsq`SKJ!g4rs&rn5P8K6zE1QNa%pQxQT<_WLfaXEQ)3G
zp&z0<?J3(`3Ut}FF}Cx&U3<^@Z0#SLy$HgyOB0SU7kZs;-unRoOY60Jjmg(8zk96B
z7#yTj^jj8Y**U!kRNVQhqhPo0#@e4Oc%x0n?!(CfuR?#;UZWu;%Ssfu%B`?D8#Vq$
zbl!wO_32VGc+%&j&Pk}(B$Ris`zpWYUY?xQOV??21~L4_t<cy4WeX7z^-xBH>0OP<
z6I0Cl%il&!(=Au7&)}pd7xH-z{d3YqYr2b0Br0q(4xa-XuiciJaA5Wx2Nph!B{;)w
zyRumy60#^Z_3B`qv;k@Sg?DC;Ka?_m7%`W6LyC*{ZPhTt-D~u7%+~5gVJ7W`Z(bN=
zRZ&aMJaWV^SXj}*HeQv)$NdsiYbqqdLNDs7=aq~T56wNX#jTVn(G%!ZvPDMT^&T@U
z=WhJ#4*5qXLbZagK-z~SyWF;dVq#f6-XAij4jrsV1*f#f`A(e1&LD_833*f_r${bZ
z1kiQ((e4?VJgMR5D{+-kn{dvkBVr7{#P3$wrK*lSV*xzu+r7#nIcBHMSP2uk-S~z0
z12dhT?015mzXnS&0TGsiUq$7)4x*x9HlnYOSdGTnYE{%_L1awNN}SEl)67yBd1xoC
z%;AZw(M?uf69kk52GAGBczH3WgcI$YKm74)ZQ=fZrTjx|zot^23EYw`RPUoLo#Qj6
zGtN{uMiH$TiWZcLduMetD^;X@&GBi}HEtuLciRlKTk-355MKP6@r4|UQkBc0cuOsk
zPJ*`g3MsM%Ks#z^c%>G4^w@CtJ4YT2crrCZjlJ{Tj~0#S?NBcu7`iJC`HA?uK2zkq
zFDL<%JiYBrHvd>Z@&R8w1j0?^kk;{mdw2!HXzNl<ga}K~7RTr(dHRuvzms%=V5=#S
zqU)qY&3Blm@(JPEhz(}@%fZFHsXb;WjJ%9A+n5!cySIU4z|pw*Aj%eyM8p&rL|R;m
zJn&f^&ZAUK1mjk6K~9j>6T4n*bqqD-7X$C)t5*5D=d9hWGm06N7nVJ#l=Vxd61L?M
zB(fT|Kfk~jNVi%pCB}x#cP|=ZO2VPx>c}ZiNZL@!rYQ|wp8Aaa?f5rN$}yzzhR*hH
z?Z6fe*VpRAF=6~nA$JPL;rUz9Ij<wgz`xKfj)wl+rWoXBf2Bx&MFgLt>X&+J26fsW
z*?ZZ4&EY8w8#G$Hk_8xI-=+DXn7{TdSu`lWLY+ae62Nho$E1XP3wL8<EdW+P24hZj
z)Yq0NSGSD!|NT<HRg`ID1I;TRwYD4(4Tf^D&J7IyISR&->CleGL96(<s)WA`D4%xH
z20hg?yyIo8qafb_?c9_py7qqboq^H}bUzswX8&IFl1<Yma1Lu<&7s+_m$UuceXc86
z$fth|n=c~lmFhwALx6r9t;Lt;z6MudGiZ`}a>G`{eL?Weq_DXu<=Ph~FKccu6VNfT
z;wcG$<St9he%M^MvI;lx6;Kp+*N`lS9vM)p&0E>6SW$bF4<|M?3^NP4DyA}{k{*p!
zIrKW9$sDJ6k8@jck|k~cc`M~~L619!7=q)@Z|ZvPuRtPyq}t_Taxxkxma#P^S<-Q8
ztK^DURT5d-?-Z0N<zhk}7r&z0z-9I`U3kA$K47tu-sU*V=eSKUUkrKpV#{ntfEpUO
zitYML^{GHXc>t31u=r!X4dH##uEFS&gU^B49qCy_=2y_IvDbWL@}@6rjeTjY*wsD+
ziDer3diFDBTYl*YC%Sp$fR6snMEj|4Ng;Dl8FKYOM5W%LPJ660%?r|N35Fa{s;oXI
zE#nCY)?SFYUchjU;2#ahcOYbo%)z@7Eidyor)gR#;Zzl*>dRJ_KhFCp6f?+*Bmo6+
za!No-7a-56e~WRVOs#p=>iE^%KqnzUkafoQ$8$HbUGuG`d4W}Qe<44RfJ&48dB=GT
z-QhN?*s|R%MVFUaR@h4k5;GE=Se5XHSZ6OAV2UbUYipv-Ym*KmW{#y_S-K8o-fSFZ
z5(<pu6qnv`x-t6_8v2%@sdEpYihb80Syb}es)ki)h{wETD2mElanQWd&p8;2p~XQ+
z01UtLc&+brg}wGComNYo*%br)5v!rxvwi6-6(zaHVY^sSQXL4GH2)|Cpn&o$_10^x
zOKdk8D_9LO%bsI-NEH!YLWPV@iYgQs6^h=d#AA=F*#`O6z|4F!GutllYQH3Xcr~{s
z5L4(_UHCD=qcOCsuhz9^`A00pBLek}lMeGj0D!3gh^DKt9IBJ4$opAPEo^}%f{^2>
zAUM&SdOr_N2?A0)Fk+*Ll~!8)8-Tk5-+SKa){QIFb_Qt(#z*#%gXV94-a;P7zD5}N
z_OBT}?}RWTpEuJVH$zlA#9~;J$;7cnX>40cT&P>(kq!?!o5SqL=5uWZ%=`AaU?pP<
zfa2FIZO?(huTfi5-XS1DN_OB%hZO~dhV5f<B|BbVb7r1wpXq+WBf(vW&0j17=S_P^
zB)kKtsFgpOOWnqY9pCaAq3k=D;MJj+Zud$0A?~<+?x@>3#b?(^U(;D|PSZ;hN_e}R
z#7+qPMsXl5kZ-i!c&q-lCvy2D?C^NNN6k`nAR?<NmfEvsL#g?f-)>^MUZAPw=|h`)
z9=l@T<HI~nzR;sKc2j@<V}GUKdF?qn?^ea{Tx^Qp(q-$a)_QacEF_haG-$XP6>M*2
zZ!!qXR=0IHS@zKoo3$k})y^>!XGnF&CVj@!_-{9DBhO<aM(6J9?bfi$!|3b%eT{(%
zh@PzTNX6<~!^+-)w@>-!aj$XH;|vP5HMy-Ip|X|l-OqgEQ)~v=*}uc((|FtUrCT05
z5Cq_WH4B*lH?x<=w@X(>=TaD>O;DNpB(MT*gV$}GB9JW=kMhpb5f&>F=8wqm(_Xn2
zBBHz|>Rs)HZd8P>V0}Tk28wttfJFzzaT)H&-?epw0SS~g;`853>-N1Ec=^edGe9k;
zbbactFq;1-eT6ecou?lfbH`SO{ym9!d{xYR?QMM><m|j1{yE@|xP+95xU7h{w2_3k
voV1Lb^uJg}PF(!II?YG_190=OcXkZ?-+^aa`>X!|3P3~UAsVk_6aIeyyukzw

diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 324e72cdd7480cb983fa1bcc7ce686e51ef87fe7..dded52e6510991691aa2c8917d6d77c6e63663aa 100644
GIT binary patch
literal 8694
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
UjT7&JX8-^I07*qoM6N<$f}%~V-2eap

literal 7718
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

diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index aee44e138434630332d88b1680f33c4b24c70ab3..4cf21665ab192e1a0dafa9fce31794d832c5e6a8 100644
GIT binary patch
literal 12668
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
CKR|Z?

literal 10486
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
acChvT-wm8jF7_S`fH(4La<wuRVgChb86-jg

diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
new file mode 100644
index 000000000..2c02b673a
--- /dev/null
+++ b/app/src/main/res/values-v21/styles.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Widget.BackboneApp.Toolbar" parent="@style/Base.Widget.BackboneApp.Toolbar">
+        <item name="android:elevation">4dp</item>
+        <item name="android:outlineProvider">bounds</item>
+    </style>
+
+    <style name="Widget.BackboneApp.Toolbar.Transparent" parent="@style/Base.Widget.BackboneApp.Toolbar">
+        <item name="android:elevation">0dp</item>
+        <item name="android:outlineProvider">none</item>
+        <item name="titleTextAppearance">@style/TextAppearance.Widget.BackboneApp.Toolbar.Title.Transparent</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 3ab3e9cbc..975426a94 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,4 +3,5 @@
     <color name="colorPrimary">#3F51B5</color>
     <color name="colorPrimaryDark">#303F9F</color>
     <color name="colorAccent">#FF4081</color>
+    <color name="dark_gray">#cccccc</color>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 54f768685..b1472a140 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,7 +1,11 @@
 <resources>
     <string name="app_name">Backbone App</string>
-    <string name="consent_button">Consent</string>
+    <string name="consent_button">Start Consent</string>
     <string name="survey_button">Take Survey</string>
     <string name="consent_button_done">Consented</string>
     <string name="clear_button">Clear</string>
+    <string name="survey">Survey</string>
+    <string name="menu_data_cleared">Data has been cleared</string>
+    <string name="user_name">User Name:</string>
+    <string name="date_consented">Date Consented:</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2b66fb071..c0507cc6b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,24 +1,59 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="CoreAppTheme" parent="Theme.Backbone">
+    <style name="Theme.BackboneApp" parent="Theme.Backbone">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/rsb_colorPrimary</item>
         <item name="colorPrimaryDark">@color/rsb_colorPrimaryDark</item>
         <item name="colorAccent">@color/rsb_colorAccent</item>
-        <item name="alertDialogTheme">@style/CoreAppTheme.Dialog</item>
+        <item name="alertDialogTheme">@style/Theme.BackboneApp.Dialog</item>
+        <item name="toolbarTheme">@style/Theme.BackboneApp.Toolbar</item>
     </style>
 
-    <style name="CoreAppTheme.Dialog" parent="Theme.AppCompat.Light">
-        <item name="android:windowIsFloating">false</item>
+    <style name="Theme.BackboneApp.Survey">
+        <item name="toolbarTheme">@style/Theme.BackboneApp.Toolbar.Transparent</item>
         <item name="android:windowBackground">@android:color/white</item>
-        <item name="android:windowSoftInputMode">stateAlwaysVisible</item>
-        <!-- Used for the buttons -->
-        <item name="colorAccent">@color/rsb_colorAccent</item>
-        <!-- Used for the title and text -->
-        <item name="android:textColorPrimary">@color/rsb_black</item>
-        <!-- Used for the background -->
+        <item name="colorPrimaryDark">@color/dark_gray</item>
+        <item name="android:windowContentOverlay">@null</item>
+    </style>
+
+    <style name="Theme.BackboneApp.Toolbar.Transparent">
+        <item name="colorControlNormal">@color/rsb_warm_gray</item>
+        <item name="colorPrimary">@android:color/white</item>
+        <item name="toolbarStyle">@style/Widget.BackboneApp.Toolbar.Transparent</item>
+    </style>
+
+    <style name="Theme.BackboneApp.Dialog" parent="Theme.AppCompat.Light.Dialog.Alert">
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:textColorPrimary">@color/rsb_warm_gray</item>
         <item name="android:background">@android:color/white</item>
     </style>
 
+    <style name="Theme.BackboneApp.Toolbar">
+        <item name="colorControlNormal">@android:color/white</item>
+        <item name="toolbarStyle">@style/Widget.BackboneApp.Toolbar</item>
+    </style>
+
+    <style name="Base.Widget.BackboneApp.Toolbar" parent="@style/Widget.AppCompat.Toolbar">
+        <item name="android:background">?attr/colorPrimary</item>
+        <item name="android:minHeight">56dp</item>
+        <item name="titleTextAppearance">@style/TextAppearance.Widget.BackboneApp.Toolbar.Title</item>
+    </style>
+
+    <style name="Widget.BackboneApp.Toolbar" parent="@style/Base.Widget.BackboneApp.Toolbar">
+        <item name="android:foreground">?android:windowContentOverlay</item>
+    </style>
+
+
+    <style name="TextAppearance.Widget.BackboneApp.Toolbar.Title"
+           parent="@style/TextAppearance.Widget.AppCompat.Toolbar.Title">
+        <item name="android:textColor">@android:color/white</item>
+        <item name="android:textSize">20sp</item>
+    </style>
+
+    <style name="TextAppearance.Widget.BackboneApp.Toolbar.Title.Transparent">
+        <item name="android:textColor">@color/rsb_warm_gray</item>
+    </style>
+
+
 </resources>

From 60f57dee3423ee871e6df6ee30200e6cb0481d47 Mon Sep 17 00:00:00 2001
From: James Kizer <james.kizer@gmail.com>
Date: Mon, 12 Nov 2018 22:04:15 -0700
Subject: [PATCH 06/53] Udpated build files to latest lib versions, tools, etc

---
 backbone/build.gradle                    | 65 +++++++++++++-----------
 build.gradle                             | 21 ++++++--
 gradle/wrapper/gradle-wrapper.properties |  4 +-
 skin/build.gradle                        | 57 ++++++++++++++-------
 4 files changed, 93 insertions(+), 54 deletions(-)

diff --git a/backbone/build.gradle b/backbone/build.gradle
index c4cbecdf9..4ce2043e7 100644
--- a/backbone/build.gradle
+++ b/backbone/build.gradle
@@ -1,21 +1,25 @@
 apply plugin: 'com.android.library'
-apply plugin: 'me.tatarka.retrolambda'
-apply plugin: 'com.neenbedankt.android-apt'
+//apply plugin: 'me.tatarka.retrolambda'
+//apply plugin: 'com.neenbedankt.android-apt'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
-version = '1.1.2'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+
+version = '1.5.0-SNAPSHOT'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 23
-        versionCode 6
+        minSdkVersion 19
+        targetSdkVersion 28
+        versionCode 7
         versionName version
     }
+
     buildTypes {
         release {
             minifyEnabled false
@@ -65,27 +69,30 @@ ext {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:23.2.1'
-    compile 'com.android.support:cardview-v7:23.2.1'
-    compile 'com.android.support:preference-v14:23.2.1'
-    compile 'com.android.support:design:23.2.1'
-    compile 'com.google.code.gson:gson:2.4'
-    compile 'io.reactivex:rxjava:1.1.3'
-    compile 'io.reactivex:rxandroid:1.1.0'
-    compile 'com.jakewharton.rxbinding:rxbinding:0.2.0'
-    compile 'com.jakewharton.rxbinding:rxbinding-support-v4:0.2.0'
-    compile 'com.jakewharton.rxbinding:rxbinding-appcompat-v7:0.2.0'
-    compile 'com.jakewharton.rxbinding:rxbinding-design:0.2.0'
-    compile 'com.github.PhilJay:MPAndroidChart:v2.2.3'
-
-    compile 'com.scottyab:aes-crypto:0.0.3'
-    compile 'co.touchlab.squeaky:squeaky-query:0.4.0.0'
-    apt 'co.touchlab.squeaky:squeaky-processor:0.4.0.0'
-    compile 'net.zetetic:android-database-sqlcipher:3.5.4@aar'
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.robolectric:robolectric:3.0'
-    testCompile 'org.mockito:mockito-core:1.10.19'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:cardview-v7:28.0.0'
+    implementation 'com.android.support:preference-v14:28.0.0'
+    implementation 'com.android.support:design:28.0.0'
+
+    implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+
+    implementation 'com.google.code.gson:gson:2.4'
+    implementation 'io.reactivex:rxjava:1.2.5'
+    implementation 'io.reactivex:rxandroid:1.2.1'
+    implementation 'com.jakewharton.rxbinding:rxbinding:0.4.0'
+    implementation 'com.jakewharton.rxbinding:rxbinding-support-v4:0.4.0'
+    implementation 'com.jakewharton.rxbinding:rxbinding-appcompat-v7:0.4.0'
+    implementation 'com.jakewharton.rxbinding:rxbinding-design:0.4.0'
+    implementation 'com.github.PhilJay:MPAndroidChart:v2.2.3'
+
+    implementation 'com.scottyab:aes-crypto:0.0.3'
+    implementation 'co.touchlab.squeaky:squeaky-query:0.4.0.0'
+    annotationProcessor 'co.touchlab.squeaky:squeaky-processor:0.4.0.0'
+    implementation 'net.zetetic:android-database-sqlcipher:3.5.4@aar'
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.robolectric:robolectric:3.0'
+    testImplementation 'org.mockito:mockito-core:1.10.19'
 }
 
 group = publishedGroupId                               // Maven Group ID for the artifact
diff --git a/build.gradle b/build.gradle
index fff1ba729..4bd1b971f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,19 +1,26 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+    ext {
+        kotlin_version = '1.2.71'
+    }
+
     repositories {
+        google()
         mavenCentral()
         mavenLocal()
         jcenter()
     }
 
     dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // change this to 1.5.x if you're not on Android Studio 2.0.0 beta
-        classpath 'com.android.tools.build:gradle:2.1.3'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
-        classpath 'me.tatarka:gradle-retrolambda:3.2.3'
-        classpath "com.neenbedankt.gradle.plugins:android-apt:1.4"
+        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'me.tatarka:gradle-retrolambda:3.7.0'
+
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
+//        classpath "com.neenbedankt.gradle.plugins:android-apt:1.4"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -27,6 +34,10 @@ allprojects {
             url "https://dl.bintray.com/touchlab/Squeaky"
         }
         maven { url "https://jitpack.io" }
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5653266a8..1b1abf9a7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Aug 30 13:10:33 EDT 2016
+#Mon Nov 12 21:34:32 MST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/skin/build.gradle b/skin/build.gradle
index d828485dc..c67721394 100644
--- a/skin/build.gradle
+++ b/skin/build.gradle
@@ -1,25 +1,27 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
 apply plugin: 'com.github.dcendents.android-maven'
-apply plugin: 'me.tatarka.retrolambda'
-apply plugin: 'com.neenbedankt.android-apt'
+//apply plugin: 'me.tatarka.retrolambda'
+//apply plugin: 'com.neenbedankt.android-apt'
 apply plugin: 'com.jfrog.bintray'
 
-version = '1.1.2'
+version = '1.5.0-SNAPSHOT'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
 
     lintOptions {
         warning "InvalidPackage"
     }
 
     defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 23
-        versionCode 6
+        minSdkVersion 19
+        targetSdkVersion 28
+        versionCode 7
         versionName version
     }
+
     buildTypes {
         release {
             minifyEnabled false
@@ -69,16 +71,32 @@ ext {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar', '*.so'])
-    compile 'com.cronutils:cron-utils:3.1.2'
-    compile project(':backbone')
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.robolectric:robolectric:3.0'
-    testCompile 'org.mockito:mockito-core:1.10.19'
-    compile 'com.squareup.retrofit2:retrofit:2.0.0-beta3'
-    compile 'com.squareup.retrofit2:converter-gson:2.0.0-beta3'
-    compile 'com.squareup.retrofit2:adapter-rxjava:2.0.0-beta3'
-    compile 'com.squareup.okhttp3:logging-interceptor:3.0.0-RC1'
+    implementation fileTree(dir: 'libs', include: ['*.jar', '*.so'])
+    implementation 'com.cronutils:cron-utils:3.1.2'
+    implementation project(':backbone')
+
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:cardview-v7:28.0.0'
+    implementation 'com.android.support:preference-v14:28.0.0'
+    implementation 'com.android.support:design:28.0.0'
+
+    implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+
+    implementation 'com.jakewharton.rxbinding:rxbinding:0.4.0'
+    implementation 'com.jakewharton.rxbinding:rxbinding-support-v4:0.4.0'
+    implementation 'com.jakewharton.rxbinding:rxbinding-appcompat-v7:0.4.0'
+    implementation 'com.jakewharton.rxbinding:rxbinding-design:0.4.0'
+
+    implementation 'co.touchlab.squeaky:squeaky-query:0.4.0.0'
+    annotationProcessor 'co.touchlab.squeaky:squeaky-processor:0.4.0.0'
+
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.robolectric:robolectric:3.0'
+    testImplementation 'org.mockito:mockito-core:1.10.19'
+    implementation 'com.squareup.retrofit2:retrofit:2.0.0-beta3'
+    implementation 'com.squareup.retrofit2:converter-gson:2.0.0-beta3'
+    implementation 'com.squareup.retrofit2:adapter-rxjava:2.0.0-beta3'
+    implementation 'com.squareup.okhttp3:logging-interceptor:3.0.0-RC1'
 
 }
 
@@ -173,3 +191,6 @@ bintray {
         publish = true
     }
 }
+repositories {
+    mavenCentral()
+}

From 28ef77b79109aa1992eec4b7016d6e9c60d90e3f Mon Sep 17 00:00:00 2001
From: James Kizer <james.kizer@gmail.com>
Date: Mon, 12 Nov 2018 22:04:53 -0700
Subject: [PATCH 07/53] Fix for build failure after support lib version updates

---
 .../skin/notification/TaskNotificationReceiver.java            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/skin/src/main/java/org/researchstack/skin/notification/TaskNotificationReceiver.java b/skin/src/main/java/org/researchstack/skin/notification/TaskNotificationReceiver.java
index 6ae54463c..73fca01c0 100644
--- a/skin/src/main/java/org/researchstack/skin/notification/TaskNotificationReceiver.java
+++ b/skin/src/main/java/org/researchstack/skin/notification/TaskNotificationReceiver.java
@@ -6,7 +6,8 @@
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.support.v7.app.NotificationCompat;
+//import android.support.v7.app.NotificationCompat;
+import android.support.v4.app.NotificationCompat;
 import android.util.Log;
 
 import org.researchstack.skin.ui.MainActivity;

From 38f32050feb775373aeef5eb2f795e7e6016a23c Mon Sep 17 00:00:00 2001
From: James Kizer <james.kizer@gmail.com>
Date: Mon, 12 Nov 2018 22:05:01 -0700
Subject: [PATCH 08/53] Added foundation module

---
 foundation/.gitignore                         |  1 +
 foundation/build.gradle                       | 40 +++++++++++++++++++
 foundation/proguard-rules.pro                 | 21 ++++++++++
 .../foundation/ExampleInstrumentedTest.java   | 26 ++++++++++++
 foundation/src/main/AndroidManifest.xml       |  2 +
 .../org/researchstack/foundation/ReplaceMe.kt |  2 +
 foundation/src/main/res/values/strings.xml    |  3 ++
 .../foundation/ExampleUnitTest.java           | 17 ++++++++
 settings.gradle                               |  2 +-
 9 files changed, 113 insertions(+), 1 deletion(-)
 create mode 100644 foundation/.gitignore
 create mode 100644 foundation/build.gradle
 create mode 100644 foundation/proguard-rules.pro
 create mode 100644 foundation/src/androidTest/java/org/researchstack/foundation/ExampleInstrumentedTest.java
 create mode 100644 foundation/src/main/AndroidManifest.xml
 create mode 100644 foundation/src/main/java/org/researchstack/foundation/ReplaceMe.kt
 create mode 100644 foundation/src/main/res/values/strings.xml
 create mode 100644 foundation/src/test/java/org/researchstack/foundation/ExampleUnitTest.java

diff --git a/foundation/.gitignore b/foundation/.gitignore
new file mode 100644
index 000000000..796b96d1c
--- /dev/null
+++ b/foundation/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/foundation/build.gradle b/foundation/build.gradle
new file mode 100644
index 000000000..4a9e7d16d
--- /dev/null
+++ b/foundation/build.gradle
@@ -0,0 +1,40 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+
+android {
+    compileSdkVersion 28
+
+
+
+    defaultConfig {
+        minSdkVersion 19
+        targetSdkVersion 28
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}
+repositories {
+    mavenCentral()
+}
diff --git a/foundation/proguard-rules.pro b/foundation/proguard-rules.pro
new file mode 100644
index 000000000..f1b424510
--- /dev/null
+++ b/foundation/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/foundation/src/androidTest/java/org/researchstack/foundation/ExampleInstrumentedTest.java b/foundation/src/androidTest/java/org/researchstack/foundation/ExampleInstrumentedTest.java
new file mode 100644
index 000000000..0a0870624
--- /dev/null
+++ b/foundation/src/androidTest/java/org/researchstack/foundation/ExampleInstrumentedTest.java
@@ -0,0 +1,26 @@
+package org.researchstack.foundation;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("org.researchstack.foundation.test", appContext.getPackageName());
+    }
+}
diff --git a/foundation/src/main/AndroidManifest.xml b/foundation/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..8c59fe33a
--- /dev/null
+++ b/foundation/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.researchstack.foundation" />
diff --git a/foundation/src/main/java/org/researchstack/foundation/ReplaceMe.kt b/foundation/src/main/java/org/researchstack/foundation/ReplaceMe.kt
new file mode 100644
index 000000000..76c9ce4ed
--- /dev/null
+++ b/foundation/src/main/java/org/researchstack/foundation/ReplaceMe.kt
@@ -0,0 +1,2 @@
+package org.researchstack.foundation
+
diff --git a/foundation/src/main/res/values/strings.xml b/foundation/src/main/res/values/strings.xml
new file mode 100644
index 000000000..1d8501575
--- /dev/null
+++ b/foundation/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">Foundation</string>
+</resources>
diff --git a/foundation/src/test/java/org/researchstack/foundation/ExampleUnitTest.java b/foundation/src/test/java/org/researchstack/foundation/ExampleUnitTest.java
new file mode 100644
index 000000000..a4687af1d
--- /dev/null
+++ b/foundation/src/test/java/org/researchstack/foundation/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package org.researchstack.foundation;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() {
+        assertEquals(4, 2 + 2);
+    }
+}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 408516fa3..1ab05aa50 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':backbone', ':skin'
+include ':backbone', ':skin', ':foundation'

From cbf9bd1109152f2fed1a885298394112285a3164 Mon Sep 17 00:00:00 2001
From: James Kizer <james.kizer@gmail.com>
Date: Tue, 13 Nov 2018 10:41:55 -0700
Subject: [PATCH 09/53] Added deployment config for Foundation

---
 backbone/build.gradle   |   7 +--
 foundation/build.gradle | 127 +++++++++++++++++++++++++++++++++++++++-
 2 files changed, 127 insertions(+), 7 deletions(-)

diff --git a/backbone/build.gradle b/backbone/build.gradle
index 4ce2043e7..9709bb1c3 100644
--- a/backbone/build.gradle
+++ b/backbone/build.gradle
@@ -69,14 +69,12 @@ ext {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.android.support:cardview-v7:28.0.0'
     implementation 'com.android.support:preference-v14:28.0.0'
     implementation 'com.android.support:design:28.0.0'
-
-    implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.google.code.gson:gson:2.4'
     implementation 'io.reactivex:rxjava:1.2.5'
     implementation 'io.reactivex:rxandroid:1.2.1'
@@ -85,7 +83,6 @@ dependencies {
     implementation 'com.jakewharton.rxbinding:rxbinding-appcompat-v7:0.4.0'
     implementation 'com.jakewharton.rxbinding:rxbinding-design:0.4.0'
     implementation 'com.github.PhilJay:MPAndroidChart:v2.2.3'
-
     implementation 'com.scottyab:aes-crypto:0.0.3'
     implementation 'co.touchlab.squeaky:squeaky-query:0.4.0.0'
     annotationProcessor 'co.touchlab.squeaky:squeaky-processor:0.4.0.0'
diff --git a/foundation/build.gradle b/foundation/build.gradle
index 4a9e7d16d..007a82e63 100644
--- a/foundation/build.gradle
+++ b/foundation/build.gradle
@@ -2,6 +2,9 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
+apply plugin: 'com.github.dcendents.android-maven'
+apply plugin: 'com.jfrog.bintray'
+
 android {
     compileSdkVersion 28
 
@@ -26,6 +29,34 @@ android {
 
 }
 
+Properties properties = new Properties()
+properties.load(project.rootProject.file('local.properties').newDataInputStream())
+
+ext {
+    bintrayRepo = 'ResearchStack'
+    bintrayName = 'Foundation'
+
+    publishedGroupId = 'org.researchstack'
+    libraryName = 'Foundation'
+    artifact = 'foundation'
+
+    libraryDescription = 'Foundation'
+
+    siteUrl = 'https://researchstack.org'
+    gitUrl = 'https://github.com/ResearchStack/ResearchStack.git'
+
+    libraryVersion = version
+
+    userOrgName = 'researchstack'
+    developerId = properties.getProperty("bintray.user")
+    developerName = properties.getProperty("bintray.developerName")
+    developerEmail = properties.getProperty("bintray.developerEmail")
+
+    licenseName = 'The Apache Software License, Version 2.0'
+    licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+    allLicenses = ["Apache-2.0"]
+}
+
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
@@ -35,6 +66,98 @@ dependencies {
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
-repositories {
-    mavenCentral()
+
+//repositories {
+//    mavenCentral()
+//}
+
+group = publishedGroupId                               // Maven Group ID for the artifact
+
+install {
+    repositories.mavenInstaller {
+        // This generates POM.xml with proper parameters
+        pom {
+            project {
+                packaging 'aar'
+                groupId publishedGroupId
+                artifactId artifact
+
+                // Add your description here
+                name libraryName
+                description libraryDescription
+                url siteUrl
+
+                // Set your license
+                licenses {
+                    license {
+                        name licenseName
+                        url licenseUrl
+                    }
+                }
+                developers {
+                    developer {
+                        id developerId
+                        name developerName
+                        email developerEmail
+                    }
+                }
+                scm {
+                    connection gitUrl
+                    developerConnection gitUrl
+                    url siteUrl
+                }
+            }
+        }
+    }
+}
+
+if (project.hasProperty("android")) { // Android libraries
+    task sourcesJar(type: Jar) {
+        classifier = 'sources'
+        from android.sourceSets.main.java.srcDirs
+    }
+
+    task javadoc(type: Javadoc) {
+        failOnError false
+        source = android.sourceSets.main.java.srcDirs
+    }
+
+    afterEvaluate {
+        javadoc.classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+        javadoc.classpath += files(android.libraryVariants.collect { variant ->
+            variant.javaCompile.classpath.files
+        })
+    }
+} else { // Java libraries
+    task sourcesJar(type: Jar, dependsOn: classes) {
+        classifier = 'sources'
+        from sourceSets.main.allSource
+    }
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
+
+artifacts {
+    archives javadocJar
+    archives sourcesJar
+}
+
+bintray {
+    user = properties.getProperty("bintray.user")
+    key = properties.getProperty("bintray.apikey")
+
+    configurations = ['archives']
+    pkg {
+        repo = bintrayRepo
+        name = bintrayName
+        userOrg = userOrgName
+        desc = libraryDescription
+        websiteUrl = siteUrl
+        vcsUrl = gitUrl
+        licenses = allLicenses
+        publish = true
+    }
 }

From e7a8e92485b0ae91e8eb722fe2a50ed17335ee59 Mon Sep 17 00:00:00 2001
From: James Kizer <james.kizer@gmail.com>
Date: Tue, 13 Nov 2018 20:47:19 -0700
Subject: [PATCH 10/53] Moved google to first in list of repos per #488

---
 build.gradle | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4bd1b971f..ebba78dae 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,15 +29,12 @@ buildscript {
 
 allprojects {
     repositories {
+        google()
         jcenter()
         maven {
             url "https://dl.bintray.com/touchlab/Squeaky"
         }
         maven { url "https://jitpack.io" }
-        maven {
-            url 'https://maven.google.com/'
-            name 'Google'
-        }
     }
 }
 

From db93a2dc81af8e915a151980f0788617d92545e5 Mon Sep 17 00:00:00 2001
From: James Kizer <james.kizer@gmail.com>
Date: Tue, 13 Nov 2018 21:39:54 -0700
Subject: [PATCH 11/53] #488

---
 build.gradle      | 1 +
 skin/build.gradle | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index ebba78dae..562bbfbb7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,6 +35,7 @@ allprojects {
             url "https://dl.bintray.com/touchlab/Squeaky"
         }
         maven { url "https://jitpack.io" }
+        mavenCentral()
     }
 }
 
diff --git a/skin/build.gradle b/skin/build.gradle
index c67721394..0612be07a 100644
--- a/skin/build.gradle
+++ b/skin/build.gradle
@@ -191,6 +191,3 @@ bintray {
         publish = true
     }
 }
-repositories {
-    mavenCentral()
-}

From 8a332e4c1619f4dcb1fa39af2d8923135149178e Mon Sep 17 00:00:00 2001
From: James Kizer <james.kizer@gmail.com>
Date: Tue, 13 Nov 2018 21:46:14 -0700
Subject: [PATCH 12/53] #488

---
 backbone/build.gradle   | 11 +++++++----
 build.gradle            |  1 +
 foundation/build.gradle |  3 +--
 skin/build.gradle       |  8 ++++----
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/backbone/build.gradle b/backbone/build.gradle
index 9709bb1c3..efcd7de47 100644
--- a/backbone/build.gradle
+++ b/backbone/build.gradle
@@ -70,11 +70,14 @@ ext {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:cardview-v7:28.0.0'
-    implementation 'com.android.support:preference-v14:28.0.0'
-    implementation 'com.android.support:design:28.0.0'
+
+    implementation "com.android.support:appcompat-v7:$support_library_version"
+    implementation "com.android.support:cardview-v7:$support_library_version"
+    implementation "com.android.support:preference-v14:$support_library_version"
+    implementation "com.android.support:design:$support_library_version"
+
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+
     implementation 'com.google.code.gson:gson:2.4'
     implementation 'io.reactivex:rxjava:1.2.5'
     implementation 'io.reactivex:rxandroid:1.2.1'
diff --git a/build.gradle b/build.gradle
index 562bbfbb7..d2ea5c5d4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,6 +3,7 @@
 buildscript {
     ext {
         kotlin_version = '1.2.71'
+        support_library_version = '28.0.0'
     }
 
     repositories {
diff --git a/foundation/build.gradle b/foundation/build.gradle
index 007a82e63..2aef10647 100644
--- a/foundation/build.gradle
+++ b/foundation/build.gradle
@@ -59,8 +59,7 @@ ext {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation "com.android.support:appcompat-v7:$support_library_version"
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
diff --git a/skin/build.gradle b/skin/build.gradle
index 0612be07a..99612c203 100644
--- a/skin/build.gradle
+++ b/skin/build.gradle
@@ -75,10 +75,10 @@ dependencies {
     implementation 'com.cronutils:cron-utils:3.1.2'
     implementation project(':backbone')
 
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:cardview-v7:28.0.0'
-    implementation 'com.android.support:preference-v14:28.0.0'
-    implementation 'com.android.support:design:28.0.0'
+    implementation "com.android.support:appcompat-v7:$support_library_version"
+    implementation "com.android.support:cardview-v7:$support_library_version"
+    implementation "com.android.support:preference-v14:$support_library_version"
+    implementation "com.android.support:design:$support_library_version"
 
     implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 

From 7de3b055269f63c6852aca477fd80ce478175479 Mon Sep 17 00:00:00 2001
From: James Kizer <james.kizer@gmail.com>
Date: Tue, 13 Nov 2018 21:52:54 -0700
Subject: [PATCH 13/53] #488

---
 backbone/build.gradle | 2 --
 build.gradle          | 4 ----
 skin/build.gradle     | 2 --
 3 files changed, 8 deletions(-)

diff --git a/backbone/build.gradle b/backbone/build.gradle
index efcd7de47..d7862b834 100644
--- a/backbone/build.gradle
+++ b/backbone/build.gradle
@@ -1,6 +1,4 @@
 apply plugin: 'com.android.library'
-//apply plugin: 'me.tatarka.retrolambda'
-//apply plugin: 'com.neenbedankt.android-apt'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
diff --git a/build.gradle b/build.gradle
index d2ea5c5d4..01bc39fd1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,13 +15,9 @@ buildscript {
 
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        // change this to 1.5.x if you're not on Android Studio 2.0.0 beta
         classpath 'com.android.tools.build:gradle:3.2.1'
-        classpath 'me.tatarka:gradle-retrolambda:3.7.0'
-
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
-//        classpath "com.neenbedankt.gradle.plugins:android-apt:1.4"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/skin/build.gradle b/skin/build.gradle
index 99612c203..d38731b56 100644
--- a/skin/build.gradle
+++ b/skin/build.gradle
@@ -1,8 +1,6 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'com.github.dcendents.android-maven'
-//apply plugin: 'me.tatarka.retrolambda'
-//apply plugin: 'com.neenbedankt.android-apt'
 apply plugin: 'com.jfrog.bintray'
 
 version = '1.5.0-SNAPSHOT'

From 02105ba3789b772b52dd68e5cf5351743a130f83 Mon Sep 17 00:00:00 2001
From: James Kizer <james.kizer@gmail.com>
Date: Tue, 13 Nov 2018 21:57:07 -0700
Subject: [PATCH 14/53] Updated kotlin version #488

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 01bc39fd1..30e50dcdc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@
 
 buildscript {
     ext {
-        kotlin_version = '1.2.71'
+        kotlin_version = '1.3.10'
         support_library_version = '28.0.0'
     }
 

From 4d4635b3587fedaab0c88407cb5ce8860edb18e7 Mon Sep 17 00:00:00 2001
From: James Kizer <james.kizer@gmail.com>
Date: Tue, 13 Nov 2018 21:58:19 -0700
Subject: [PATCH 15/53] Added foundation dependencies to backbone and skin #488

---
 backbone/build.gradle | 2 ++
 skin/build.gradle     | 1 +
 2 files changed, 3 insertions(+)

diff --git a/backbone/build.gradle b/backbone/build.gradle
index d7862b834..807238728 100644
--- a/backbone/build.gradle
+++ b/backbone/build.gradle
@@ -76,6 +76,8 @@ dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
+    implementation project(':foundation')
+
     implementation 'com.google.code.gson:gson:2.4'
     implementation 'io.reactivex:rxjava:1.2.5'
     implementation 'io.reactivex:rxandroid:1.2.1'
diff --git a/skin/build.gradle b/skin/build.gradle
index d38731b56..48958bf0f 100644
--- a/skin/build.gradle
+++ b/skin/build.gradle
@@ -71,6 +71,7 @@ ext {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar', '*.so'])
     implementation 'com.cronutils:cron-utils:3.1.2'
+    implementation project(':foundation')
     implementation project(':backbone')
 
     implementation "com.android.support:appcompat-v7:$support_library_version"

From 709c031a5b60fcb36af527a2f70cb24bcf3ce6ac Mon Sep 17 00:00:00 2001
From: James Kizer <james.kizer@gmail.com>
Date: Tue, 13 Nov 2018 22:18:51 -0700
Subject: [PATCH 16/53] Moved version string to project build file #488

---
 backbone/build.gradle   |  4 ++--
 build.gradle            |  2 ++
 foundation/build.gradle | 10 +++-------
 skin/build.gradle       |  2 +-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/backbone/build.gradle b/backbone/build.gradle
index 807238728..b56f8fcc4 100644
--- a/backbone/build.gradle
+++ b/backbone/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'com.jfrog.bintray'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
-version = '1.5.0-SNAPSHOT'
+version = research_stack_version
 
 android {
     compileSdkVersion 28
@@ -54,7 +54,7 @@ ext {
     siteUrl = 'https://researchstack.org'
     gitUrl = 'https://github.com/ResearchStack/ResearchStack.git'
 
-    libraryVersion = version
+    libraryVersion = research_stack_version
 
     userOrgName = 'researchstack'
     developerId = properties.getProperty("bintray.user")
diff --git a/build.gradle b/build.gradle
index 30e50dcdc..6d8665312 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,9 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+
     ext {
+        research_stack_version = '1.5.0-SNAPSHOT'
         kotlin_version = '1.3.10'
         support_library_version = '28.0.0'
     }
diff --git a/foundation/build.gradle b/foundation/build.gradle
index 2aef10647..54ea21743 100644
--- a/foundation/build.gradle
+++ b/foundation/build.gradle
@@ -5,16 +5,16 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
+version = research_stack_version
+
 android {
     compileSdkVersion 28
 
-
-
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 28
         versionCode 1
-        versionName "1.0"
+        versionName version
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
@@ -66,10 +66,6 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 
-//repositories {
-//    mavenCentral()
-//}
-
 group = publishedGroupId                               // Maven Group ID for the artifact
 
 install {
diff --git a/skin/build.gradle b/skin/build.gradle
index 48958bf0f..8c0c93730 100644
--- a/skin/build.gradle
+++ b/skin/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
-version = '1.5.0-SNAPSHOT'
+version = research_stack_version
 
 android {
     compileSdkVersion 28

From 86c156ebb311e6e99c745213a4f505b2dd9931ab Mon Sep 17 00:00:00 2001
From: James Kizer <james.kizer@gmail.com>
Date: Wed, 2 Jan 2019 15:23:48 -0500
Subject: [PATCH 17/53] Added modules for auth, chart, consent, and storage
 #488

---
 authentication/.gitignore                     |   1 +
 authentication/build.gradle                   | 169 +++++++++++++++++
 authentication/proguard-rules.pro             |  21 +++
 .../ExampleInstrumentedTest.java              |  26 +++
 authentication/src/main/AndroidManifest.xml   |   2 +
 .../feature/authentication/ReplaceMe.kt       |   2 +
 .../src/main/res/values/strings.xml           |   3 +
 .../authentication/ExampleUnitTest.java       |  17 ++
 build.gradle                                  |   3 +-
 chart/.gitignore                              |   1 +
 chart/build.gradle                            | 174 ++++++++++++++++++
 chart/proguard-rules.pro                      |  21 +++
 .../chart/ExampleInstrumentedTest.java        |  26 +++
 chart/src/main/AndroidManifest.xml            |   2 +
 .../researchstack/feature/chart/ReplaceMe.kt  |   2 +
 chart/src/main/res/values/strings.xml         |   3 +
 .../feature/chart/ExampleUnitTest.java        |  17 ++
 consent/.gitignore                            |   1 +
 consent/build.gradle                          | 170 +++++++++++++++++
 consent/proguard-rules.pro                    |  21 +++
 .../consent/ExampleInstrumentedTest.java      |  26 +++
 consent/src/main/AndroidManifest.xml          |   2 +
 consent/src/main/res/values/strings.xml       |   3 +
 .../feature/consent/ExampleUnitTest.java      |  17 ++
 settings.gradle                               |   2 +-
 storage/.gitignore                            |   1 +
 storage/build.gradle                          | 174 ++++++++++++++++++
 storage/proguard-rules.pro                    |  21 +++
 .../storage/ExampleInstrumentedTest.java      |  26 +++
 storage/src/main/AndroidManifest.xml          |   2 +
 storage/src/main/res/values/strings.xml       |   3 +
 .../feature/storage/ExampleUnitTest.java      |  17 ++
 32 files changed, 974 insertions(+), 2 deletions(-)
 create mode 100644 authentication/.gitignore
 create mode 100644 authentication/build.gradle
 create mode 100644 authentication/proguard-rules.pro
 create mode 100644 authentication/src/androidTest/java/org/researchstack/feature/authentication/ExampleInstrumentedTest.java
 create mode 100644 authentication/src/main/AndroidManifest.xml
 create mode 100644 authentication/src/main/java/org/researchstack/feature/authentication/ReplaceMe.kt
 create mode 100644 authentication/src/main/res/values/strings.xml
 create mode 100644 authentication/src/test/java/org/researchstack/feature/authentication/ExampleUnitTest.java
 create mode 100644 chart/.gitignore
 create mode 100644 chart/build.gradle
 create mode 100644 chart/proguard-rules.pro
 create mode 100644 chart/src/androidTest/java/org/researchstack/feature/chart/ExampleInstrumentedTest.java
 create mode 100644 chart/src/main/AndroidManifest.xml
 create mode 100644 chart/src/main/java/org/researchstack/feature/chart/ReplaceMe.kt
 create mode 100644 chart/src/main/res/values/strings.xml
 create mode 100644 chart/src/test/java/org/researchstack/feature/chart/ExampleUnitTest.java
 create mode 100644 consent/.gitignore
 create mode 100644 consent/build.gradle
 create mode 100644 consent/proguard-rules.pro
 create mode 100644 consent/src/androidTest/java/org/researchstack/feature/consent/ExampleInstrumentedTest.java
 create mode 100644 consent/src/main/AndroidManifest.xml
 create mode 100644 consent/src/main/res/values/strings.xml
 create mode 100644 consent/src/test/java/org/researchstack/feature/consent/ExampleUnitTest.java
 create mode 100644 storage/.gitignore
 create mode 100644 storage/build.gradle
 create mode 100644 storage/proguard-rules.pro
 create mode 100644 storage/src/androidTest/java/org/researchstack/feature/storage/ExampleInstrumentedTest.java
 create mode 100644 storage/src/main/AndroidManifest.xml
 create mode 100644 storage/src/main/res/values/strings.xml
 create mode 100644 storage/src/test/java/org/researchstack/feature/storage/ExampleUnitTest.java

diff --git a/authentication/.gitignore b/authentication/.gitignore
new file mode 100644
index 000000000..796b96d1c
--- /dev/null
+++ b/authentication/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/authentication/build.gradle b/authentication/build.gradle
new file mode 100644
index 000000000..ae41785f9
--- /dev/null
+++ b/authentication/build.gradle
@@ -0,0 +1,169 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+
+apply plugin: 'com.github.dcendents.android-maven'
+apply plugin: 'com.jfrog.bintray'
+
+version = research_stack_version
+
+android {
+    compileSdkVersion 28
+    defaultConfig {
+        minSdkVersion 19
+        targetSdkVersion 28
+        versionCode 1
+        versionName version
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+    resourcePrefix 'rsfa_'
+    compileOptions {
+        sourceCompatibility = '1.8'
+        targetCompatibility = '1.8'
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    buildToolsVersion '28.0.3'
+}
+
+Properties properties = new Properties()
+properties.load(project.rootProject.file('local.properties').newDataInputStream())
+
+ext {
+    bintrayRepo = 'ResearchStack'
+    bintrayName = 'Authentication'
+
+    publishedGroupId = 'org.researchstack'
+    libraryName = 'Authentication'
+    artifact = 'authentication'
+
+    libraryDescription = 'Authentication'
+
+    siteUrl = 'https://researchstack.org'
+    gitUrl = 'https://github.com/ResearchStack/ResearchStack.git'
+
+    libraryVersion = version
+
+    userOrgName = 'researchstack'
+    developerId = properties.getProperty("bintray.user")
+    developerName = properties.getProperty("bintray.developerName")
+    developerEmail = properties.getProperty("bintray.developerEmail")
+
+    licenseName = 'The Apache Software License, Version 2.0'
+    licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+    allLicenses = ["Apache-2.0"]
+}
+
+dependencies {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation "com.android.support:appcompat-v7:$support_library_version"
+    implementation "com.android.support:cardview-v7:$support_library_version"
+    implementation "com.android.support:preference-v14:$support_library_version"
+    implementation "com.android.support:design:$support_library_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+
+    implementation project(':foundation')
+
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+}
+
+group = publishedGroupId                               // Maven Group ID for the artifact
+
+install {
+    repositories.mavenInstaller {
+        // This generates POM.xml with proper parameters
+        pom {
+            project {
+                packaging 'aar'
+                groupId publishedGroupId
+                artifactId artifact
+
+                // Add your description here
+                name libraryName
+                description libraryDescription
+                url siteUrl
+
+                // Set your license
+                licenses {
+                    license {
+                        name licenseName
+                        url licenseUrl
+                    }
+                }
+                developers {
+                    developer {
+                        id developerId
+                        name developerName
+                        email developerEmail
+                    }
+                }
+                scm {
+                    connection gitUrl
+                    developerConnection gitUrl
+                    url siteUrl
+                }
+            }
+        }
+    }
+}
+
+if (project.hasProperty("android")) { // Android libraries
+    task sourcesJar(type: Jar) {
+        classifier = 'sources'
+        from android.sourceSets.main.java.srcDirs
+    }
+
+    task javadoc(type: Javadoc) {
+        failOnError false
+        source = android.sourceSets.main.java.srcDirs
+    }
+
+    afterEvaluate {
+        javadoc.classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+        javadoc.classpath += files(android.libraryVariants.collect { variant ->
+            variant.javaCompile.classpath.files
+        })
+    }
+} else { // Java libraries
+    task sourcesJar(type: Jar, dependsOn: classes) {
+        classifier = 'sources'
+        from sourceSets.main.allSource
+    }
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
+
+artifacts {
+    archives javadocJar
+    archives sourcesJar
+}
+
+bintray {
+    user = properties.getProperty("bintray.user")
+    key = properties.getProperty("bintray.apikey")
+
+    configurations = ['archives']
+    pkg {
+        repo = bintrayRepo
+        name = bintrayName
+        userOrg = userOrgName
+        desc = libraryDescription
+        websiteUrl = siteUrl
+        vcsUrl = gitUrl
+        licenses = allLicenses
+        publish = true
+    }
+}
diff --git a/authentication/proguard-rules.pro b/authentication/proguard-rules.pro
new file mode 100644
index 000000000..f1b424510
--- /dev/null
+++ b/authentication/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/authentication/src/androidTest/java/org/researchstack/feature/authentication/ExampleInstrumentedTest.java b/authentication/src/androidTest/java/org/researchstack/feature/authentication/ExampleInstrumentedTest.java
new file mode 100644
index 000000000..9606b2642
--- /dev/null
+++ b/authentication/src/androidTest/java/org/researchstack/feature/authentication/ExampleInstrumentedTest.java
@@ -0,0 +1,26 @@
+package org.researchstack.feature.authentication;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("org.researchstack.feature.authentication.test", appContext.getPackageName());
+    }
+}
diff --git a/authentication/src/main/AndroidManifest.xml b/authentication/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..429932ed6
--- /dev/null
+++ b/authentication/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.researchstack.feature.authentication" />
diff --git a/authentication/src/main/java/org/researchstack/feature/authentication/ReplaceMe.kt b/authentication/src/main/java/org/researchstack/feature/authentication/ReplaceMe.kt
new file mode 100644
index 000000000..44215b40e
--- /dev/null
+++ b/authentication/src/main/java/org/researchstack/feature/authentication/ReplaceMe.kt
@@ -0,0 +1,2 @@
+package org.researchstack.feature.authentication
+
diff --git a/authentication/src/main/res/values/strings.xml b/authentication/src/main/res/values/strings.xml
new file mode 100644
index 000000000..3ca9920b6
--- /dev/null
+++ b/authentication/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">Authentication</string>
+</resources>
diff --git a/authentication/src/test/java/org/researchstack/feature/authentication/ExampleUnitTest.java b/authentication/src/test/java/org/researchstack/feature/authentication/ExampleUnitTest.java
new file mode 100644
index 000000000..4040ee842
--- /dev/null
+++ b/authentication/src/test/java/org/researchstack/feature/authentication/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package org.researchstack.feature.authentication;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() {
+        assertEquals(4, 2 + 2);
+    }
+}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 6d8665312..a95e8a658 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,8 +4,9 @@ buildscript {
 
     ext {
         research_stack_version = '1.5.0-SNAPSHOT'
-        kotlin_version = '1.3.10'
+        kotlin_version = '1.3.11'
         support_library_version = '28.0.0'
+        gson_version = '2.8.2'
     }
 
     repositories {
diff --git a/chart/.gitignore b/chart/.gitignore
new file mode 100644
index 000000000..796b96d1c
--- /dev/null
+++ b/chart/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/chart/build.gradle b/chart/build.gradle
new file mode 100644
index 000000000..54d03b39d
--- /dev/null
+++ b/chart/build.gradle
@@ -0,0 +1,174 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+
+apply plugin: 'com.github.dcendents.android-maven'
+apply plugin: 'com.jfrog.bintray'
+
+version = research_stack_version
+
+android {
+    compileSdkVersion 28
+    defaultConfig {
+        minSdkVersion 19
+        targetSdkVersion 28
+        versionCode 1
+        versionName version
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+    resourcePrefix 'rsfch_'
+    compileOptions {
+        sourceCompatibility = '1.8'
+        targetCompatibility = '1.8'
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    buildToolsVersion '28.0.3'
+}
+
+Properties properties = new Properties()
+properties.load(project.rootProject.file('local.properties').newDataInputStream())
+
+ext {
+    bintrayRepo = 'ResearchStack'
+    bintrayName = 'Chart'
+
+    publishedGroupId = 'org.researchstack'
+    libraryName = 'Chart'
+    artifact = 'chart'
+
+    libraryDescription = 'Chart'
+
+    siteUrl = 'https://researchstack.org'
+    gitUrl = 'https://github.com/ResearchStack/ResearchStack.git'
+
+    libraryVersion = version
+
+    userOrgName = 'researchstack'
+    developerId = properties.getProperty("bintray.user")
+    developerName = properties.getProperty("bintray.developerName")
+    developerEmail = properties.getProperty("bintray.developerEmail")
+
+    licenseName = 'The Apache Software License, Version 2.0'
+    licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+    allLicenses = ["Apache-2.0"]
+}
+
+dependencies {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation "com.android.support:appcompat-v7:$support_library_version"
+    implementation "com.android.support:cardview-v7:$support_library_version"
+    implementation "com.android.support:preference-v14:$support_library_version"
+    implementation "com.android.support:design:$support_library_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+
+    implementation project(':foundation')
+    implementation 'com.github.PhilJay:MPAndroidChart:v2.2.3'
+    implementation 'com.jakewharton.rxbinding:rxbinding:0.4.0'
+    implementation 'com.jakewharton.rxbinding:rxbinding-support-v4:0.4.0'
+    implementation 'com.jakewharton.rxbinding:rxbinding-appcompat-v7:0.4.0'
+    implementation 'com.jakewharton.rxbinding:rxbinding-design:0.4.0'
+
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+}
+
+group = publishedGroupId                               // Maven Group ID for the artifact
+
+install {
+    repositories.mavenInstaller {
+        // This generates POM.xml with proper parameters
+        pom {
+            project {
+                packaging 'aar'
+                groupId publishedGroupId
+                artifactId artifact
+
+                // Add your description here
+                name libraryName
+                description libraryDescription
+                url siteUrl
+
+                // Set your license
+                licenses {
+                    license {
+                        name licenseName
+                        url licenseUrl
+                    }
+                }
+                developers {
+                    developer {
+                        id developerId
+                        name developerName
+                        email developerEmail
+                    }
+                }
+                scm {
+                    connection gitUrl
+                    developerConnection gitUrl
+                    url siteUrl
+                }
+            }
+        }
+    }
+}
+
+if (project.hasProperty("android")) { // Android libraries
+    task sourcesJar(type: Jar) {
+        classifier = 'sources'
+        from android.sourceSets.main.java.srcDirs
+    }
+
+    task javadoc(type: Javadoc) {
+        failOnError false
+        source = android.sourceSets.main.java.srcDirs
+    }
+
+    afterEvaluate {
+        javadoc.classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+        javadoc.classpath += files(android.libraryVariants.collect { variant ->
+            variant.javaCompile.classpath.files
+        })
+    }
+} else { // Java libraries
+    task sourcesJar(type: Jar, dependsOn: classes) {
+        classifier = 'sources'
+        from sourceSets.main.allSource
+    }
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
+
+artifacts {
+    archives javadocJar
+    archives sourcesJar
+}
+
+bintray {
+    user = properties.getProperty("bintray.user")
+    key = properties.getProperty("bintray.apikey")
+
+    configurations = ['archives']
+    pkg {
+        repo = bintrayRepo
+        name = bintrayName
+        userOrg = userOrgName
+        desc = libraryDescription
+        websiteUrl = siteUrl
+        vcsUrl = gitUrl
+        licenses = allLicenses
+        publish = true
+    }
+}
diff --git a/chart/proguard-rules.pro b/chart/proguard-rules.pro
new file mode 100644
index 000000000..f1b424510
--- /dev/null
+++ b/chart/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/chart/src/androidTest/java/org/researchstack/feature/chart/ExampleInstrumentedTest.java b/chart/src/androidTest/java/org/researchstack/feature/chart/ExampleInstrumentedTest.java
new file mode 100644
index 000000000..0c16cbc49
--- /dev/null
+++ b/chart/src/androidTest/java/org/researchstack/feature/chart/ExampleInstrumentedTest.java
@@ -0,0 +1,26 @@
+package org.researchstack.feature.chart;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("org.researchstack.feature.chart.test", appContext.getPackageName());
+    }
+}
diff --git a/chart/src/main/AndroidManifest.xml b/chart/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..032cc9c0a
--- /dev/null
+++ b/chart/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.researchstack.feature.chart" />
diff --git a/chart/src/main/java/org/researchstack/feature/chart/ReplaceMe.kt b/chart/src/main/java/org/researchstack/feature/chart/ReplaceMe.kt
new file mode 100644
index 000000000..b86402bf2
--- /dev/null
+++ b/chart/src/main/java/org/researchstack/feature/chart/ReplaceMe.kt
@@ -0,0 +1,2 @@
+package org.researchstack.feature.chart
+
diff --git a/chart/src/main/res/values/strings.xml b/chart/src/main/res/values/strings.xml
new file mode 100644
index 000000000..487a93aa7
--- /dev/null
+++ b/chart/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">Chart</string>
+</resources>
diff --git a/chart/src/test/java/org/researchstack/feature/chart/ExampleUnitTest.java b/chart/src/test/java/org/researchstack/feature/chart/ExampleUnitTest.java
new file mode 100644
index 000000000..4ca3c32e3
--- /dev/null
+++ b/chart/src/test/java/org/researchstack/feature/chart/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package org.researchstack.feature.chart;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() {
+        assertEquals(4, 2 + 2);
+    }
+}
\ No newline at end of file
diff --git a/consent/.gitignore b/consent/.gitignore
new file mode 100644
index 000000000..796b96d1c
--- /dev/null
+++ b/consent/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/consent/build.gradle b/consent/build.gradle
new file mode 100644
index 000000000..ba90b2b47
--- /dev/null
+++ b/consent/build.gradle
@@ -0,0 +1,170 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+
+apply plugin: 'com.github.dcendents.android-maven'
+apply plugin: 'com.jfrog.bintray'
+
+version = research_stack_version
+
+android {
+    compileSdkVersion 28
+    defaultConfig {
+        minSdkVersion 19
+        targetSdkVersion 28
+        versionCode 1
+        versionName version
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+    resourcePrefix 'rsfc_'
+    compileOptions {
+        sourceCompatibility = '1.8'
+        targetCompatibility = '1.8'
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    buildToolsVersion '28.0.3'
+}
+
+Properties properties = new Properties()
+properties.load(project.rootProject.file('local.properties').newDataInputStream())
+
+ext {
+    bintrayRepo = 'ResearchStack'
+    bintrayName = 'Authentication'
+
+    publishedGroupId = 'org.researchstack'
+    libraryName = 'Consent'
+    artifact = 'consent'
+
+    libraryDescription = 'Consent'
+
+    siteUrl = 'https://researchstack.org'
+    gitUrl = 'https://github.com/ResearchStack/ResearchStack.git'
+
+    libraryVersion = version
+
+    userOrgName = 'researchstack'
+    developerId = properties.getProperty("bintray.user")
+    developerName = properties.getProperty("bintray.developerName")
+    developerEmail = properties.getProperty("bintray.developerEmail")
+
+    licenseName = 'The Apache Software License, Version 2.0'
+    licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+    allLicenses = ["Apache-2.0"]
+}
+
+dependencies {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation "com.android.support:appcompat-v7:$support_library_version"
+    implementation "com.android.support:cardview-v7:$support_library_version"
+    implementation "com.android.support:preference-v14:$support_library_version"
+    implementation "com.android.support:design:$support_library_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+
+    implementation project(':foundation')
+    implementation "com.google.code.gson:gson:$gson_version"
+
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+}
+
+group = publishedGroupId                               // Maven Group ID for the artifact
+
+install {
+    repositories.mavenInstaller {
+        // This generates POM.xml with proper parameters
+        pom {
+            project {
+                packaging 'aar'
+                groupId publishedGroupId
+                artifactId artifact
+
+                // Add your description here
+                name libraryName
+                description libraryDescription
+                url siteUrl
+
+                // Set your license
+                licenses {
+                    license {
+                        name licenseName
+                        url licenseUrl
+                    }
+                }
+                developers {
+                    developer {
+                        id developerId
+                        name developerName
+                        email developerEmail
+                    }
+                }
+                scm {
+                    connection gitUrl
+                    developerConnection gitUrl
+                    url siteUrl
+                }
+            }
+        }
+    }
+}
+
+if (project.hasProperty("android")) { // Android libraries
+    task sourcesJar(type: Jar) {
+        classifier = 'sources'
+        from android.sourceSets.main.java.srcDirs
+    }
+
+    task javadoc(type: Javadoc) {
+        failOnError false
+        source = android.sourceSets.main.java.srcDirs
+    }
+
+    afterEvaluate {
+        javadoc.classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+        javadoc.classpath += files(android.libraryVariants.collect { variant ->
+            variant.javaCompile.classpath.files
+        })
+    }
+} else { // Java libraries
+    task sourcesJar(type: Jar, dependsOn: classes) {
+        classifier = 'sources'
+        from sourceSets.main.allSource
+    }
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
+
+artifacts {
+    archives javadocJar
+    archives sourcesJar
+}
+
+bintray {
+    user = properties.getProperty("bintray.user")
+    key = properties.getProperty("bintray.apikey")
+
+    configurations = ['archives']
+    pkg {
+        repo = bintrayRepo
+        name = bintrayName
+        userOrg = userOrgName
+        desc = libraryDescription
+        websiteUrl = siteUrl
+        vcsUrl = gitUrl
+        licenses = allLicenses
+        publish = true
+    }
+}
diff --git a/consent/proguard-rules.pro b/consent/proguard-rules.pro
new file mode 100644
index 000000000..f1b424510
--- /dev/null
+++ b/consent/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/consent/src/androidTest/java/org/researchstack/feature/consent/ExampleInstrumentedTest.java b/consent/src/androidTest/java/org/researchstack/feature/consent/ExampleInstrumentedTest.java
new file mode 100644
index 000000000..630a09580
--- /dev/null
+++ b/consent/src/androidTest/java/org/researchstack/feature/consent/ExampleInstrumentedTest.java
@@ -0,0 +1,26 @@
+package org.researchstack.feature.consent;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("org.researchstack.feature.consent.test", appContext.getPackageName());
+    }
+}
diff --git a/consent/src/main/AndroidManifest.xml b/consent/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..181af0c26
--- /dev/null
+++ b/consent/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.researchstack.feature.consent" />
diff --git a/consent/src/main/res/values/strings.xml b/consent/src/main/res/values/strings.xml
new file mode 100644
index 000000000..67cceb3f1
--- /dev/null
+++ b/consent/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">Consent</string>
+</resources>
diff --git a/consent/src/test/java/org/researchstack/feature/consent/ExampleUnitTest.java b/consent/src/test/java/org/researchstack/feature/consent/ExampleUnitTest.java
new file mode 100644
index 000000000..bcdf8f5dd
--- /dev/null
+++ b/consent/src/test/java/org/researchstack/feature/consent/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package org.researchstack.feature.consent;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() {
+        assertEquals(4, 2 + 2);
+    }
+}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 1ab05aa50..667b831c4 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':backbone', ':skin', ':foundation'
+include ':backbone', ':skin', ':foundation', ':authentication', ':chart', ':consent', ':storage'
diff --git a/storage/.gitignore b/storage/.gitignore
new file mode 100644
index 000000000..796b96d1c
--- /dev/null
+++ b/storage/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/storage/build.gradle b/storage/build.gradle
new file mode 100644
index 000000000..91f3db834
--- /dev/null
+++ b/storage/build.gradle
@@ -0,0 +1,174 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+
+apply plugin: 'com.github.dcendents.android-maven'
+apply plugin: 'com.jfrog.bintray'
+
+version = research_stack_version
+
+android {
+    compileSdkVersion 28
+    defaultConfig {
+        minSdkVersion 19
+        targetSdkVersion 28
+        versionCode 1
+        versionName version
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+    resourcePrefix 'rsfs_'
+    compileOptions {
+        sourceCompatibility = '1.8'
+        targetCompatibility = '1.8'
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    buildToolsVersion '28.0.3'
+}
+
+Properties properties = new Properties()
+properties.load(project.rootProject.file('local.properties').newDataInputStream())
+
+ext {
+    bintrayRepo = 'ResearchStack'
+    bintrayName = 'Storage'
+
+    publishedGroupId = 'org.researchstack'
+    libraryName = 'Storage'
+    artifact = 'storage'
+
+    libraryDescription = 'Storage'
+
+    siteUrl = 'https://researchstack.org'
+    gitUrl = 'https://github.com/ResearchStack/ResearchStack.git'
+
+    libraryVersion = version
+
+    userOrgName = 'researchstack'
+    developerId = properties.getProperty("bintray.user")
+    developerName = properties.getProperty("bintray.developerName")
+    developerEmail = properties.getProperty("bintray.developerEmail")
+
+    licenseName = 'The Apache Software License, Version 2.0'
+    licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+    allLicenses = ["Apache-2.0"]
+}
+
+dependencies {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation "com.android.support:appcompat-v7:$support_library_version"
+    implementation "com.android.support:cardview-v7:$support_library_version"
+    implementation "com.android.support:preference-v14:$support_library_version"
+    implementation "com.android.support:design:$support_library_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation project(':foundation')
+    implementation project(':authentication')
+    implementation "com.google.code.gson:gson:$gson_version"
+    implementation 'com.scottyab:aes-crypto:0.0.3'
+    implementation 'co.touchlab.squeaky:squeaky-query:0.4.0.0'
+    annotationProcessor 'co.touchlab.squeaky:squeaky-processor:0.4.0.0'
+    implementation 'net.zetetic:android-database-sqlcipher:3.5.4@aar'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+}
+
+group = publishedGroupId                               // Maven Group ID for the artifact
+
+install {
+    repositories.mavenInstaller {
+        // This generates POM.xml with proper parameters
+        pom {
+            project {
+                packaging 'aar'
+                groupId publishedGroupId
+                artifactId artifact
+
+                // Add your description here
+                name libraryName
+                description libraryDescription
+                url siteUrl
+
+                // Set your license
+                licenses {
+                    license {
+                        name licenseName
+                        url licenseUrl
+                    }
+                }
+                developers {
+                    developer {
+                        id developerId
+                        name developerName
+                        email developerEmail
+                    }
+                }
+                scm {
+                    connection gitUrl
+                    developerConnection gitUrl
+                    url siteUrl
+                }
+            }
+        }
+    }
+}
+
+if (project.hasProperty("android")) { // Android libraries
+    task sourcesJar(type: Jar) {
+        classifier = 'sources'
+        from android.sourceSets.main.java.srcDirs
+    }
+
+    task javadoc(type: Javadoc) {
+        failOnError false
+        source = android.sourceSets.main.java.srcDirs
+    }
+
+    afterEvaluate {
+        javadoc.classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+        javadoc.classpath += files(android.libraryVariants.collect { variant ->
+            variant.javaCompile.classpath.files
+        })
+    }
+} else { // Java libraries
+    task sourcesJar(type: Jar, dependsOn: classes) {
+        classifier = 'sources'
+        from sourceSets.main.allSource
+    }
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
+
+artifacts {
+    archives javadocJar
+    archives sourcesJar
+}
+
+bintray {
+    user = properties.getProperty("bintray.user")
+    key = properties.getProperty("bintray.apikey")
+
+    configurations = ['archives']
+    pkg {
+        repo = bintrayRepo
+        name = bintrayName
+        userOrg = userOrgName
+        desc = libraryDescription
+        websiteUrl = siteUrl
+        vcsUrl = gitUrl
+        licenses = allLicenses
+        publish = true
+    }
+}
\ No newline at end of file
diff --git a/storage/proguard-rules.pro b/storage/proguard-rules.pro
new file mode 100644
index 000000000..f1b424510
--- /dev/null
+++ b/storage/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/storage/src/androidTest/java/org/researchstack/feature/storage/ExampleInstrumentedTest.java b/storage/src/androidTest/java/org/researchstack/feature/storage/ExampleInstrumentedTest.java
new file mode 100644
index 000000000..657ef7ff5
--- /dev/null
+++ b/storage/src/androidTest/java/org/researchstack/feature/storage/ExampleInstrumentedTest.java
@@ -0,0 +1,26 @@
+package org.researchstack.feature.storage;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("org.researchstack.feature.storage.test", appContext.getPackageName());
+    }
+}
diff --git a/storage/src/main/AndroidManifest.xml b/storage/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..b86a31c3e
--- /dev/null
+++ b/storage/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.researchstack.feature.storage" />
diff --git a/storage/src/main/res/values/strings.xml b/storage/src/main/res/values/strings.xml
new file mode 100644
index 000000000..48044a87d
--- /dev/null
+++ b/storage/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">Storage</string>
+</resources>
diff --git a/storage/src/test/java/org/researchstack/feature/storage/ExampleUnitTest.java b/storage/src/test/java/org/researchstack/feature/storage/ExampleUnitTest.java
new file mode 100644
index 000000000..f3083ac17
--- /dev/null
+++ b/storage/src/test/java/org/researchstack/feature/storage/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package org.researchstack.feature.storage;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() {
+        assertEquals(4, 2 + 2);
+    }
+}
\ No newline at end of file

From 549a6061eeca70916d9ed4b1b0a611424b7adcbf Mon Sep 17 00:00:00 2001
From: James Kizer <james.kizer@gmail.com>
Date: Wed, 2 Jan 2019 16:21:06 -0500
Subject: [PATCH 18/53] Moved auth files from backbone to auth module

---
 .../java/org/researchstack/feature/authentication/ReplaceMe.kt  | 2 --
 .../feature/authentication/pincode}/PinCodeConfig.java          | 0
 .../authentication/pincode}/step/PassCodeCreationStep.java      | 0
 .../feature/authentication/pincode/ui}/PinCodeLayout.java       | 0
 .../pincode/ui}/SignUpPinCodeCreationStepLayout.java            | 0
 5 files changed, 2 deletions(-)
 delete mode 100644 authentication/src/main/java/org/researchstack/feature/authentication/ReplaceMe.kt
 rename {backbone/src/main/java/org/researchstack/backbone/storage/file => authentication/src/main/java/org/researchstack/feature/authentication/pincode}/PinCodeConfig.java (100%)
 rename {skin/src/main/java/org/researchstack/skin => authentication/src/main/java/org/researchstack/feature/authentication/pincode}/step/PassCodeCreationStep.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone/ui/views => authentication/src/main/java/org/researchstack/feature/authentication/pincode/ui}/PinCodeLayout.java (100%)
 rename {skin/src/main/java/org/researchstack/skin/ui/layout => authentication/src/main/java/org/researchstack/feature/authentication/pincode/ui}/SignUpPinCodeCreationStepLayout.java (100%)

diff --git a/authentication/src/main/java/org/researchstack/feature/authentication/ReplaceMe.kt b/authentication/src/main/java/org/researchstack/feature/authentication/ReplaceMe.kt
deleted file mode 100644
index 44215b40e..000000000
--- a/authentication/src/main/java/org/researchstack/feature/authentication/ReplaceMe.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-package org.researchstack.feature.authentication
-
diff --git a/backbone/src/main/java/org/researchstack/backbone/storage/file/PinCodeConfig.java b/authentication/src/main/java/org/researchstack/feature/authentication/pincode/PinCodeConfig.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/storage/file/PinCodeConfig.java
rename to authentication/src/main/java/org/researchstack/feature/authentication/pincode/PinCodeConfig.java
diff --git a/skin/src/main/java/org/researchstack/skin/step/PassCodeCreationStep.java b/authentication/src/main/java/org/researchstack/feature/authentication/pincode/step/PassCodeCreationStep.java
similarity index 100%
rename from skin/src/main/java/org/researchstack/skin/step/PassCodeCreationStep.java
rename to authentication/src/main/java/org/researchstack/feature/authentication/pincode/step/PassCodeCreationStep.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/views/PinCodeLayout.java b/authentication/src/main/java/org/researchstack/feature/authentication/pincode/ui/PinCodeLayout.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/ui/views/PinCodeLayout.java
rename to authentication/src/main/java/org/researchstack/feature/authentication/pincode/ui/PinCodeLayout.java
diff --git a/skin/src/main/java/org/researchstack/skin/ui/layout/SignUpPinCodeCreationStepLayout.java b/authentication/src/main/java/org/researchstack/feature/authentication/pincode/ui/SignUpPinCodeCreationStepLayout.java
similarity index 100%
rename from skin/src/main/java/org/researchstack/skin/ui/layout/SignUpPinCodeCreationStepLayout.java
rename to authentication/src/main/java/org/researchstack/feature/authentication/pincode/ui/SignUpPinCodeCreationStepLayout.java

From d4861c53a47b0888ccb4ef8aeace1ad1bebd29b8 Mon Sep 17 00:00:00 2001
From: James Kizer <james.kizer@gmail.com>
Date: Wed, 2 Jan 2019 16:24:20 -0500
Subject: [PATCH 19/53] moved layout file from backbone to auth

---
 .../src/main/res/layout/rsb_step_layout_pincode.xml               | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {backbone => authentication}/src/main/res/layout/rsb_step_layout_pincode.xml (100%)

diff --git a/backbone/src/main/res/layout/rsb_step_layout_pincode.xml b/authentication/src/main/res/layout/rsb_step_layout_pincode.xml
similarity index 100%
rename from backbone/src/main/res/layout/rsb_step_layout_pincode.xml
rename to authentication/src/main/res/layout/rsb_step_layout_pincode.xml

From dd676890c1743e2d0e52362a8cf0889e046fe073 Mon Sep 17 00:00:00 2001
From: James Kizer <james.kizer@gmail.com>
Date: Wed, 2 Jan 2019 16:30:56 -0500
Subject: [PATCH 20/53] moved chart files from backbone into chart module

---
 .../src/main/java/org/researchstack/feature/chart/ReplaceMe.kt  | 2 --
 .../java/org/researchstack/feature/chart/ui}/BarChartCard.java  | 0
 .../java/org/researchstack/feature/chart/ui}/EmptyView.java     | 0
 .../java/org/researchstack/feature/chart/ui}/LineChartCard.java | 0
 .../java/org/researchstack/feature/chart/ui}/PieChartCard.java  | 0
 .../org/researchstack/feature/chart/ui}/ProgressChartCard.java  | 0
 {backbone => chart}/src/main/res/layout/rsb_item_chart_pie.xml  | 0
 {backbone => chart}/src/main/res/layout/rsb_view_chart_bar.xml  | 0
 {backbone => chart}/src/main/res/layout/rsb_view_chart_line.xml | 0
 {backbone => chart}/src/main/res/layout/rsb_view_chart_pie.xml  | 0
 .../src/main/res/layout/rsb_view_chart_progress.xml             | 0
 {backbone => chart}/src/main/res/layout/rsb_view_empty.xml      | 0
 12 files changed, 2 deletions(-)
 delete mode 100644 chart/src/main/java/org/researchstack/feature/chart/ReplaceMe.kt
 rename {backbone/src/main/java/org/researchstack/backbone/ui/graph => chart/src/main/java/org/researchstack/feature/chart/ui}/BarChartCard.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone/ui/graph => chart/src/main/java/org/researchstack/feature/chart/ui}/EmptyView.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone/ui/graph => chart/src/main/java/org/researchstack/feature/chart/ui}/LineChartCard.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone/ui/graph => chart/src/main/java/org/researchstack/feature/chart/ui}/PieChartCard.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone/ui/graph => chart/src/main/java/org/researchstack/feature/chart/ui}/ProgressChartCard.java (100%)
 rename {backbone => chart}/src/main/res/layout/rsb_item_chart_pie.xml (100%)
 rename {backbone => chart}/src/main/res/layout/rsb_view_chart_bar.xml (100%)
 rename {backbone => chart}/src/main/res/layout/rsb_view_chart_line.xml (100%)
 rename {backbone => chart}/src/main/res/layout/rsb_view_chart_pie.xml (100%)
 rename {backbone => chart}/src/main/res/layout/rsb_view_chart_progress.xml (100%)
 rename {backbone => chart}/src/main/res/layout/rsb_view_empty.xml (100%)

diff --git a/chart/src/main/java/org/researchstack/feature/chart/ReplaceMe.kt b/chart/src/main/java/org/researchstack/feature/chart/ReplaceMe.kt
deleted file mode 100644
index b86402bf2..000000000
--- a/chart/src/main/java/org/researchstack/feature/chart/ReplaceMe.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-package org.researchstack.feature.chart
-
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/graph/BarChartCard.java b/chart/src/main/java/org/researchstack/feature/chart/ui/BarChartCard.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/ui/graph/BarChartCard.java
rename to chart/src/main/java/org/researchstack/feature/chart/ui/BarChartCard.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/graph/EmptyView.java b/chart/src/main/java/org/researchstack/feature/chart/ui/EmptyView.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/ui/graph/EmptyView.java
rename to chart/src/main/java/org/researchstack/feature/chart/ui/EmptyView.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/graph/LineChartCard.java b/chart/src/main/java/org/researchstack/feature/chart/ui/LineChartCard.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/ui/graph/LineChartCard.java
rename to chart/src/main/java/org/researchstack/feature/chart/ui/LineChartCard.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/graph/PieChartCard.java b/chart/src/main/java/org/researchstack/feature/chart/ui/PieChartCard.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/ui/graph/PieChartCard.java
rename to chart/src/main/java/org/researchstack/feature/chart/ui/PieChartCard.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/graph/ProgressChartCard.java b/chart/src/main/java/org/researchstack/feature/chart/ui/ProgressChartCard.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/ui/graph/ProgressChartCard.java
rename to chart/src/main/java/org/researchstack/feature/chart/ui/ProgressChartCard.java
diff --git a/backbone/src/main/res/layout/rsb_item_chart_pie.xml b/chart/src/main/res/layout/rsb_item_chart_pie.xml
similarity index 100%
rename from backbone/src/main/res/layout/rsb_item_chart_pie.xml
rename to chart/src/main/res/layout/rsb_item_chart_pie.xml
diff --git a/backbone/src/main/res/layout/rsb_view_chart_bar.xml b/chart/src/main/res/layout/rsb_view_chart_bar.xml
similarity index 100%
rename from backbone/src/main/res/layout/rsb_view_chart_bar.xml
rename to chart/src/main/res/layout/rsb_view_chart_bar.xml
diff --git a/backbone/src/main/res/layout/rsb_view_chart_line.xml b/chart/src/main/res/layout/rsb_view_chart_line.xml
similarity index 100%
rename from backbone/src/main/res/layout/rsb_view_chart_line.xml
rename to chart/src/main/res/layout/rsb_view_chart_line.xml
diff --git a/backbone/src/main/res/layout/rsb_view_chart_pie.xml b/chart/src/main/res/layout/rsb_view_chart_pie.xml
similarity index 100%
rename from backbone/src/main/res/layout/rsb_view_chart_pie.xml
rename to chart/src/main/res/layout/rsb_view_chart_pie.xml
diff --git a/backbone/src/main/res/layout/rsb_view_chart_progress.xml b/chart/src/main/res/layout/rsb_view_chart_progress.xml
similarity index 100%
rename from backbone/src/main/res/layout/rsb_view_chart_progress.xml
rename to chart/src/main/res/layout/rsb_view_chart_progress.xml
diff --git a/backbone/src/main/res/layout/rsb_view_empty.xml b/chart/src/main/res/layout/rsb_view_empty.xml
similarity index 100%
rename from backbone/src/main/res/layout/rsb_view_empty.xml
rename to chart/src/main/res/layout/rsb_view_empty.xml

From 6eb5a3c3e565cb44a1616af3344fd7c22c67754f Mon Sep 17 00:00:00 2001
From: James Kizer <james.kizer@gmail.com>
Date: Wed, 2 Jan 2019 16:44:53 -0500
Subject: [PATCH 21/53] moved consent files into consent module

---
 .../feature/consent}/model/ConsentDocument.java     |   0
 .../feature/consent}/model/ConsentSection.java      |   0
 .../feature/consent}/model/ConsentSignature.java    |   0
 .../feature/consent}/step/ConsentDocumentStep.java  |   0
 .../feature/consent}/step/ConsentSharingStep.java   |   0
 .../feature/consent}/step/ConsentSignatureStep.java |   0
 .../feature/consent}/step/ConsentVisualStep.java    |   0
 .../consent}/ui/callbacks/SignatureCallbacks.java   |   0
 .../ui}/layout/ConsentDocumentStepLayout.java       |   0
 .../ui}/layout/ConsentSignatureStepLayout.java      |   0
 .../consent/ui}/layout/ConsentVisualStepLayout.java |   0
 .../feature/consent}/ui/views/SignatureView.java    |   0
 .../rsb_consent_section_data_gathering.png          | Bin
 .../drawable-hdpi/rsb_consent_section_data_use.png  | Bin
 .../rsb_consent_section_potential_benefits_alt.png  | Bin
 .../drawable-hdpi/rsb_consent_section_privacy.png   | Bin
 .../drawable-hdpi/rsb_consent_section_recontact.png | Bin
 .../rsb_consent_section_study_survey.png            | Bin
 .../rsb_consent_section_study_tasks.png             | Bin
 .../rsb_consent_section_time_commitment.png         | Bin
 .../rsb_consent_section_visiting_doctor.png         | Bin
 .../rsb_consent_section_withdrawing.png             | Bin
 .../rsb_consent_section_data_gathering.png          | Bin
 .../drawable-mdpi/rsb_consent_section_data_use.png  | Bin
 .../rsb_consent_section_potential_benefits_alt.png  | Bin
 .../drawable-mdpi/rsb_consent_section_privacy.png   | Bin
 .../drawable-mdpi/rsb_consent_section_recontact.png | Bin
 .../rsb_consent_section_study_survey.png            | Bin
 .../rsb_consent_section_study_tasks.png             | Bin
 .../rsb_consent_section_time_commitment.png         | Bin
 .../rsb_consent_section_visiting_doctor.png         | Bin
 .../rsb_consent_section_withdrawing.png             | Bin
 .../rsb_consent_section_data_gathering.png          | Bin
 .../drawable-xhdpi/rsb_consent_section_data_use.png | Bin
 .../rsb_consent_section_potential_benefits_alt.png  | Bin
 .../drawable-xhdpi/rsb_consent_section_privacy.png  | Bin
 .../rsb_consent_section_recontact.png               | Bin
 .../rsb_consent_section_study_survey.png            | Bin
 .../rsb_consent_section_study_tasks.png             | Bin
 .../rsb_consent_section_time_commitment.png         | Bin
 .../rsb_consent_section_visiting_doctor.png         | Bin
 .../rsb_consent_section_withdrawing.png             | Bin
 .../rsb_consent_section_data_gathering.png          | Bin
 .../rsb_consent_section_data_use.png                | Bin
 .../rsb_consent_section_potential_benefits_alt.png  | Bin
 .../drawable-xxhdpi/rsb_consent_section_privacy.png | Bin
 .../rsb_consent_section_recontact.png               | Bin
 .../rsb_consent_section_study_survey.png            | Bin
 .../rsb_consent_section_study_tasks.png             | Bin
 .../rsb_consent_section_time_commitment.png         | Bin
 .../rsb_consent_section_visiting_doctor.png         | Bin
 .../rsb_consent_section_withdrawing.png             | Bin
 .../rsb_consent_section_data_gathering.png          | Bin
 .../rsb_consent_section_data_use.png                | Bin
 .../rsb_consent_section_potential_benefits_alt.png  | Bin
 .../rsb_consent_section_privacy.png                 | Bin
 .../rsb_consent_section_recontact.png               | Bin
 .../rsb_consent_section_study_survey.png            | Bin
 .../rsb_consent_section_study_tasks.png             | Bin
 .../rsb_consent_section_time_commitment.png         | Bin
 .../rsb_consent_section_visiting_doctor.png         | Bin
 .../rsb_consent_section_withdrawing.png             | Bin
 .../main/res/layout/rsb_step_layout_consent_doc.xml |   0
 .../layout/rsb_step_layout_consent_signature.xml    |   0
 .../res/layout/rsb_step_layout_consent_visual.xml   |   0
 65 files changed, 0 insertions(+), 0 deletions(-)
 rename {backbone/src/main/java/org/researchstack/backbone => consent/src/main/java/org/researchstack/feature/consent}/model/ConsentDocument.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => consent/src/main/java/org/researchstack/feature/consent}/model/ConsentSection.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => consent/src/main/java/org/researchstack/feature/consent}/model/ConsentSignature.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => consent/src/main/java/org/researchstack/feature/consent}/step/ConsentDocumentStep.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => consent/src/main/java/org/researchstack/feature/consent}/step/ConsentSharingStep.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => consent/src/main/java/org/researchstack/feature/consent}/step/ConsentSignatureStep.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => consent/src/main/java/org/researchstack/feature/consent}/step/ConsentVisualStep.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => consent/src/main/java/org/researchstack/feature/consent}/ui/callbacks/SignatureCallbacks.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone/ui/step => consent/src/main/java/org/researchstack/feature/consent/ui}/layout/ConsentDocumentStepLayout.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone/ui/step => consent/src/main/java/org/researchstack/feature/consent/ui}/layout/ConsentSignatureStepLayout.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone/ui/step => consent/src/main/java/org/researchstack/feature/consent/ui}/layout/ConsentVisualStepLayout.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => consent/src/main/java/org/researchstack/feature/consent}/ui/views/SignatureView.java (100%)
 rename {backbone => consent}/src/main/res/drawable-hdpi/rsb_consent_section_data_gathering.png (100%)
 rename {backbone => consent}/src/main/res/drawable-hdpi/rsb_consent_section_data_use.png (100%)
 rename {backbone => consent}/src/main/res/drawable-hdpi/rsb_consent_section_potential_benefits_alt.png (100%)
 rename {backbone => consent}/src/main/res/drawable-hdpi/rsb_consent_section_privacy.png (100%)
 rename {backbone => consent}/src/main/res/drawable-hdpi/rsb_consent_section_recontact.png (100%)
 rename {backbone => consent}/src/main/res/drawable-hdpi/rsb_consent_section_study_survey.png (100%)
 rename {backbone => consent}/src/main/res/drawable-hdpi/rsb_consent_section_study_tasks.png (100%)
 rename {backbone => consent}/src/main/res/drawable-hdpi/rsb_consent_section_time_commitment.png (100%)
 rename {backbone => consent}/src/main/res/drawable-hdpi/rsb_consent_section_visiting_doctor.png (100%)
 rename {backbone => consent}/src/main/res/drawable-hdpi/rsb_consent_section_withdrawing.png (100%)
 rename {backbone => consent}/src/main/res/drawable-mdpi/rsb_consent_section_data_gathering.png (100%)
 rename {backbone => consent}/src/main/res/drawable-mdpi/rsb_consent_section_data_use.png (100%)
 rename {backbone => consent}/src/main/res/drawable-mdpi/rsb_consent_section_potential_benefits_alt.png (100%)
 rename {backbone => consent}/src/main/res/drawable-mdpi/rsb_consent_section_privacy.png (100%)
 rename {backbone => consent}/src/main/res/drawable-mdpi/rsb_consent_section_recontact.png (100%)
 rename {backbone => consent}/src/main/res/drawable-mdpi/rsb_consent_section_study_survey.png (100%)
 rename {backbone => consent}/src/main/res/drawable-mdpi/rsb_consent_section_study_tasks.png (100%)
 rename {backbone => consent}/src/main/res/drawable-mdpi/rsb_consent_section_time_commitment.png (100%)
 rename {backbone => consent}/src/main/res/drawable-mdpi/rsb_consent_section_visiting_doctor.png (100%)
 rename {backbone => consent}/src/main/res/drawable-mdpi/rsb_consent_section_withdrawing.png (100%)
 rename {backbone => consent}/src/main/res/drawable-xhdpi/rsb_consent_section_data_gathering.png (100%)
 rename {backbone => consent}/src/main/res/drawable-xhdpi/rsb_consent_section_data_use.png (100%)
 rename {backbone => consent}/src/main/res/drawable-xhdpi/rsb_consent_section_potential_benefits_alt.png (100%)
 rename {backbone => consent}/src/main/res/drawable-xhdpi/rsb_consent_section_privacy.png (100%)
 rename {backbone => consent}/src/main/res/drawable-xhdpi/rsb_consent_section_recontact.png (100%)
 rename {backbone => consent}/src/main/res/drawable-xhdpi/rsb_consent_section_study_survey.png (100%)
 rename {backbone => consent}/src/main/res/drawable-xhdpi/rsb_consent_section_study_tasks.png (100%)
 rename {backbone => consent}/src/main/res/drawable-xhdpi/rsb_consent_section_time_commitment.png (100%)
 rename {backbone => consent}/src/main/res/drawable-xhdpi/rsb_consent_section_visiting_doctor.png (100%)
 rename {backbone => consent}/src/main/res/drawable-xhdpi/rsb_consent_section_withdrawing.png (100%)
 rename {backbone => consent}/src/main/res/drawable-xxhdpi/rsb_consent_section_data_gathering.png (100%)
 rename {backbone => consent}/src/main/res/drawable-xxhdpi/rsb_consent_section_data_use.png (100%)
 rename {backbone => consent}/src/main/res/drawable-xxhdpi/rsb_consent_section_potential_benefits_alt.png (100%)
 rename {backbone => consent}/src/main/res/drawable-xxhdpi/rsb_consent_section_privacy.png (100%)
 rename {backbone => consent}/src/main/res/drawable-xxhdpi/rsb_consent_section_recontact.png (100%)
 rename {backbone => consent}/src/main/res/drawable-xxhdpi/rsb_consent_section_study_survey.png (100%)
 rename {backbone => consent}/src/main/res/drawable-xxhdpi/rsb_consent_section_study_tasks.png (100%)
 rename {backbone => consent}/src/main/res/drawable-xxhdpi/rsb_consent_section_time_commitment.png (100%)
 rename {backbone => consent}/src/main/res/drawable-xxhdpi/rsb_consent_section_visiting_doctor.png (100%)
 rename {backbone => consent}/src/main/res/drawable-xxhdpi/rsb_consent_section_withdrawing.png (100%)
 rename {backbone => consent}/src/main/res/drawable-xxxhdpi/rsb_consent_section_data_gathering.png (100%)
 rename {backbone => consent}/src/main/res/drawable-xxxhdpi/rsb_consent_section_data_use.png (100%)
 rename {backbone => consent}/src/main/res/drawable-xxxhdpi/rsb_consent_section_potential_benefits_alt.png (100%)
 rename {backbone => consent}/src/main/res/drawable-xxxhdpi/rsb_consent_section_privacy.png (100%)
 rename {backbone => consent}/src/main/res/drawable-xxxhdpi/rsb_consent_section_recontact.png (100%)
 rename {backbone => consent}/src/main/res/drawable-xxxhdpi/rsb_consent_section_study_survey.png (100%)
 rename {backbone => consent}/src/main/res/drawable-xxxhdpi/rsb_consent_section_study_tasks.png (100%)
 rename {backbone => consent}/src/main/res/drawable-xxxhdpi/rsb_consent_section_time_commitment.png (100%)
 rename {backbone => consent}/src/main/res/drawable-xxxhdpi/rsb_consent_section_visiting_doctor.png (100%)
 rename {backbone => consent}/src/main/res/drawable-xxxhdpi/rsb_consent_section_withdrawing.png (100%)
 rename {backbone => consent}/src/main/res/layout/rsb_step_layout_consent_doc.xml (100%)
 rename {backbone => consent}/src/main/res/layout/rsb_step_layout_consent_signature.xml (100%)
 rename {backbone => consent}/src/main/res/layout/rsb_step_layout_consent_visual.xml (100%)

diff --git a/backbone/src/main/java/org/researchstack/backbone/model/ConsentDocument.java b/consent/src/main/java/org/researchstack/feature/consent/model/ConsentDocument.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/model/ConsentDocument.java
rename to consent/src/main/java/org/researchstack/feature/consent/model/ConsentDocument.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/model/ConsentSection.java b/consent/src/main/java/org/researchstack/feature/consent/model/ConsentSection.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/model/ConsentSection.java
rename to consent/src/main/java/org/researchstack/feature/consent/model/ConsentSection.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/model/ConsentSignature.java b/consent/src/main/java/org/researchstack/feature/consent/model/ConsentSignature.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/model/ConsentSignature.java
rename to consent/src/main/java/org/researchstack/feature/consent/model/ConsentSignature.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/step/ConsentDocumentStep.java b/consent/src/main/java/org/researchstack/feature/consent/step/ConsentDocumentStep.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/step/ConsentDocumentStep.java
rename to consent/src/main/java/org/researchstack/feature/consent/step/ConsentDocumentStep.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/step/ConsentSharingStep.java b/consent/src/main/java/org/researchstack/feature/consent/step/ConsentSharingStep.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/step/ConsentSharingStep.java
rename to consent/src/main/java/org/researchstack/feature/consent/step/ConsentSharingStep.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/step/ConsentSignatureStep.java b/consent/src/main/java/org/researchstack/feature/consent/step/ConsentSignatureStep.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/step/ConsentSignatureStep.java
rename to consent/src/main/java/org/researchstack/feature/consent/step/ConsentSignatureStep.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/step/ConsentVisualStep.java b/consent/src/main/java/org/researchstack/feature/consent/step/ConsentVisualStep.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/step/ConsentVisualStep.java
rename to consent/src/main/java/org/researchstack/feature/consent/step/ConsentVisualStep.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/callbacks/SignatureCallbacks.java b/consent/src/main/java/org/researchstack/feature/consent/ui/callbacks/SignatureCallbacks.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/ui/callbacks/SignatureCallbacks.java
rename to consent/src/main/java/org/researchstack/feature/consent/ui/callbacks/SignatureCallbacks.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/step/layout/ConsentDocumentStepLayout.java b/consent/src/main/java/org/researchstack/feature/consent/ui/layout/ConsentDocumentStepLayout.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/ui/step/layout/ConsentDocumentStepLayout.java
rename to consent/src/main/java/org/researchstack/feature/consent/ui/layout/ConsentDocumentStepLayout.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/step/layout/ConsentSignatureStepLayout.java b/consent/src/main/java/org/researchstack/feature/consent/ui/layout/ConsentSignatureStepLayout.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/ui/step/layout/ConsentSignatureStepLayout.java
rename to consent/src/main/java/org/researchstack/feature/consent/ui/layout/ConsentSignatureStepLayout.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/step/layout/ConsentVisualStepLayout.java b/consent/src/main/java/org/researchstack/feature/consent/ui/layout/ConsentVisualStepLayout.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/ui/step/layout/ConsentVisualStepLayout.java
rename to consent/src/main/java/org/researchstack/feature/consent/ui/layout/ConsentVisualStepLayout.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/views/SignatureView.java b/consent/src/main/java/org/researchstack/feature/consent/ui/views/SignatureView.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/ui/views/SignatureView.java
rename to consent/src/main/java/org/researchstack/feature/consent/ui/views/SignatureView.java
diff --git a/backbone/src/main/res/drawable-hdpi/rsb_consent_section_data_gathering.png b/consent/src/main/res/drawable-hdpi/rsb_consent_section_data_gathering.png
similarity index 100%
rename from backbone/src/main/res/drawable-hdpi/rsb_consent_section_data_gathering.png
rename to consent/src/main/res/drawable-hdpi/rsb_consent_section_data_gathering.png
diff --git a/backbone/src/main/res/drawable-hdpi/rsb_consent_section_data_use.png b/consent/src/main/res/drawable-hdpi/rsb_consent_section_data_use.png
similarity index 100%
rename from backbone/src/main/res/drawable-hdpi/rsb_consent_section_data_use.png
rename to consent/src/main/res/drawable-hdpi/rsb_consent_section_data_use.png
diff --git a/backbone/src/main/res/drawable-hdpi/rsb_consent_section_potential_benefits_alt.png b/consent/src/main/res/drawable-hdpi/rsb_consent_section_potential_benefits_alt.png
similarity index 100%
rename from backbone/src/main/res/drawable-hdpi/rsb_consent_section_potential_benefits_alt.png
rename to consent/src/main/res/drawable-hdpi/rsb_consent_section_potential_benefits_alt.png
diff --git a/backbone/src/main/res/drawable-hdpi/rsb_consent_section_privacy.png b/consent/src/main/res/drawable-hdpi/rsb_consent_section_privacy.png
similarity index 100%
rename from backbone/src/main/res/drawable-hdpi/rsb_consent_section_privacy.png
rename to consent/src/main/res/drawable-hdpi/rsb_consent_section_privacy.png
diff --git a/backbone/src/main/res/drawable-hdpi/rsb_consent_section_recontact.png b/consent/src/main/res/drawable-hdpi/rsb_consent_section_recontact.png
similarity index 100%
rename from backbone/src/main/res/drawable-hdpi/rsb_consent_section_recontact.png
rename to consent/src/main/res/drawable-hdpi/rsb_consent_section_recontact.png
diff --git a/backbone/src/main/res/drawable-hdpi/rsb_consent_section_study_survey.png b/consent/src/main/res/drawable-hdpi/rsb_consent_section_study_survey.png
similarity index 100%
rename from backbone/src/main/res/drawable-hdpi/rsb_consent_section_study_survey.png
rename to consent/src/main/res/drawable-hdpi/rsb_consent_section_study_survey.png
diff --git a/backbone/src/main/res/drawable-hdpi/rsb_consent_section_study_tasks.png b/consent/src/main/res/drawable-hdpi/rsb_consent_section_study_tasks.png
similarity index 100%
rename from backbone/src/main/res/drawable-hdpi/rsb_consent_section_study_tasks.png
rename to consent/src/main/res/drawable-hdpi/rsb_consent_section_study_tasks.png
diff --git a/backbone/src/main/res/drawable-hdpi/rsb_consent_section_time_commitment.png b/consent/src/main/res/drawable-hdpi/rsb_consent_section_time_commitment.png
similarity index 100%
rename from backbone/src/main/res/drawable-hdpi/rsb_consent_section_time_commitment.png
rename to consent/src/main/res/drawable-hdpi/rsb_consent_section_time_commitment.png
diff --git a/backbone/src/main/res/drawable-hdpi/rsb_consent_section_visiting_doctor.png b/consent/src/main/res/drawable-hdpi/rsb_consent_section_visiting_doctor.png
similarity index 100%
rename from backbone/src/main/res/drawable-hdpi/rsb_consent_section_visiting_doctor.png
rename to consent/src/main/res/drawable-hdpi/rsb_consent_section_visiting_doctor.png
diff --git a/backbone/src/main/res/drawable-hdpi/rsb_consent_section_withdrawing.png b/consent/src/main/res/drawable-hdpi/rsb_consent_section_withdrawing.png
similarity index 100%
rename from backbone/src/main/res/drawable-hdpi/rsb_consent_section_withdrawing.png
rename to consent/src/main/res/drawable-hdpi/rsb_consent_section_withdrawing.png
diff --git a/backbone/src/main/res/drawable-mdpi/rsb_consent_section_data_gathering.png b/consent/src/main/res/drawable-mdpi/rsb_consent_section_data_gathering.png
similarity index 100%
rename from backbone/src/main/res/drawable-mdpi/rsb_consent_section_data_gathering.png
rename to consent/src/main/res/drawable-mdpi/rsb_consent_section_data_gathering.png
diff --git a/backbone/src/main/res/drawable-mdpi/rsb_consent_section_data_use.png b/consent/src/main/res/drawable-mdpi/rsb_consent_section_data_use.png
similarity index 100%
rename from backbone/src/main/res/drawable-mdpi/rsb_consent_section_data_use.png
rename to consent/src/main/res/drawable-mdpi/rsb_consent_section_data_use.png
diff --git a/backbone/src/main/res/drawable-mdpi/rsb_consent_section_potential_benefits_alt.png b/consent/src/main/res/drawable-mdpi/rsb_consent_section_potential_benefits_alt.png
similarity index 100%
rename from backbone/src/main/res/drawable-mdpi/rsb_consent_section_potential_benefits_alt.png
rename to consent/src/main/res/drawable-mdpi/rsb_consent_section_potential_benefits_alt.png
diff --git a/backbone/src/main/res/drawable-mdpi/rsb_consent_section_privacy.png b/consent/src/main/res/drawable-mdpi/rsb_consent_section_privacy.png
similarity index 100%
rename from backbone/src/main/res/drawable-mdpi/rsb_consent_section_privacy.png
rename to consent/src/main/res/drawable-mdpi/rsb_consent_section_privacy.png
diff --git a/backbone/src/main/res/drawable-mdpi/rsb_consent_section_recontact.png b/consent/src/main/res/drawable-mdpi/rsb_consent_section_recontact.png
similarity index 100%
rename from backbone/src/main/res/drawable-mdpi/rsb_consent_section_recontact.png
rename to consent/src/main/res/drawable-mdpi/rsb_consent_section_recontact.png
diff --git a/backbone/src/main/res/drawable-mdpi/rsb_consent_section_study_survey.png b/consent/src/main/res/drawable-mdpi/rsb_consent_section_study_survey.png
similarity index 100%
rename from backbone/src/main/res/drawable-mdpi/rsb_consent_section_study_survey.png
rename to consent/src/main/res/drawable-mdpi/rsb_consent_section_study_survey.png
diff --git a/backbone/src/main/res/drawable-mdpi/rsb_consent_section_study_tasks.png b/consent/src/main/res/drawable-mdpi/rsb_consent_section_study_tasks.png
similarity index 100%
rename from backbone/src/main/res/drawable-mdpi/rsb_consent_section_study_tasks.png
rename to consent/src/main/res/drawable-mdpi/rsb_consent_section_study_tasks.png
diff --git a/backbone/src/main/res/drawable-mdpi/rsb_consent_section_time_commitment.png b/consent/src/main/res/drawable-mdpi/rsb_consent_section_time_commitment.png
similarity index 100%
rename from backbone/src/main/res/drawable-mdpi/rsb_consent_section_time_commitment.png
rename to consent/src/main/res/drawable-mdpi/rsb_consent_section_time_commitment.png
diff --git a/backbone/src/main/res/drawable-mdpi/rsb_consent_section_visiting_doctor.png b/consent/src/main/res/drawable-mdpi/rsb_consent_section_visiting_doctor.png
similarity index 100%
rename from backbone/src/main/res/drawable-mdpi/rsb_consent_section_visiting_doctor.png
rename to consent/src/main/res/drawable-mdpi/rsb_consent_section_visiting_doctor.png
diff --git a/backbone/src/main/res/drawable-mdpi/rsb_consent_section_withdrawing.png b/consent/src/main/res/drawable-mdpi/rsb_consent_section_withdrawing.png
similarity index 100%
rename from backbone/src/main/res/drawable-mdpi/rsb_consent_section_withdrawing.png
rename to consent/src/main/res/drawable-mdpi/rsb_consent_section_withdrawing.png
diff --git a/backbone/src/main/res/drawable-xhdpi/rsb_consent_section_data_gathering.png b/consent/src/main/res/drawable-xhdpi/rsb_consent_section_data_gathering.png
similarity index 100%
rename from backbone/src/main/res/drawable-xhdpi/rsb_consent_section_data_gathering.png
rename to consent/src/main/res/drawable-xhdpi/rsb_consent_section_data_gathering.png
diff --git a/backbone/src/main/res/drawable-xhdpi/rsb_consent_section_data_use.png b/consent/src/main/res/drawable-xhdpi/rsb_consent_section_data_use.png
similarity index 100%
rename from backbone/src/main/res/drawable-xhdpi/rsb_consent_section_data_use.png
rename to consent/src/main/res/drawable-xhdpi/rsb_consent_section_data_use.png
diff --git a/backbone/src/main/res/drawable-xhdpi/rsb_consent_section_potential_benefits_alt.png b/consent/src/main/res/drawable-xhdpi/rsb_consent_section_potential_benefits_alt.png
similarity index 100%
rename from backbone/src/main/res/drawable-xhdpi/rsb_consent_section_potential_benefits_alt.png
rename to consent/src/main/res/drawable-xhdpi/rsb_consent_section_potential_benefits_alt.png
diff --git a/backbone/src/main/res/drawable-xhdpi/rsb_consent_section_privacy.png b/consent/src/main/res/drawable-xhdpi/rsb_consent_section_privacy.png
similarity index 100%
rename from backbone/src/main/res/drawable-xhdpi/rsb_consent_section_privacy.png
rename to consent/src/main/res/drawable-xhdpi/rsb_consent_section_privacy.png
diff --git a/backbone/src/main/res/drawable-xhdpi/rsb_consent_section_recontact.png b/consent/src/main/res/drawable-xhdpi/rsb_consent_section_recontact.png
similarity index 100%
rename from backbone/src/main/res/drawable-xhdpi/rsb_consent_section_recontact.png
rename to consent/src/main/res/drawable-xhdpi/rsb_consent_section_recontact.png
diff --git a/backbone/src/main/res/drawable-xhdpi/rsb_consent_section_study_survey.png b/consent/src/main/res/drawable-xhdpi/rsb_consent_section_study_survey.png
similarity index 100%
rename from backbone/src/main/res/drawable-xhdpi/rsb_consent_section_study_survey.png
rename to consent/src/main/res/drawable-xhdpi/rsb_consent_section_study_survey.png
diff --git a/backbone/src/main/res/drawable-xhdpi/rsb_consent_section_study_tasks.png b/consent/src/main/res/drawable-xhdpi/rsb_consent_section_study_tasks.png
similarity index 100%
rename from backbone/src/main/res/drawable-xhdpi/rsb_consent_section_study_tasks.png
rename to consent/src/main/res/drawable-xhdpi/rsb_consent_section_study_tasks.png
diff --git a/backbone/src/main/res/drawable-xhdpi/rsb_consent_section_time_commitment.png b/consent/src/main/res/drawable-xhdpi/rsb_consent_section_time_commitment.png
similarity index 100%
rename from backbone/src/main/res/drawable-xhdpi/rsb_consent_section_time_commitment.png
rename to consent/src/main/res/drawable-xhdpi/rsb_consent_section_time_commitment.png
diff --git a/backbone/src/main/res/drawable-xhdpi/rsb_consent_section_visiting_doctor.png b/consent/src/main/res/drawable-xhdpi/rsb_consent_section_visiting_doctor.png
similarity index 100%
rename from backbone/src/main/res/drawable-xhdpi/rsb_consent_section_visiting_doctor.png
rename to consent/src/main/res/drawable-xhdpi/rsb_consent_section_visiting_doctor.png
diff --git a/backbone/src/main/res/drawable-xhdpi/rsb_consent_section_withdrawing.png b/consent/src/main/res/drawable-xhdpi/rsb_consent_section_withdrawing.png
similarity index 100%
rename from backbone/src/main/res/drawable-xhdpi/rsb_consent_section_withdrawing.png
rename to consent/src/main/res/drawable-xhdpi/rsb_consent_section_withdrawing.png
diff --git a/backbone/src/main/res/drawable-xxhdpi/rsb_consent_section_data_gathering.png b/consent/src/main/res/drawable-xxhdpi/rsb_consent_section_data_gathering.png
similarity index 100%
rename from backbone/src/main/res/drawable-xxhdpi/rsb_consent_section_data_gathering.png
rename to consent/src/main/res/drawable-xxhdpi/rsb_consent_section_data_gathering.png
diff --git a/backbone/src/main/res/drawable-xxhdpi/rsb_consent_section_data_use.png b/consent/src/main/res/drawable-xxhdpi/rsb_consent_section_data_use.png
similarity index 100%
rename from backbone/src/main/res/drawable-xxhdpi/rsb_consent_section_data_use.png
rename to consent/src/main/res/drawable-xxhdpi/rsb_consent_section_data_use.png
diff --git a/backbone/src/main/res/drawable-xxhdpi/rsb_consent_section_potential_benefits_alt.png b/consent/src/main/res/drawable-xxhdpi/rsb_consent_section_potential_benefits_alt.png
similarity index 100%
rename from backbone/src/main/res/drawable-xxhdpi/rsb_consent_section_potential_benefits_alt.png
rename to consent/src/main/res/drawable-xxhdpi/rsb_consent_section_potential_benefits_alt.png
diff --git a/backbone/src/main/res/drawable-xxhdpi/rsb_consent_section_privacy.png b/consent/src/main/res/drawable-xxhdpi/rsb_consent_section_privacy.png
similarity index 100%
rename from backbone/src/main/res/drawable-xxhdpi/rsb_consent_section_privacy.png
rename to consent/src/main/res/drawable-xxhdpi/rsb_consent_section_privacy.png
diff --git a/backbone/src/main/res/drawable-xxhdpi/rsb_consent_section_recontact.png b/consent/src/main/res/drawable-xxhdpi/rsb_consent_section_recontact.png
similarity index 100%
rename from backbone/src/main/res/drawable-xxhdpi/rsb_consent_section_recontact.png
rename to consent/src/main/res/drawable-xxhdpi/rsb_consent_section_recontact.png
diff --git a/backbone/src/main/res/drawable-xxhdpi/rsb_consent_section_study_survey.png b/consent/src/main/res/drawable-xxhdpi/rsb_consent_section_study_survey.png
similarity index 100%
rename from backbone/src/main/res/drawable-xxhdpi/rsb_consent_section_study_survey.png
rename to consent/src/main/res/drawable-xxhdpi/rsb_consent_section_study_survey.png
diff --git a/backbone/src/main/res/drawable-xxhdpi/rsb_consent_section_study_tasks.png b/consent/src/main/res/drawable-xxhdpi/rsb_consent_section_study_tasks.png
similarity index 100%
rename from backbone/src/main/res/drawable-xxhdpi/rsb_consent_section_study_tasks.png
rename to consent/src/main/res/drawable-xxhdpi/rsb_consent_section_study_tasks.png
diff --git a/backbone/src/main/res/drawable-xxhdpi/rsb_consent_section_time_commitment.png b/consent/src/main/res/drawable-xxhdpi/rsb_consent_section_time_commitment.png
similarity index 100%
rename from backbone/src/main/res/drawable-xxhdpi/rsb_consent_section_time_commitment.png
rename to consent/src/main/res/drawable-xxhdpi/rsb_consent_section_time_commitment.png
diff --git a/backbone/src/main/res/drawable-xxhdpi/rsb_consent_section_visiting_doctor.png b/consent/src/main/res/drawable-xxhdpi/rsb_consent_section_visiting_doctor.png
similarity index 100%
rename from backbone/src/main/res/drawable-xxhdpi/rsb_consent_section_visiting_doctor.png
rename to consent/src/main/res/drawable-xxhdpi/rsb_consent_section_visiting_doctor.png
diff --git a/backbone/src/main/res/drawable-xxhdpi/rsb_consent_section_withdrawing.png b/consent/src/main/res/drawable-xxhdpi/rsb_consent_section_withdrawing.png
similarity index 100%
rename from backbone/src/main/res/drawable-xxhdpi/rsb_consent_section_withdrawing.png
rename to consent/src/main/res/drawable-xxhdpi/rsb_consent_section_withdrawing.png
diff --git a/backbone/src/main/res/drawable-xxxhdpi/rsb_consent_section_data_gathering.png b/consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_data_gathering.png
similarity index 100%
rename from backbone/src/main/res/drawable-xxxhdpi/rsb_consent_section_data_gathering.png
rename to consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_data_gathering.png
diff --git a/backbone/src/main/res/drawable-xxxhdpi/rsb_consent_section_data_use.png b/consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_data_use.png
similarity index 100%
rename from backbone/src/main/res/drawable-xxxhdpi/rsb_consent_section_data_use.png
rename to consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_data_use.png
diff --git a/backbone/src/main/res/drawable-xxxhdpi/rsb_consent_section_potential_benefits_alt.png b/consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_potential_benefits_alt.png
similarity index 100%
rename from backbone/src/main/res/drawable-xxxhdpi/rsb_consent_section_potential_benefits_alt.png
rename to consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_potential_benefits_alt.png
diff --git a/backbone/src/main/res/drawable-xxxhdpi/rsb_consent_section_privacy.png b/consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_privacy.png
similarity index 100%
rename from backbone/src/main/res/drawable-xxxhdpi/rsb_consent_section_privacy.png
rename to consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_privacy.png
diff --git a/backbone/src/main/res/drawable-xxxhdpi/rsb_consent_section_recontact.png b/consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_recontact.png
similarity index 100%
rename from backbone/src/main/res/drawable-xxxhdpi/rsb_consent_section_recontact.png
rename to consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_recontact.png
diff --git a/backbone/src/main/res/drawable-xxxhdpi/rsb_consent_section_study_survey.png b/consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_study_survey.png
similarity index 100%
rename from backbone/src/main/res/drawable-xxxhdpi/rsb_consent_section_study_survey.png
rename to consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_study_survey.png
diff --git a/backbone/src/main/res/drawable-xxxhdpi/rsb_consent_section_study_tasks.png b/consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_study_tasks.png
similarity index 100%
rename from backbone/src/main/res/drawable-xxxhdpi/rsb_consent_section_study_tasks.png
rename to consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_study_tasks.png
diff --git a/backbone/src/main/res/drawable-xxxhdpi/rsb_consent_section_time_commitment.png b/consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_time_commitment.png
similarity index 100%
rename from backbone/src/main/res/drawable-xxxhdpi/rsb_consent_section_time_commitment.png
rename to consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_time_commitment.png
diff --git a/backbone/src/main/res/drawable-xxxhdpi/rsb_consent_section_visiting_doctor.png b/consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_visiting_doctor.png
similarity index 100%
rename from backbone/src/main/res/drawable-xxxhdpi/rsb_consent_section_visiting_doctor.png
rename to consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_visiting_doctor.png
diff --git a/backbone/src/main/res/drawable-xxxhdpi/rsb_consent_section_withdrawing.png b/consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_withdrawing.png
similarity index 100%
rename from backbone/src/main/res/drawable-xxxhdpi/rsb_consent_section_withdrawing.png
rename to consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_withdrawing.png
diff --git a/backbone/src/main/res/layout/rsb_step_layout_consent_doc.xml b/consent/src/main/res/layout/rsb_step_layout_consent_doc.xml
similarity index 100%
rename from backbone/src/main/res/layout/rsb_step_layout_consent_doc.xml
rename to consent/src/main/res/layout/rsb_step_layout_consent_doc.xml
diff --git a/backbone/src/main/res/layout/rsb_step_layout_consent_signature.xml b/consent/src/main/res/layout/rsb_step_layout_consent_signature.xml
similarity index 100%
rename from backbone/src/main/res/layout/rsb_step_layout_consent_signature.xml
rename to consent/src/main/res/layout/rsb_step_layout_consent_signature.xml
diff --git a/backbone/src/main/res/layout/rsb_step_layout_consent_visual.xml b/consent/src/main/res/layout/rsb_step_layout_consent_visual.xml
similarity index 100%
rename from backbone/src/main/res/layout/rsb_step_layout_consent_visual.xml
rename to consent/src/main/res/layout/rsb_step_layout_consent_visual.xml

From f1e5b88202baae2c0ce80266f4a5a119875b2f54 Mon Sep 17 00:00:00 2001
From: James Kizer <james.kizer@gmail.com>
Date: Wed, 2 Jan 2019 16:49:31 -0500
Subject: [PATCH 22/53] Moved storage files into storage module

---
 .../org/researchstack/feature}/storage/NotificationHelper.java    | 0
 .../java/org/researchstack/feature/storage}/StorageAccess.java    | 0
 .../org/researchstack/feature}/storage/database/AppDatabase.java  | 0
 .../org/researchstack/feature}/storage/database/StepRecord.java   | 0
 .../researchstack/feature}/storage/database/TaskNotification.java | 0
 .../org/researchstack/feature}/storage/database/TaskRecord.java   | 0
 .../feature}/storage/database/sqlite/DatabaseHelper.java          | 0
 .../feature}/storage/database/sqlite/SqlCipherDatabaseHelper.java | 0
 .../storage/database/sqlite/UpdatablePassphraseProvider.java      | 0
 .../researchstack/feature}/storage/file/EncryptionProvider.java   | 0
 .../java/org/researchstack/feature}/storage/file/FileAccess.java  | 0
 .../org/researchstack/feature}/storage/file/SimpleFileAccess.java | 0
 .../feature}/storage/file/StorageAccessException.java             | 0
 .../feature}/storage/file/StorageAccessListener.java              | 0
 .../researchstack/feature}/storage/file/UnencryptedProvider.java  | 0
 .../org/researchstack/feature}/storage/file/aes/AesEncrypter.java | 0
 .../org/researchstack/feature}/storage/file/aes/AesProvider.java  | 0
 .../researchstack/feature}/storage/file/aes/ClearEncrypter.java   | 0
 .../org/researchstack/feature}/storage/file/aes/Encrypter.java    | 0
 .../feature}/storage/file/aes/PinProtectedProvider.java           | 0
 .../feature}/storage/file/aes/UnencryptedPinProvider.java         | 0
 .../java/org/researchstack/feature/storage}/utils/FileUtils.java  | 0
 22 files changed, 0 insertions(+), 0 deletions(-)
 rename {backbone/src/main/java/org/researchstack/backbone => storage/src/main/java/org/researchstack/feature}/storage/NotificationHelper.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => storage/src/main/java/org/researchstack/feature/storage}/StorageAccess.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => storage/src/main/java/org/researchstack/feature}/storage/database/AppDatabase.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => storage/src/main/java/org/researchstack/feature}/storage/database/StepRecord.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => storage/src/main/java/org/researchstack/feature}/storage/database/TaskNotification.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => storage/src/main/java/org/researchstack/feature}/storage/database/TaskRecord.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => storage/src/main/java/org/researchstack/feature}/storage/database/sqlite/DatabaseHelper.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => storage/src/main/java/org/researchstack/feature}/storage/database/sqlite/SqlCipherDatabaseHelper.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => storage/src/main/java/org/researchstack/feature}/storage/database/sqlite/UpdatablePassphraseProvider.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => storage/src/main/java/org/researchstack/feature}/storage/file/EncryptionProvider.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => storage/src/main/java/org/researchstack/feature}/storage/file/FileAccess.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => storage/src/main/java/org/researchstack/feature}/storage/file/SimpleFileAccess.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => storage/src/main/java/org/researchstack/feature}/storage/file/StorageAccessException.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => storage/src/main/java/org/researchstack/feature}/storage/file/StorageAccessListener.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => storage/src/main/java/org/researchstack/feature}/storage/file/UnencryptedProvider.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => storage/src/main/java/org/researchstack/feature}/storage/file/aes/AesEncrypter.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => storage/src/main/java/org/researchstack/feature}/storage/file/aes/AesProvider.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => storage/src/main/java/org/researchstack/feature}/storage/file/aes/ClearEncrypter.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => storage/src/main/java/org/researchstack/feature}/storage/file/aes/Encrypter.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => storage/src/main/java/org/researchstack/feature}/storage/file/aes/PinProtectedProvider.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => storage/src/main/java/org/researchstack/feature}/storage/file/aes/UnencryptedPinProvider.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => storage/src/main/java/org/researchstack/feature/storage}/utils/FileUtils.java (100%)

diff --git a/backbone/src/main/java/org/researchstack/backbone/storage/NotificationHelper.java b/storage/src/main/java/org/researchstack/feature/storage/NotificationHelper.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/storage/NotificationHelper.java
rename to storage/src/main/java/org/researchstack/feature/storage/NotificationHelper.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/StorageAccess.java b/storage/src/main/java/org/researchstack/feature/storage/StorageAccess.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/StorageAccess.java
rename to storage/src/main/java/org/researchstack/feature/storage/StorageAccess.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/storage/database/AppDatabase.java b/storage/src/main/java/org/researchstack/feature/storage/database/AppDatabase.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/storage/database/AppDatabase.java
rename to storage/src/main/java/org/researchstack/feature/storage/database/AppDatabase.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/storage/database/StepRecord.java b/storage/src/main/java/org/researchstack/feature/storage/database/StepRecord.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/storage/database/StepRecord.java
rename to storage/src/main/java/org/researchstack/feature/storage/database/StepRecord.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/storage/database/TaskNotification.java b/storage/src/main/java/org/researchstack/feature/storage/database/TaskNotification.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/storage/database/TaskNotification.java
rename to storage/src/main/java/org/researchstack/feature/storage/database/TaskNotification.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/storage/database/TaskRecord.java b/storage/src/main/java/org/researchstack/feature/storage/database/TaskRecord.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/storage/database/TaskRecord.java
rename to storage/src/main/java/org/researchstack/feature/storage/database/TaskRecord.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/storage/database/sqlite/DatabaseHelper.java b/storage/src/main/java/org/researchstack/feature/storage/database/sqlite/DatabaseHelper.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/storage/database/sqlite/DatabaseHelper.java
rename to storage/src/main/java/org/researchstack/feature/storage/database/sqlite/DatabaseHelper.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/storage/database/sqlite/SqlCipherDatabaseHelper.java b/storage/src/main/java/org/researchstack/feature/storage/database/sqlite/SqlCipherDatabaseHelper.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/storage/database/sqlite/SqlCipherDatabaseHelper.java
rename to storage/src/main/java/org/researchstack/feature/storage/database/sqlite/SqlCipherDatabaseHelper.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/storage/database/sqlite/UpdatablePassphraseProvider.java b/storage/src/main/java/org/researchstack/feature/storage/database/sqlite/UpdatablePassphraseProvider.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/storage/database/sqlite/UpdatablePassphraseProvider.java
rename to storage/src/main/java/org/researchstack/feature/storage/database/sqlite/UpdatablePassphraseProvider.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/storage/file/EncryptionProvider.java b/storage/src/main/java/org/researchstack/feature/storage/file/EncryptionProvider.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/storage/file/EncryptionProvider.java
rename to storage/src/main/java/org/researchstack/feature/storage/file/EncryptionProvider.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/storage/file/FileAccess.java b/storage/src/main/java/org/researchstack/feature/storage/file/FileAccess.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/storage/file/FileAccess.java
rename to storage/src/main/java/org/researchstack/feature/storage/file/FileAccess.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/storage/file/SimpleFileAccess.java b/storage/src/main/java/org/researchstack/feature/storage/file/SimpleFileAccess.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/storage/file/SimpleFileAccess.java
rename to storage/src/main/java/org/researchstack/feature/storage/file/SimpleFileAccess.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/storage/file/StorageAccessException.java b/storage/src/main/java/org/researchstack/feature/storage/file/StorageAccessException.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/storage/file/StorageAccessException.java
rename to storage/src/main/java/org/researchstack/feature/storage/file/StorageAccessException.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/storage/file/StorageAccessListener.java b/storage/src/main/java/org/researchstack/feature/storage/file/StorageAccessListener.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/storage/file/StorageAccessListener.java
rename to storage/src/main/java/org/researchstack/feature/storage/file/StorageAccessListener.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/storage/file/UnencryptedProvider.java b/storage/src/main/java/org/researchstack/feature/storage/file/UnencryptedProvider.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/storage/file/UnencryptedProvider.java
rename to storage/src/main/java/org/researchstack/feature/storage/file/UnencryptedProvider.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/storage/file/aes/AesEncrypter.java b/storage/src/main/java/org/researchstack/feature/storage/file/aes/AesEncrypter.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/storage/file/aes/AesEncrypter.java
rename to storage/src/main/java/org/researchstack/feature/storage/file/aes/AesEncrypter.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/storage/file/aes/AesProvider.java b/storage/src/main/java/org/researchstack/feature/storage/file/aes/AesProvider.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/storage/file/aes/AesProvider.java
rename to storage/src/main/java/org/researchstack/feature/storage/file/aes/AesProvider.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/storage/file/aes/ClearEncrypter.java b/storage/src/main/java/org/researchstack/feature/storage/file/aes/ClearEncrypter.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/storage/file/aes/ClearEncrypter.java
rename to storage/src/main/java/org/researchstack/feature/storage/file/aes/ClearEncrypter.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/storage/file/aes/Encrypter.java b/storage/src/main/java/org/researchstack/feature/storage/file/aes/Encrypter.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/storage/file/aes/Encrypter.java
rename to storage/src/main/java/org/researchstack/feature/storage/file/aes/Encrypter.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/storage/file/aes/PinProtectedProvider.java b/storage/src/main/java/org/researchstack/feature/storage/file/aes/PinProtectedProvider.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/storage/file/aes/PinProtectedProvider.java
rename to storage/src/main/java/org/researchstack/feature/storage/file/aes/PinProtectedProvider.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/storage/file/aes/UnencryptedPinProvider.java b/storage/src/main/java/org/researchstack/feature/storage/file/aes/UnencryptedPinProvider.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/storage/file/aes/UnencryptedPinProvider.java
rename to storage/src/main/java/org/researchstack/feature/storage/file/aes/UnencryptedPinProvider.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/utils/FileUtils.java b/storage/src/main/java/org/researchstack/feature/storage/utils/FileUtils.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/utils/FileUtils.java
rename to storage/src/main/java/org/researchstack/feature/storage/utils/FileUtils.java

From ddf07758e40794f9263a82f773ce2ebb885b0e0a Mon Sep 17 00:00:00 2001
From: James Kizer <james.kizer@gmail.com>
Date: Wed, 2 Jan 2019 18:16:40 -0500
Subject: [PATCH 23/53] moved files into foundation

---
 .../components/common}/task/OrderedTask.java        |   0
 .../common}/ui/callbacks/StepCallbacks.java         |   0
 .../common/ui/layout}/FixedSubmitBarLayout.java     |   0
 .../components/common/ui}/layout/StepLayout.java    |   0
 .../components/common}/ui/views/IconTab.java        |   0
 .../components/common}/ui/views/IconTabLayout.java  |   0
 .../common}/ui/views/ObservableScrollView.java      |   0
 .../components/common}/ui/views/SubmitBar.java      |   0
 .../common/ui/views}/TextViewLinkHandler.java       |   0
 .../components/singletons}/ResourcePathManager.java |   0
 .../survey}/answerformat/AnswerFormat.java          |   0
 .../survey}/answerformat/BirthDateAnswerFormat.java |   0
 .../survey}/answerformat/BooleanAnswerFormat.java   |   0
 .../survey}/answerformat/ChoiceAnswerFormat.java    |   0
 .../survey}/answerformat/DateAnswerFormat.java      |   0
 .../survey}/answerformat/DecimalAnswerFormat.java   |   0
 .../survey}/answerformat/DurationAnswerFormat.java  |   0
 .../survey}/answerformat/EmailAnswerFormat.java     |   0
 .../survey}/answerformat/FormAnswerFormat.java      |   0
 .../survey}/answerformat/IntegerAnswerFormat.java   |   0
 .../survey}/answerformat/TextAnswerFormat.java      |   0
 .../survey}/answerformat/UnknownAnswerFormat.java   |   0
 .../foundation/components/survey}/model/Choice.java |   0
 .../components/survey}/step/FormStep.java           |   0
 .../components/survey}/step/InstructionStep.java    |   0
 .../components/survey}/step/QuestionStep.java       |   0
 .../components/survey/ui}/body/BodyAnswer.java      |   0
 .../survey/ui}/body/DateQuestionBody.java           |   0
 .../survey/ui}/body/DecimalQuestionBody.java        |   0
 .../survey/ui}/body/DurationQuestionBody.java       |   0
 .../components/survey/ui}/body/FormBody.java        |   0
 .../survey/ui}/body/IntegerQuestionBody.java        |   0
 .../survey/ui}/body/MultiChoiceQuestionBody.java    |   0
 .../survey/ui}/body/NotImplementedStepBody.java     |   0
 .../survey/ui}/body/SingleChoiceQuestionBody.java   |   0
 .../components/survey/ui}/body/StepBody.java        |   0
 .../survey/ui}/body/TextQuestionBody.java           |   0
 .../survey/ui}/layout/InstructionStepLayout.java    |   0
 .../survey/ui}/layout/SurveyStepLayout.java         |   0
 .../foundation/components}/utils/FormatHelper.java  |   0
 .../foundation/components}/utils/LogExt.java        |   0
 .../foundation/components}/utils/ResUtils.java      |   0
 .../foundation/components}/utils/TextUtils.java     |   0
 .../foundation/components}/utils/ThemeUtils.java    |   0
 .../components}/utils/UiThreadContext.java          |   0
 .../foundation/components}/utils/ViewUtils.java     |   0
 .../web/ui/activities}/ViewVideoActivity.java       |   0
 .../web/ui/activities}/ViewWebDocumentActivity.java |   0
 .../components/web}/ui/views/AssetVideoView.java    |   0
 .../components/web}/ui/views/LocalWebView.java      |   0
 .../foundation/core/models}/result/Result.java      |   0
 .../foundation/core/models}/result/StepResult.java  |   0
 .../foundation/core/models}/result/TaskResult.java  |   0
 .../foundation/core/models}/step/Step.java          |   0
 .../foundation/core/models}/task/Task.java          |   0
 .../main/res/anim/rsb_interpolator_step_layout.xml  |   0
 .../src/main/res/anim/rsb_slide_in_left.xml         |   0
 .../src/main/res/anim/rsb_slide_in_right.xml        |   0
 .../src/main/res/anim/rsb_slide_in_up.xml           |   0
 .../src/main/res/anim/rsb_slide_out_down.xml        |   0
 .../src/main/res/anim/rsb_slide_out_left.xml        |   0
 .../src/main/res/anim/rsb_slide_out_right.xml       |   0
 .../src/main/res/drawable-hdpi/rsb_ic_check.png     | Bin
 .../main/res/drawable-hdpi/rsb_ic_fullscreen.png    | Bin
 .../src/main/res/drawable-hdpi/rsb_ic_x.png         | Bin
 .../res/drawable-hdpi/rsb_illo_dashboard_empty.png  | Bin
 .../src/main/res/drawable-mdpi/rsb_ic_check.png     | Bin
 .../main/res/drawable-mdpi/rsb_ic_fullscreen.png    | Bin
 .../src/main/res/drawable-mdpi/rsb_ic_x.png         | Bin
 .../res/drawable-mdpi/rsb_illo_dashboard_empty.png  | Bin
 .../src/main/res/drawable-xhdpi/rsb_ic_check.png    | Bin
 .../main/res/drawable-xhdpi/rsb_ic_fullscreen.png   | Bin
 .../src/main/res/drawable-xhdpi/rsb_ic_x.png        | Bin
 .../res/drawable-xhdpi/rsb_illo_dashboard_empty.png | Bin
 .../src/main/res/drawable-xxhdpi/rsb_ic_check.png   | Bin
 .../main/res/drawable-xxhdpi/rsb_ic_fullscreen.png  | Bin
 .../src/main/res/drawable-xxhdpi/rsb_ic_x.png       | Bin
 .../drawable-xxhdpi/rsb_illo_dashboard_empty.png    | Bin
 .../src/main/res/drawable-xxxhdpi/rsb_ic_check.png  | Bin
 .../main/res/drawable-xxxhdpi/rsb_ic_fullscreen.png | Bin
 .../src/main/res/drawable-xxxhdpi/rsb_ic_x.png      | Bin
 .../drawable-xxxhdpi/rsb_illo_dashboard_empty.png   | Bin
 .../src/main/res/drawable/rsb_debug_gray.xml        |   0
 .../main/res/drawable/rsb_divider_empty_16dp.xml    |   0
 .../src/main/res/drawable/rsb_divider_empty_8dp.xml |   0
 .../src/main/res/drawable/rsb_ic_circle_8dp.xml     |   0
 .../main/res/layout/rsb_activity_video_viewer.xml   |   0
 .../main/res/layout/rsb_activity_web_document.xml   |   0
 .../src/main/res/layout/rsb_item_checkbox.xml       |   0
 .../src/main/res/layout/rsb_item_date_view.xml      |   0
 .../src/main/res/layout/rsb_item_edit_duration.xml  |   0
 .../src/main/res/layout/rsb_item_edit_text.xml      |   0
 .../main/res/layout/rsb_item_edit_text_compact.xml  |   0
 .../src/main/res/layout/rsb_item_radio.xml          |   0
 .../res/layout/rsb_item_text_view_title_compact.xml |   0
 .../main/res/layout/rsb_layout_fixed_submit_bar.xml |   0
 .../src/main/res/layout/rsb_layout_toolbar.xml      |   0
 .../src/main/res/layout/rsb_progress.xml            |   0
 .../src/main/res/layout/rsb_step_layout.xml         |   0
 .../main/res/layout/rsb_step_layout_form_body.xml   |   0
 .../main/res/layout/rsb_step_layout_instruction.xml |   0
 .../src/main/res/layout/rsb_view_icon_tab.xml       |   0
 .../src/main/res/layout/rsb_view_submitbar.xml      |   0
 103 files changed, 0 insertions(+), 0 deletions(-)
 rename {backbone/src/main/java/org/researchstack/backbone => foundation/src/main/java/org/researchstack/foundation/components/common}/task/OrderedTask.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => foundation/src/main/java/org/researchstack/foundation/components/common}/ui/callbacks/StepCallbacks.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone/ui/views => foundation/src/main/java/org/researchstack/foundation/components/common/ui/layout}/FixedSubmitBarLayout.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone/ui/step => foundation/src/main/java/org/researchstack/foundation/components/common/ui}/layout/StepLayout.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => foundation/src/main/java/org/researchstack/foundation/components/common}/ui/views/IconTab.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => foundation/src/main/java/org/researchstack/foundation/components/common}/ui/views/IconTabLayout.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => foundation/src/main/java/org/researchstack/foundation/components/common}/ui/views/ObservableScrollView.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => foundation/src/main/java/org/researchstack/foundation/components/common}/ui/views/SubmitBar.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone/ui/step/layout => foundation/src/main/java/org/researchstack/foundation/components/common/ui/views}/TextViewLinkHandler.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => foundation/src/main/java/org/researchstack/foundation/components/singletons}/ResourcePathManager.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => foundation/src/main/java/org/researchstack/foundation/components/survey}/answerformat/AnswerFormat.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => foundation/src/main/java/org/researchstack/foundation/components/survey}/answerformat/BirthDateAnswerFormat.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => foundation/src/main/java/org/researchstack/foundation/components/survey}/answerformat/BooleanAnswerFormat.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => foundation/src/main/java/org/researchstack/foundation/components/survey}/answerformat/ChoiceAnswerFormat.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => foundation/src/main/java/org/researchstack/foundation/components/survey}/answerformat/DateAnswerFormat.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => foundation/src/main/java/org/researchstack/foundation/components/survey}/answerformat/DecimalAnswerFormat.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => foundation/src/main/java/org/researchstack/foundation/components/survey}/answerformat/DurationAnswerFormat.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => foundation/src/main/java/org/researchstack/foundation/components/survey}/answerformat/EmailAnswerFormat.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => foundation/src/main/java/org/researchstack/foundation/components/survey}/answerformat/FormAnswerFormat.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => foundation/src/main/java/org/researchstack/foundation/components/survey}/answerformat/IntegerAnswerFormat.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => foundation/src/main/java/org/researchstack/foundation/components/survey}/answerformat/TextAnswerFormat.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => foundation/src/main/java/org/researchstack/foundation/components/survey}/answerformat/UnknownAnswerFormat.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => foundation/src/main/java/org/researchstack/foundation/components/survey}/model/Choice.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => foundation/src/main/java/org/researchstack/foundation/components/survey}/step/FormStep.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => foundation/src/main/java/org/researchstack/foundation/components/survey}/step/InstructionStep.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => foundation/src/main/java/org/researchstack/foundation/components/survey}/step/QuestionStep.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone/ui/step => foundation/src/main/java/org/researchstack/foundation/components/survey/ui}/body/BodyAnswer.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone/ui/step => foundation/src/main/java/org/researchstack/foundation/components/survey/ui}/body/DateQuestionBody.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone/ui/step => foundation/src/main/java/org/researchstack/foundation/components/survey/ui}/body/DecimalQuestionBody.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone/ui/step => foundation/src/main/java/org/researchstack/foundation/components/survey/ui}/body/DurationQuestionBody.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone/ui/step => foundation/src/main/java/org/researchstack/foundation/components/survey/ui}/body/FormBody.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone/ui/step => foundation/src/main/java/org/researchstack/foundation/components/survey/ui}/body/IntegerQuestionBody.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone/ui/step => foundation/src/main/java/org/researchstack/foundation/components/survey/ui}/body/MultiChoiceQuestionBody.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone/ui/step => foundation/src/main/java/org/researchstack/foundation/components/survey/ui}/body/NotImplementedStepBody.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone/ui/step => foundation/src/main/java/org/researchstack/foundation/components/survey/ui}/body/SingleChoiceQuestionBody.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone/ui/step => foundation/src/main/java/org/researchstack/foundation/components/survey/ui}/body/StepBody.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone/ui/step => foundation/src/main/java/org/researchstack/foundation/components/survey/ui}/body/TextQuestionBody.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone/ui/step => foundation/src/main/java/org/researchstack/foundation/components/survey/ui}/layout/InstructionStepLayout.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone/ui/step => foundation/src/main/java/org/researchstack/foundation/components/survey/ui}/layout/SurveyStepLayout.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => foundation/src/main/java/org/researchstack/foundation/components}/utils/FormatHelper.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => foundation/src/main/java/org/researchstack/foundation/components}/utils/LogExt.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => foundation/src/main/java/org/researchstack/foundation/components}/utils/ResUtils.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => foundation/src/main/java/org/researchstack/foundation/components}/utils/TextUtils.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => foundation/src/main/java/org/researchstack/foundation/components}/utils/ThemeUtils.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => foundation/src/main/java/org/researchstack/foundation/components}/utils/UiThreadContext.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => foundation/src/main/java/org/researchstack/foundation/components}/utils/ViewUtils.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone/ui => foundation/src/main/java/org/researchstack/foundation/components/web/ui/activities}/ViewVideoActivity.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone/ui => foundation/src/main/java/org/researchstack/foundation/components/web/ui/activities}/ViewWebDocumentActivity.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => foundation/src/main/java/org/researchstack/foundation/components/web}/ui/views/AssetVideoView.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => foundation/src/main/java/org/researchstack/foundation/components/web}/ui/views/LocalWebView.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => foundation/src/main/java/org/researchstack/foundation/core/models}/result/Result.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => foundation/src/main/java/org/researchstack/foundation/core/models}/result/StepResult.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => foundation/src/main/java/org/researchstack/foundation/core/models}/result/TaskResult.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => foundation/src/main/java/org/researchstack/foundation/core/models}/step/Step.java (100%)
 rename {backbone/src/main/java/org/researchstack/backbone => foundation/src/main/java/org/researchstack/foundation/core/models}/task/Task.java (100%)
 rename {backbone => foundation}/src/main/res/anim/rsb_interpolator_step_layout.xml (100%)
 rename {backbone => foundation}/src/main/res/anim/rsb_slide_in_left.xml (100%)
 rename {backbone => foundation}/src/main/res/anim/rsb_slide_in_right.xml (100%)
 rename {backbone => foundation}/src/main/res/anim/rsb_slide_in_up.xml (100%)
 rename {backbone => foundation}/src/main/res/anim/rsb_slide_out_down.xml (100%)
 rename {backbone => foundation}/src/main/res/anim/rsb_slide_out_left.xml (100%)
 rename {backbone => foundation}/src/main/res/anim/rsb_slide_out_right.xml (100%)
 rename {backbone => foundation}/src/main/res/drawable-hdpi/rsb_ic_check.png (100%)
 rename {backbone => foundation}/src/main/res/drawable-hdpi/rsb_ic_fullscreen.png (100%)
 rename {backbone => foundation}/src/main/res/drawable-hdpi/rsb_ic_x.png (100%)
 rename {backbone => foundation}/src/main/res/drawable-hdpi/rsb_illo_dashboard_empty.png (100%)
 rename {backbone => foundation}/src/main/res/drawable-mdpi/rsb_ic_check.png (100%)
 rename {backbone => foundation}/src/main/res/drawable-mdpi/rsb_ic_fullscreen.png (100%)
 rename {backbone => foundation}/src/main/res/drawable-mdpi/rsb_ic_x.png (100%)
 rename {backbone => foundation}/src/main/res/drawable-mdpi/rsb_illo_dashboard_empty.png (100%)
 rename {backbone => foundation}/src/main/res/drawable-xhdpi/rsb_ic_check.png (100%)
 rename {backbone => foundation}/src/main/res/drawable-xhdpi/rsb_ic_fullscreen.png (100%)
 rename {backbone => foundation}/src/main/res/drawable-xhdpi/rsb_ic_x.png (100%)
 rename {backbone => foundation}/src/main/res/drawable-xhdpi/rsb_illo_dashboard_empty.png (100%)
 rename {backbone => foundation}/src/main/res/drawable-xxhdpi/rsb_ic_check.png (100%)
 rename {backbone => foundation}/src/main/res/drawable-xxhdpi/rsb_ic_fullscreen.png (100%)
 rename {backbone => foundation}/src/main/res/drawable-xxhdpi/rsb_ic_x.png (100%)
 rename {backbone => foundation}/src/main/res/drawable-xxhdpi/rsb_illo_dashboard_empty.png (100%)
 rename {backbone => foundation}/src/main/res/drawable-xxxhdpi/rsb_ic_check.png (100%)
 rename {backbone => foundation}/src/main/res/drawable-xxxhdpi/rsb_ic_fullscreen.png (100%)
 rename {backbone => foundation}/src/main/res/drawable-xxxhdpi/rsb_ic_x.png (100%)
 rename {backbone => foundation}/src/main/res/drawable-xxxhdpi/rsb_illo_dashboard_empty.png (100%)
 rename {backbone => foundation}/src/main/res/drawable/rsb_debug_gray.xml (100%)
 rename {backbone => foundation}/src/main/res/drawable/rsb_divider_empty_16dp.xml (100%)
 rename {backbone => foundation}/src/main/res/drawable/rsb_divider_empty_8dp.xml (100%)
 rename {backbone => foundation}/src/main/res/drawable/rsb_ic_circle_8dp.xml (100%)
 rename {backbone => foundation}/src/main/res/layout/rsb_activity_video_viewer.xml (100%)
 rename {backbone => foundation}/src/main/res/layout/rsb_activity_web_document.xml (100%)
 rename {backbone => foundation}/src/main/res/layout/rsb_item_checkbox.xml (100%)
 rename {backbone => foundation}/src/main/res/layout/rsb_item_date_view.xml (100%)
 rename {backbone => foundation}/src/main/res/layout/rsb_item_edit_duration.xml (100%)
 rename {backbone => foundation}/src/main/res/layout/rsb_item_edit_text.xml (100%)
 rename {backbone => foundation}/src/main/res/layout/rsb_item_edit_text_compact.xml (100%)
 rename {backbone => foundation}/src/main/res/layout/rsb_item_radio.xml (100%)
 rename {backbone => foundation}/src/main/res/layout/rsb_item_text_view_title_compact.xml (100%)
 rename {backbone => foundation}/src/main/res/layout/rsb_layout_fixed_submit_bar.xml (100%)
 rename {backbone => foundation}/src/main/res/layout/rsb_layout_toolbar.xml (100%)
 rename {backbone => foundation}/src/main/res/layout/rsb_progress.xml (100%)
 rename {backbone => foundation}/src/main/res/layout/rsb_step_layout.xml (100%)
 rename {backbone => foundation}/src/main/res/layout/rsb_step_layout_form_body.xml (100%)
 rename {backbone => foundation}/src/main/res/layout/rsb_step_layout_instruction.xml (100%)
 rename {backbone => foundation}/src/main/res/layout/rsb_view_icon_tab.xml (100%)
 rename {backbone => foundation}/src/main/res/layout/rsb_view_submitbar.xml (100%)

diff --git a/backbone/src/main/java/org/researchstack/backbone/task/OrderedTask.java b/foundation/src/main/java/org/researchstack/foundation/components/common/task/OrderedTask.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/task/OrderedTask.java
rename to foundation/src/main/java/org/researchstack/foundation/components/common/task/OrderedTask.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/callbacks/StepCallbacks.java b/foundation/src/main/java/org/researchstack/foundation/components/common/ui/callbacks/StepCallbacks.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/ui/callbacks/StepCallbacks.java
rename to foundation/src/main/java/org/researchstack/foundation/components/common/ui/callbacks/StepCallbacks.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/views/FixedSubmitBarLayout.java b/foundation/src/main/java/org/researchstack/foundation/components/common/ui/layout/FixedSubmitBarLayout.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/ui/views/FixedSubmitBarLayout.java
rename to foundation/src/main/java/org/researchstack/foundation/components/common/ui/layout/FixedSubmitBarLayout.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/step/layout/StepLayout.java b/foundation/src/main/java/org/researchstack/foundation/components/common/ui/layout/StepLayout.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/ui/step/layout/StepLayout.java
rename to foundation/src/main/java/org/researchstack/foundation/components/common/ui/layout/StepLayout.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/views/IconTab.java b/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/IconTab.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/ui/views/IconTab.java
rename to foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/IconTab.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/views/IconTabLayout.java b/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/IconTabLayout.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/ui/views/IconTabLayout.java
rename to foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/IconTabLayout.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/views/ObservableScrollView.java b/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/ObservableScrollView.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/ui/views/ObservableScrollView.java
rename to foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/ObservableScrollView.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/views/SubmitBar.java b/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/SubmitBar.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/ui/views/SubmitBar.java
rename to foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/SubmitBar.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/step/layout/TextViewLinkHandler.java b/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/TextViewLinkHandler.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/ui/step/layout/TextViewLinkHandler.java
rename to foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/TextViewLinkHandler.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/ResourcePathManager.java b/foundation/src/main/java/org/researchstack/foundation/components/singletons/ResourcePathManager.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/ResourcePathManager.java
rename to foundation/src/main/java/org/researchstack/foundation/components/singletons/ResourcePathManager.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/answerformat/AnswerFormat.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/AnswerFormat.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/answerformat/AnswerFormat.java
rename to foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/AnswerFormat.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/answerformat/BirthDateAnswerFormat.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/BirthDateAnswerFormat.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/answerformat/BirthDateAnswerFormat.java
rename to foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/BirthDateAnswerFormat.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/answerformat/BooleanAnswerFormat.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/BooleanAnswerFormat.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/answerformat/BooleanAnswerFormat.java
rename to foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/BooleanAnswerFormat.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/answerformat/ChoiceAnswerFormat.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/ChoiceAnswerFormat.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/answerformat/ChoiceAnswerFormat.java
rename to foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/ChoiceAnswerFormat.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/answerformat/DateAnswerFormat.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/DateAnswerFormat.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/answerformat/DateAnswerFormat.java
rename to foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/DateAnswerFormat.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/answerformat/DecimalAnswerFormat.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/DecimalAnswerFormat.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/answerformat/DecimalAnswerFormat.java
rename to foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/DecimalAnswerFormat.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/answerformat/DurationAnswerFormat.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/DurationAnswerFormat.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/answerformat/DurationAnswerFormat.java
rename to foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/DurationAnswerFormat.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/answerformat/EmailAnswerFormat.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/EmailAnswerFormat.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/answerformat/EmailAnswerFormat.java
rename to foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/EmailAnswerFormat.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/answerformat/FormAnswerFormat.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/FormAnswerFormat.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/answerformat/FormAnswerFormat.java
rename to foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/FormAnswerFormat.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/answerformat/IntegerAnswerFormat.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/IntegerAnswerFormat.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/answerformat/IntegerAnswerFormat.java
rename to foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/IntegerAnswerFormat.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/answerformat/TextAnswerFormat.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/TextAnswerFormat.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/answerformat/TextAnswerFormat.java
rename to foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/TextAnswerFormat.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/answerformat/UnknownAnswerFormat.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/UnknownAnswerFormat.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/answerformat/UnknownAnswerFormat.java
rename to foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/UnknownAnswerFormat.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/model/Choice.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/model/Choice.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/model/Choice.java
rename to foundation/src/main/java/org/researchstack/foundation/components/survey/model/Choice.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/step/FormStep.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/step/FormStep.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/step/FormStep.java
rename to foundation/src/main/java/org/researchstack/foundation/components/survey/step/FormStep.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/step/InstructionStep.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/step/InstructionStep.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/step/InstructionStep.java
rename to foundation/src/main/java/org/researchstack/foundation/components/survey/step/InstructionStep.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/step/QuestionStep.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/step/QuestionStep.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/step/QuestionStep.java
rename to foundation/src/main/java/org/researchstack/foundation/components/survey/step/QuestionStep.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/step/body/BodyAnswer.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/BodyAnswer.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/ui/step/body/BodyAnswer.java
rename to foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/BodyAnswer.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/step/body/DateQuestionBody.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/DateQuestionBody.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/ui/step/body/DateQuestionBody.java
rename to foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/DateQuestionBody.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/step/body/DecimalQuestionBody.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/DecimalQuestionBody.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/ui/step/body/DecimalQuestionBody.java
rename to foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/DecimalQuestionBody.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/step/body/DurationQuestionBody.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/DurationQuestionBody.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/ui/step/body/DurationQuestionBody.java
rename to foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/DurationQuestionBody.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/step/body/FormBody.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/FormBody.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/ui/step/body/FormBody.java
rename to foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/FormBody.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/step/body/IntegerQuestionBody.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/IntegerQuestionBody.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/ui/step/body/IntegerQuestionBody.java
rename to foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/IntegerQuestionBody.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/step/body/MultiChoiceQuestionBody.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/MultiChoiceQuestionBody.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/ui/step/body/MultiChoiceQuestionBody.java
rename to foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/MultiChoiceQuestionBody.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/step/body/NotImplementedStepBody.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/NotImplementedStepBody.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/ui/step/body/NotImplementedStepBody.java
rename to foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/NotImplementedStepBody.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/step/body/SingleChoiceQuestionBody.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/SingleChoiceQuestionBody.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/ui/step/body/SingleChoiceQuestionBody.java
rename to foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/SingleChoiceQuestionBody.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/step/body/StepBody.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/StepBody.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/ui/step/body/StepBody.java
rename to foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/StepBody.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/step/body/TextQuestionBody.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/TextQuestionBody.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/ui/step/body/TextQuestionBody.java
rename to foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/TextQuestionBody.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/step/layout/InstructionStepLayout.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/layout/InstructionStepLayout.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/ui/step/layout/InstructionStepLayout.java
rename to foundation/src/main/java/org/researchstack/foundation/components/survey/ui/layout/InstructionStepLayout.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/step/layout/SurveyStepLayout.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/layout/SurveyStepLayout.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/ui/step/layout/SurveyStepLayout.java
rename to foundation/src/main/java/org/researchstack/foundation/components/survey/ui/layout/SurveyStepLayout.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/utils/FormatHelper.java b/foundation/src/main/java/org/researchstack/foundation/components/utils/FormatHelper.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/utils/FormatHelper.java
rename to foundation/src/main/java/org/researchstack/foundation/components/utils/FormatHelper.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/utils/LogExt.java b/foundation/src/main/java/org/researchstack/foundation/components/utils/LogExt.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/utils/LogExt.java
rename to foundation/src/main/java/org/researchstack/foundation/components/utils/LogExt.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/utils/ResUtils.java b/foundation/src/main/java/org/researchstack/foundation/components/utils/ResUtils.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/utils/ResUtils.java
rename to foundation/src/main/java/org/researchstack/foundation/components/utils/ResUtils.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/utils/TextUtils.java b/foundation/src/main/java/org/researchstack/foundation/components/utils/TextUtils.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/utils/TextUtils.java
rename to foundation/src/main/java/org/researchstack/foundation/components/utils/TextUtils.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/utils/ThemeUtils.java b/foundation/src/main/java/org/researchstack/foundation/components/utils/ThemeUtils.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/utils/ThemeUtils.java
rename to foundation/src/main/java/org/researchstack/foundation/components/utils/ThemeUtils.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/utils/UiThreadContext.java b/foundation/src/main/java/org/researchstack/foundation/components/utils/UiThreadContext.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/utils/UiThreadContext.java
rename to foundation/src/main/java/org/researchstack/foundation/components/utils/UiThreadContext.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/utils/ViewUtils.java b/foundation/src/main/java/org/researchstack/foundation/components/utils/ViewUtils.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/utils/ViewUtils.java
rename to foundation/src/main/java/org/researchstack/foundation/components/utils/ViewUtils.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/ViewVideoActivity.java b/foundation/src/main/java/org/researchstack/foundation/components/web/ui/activities/ViewVideoActivity.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/ui/ViewVideoActivity.java
rename to foundation/src/main/java/org/researchstack/foundation/components/web/ui/activities/ViewVideoActivity.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/ViewWebDocumentActivity.java b/foundation/src/main/java/org/researchstack/foundation/components/web/ui/activities/ViewWebDocumentActivity.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/ui/ViewWebDocumentActivity.java
rename to foundation/src/main/java/org/researchstack/foundation/components/web/ui/activities/ViewWebDocumentActivity.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/views/AssetVideoView.java b/foundation/src/main/java/org/researchstack/foundation/components/web/ui/views/AssetVideoView.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/ui/views/AssetVideoView.java
rename to foundation/src/main/java/org/researchstack/foundation/components/web/ui/views/AssetVideoView.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/views/LocalWebView.java b/foundation/src/main/java/org/researchstack/foundation/components/web/ui/views/LocalWebView.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/ui/views/LocalWebView.java
rename to foundation/src/main/java/org/researchstack/foundation/components/web/ui/views/LocalWebView.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/result/Result.java b/foundation/src/main/java/org/researchstack/foundation/core/models/result/Result.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/result/Result.java
rename to foundation/src/main/java/org/researchstack/foundation/core/models/result/Result.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/result/StepResult.java b/foundation/src/main/java/org/researchstack/foundation/core/models/result/StepResult.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/result/StepResult.java
rename to foundation/src/main/java/org/researchstack/foundation/core/models/result/StepResult.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/result/TaskResult.java b/foundation/src/main/java/org/researchstack/foundation/core/models/result/TaskResult.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/result/TaskResult.java
rename to foundation/src/main/java/org/researchstack/foundation/core/models/result/TaskResult.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/step/Step.java b/foundation/src/main/java/org/researchstack/foundation/core/models/step/Step.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/step/Step.java
rename to foundation/src/main/java/org/researchstack/foundation/core/models/step/Step.java
diff --git a/backbone/src/main/java/org/researchstack/backbone/task/Task.java b/foundation/src/main/java/org/researchstack/foundation/core/models/task/Task.java
similarity index 100%
rename from backbone/src/main/java/org/researchstack/backbone/task/Task.java
rename to foundation/src/main/java/org/researchstack/foundation/core/models/task/Task.java
diff --git a/backbone/src/main/res/anim/rsb_interpolator_step_layout.xml b/foundation/src/main/res/anim/rsb_interpolator_step_layout.xml
similarity index 100%
rename from backbone/src/main/res/anim/rsb_interpolator_step_layout.xml
rename to foundation/src/main/res/anim/rsb_interpolator_step_layout.xml
diff --git a/backbone/src/main/res/anim/rsb_slide_in_left.xml b/foundation/src/main/res/anim/rsb_slide_in_left.xml
similarity index 100%
rename from backbone/src/main/res/anim/rsb_slide_in_left.xml
rename to foundation/src/main/res/anim/rsb_slide_in_left.xml
diff --git a/backbone/src/main/res/anim/rsb_slide_in_right.xml b/foundation/src/main/res/anim/rsb_slide_in_right.xml
similarity index 100%
rename from backbone/src/main/res/anim/rsb_slide_in_right.xml
rename to foundation/src/main/res/anim/rsb_slide_in_right.xml
diff --git a/backbone/src/main/res/anim/rsb_slide_in_up.xml b/foundation/src/main/res/anim/rsb_slide_in_up.xml
similarity index 100%
rename from backbone/src/main/res/anim/rsb_slide_in_up.xml
rename to foundation/src/main/res/anim/rsb_slide_in_up.xml
diff --git a/backbone/src/main/res/anim/rsb_slide_out_down.xml b/foundation/src/main/res/anim/rsb_slide_out_down.xml
similarity index 100%
rename from backbone/src/main/res/anim/rsb_slide_out_down.xml
rename to foundation/src/main/res/anim/rsb_slide_out_down.xml
diff --git a/backbone/src/main/res/anim/rsb_slide_out_left.xml b/foundation/src/main/res/anim/rsb_slide_out_left.xml
similarity index 100%
rename from backbone/src/main/res/anim/rsb_slide_out_left.xml
rename to foundation/src/main/res/anim/rsb_slide_out_left.xml
diff --git a/backbone/src/main/res/anim/rsb_slide_out_right.xml b/foundation/src/main/res/anim/rsb_slide_out_right.xml
similarity index 100%
rename from backbone/src/main/res/anim/rsb_slide_out_right.xml
rename to foundation/src/main/res/anim/rsb_slide_out_right.xml
diff --git a/backbone/src/main/res/drawable-hdpi/rsb_ic_check.png b/foundation/src/main/res/drawable-hdpi/rsb_ic_check.png
similarity index 100%
rename from backbone/src/main/res/drawable-hdpi/rsb_ic_check.png
rename to foundation/src/main/res/drawable-hdpi/rsb_ic_check.png
diff --git a/backbone/src/main/res/drawable-hdpi/rsb_ic_fullscreen.png b/foundation/src/main/res/drawable-hdpi/rsb_ic_fullscreen.png
similarity index 100%
rename from backbone/src/main/res/drawable-hdpi/rsb_ic_fullscreen.png
rename to foundation/src/main/res/drawable-hdpi/rsb_ic_fullscreen.png
diff --git a/backbone/src/main/res/drawable-hdpi/rsb_ic_x.png b/foundation/src/main/res/drawable-hdpi/rsb_ic_x.png
similarity index 100%
rename from backbone/src/main/res/drawable-hdpi/rsb_ic_x.png
rename to foundation/src/main/res/drawable-hdpi/rsb_ic_x.png
diff --git a/backbone/src/main/res/drawable-hdpi/rsb_illo_dashboard_empty.png b/foundation/src/main/res/drawable-hdpi/rsb_illo_dashboard_empty.png
similarity index 100%
rename from backbone/src/main/res/drawable-hdpi/rsb_illo_dashboard_empty.png
rename to foundation/src/main/res/drawable-hdpi/rsb_illo_dashboard_empty.png
diff --git a/backbone/src/main/res/drawable-mdpi/rsb_ic_check.png b/foundation/src/main/res/drawable-mdpi/rsb_ic_check.png
similarity index 100%
rename from backbone/src/main/res/drawable-mdpi/rsb_ic_check.png
rename to foundation/src/main/res/drawable-mdpi/rsb_ic_check.png
diff --git a/backbone/src/main/res/drawable-mdpi/rsb_ic_fullscreen.png b/foundation/src/main/res/drawable-mdpi/rsb_ic_fullscreen.png
similarity index 100%
rename from backbone/src/main/res/drawable-mdpi/rsb_ic_fullscreen.png
rename to foundation/src/main/res/drawable-mdpi/rsb_ic_fullscreen.png
diff --git a/backbone/src/main/res/drawable-mdpi/rsb_ic_x.png b/foundation/src/main/res/drawable-mdpi/rsb_ic_x.png
similarity index 100%
rename from backbone/src/main/res/drawable-mdpi/rsb_ic_x.png
rename to foundation/src/main/res/drawable-mdpi/rsb_ic_x.png
diff --git a/backbone/src/main/res/drawable-mdpi/rsb_illo_dashboard_empty.png b/foundation/src/main/res/drawable-mdpi/rsb_illo_dashboard_empty.png
similarity index 100%
rename from backbone/src/main/res/drawable-mdpi/rsb_illo_dashboard_empty.png
rename to foundation/src/main/res/drawable-mdpi/rsb_illo_dashboard_empty.png
diff --git a/backbone/src/main/res/drawable-xhdpi/rsb_ic_check.png b/foundation/src/main/res/drawable-xhdpi/rsb_ic_check.png
similarity index 100%
rename from backbone/src/main/res/drawable-xhdpi/rsb_ic_check.png
rename to foundation/src/main/res/drawable-xhdpi/rsb_ic_check.png
diff --git a/backbone/src/main/res/drawable-xhdpi/rsb_ic_fullscreen.png b/foundation/src/main/res/drawable-xhdpi/rsb_ic_fullscreen.png
similarity index 100%
rename from backbone/src/main/res/drawable-xhdpi/rsb_ic_fullscreen.png
rename to foundation/src/main/res/drawable-xhdpi/rsb_ic_fullscreen.png
diff --git a/backbone/src/main/res/drawable-xhdpi/rsb_ic_x.png b/foundation/src/main/res/drawable-xhdpi/rsb_ic_x.png
similarity index 100%
rename from backbone/src/main/res/drawable-xhdpi/rsb_ic_x.png
rename to foundation/src/main/res/drawable-xhdpi/rsb_ic_x.png
diff --git a/backbone/src/main/res/drawable-xhdpi/rsb_illo_dashboard_empty.png b/foundation/src/main/res/drawable-xhdpi/rsb_illo_dashboard_empty.png
similarity index 100%
rename from backbone/src/main/res/drawable-xhdpi/rsb_illo_dashboard_empty.png
rename to foundation/src/main/res/drawable-xhdpi/rsb_illo_dashboard_empty.png
diff --git a/backbone/src/main/res/drawable-xxhdpi/rsb_ic_check.png b/foundation/src/main/res/drawable-xxhdpi/rsb_ic_check.png
similarity index 100%
rename from backbone/src/main/res/drawable-xxhdpi/rsb_ic_check.png
rename to foundation/src/main/res/drawable-xxhdpi/rsb_ic_check.png
diff --git a/backbone/src/main/res/drawable-xxhdpi/rsb_ic_fullscreen.png b/foundation/src/main/res/drawable-xxhdpi/rsb_ic_fullscreen.png
similarity index 100%
rename from backbone/src/main/res/drawable-xxhdpi/rsb_ic_fullscreen.png
rename to foundation/src/main/res/drawable-xxhdpi/rsb_ic_fullscreen.png
diff --git a/backbone/src/main/res/drawable-xxhdpi/rsb_ic_x.png b/foundation/src/main/res/drawable-xxhdpi/rsb_ic_x.png
similarity index 100%
rename from backbone/src/main/res/drawable-xxhdpi/rsb_ic_x.png
rename to foundation/src/main/res/drawable-xxhdpi/rsb_ic_x.png
diff --git a/backbone/src/main/res/drawable-xxhdpi/rsb_illo_dashboard_empty.png b/foundation/src/main/res/drawable-xxhdpi/rsb_illo_dashboard_empty.png
similarity index 100%
rename from backbone/src/main/res/drawable-xxhdpi/rsb_illo_dashboard_empty.png
rename to foundation/src/main/res/drawable-xxhdpi/rsb_illo_dashboard_empty.png
diff --git a/backbone/src/main/res/drawable-xxxhdpi/rsb_ic_check.png b/foundation/src/main/res/drawable-xxxhdpi/rsb_ic_check.png
similarity index 100%
rename from backbone/src/main/res/drawable-xxxhdpi/rsb_ic_check.png
rename to foundation/src/main/res/drawable-xxxhdpi/rsb_ic_check.png
diff --git a/backbone/src/main/res/drawable-xxxhdpi/rsb_ic_fullscreen.png b/foundation/src/main/res/drawable-xxxhdpi/rsb_ic_fullscreen.png
similarity index 100%
rename from backbone/src/main/res/drawable-xxxhdpi/rsb_ic_fullscreen.png
rename to foundation/src/main/res/drawable-xxxhdpi/rsb_ic_fullscreen.png
diff --git a/backbone/src/main/res/drawable-xxxhdpi/rsb_ic_x.png b/foundation/src/main/res/drawable-xxxhdpi/rsb_ic_x.png
similarity index 100%
rename from backbone/src/main/res/drawable-xxxhdpi/rsb_ic_x.png
rename to foundation/src/main/res/drawable-xxxhdpi/rsb_ic_x.png
diff --git a/backbone/src/main/res/drawable-xxxhdpi/rsb_illo_dashboard_empty.png b/foundation/src/main/res/drawable-xxxhdpi/rsb_illo_dashboard_empty.png
similarity index 100%
rename from backbone/src/main/res/drawable-xxxhdpi/rsb_illo_dashboard_empty.png
rename to foundation/src/main/res/drawable-xxxhdpi/rsb_illo_dashboard_empty.png
diff --git a/backbone/src/main/res/drawable/rsb_debug_gray.xml b/foundation/src/main/res/drawable/rsb_debug_gray.xml
similarity index 100%
rename from backbone/src/main/res/drawable/rsb_debug_gray.xml
rename to foundation/src/main/res/drawable/rsb_debug_gray.xml
diff --git a/backbone/src/main/res/drawable/rsb_divider_empty_16dp.xml b/foundation/src/main/res/drawable/rsb_divider_empty_16dp.xml
similarity index 100%
rename from backbone/src/main/res/drawable/rsb_divider_empty_16dp.xml
rename to foundation/src/main/res/drawable/rsb_divider_empty_16dp.xml
diff --git a/backbone/src/main/res/drawable/rsb_divider_empty_8dp.xml b/foundation/src/main/res/drawable/rsb_divider_empty_8dp.xml
similarity index 100%
rename from backbone/src/main/res/drawable/rsb_divider_empty_8dp.xml
rename to foundation/src/main/res/drawable/rsb_divider_empty_8dp.xml
diff --git a/backbone/src/main/res/drawable/rsb_ic_circle_8dp.xml b/foundation/src/main/res/drawable/rsb_ic_circle_8dp.xml
similarity index 100%
rename from backbone/src/main/res/drawable/rsb_ic_circle_8dp.xml
rename to foundation/src/main/res/drawable/rsb_ic_circle_8dp.xml
diff --git a/backbone/src/main/res/layout/rsb_activity_video_viewer.xml b/foundation/src/main/res/layout/rsb_activity_video_viewer.xml
similarity index 100%
rename from backbone/src/main/res/layout/rsb_activity_video_viewer.xml
rename to foundation/src/main/res/layout/rsb_activity_video_viewer.xml
diff --git a/backbone/src/main/res/layout/rsb_activity_web_document.xml b/foundation/src/main/res/layout/rsb_activity_web_document.xml
similarity index 100%
rename from backbone/src/main/res/layout/rsb_activity_web_document.xml
rename to foundation/src/main/res/layout/rsb_activity_web_document.xml
diff --git a/backbone/src/main/res/layout/rsb_item_checkbox.xml b/foundation/src/main/res/layout/rsb_item_checkbox.xml
similarity index 100%
rename from backbone/src/main/res/layout/rsb_item_checkbox.xml
rename to foundation/src/main/res/layout/rsb_item_checkbox.xml
diff --git a/backbone/src/main/res/layout/rsb_item_date_view.xml b/foundation/src/main/res/layout/rsb_item_date_view.xml
similarity index 100%
rename from backbone/src/main/res/layout/rsb_item_date_view.xml
rename to foundation/src/main/res/layout/rsb_item_date_view.xml
diff --git a/backbone/src/main/res/layout/rsb_item_edit_duration.xml b/foundation/src/main/res/layout/rsb_item_edit_duration.xml
similarity index 100%
rename from backbone/src/main/res/layout/rsb_item_edit_duration.xml
rename to foundation/src/main/res/layout/rsb_item_edit_duration.xml
diff --git a/backbone/src/main/res/layout/rsb_item_edit_text.xml b/foundation/src/main/res/layout/rsb_item_edit_text.xml
similarity index 100%
rename from backbone/src/main/res/layout/rsb_item_edit_text.xml
rename to foundation/src/main/res/layout/rsb_item_edit_text.xml
diff --git a/backbone/src/main/res/layout/rsb_item_edit_text_compact.xml b/foundation/src/main/res/layout/rsb_item_edit_text_compact.xml
similarity index 100%
rename from backbone/src/main/res/layout/rsb_item_edit_text_compact.xml
rename to foundation/src/main/res/layout/rsb_item_edit_text_compact.xml
diff --git a/backbone/src/main/res/layout/rsb_item_radio.xml b/foundation/src/main/res/layout/rsb_item_radio.xml
similarity index 100%
rename from backbone/src/main/res/layout/rsb_item_radio.xml
rename to foundation/src/main/res/layout/rsb_item_radio.xml
diff --git a/backbone/src/main/res/layout/rsb_item_text_view_title_compact.xml b/foundation/src/main/res/layout/rsb_item_text_view_title_compact.xml
similarity index 100%
rename from backbone/src/main/res/layout/rsb_item_text_view_title_compact.xml
rename to foundation/src/main/res/layout/rsb_item_text_view_title_compact.xml
diff --git a/backbone/src/main/res/layout/rsb_layout_fixed_submit_bar.xml b/foundation/src/main/res/layout/rsb_layout_fixed_submit_bar.xml
similarity index 100%
rename from backbone/src/main/res/layout/rsb_layout_fixed_submit_bar.xml
rename to foundation/src/main/res/layout/rsb_layout_fixed_submit_bar.xml
diff --git a/backbone/src/main/res/layout/rsb_layout_toolbar.xml b/foundation/src/main/res/layout/rsb_layout_toolbar.xml
similarity index 100%
rename from backbone/src/main/res/layout/rsb_layout_toolbar.xml
rename to foundation/src/main/res/layout/rsb_layout_toolbar.xml
diff --git a/backbone/src/main/res/layout/rsb_progress.xml b/foundation/src/main/res/layout/rsb_progress.xml
similarity index 100%
rename from backbone/src/main/res/layout/rsb_progress.xml
rename to foundation/src/main/res/layout/rsb_progress.xml
diff --git a/backbone/src/main/res/layout/rsb_step_layout.xml b/foundation/src/main/res/layout/rsb_step_layout.xml
similarity index 100%
rename from backbone/src/main/res/layout/rsb_step_layout.xml
rename to foundation/src/main/res/layout/rsb_step_layout.xml
diff --git a/backbone/src/main/res/layout/rsb_step_layout_form_body.xml b/foundation/src/main/res/layout/rsb_step_layout_form_body.xml
similarity index 100%
rename from backbone/src/main/res/layout/rsb_step_layout_form_body.xml
rename to foundation/src/main/res/layout/rsb_step_layout_form_body.xml
diff --git a/backbone/src/main/res/layout/rsb_step_layout_instruction.xml b/foundation/src/main/res/layout/rsb_step_layout_instruction.xml
similarity index 100%
rename from backbone/src/main/res/layout/rsb_step_layout_instruction.xml
rename to foundation/src/main/res/layout/rsb_step_layout_instruction.xml
diff --git a/backbone/src/main/res/layout/rsb_view_icon_tab.xml b/foundation/src/main/res/layout/rsb_view_icon_tab.xml
similarity index 100%
rename from backbone/src/main/res/layout/rsb_view_icon_tab.xml
rename to foundation/src/main/res/layout/rsb_view_icon_tab.xml
diff --git a/backbone/src/main/res/layout/rsb_view_submitbar.xml b/foundation/src/main/res/layout/rsb_view_submitbar.xml
similarity index 100%
rename from backbone/src/main/res/layout/rsb_view_submitbar.xml
rename to foundation/src/main/res/layout/rsb_view_submitbar.xml

From 9f12193043ab9a58ea92ec57f56e22bac4815471 Mon Sep 17 00:00:00 2001
From: James Kizer <james.kizer@gmail.com>
Date: Wed, 2 Jan 2019 18:34:32 -0500
Subject: [PATCH 24/53] Foundation build file updates

---
 foundation/build.gradle                       | 20 +++++++++++++++----
 .../org/researchstack/foundation/ReplaceMe.kt |  2 --
 2 files changed, 16 insertions(+), 6 deletions(-)
 delete mode 100644 foundation/src/main/java/org/researchstack/foundation/ReplaceMe.kt

diff --git a/foundation/build.gradle b/foundation/build.gradle
index 54ea21743..e00439545 100644
--- a/foundation/build.gradle
+++ b/foundation/build.gradle
@@ -9,7 +9,6 @@ version = research_stack_version
 
 android {
     compileSdkVersion 28
-
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 28
@@ -19,14 +18,20 @@ android {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
     }
-
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-
+    resourcePrefix 'rsf_'
+    compileOptions {
+        sourceCompatibility = '1.8'
+        targetCompatibility = '1.8'
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    buildToolsVersion '28.0.3'
 }
 
 Properties properties = new Properties()
@@ -58,12 +63,19 @@ ext {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "com.android.support:appcompat-v7:$support_library_version"
+    implementation "com.android.support:cardview-v7:$support_library_version"
+    implementation "com.android.support:preference-v14:$support_library_version"
+    implementation "com.android.support:design:$support_library_version"
+    implementation "com.android.support:support-compat:$support_library_version"
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+
+    implementation "com.google.code.gson:gson:$gson_version"
+
 }
 
 group = publishedGroupId                               // Maven Group ID for the artifact
diff --git a/foundation/src/main/java/org/researchstack/foundation/ReplaceMe.kt b/foundation/src/main/java/org/researchstack/foundation/ReplaceMe.kt
deleted file mode 100644
index 76c9ce4ed..000000000
--- a/foundation/src/main/java/org/researchstack/foundation/ReplaceMe.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-package org.researchstack.foundation
-

From 67fa296eeb8eb54b1aa73c2c6e800ecbd80c0520 Mon Sep 17 00:00:00 2001
From: James Kizer <james.kizer@gmail.com>
Date: Wed, 2 Jan 2019 18:38:14 -0500
Subject: [PATCH 25/53] Added new core interfaces

---
 .../org/researchstack/foundation/core/interfaces/IResult.kt  | 5 +++++
 .../org/researchstack/foundation/core/interfaces/IStep.kt    | 5 +++++
 .../org/researchstack/foundation/core/interfaces/ITask.kt    | 5 +++++
 3 files changed, 15 insertions(+)
 create mode 100644 foundation/src/main/java/org/researchstack/foundation/core/interfaces/IResult.kt
 create mode 100644 foundation/src/main/java/org/researchstack/foundation/core/interfaces/IStep.kt
 create mode 100644 foundation/src/main/java/org/researchstack/foundation/core/interfaces/ITask.kt

diff --git a/foundation/src/main/java/org/researchstack/foundation/core/interfaces/IResult.kt b/foundation/src/main/java/org/researchstack/foundation/core/interfaces/IResult.kt
new file mode 100644
index 000000000..1d27e84b1
--- /dev/null
+++ b/foundation/src/main/java/org/researchstack/foundation/core/interfaces/IResult.kt
@@ -0,0 +1,5 @@
+package org.researchstack.foundation.core.interfaces
+
+interface IResult {
+    val identifier: String
+}
\ No newline at end of file
diff --git a/foundation/src/main/java/org/researchstack/foundation/core/interfaces/IStep.kt b/foundation/src/main/java/org/researchstack/foundation/core/interfaces/IStep.kt
new file mode 100644
index 000000000..73b80619a
--- /dev/null
+++ b/foundation/src/main/java/org/researchstack/foundation/core/interfaces/IStep.kt
@@ -0,0 +1,5 @@
+package org.researchstack.foundation.core.interfaces
+
+interface IStep {
+    val identifier: String
+}
\ No newline at end of file
diff --git a/foundation/src/main/java/org/researchstack/foundation/core/interfaces/ITask.kt b/foundation/src/main/java/org/researchstack/foundation/core/interfaces/ITask.kt
new file mode 100644
index 000000000..a99d6498a
--- /dev/null
+++ b/foundation/src/main/java/org/researchstack/foundation/core/interfaces/ITask.kt
@@ -0,0 +1,5 @@
+package org.researchstack.foundation.core.interfaces
+
+interface ITask {
+    val identifier: String
+}
\ No newline at end of file

From d98738ace7d6620988d9c4d200701e2d874815c2 Mon Sep 17 00:00:00 2001
From: James Kizer <james.kizer@gmail.com>
Date: Wed, 2 Jan 2019 18:50:35 -0500
Subject: [PATCH 26/53] renamed lots of resource files and merged in some
 values from backbone

---
 ...t.xml => rsf_interpolator_step_layout.xml} |   0
 ...lide_in_left.xml => rsf_slide_in_left.xml} |   4 +-
 ...de_in_right.xml => rsf_slide_in_right.xml} |   4 +-
 ...sb_slide_in_up.xml => rsf_slide_in_up.xml} |   4 +-
 ...de_out_down.xml => rsf_slide_out_down.xml} |   4 +-
 ...de_out_left.xml => rsf_slide_out_left.xml} |   4 +-
 ..._out_right.xml => rsf_slide_out_right.xml} |   4 +-
 .../{rsb_ic_check.png => rsf_ic_check.png}    | Bin
 ...c_fullscreen.png => rsf_ic_fullscreen.png} | Bin
 .../{rsb_ic_x.png => rsf_ic_x.png}            | Bin
 ...empty.png => rsf_illo_dashboard_empty.png} | Bin
 .../{rsb_ic_check.png => rsf_ic_check.png}    | Bin
 ...c_fullscreen.png => rsf_ic_fullscreen.png} | Bin
 .../{rsb_ic_x.png => rsf_ic_x.png}            | Bin
 ...empty.png => rsf_illo_dashboard_empty.png} | Bin
 .../{rsb_ic_check.png => rsf_ic_check.png}    | Bin
 ...c_fullscreen.png => rsf_ic_fullscreen.png} | Bin
 .../{rsb_ic_x.png => rsf_ic_x.png}            | Bin
 ...empty.png => rsf_illo_dashboard_empty.png} | Bin
 .../{rsb_ic_check.png => rsf_ic_check.png}    | Bin
 ...c_fullscreen.png => rsf_ic_fullscreen.png} | Bin
 .../{rsb_ic_x.png => rsf_ic_x.png}            | Bin
 ...empty.png => rsf_illo_dashboard_empty.png} | Bin
 .../{rsb_ic_check.png => rsf_ic_check.png}    | Bin
 ...c_fullscreen.png => rsf_ic_fullscreen.png} | Bin
 .../{rsb_ic_x.png => rsf_ic_x.png}            | Bin
 ...empty.png => rsf_illo_dashboard_empty.png} | Bin
 ...{rsb_debug_gray.xml => rsf_debug_gray.xml} |   0
 ...ty_16dp.xml => rsf_divider_empty_16dp.xml} |   0
 ...mpty_8dp.xml => rsf_divider_empty_8dp.xml} |   0
 ...c_circle_8dp.xml => rsf_ic_circle_8dp.xml} |   2 +-
 ...ewer.xml => rsf_activity_video_viewer.xml} |   2 +-
 ...ment.xml => rsf_activity_web_document.xml} |   4 +-
 .../res/layout/rsf_fragment_step_compat.xml   |  15 ++++
 .../layout/rsf_fragment_task_presentation.xml |  18 ++++
 ...tem_checkbox.xml => rsf_item_checkbox.xml} |   2 +-
 ...m_date_view.xml => rsf_item_date_view.xml} |   4 +-
 ...uration.xml => rsf_item_edit_duration.xml} |   8 +-
 ...m_edit_text.xml => rsf_item_edit_text.xml} |   2 +-
 ...act.xml => rsf_item_edit_text_compact.xml} |   4 +-
 ...{rsb_item_radio.xml => rsf_item_radio.xml} |   2 +-
 ...l => rsf_item_text_view_title_compact.xml} |   0
 ...ar.xml => rsf_layout_fixed_submit_bar.xml} |  14 ++--
 ...out_toolbar.xml => rsf_layout_toolbar.xml} |   0
 .../{rsb_progress.xml => rsf_progress.xml}    |   2 +-
 ...sb_step_layout.xml => rsf_step_layout.xml} |  12 +--
 ...body.xml => rsf_step_layout_form_body.xml} |   2 +-
 ...on.xml => rsf_step_layout_instruction.xml} |   8 +-
 ...iew_icon_tab.xml => rsf_view_icon_tab.xml} |   2 +-
 ...w_submitbar.xml => rsf_view_submitbar.xml} |   0
 foundation/src/main/res/values-v17/themes.xml |   9 ++
 foundation/src/main/res/values/attrs.xml      |  33 ++++++++
 foundation/src/main/res/values/colors.xml     |  20 +++++
 foundation/src/main/res/values/dimens.xml     |  23 ++++++
 foundation/src/main/res/values/ids.xml        |   9 ++
 foundation/src/main/res/values/integers.xml   |   4 +
 foundation/src/main/res/values/strings.xml    |  77 +++++++++++++++++-
 foundation/src/main/res/values/styles.xml     |  49 +++++++++++
 foundation/src/main/res/values/themes.xml     |  22 +++++
 59 files changed, 324 insertions(+), 49 deletions(-)
 rename foundation/src/main/res/anim/{rsb_interpolator_step_layout.xml => rsf_interpolator_step_layout.xml} (100%)
 rename foundation/src/main/res/anim/{rsb_slide_in_left.xml => rsf_slide_in_left.xml} (87%)
 rename foundation/src/main/res/anim/{rsb_slide_in_right.xml => rsf_slide_in_right.xml} (87%)
 rename foundation/src/main/res/anim/{rsb_slide_in_up.xml => rsf_slide_in_up.xml} (89%)
 rename foundation/src/main/res/anim/{rsb_slide_out_down.xml => rsf_slide_out_down.xml} (89%)
 rename foundation/src/main/res/anim/{rsb_slide_out_left.xml => rsf_slide_out_left.xml} (87%)
 rename foundation/src/main/res/anim/{rsb_slide_out_right.xml => rsf_slide_out_right.xml} (87%)
 rename foundation/src/main/res/drawable-hdpi/{rsb_ic_check.png => rsf_ic_check.png} (100%)
 rename foundation/src/main/res/drawable-hdpi/{rsb_ic_fullscreen.png => rsf_ic_fullscreen.png} (100%)
 rename foundation/src/main/res/drawable-hdpi/{rsb_ic_x.png => rsf_ic_x.png} (100%)
 rename foundation/src/main/res/drawable-hdpi/{rsb_illo_dashboard_empty.png => rsf_illo_dashboard_empty.png} (100%)
 rename foundation/src/main/res/drawable-mdpi/{rsb_ic_check.png => rsf_ic_check.png} (100%)
 rename foundation/src/main/res/drawable-mdpi/{rsb_ic_fullscreen.png => rsf_ic_fullscreen.png} (100%)
 rename foundation/src/main/res/drawable-mdpi/{rsb_ic_x.png => rsf_ic_x.png} (100%)
 rename foundation/src/main/res/drawable-mdpi/{rsb_illo_dashboard_empty.png => rsf_illo_dashboard_empty.png} (100%)
 rename foundation/src/main/res/drawable-xhdpi/{rsb_ic_check.png => rsf_ic_check.png} (100%)
 rename foundation/src/main/res/drawable-xhdpi/{rsb_ic_fullscreen.png => rsf_ic_fullscreen.png} (100%)
 rename foundation/src/main/res/drawable-xhdpi/{rsb_ic_x.png => rsf_ic_x.png} (100%)
 rename foundation/src/main/res/drawable-xhdpi/{rsb_illo_dashboard_empty.png => rsf_illo_dashboard_empty.png} (100%)
 rename foundation/src/main/res/drawable-xxhdpi/{rsb_ic_check.png => rsf_ic_check.png} (100%)
 rename foundation/src/main/res/drawable-xxhdpi/{rsb_ic_fullscreen.png => rsf_ic_fullscreen.png} (100%)
 rename foundation/src/main/res/drawable-xxhdpi/{rsb_ic_x.png => rsf_ic_x.png} (100%)
 rename foundation/src/main/res/drawable-xxhdpi/{rsb_illo_dashboard_empty.png => rsf_illo_dashboard_empty.png} (100%)
 rename foundation/src/main/res/drawable-xxxhdpi/{rsb_ic_check.png => rsf_ic_check.png} (100%)
 rename foundation/src/main/res/drawable-xxxhdpi/{rsb_ic_fullscreen.png => rsf_ic_fullscreen.png} (100%)
 rename foundation/src/main/res/drawable-xxxhdpi/{rsb_ic_x.png => rsf_ic_x.png} (100%)
 rename foundation/src/main/res/drawable-xxxhdpi/{rsb_illo_dashboard_empty.png => rsf_illo_dashboard_empty.png} (100%)
 rename foundation/src/main/res/drawable/{rsb_debug_gray.xml => rsf_debug_gray.xml} (100%)
 rename foundation/src/main/res/drawable/{rsb_divider_empty_16dp.xml => rsf_divider_empty_16dp.xml} (100%)
 rename foundation/src/main/res/drawable/{rsb_divider_empty_8dp.xml => rsf_divider_empty_8dp.xml} (100%)
 rename foundation/src/main/res/drawable/{rsb_ic_circle_8dp.xml => rsf_ic_circle_8dp.xml} (81%)
 rename foundation/src/main/res/layout/{rsb_activity_video_viewer.xml => rsf_activity_video_viewer.xml} (83%)
 rename foundation/src/main/res/layout/{rsb_activity_web_document.xml => rsf_activity_web_document.xml} (76%)
 create mode 100644 foundation/src/main/res/layout/rsf_fragment_step_compat.xml
 create mode 100644 foundation/src/main/res/layout/rsf_fragment_task_presentation.xml
 rename foundation/src/main/res/layout/{rsb_item_checkbox.xml => rsf_item_checkbox.xml} (87%)
 rename foundation/src/main/res/layout/{rsb_item_date_view.xml => rsf_item_date_view.xml} (89%)
 rename foundation/src/main/res/layout/{rsb_item_edit_duration.xml => rsf_item_edit_duration.xml} (90%)
 rename foundation/src/main/res/layout/{rsb_item_edit_text.xml => rsf_item_edit_text.xml} (89%)
 rename foundation/src/main/res/layout/{rsb_item_edit_text_compact.xml => rsf_item_edit_text_compact.xml} (89%)
 rename foundation/src/main/res/layout/{rsb_item_radio.xml => rsf_item_radio.xml} (87%)
 rename foundation/src/main/res/layout/{rsb_item_text_view_title_compact.xml => rsf_item_text_view_title_compact.xml} (100%)
 rename foundation/src/main/res/layout/{rsb_layout_fixed_submit_bar.xml => rsf_layout_fixed_submit_bar.xml} (63%)
 rename foundation/src/main/res/layout/{rsb_layout_toolbar.xml => rsf_layout_toolbar.xml} (100%)
 rename foundation/src/main/res/layout/{rsb_progress.xml => rsf_progress.xml} (89%)
 rename foundation/src/main/res/layout/{rsb_step_layout.xml => rsf_step_layout.xml} (77%)
 rename foundation/src/main/res/layout/{rsb_step_layout_form_body.xml => rsf_step_layout_form_body.xml} (82%)
 rename foundation/src/main/res/layout/{rsb_step_layout_instruction.xml => rsf_step_layout_instruction.xml} (81%)
 rename foundation/src/main/res/layout/{rsb_view_icon_tab.xml => rsf_view_icon_tab.xml} (96%)
 rename foundation/src/main/res/layout/{rsb_view_submitbar.xml => rsf_view_submitbar.xml} (100%)
 create mode 100644 foundation/src/main/res/values-v17/themes.xml
 create mode 100644 foundation/src/main/res/values/attrs.xml
 create mode 100644 foundation/src/main/res/values/colors.xml
 create mode 100644 foundation/src/main/res/values/dimens.xml
 create mode 100644 foundation/src/main/res/values/ids.xml
 create mode 100644 foundation/src/main/res/values/integers.xml
 create mode 100644 foundation/src/main/res/values/styles.xml
 create mode 100644 foundation/src/main/res/values/themes.xml

diff --git a/foundation/src/main/res/anim/rsb_interpolator_step_layout.xml b/foundation/src/main/res/anim/rsf_interpolator_step_layout.xml
similarity index 100%
rename from foundation/src/main/res/anim/rsb_interpolator_step_layout.xml
rename to foundation/src/main/res/anim/rsf_interpolator_step_layout.xml
diff --git a/foundation/src/main/res/anim/rsb_slide_in_left.xml b/foundation/src/main/res/anim/rsf_slide_in_left.xml
similarity index 87%
rename from foundation/src/main/res/anim/rsb_slide_in_left.xml
rename to foundation/src/main/res/anim/rsf_slide_in_left.xml
index a3239933b..c70afe17a 100644
--- a/foundation/src/main/res/anim/rsb_slide_in_left.xml
+++ b/foundation/src/main/res/anim/rsf_slide_in_left.xml
@@ -18,7 +18,7 @@
 -->
 
 <translate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="@integer/rsb_config_mediumAnimTime"
+    android:duration="@integer/rsf_config_mediumAnimTime"
     android:fromXDelta="-100%p"
-    android:interpolator="@anim/rsb_interpolator_step_layout"
+    android:interpolator="@anim/rsf_interpolator_step_layout"
     android:toXDelta="0" />
diff --git a/foundation/src/main/res/anim/rsb_slide_in_right.xml b/foundation/src/main/res/anim/rsf_slide_in_right.xml
similarity index 87%
rename from foundation/src/main/res/anim/rsb_slide_in_right.xml
rename to foundation/src/main/res/anim/rsf_slide_in_right.xml
index d42bf20c3..725324da8 100644
--- a/foundation/src/main/res/anim/rsb_slide_in_right.xml
+++ b/foundation/src/main/res/anim/rsf_slide_in_right.xml
@@ -18,7 +18,7 @@
 -->
 
 <translate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="@integer/rsb_config_mediumAnimTime"
+    android:duration="@integer/rsf_config_mediumAnimTime"
     android:fromXDelta="100%p"
-    android:interpolator="@anim/rsb_interpolator_step_layout"
+    android:interpolator="@anim/rsf_interpolator_step_layout"
     android:toXDelta="0" />
diff --git a/foundation/src/main/res/anim/rsb_slide_in_up.xml b/foundation/src/main/res/anim/rsf_slide_in_up.xml
similarity index 89%
rename from foundation/src/main/res/anim/rsb_slide_in_up.xml
rename to foundation/src/main/res/anim/rsf_slide_in_up.xml
index 309e7c884..e2a1435d6 100644
--- a/foundation/src/main/res/anim/rsb_slide_in_up.xml
+++ b/foundation/src/main/res/anim/rsf_slide_in_up.xml
@@ -21,11 +21,11 @@
     android:interpolator="@android:interpolator/decelerate_cubic">
 
     <translate
-        android:duration="@integer/rsb_config_mediumAnimTime"
+        android:duration="@integer/rsf_config_mediumAnimTime"
         android:fromYDelta="70%p"
         android:toYDelta="0" />
     <alpha
-        android:duration="@integer/rsb_config_mediumAnimTime"
+        android:duration="@integer/rsf_config_mediumAnimTime"
         android:fromAlpha="0.0"
         android:toAlpha="1.0" />
 </set>
diff --git a/foundation/src/main/res/anim/rsb_slide_out_down.xml b/foundation/src/main/res/anim/rsf_slide_out_down.xml
similarity index 89%
rename from foundation/src/main/res/anim/rsb_slide_out_down.xml
rename to foundation/src/main/res/anim/rsf_slide_out_down.xml
index 7b5382c6e..16d4feb50 100644
--- a/foundation/src/main/res/anim/rsb_slide_out_down.xml
+++ b/foundation/src/main/res/anim/rsf_slide_out_down.xml
@@ -20,11 +20,11 @@
 <set xmlns:android="http://schemas.android.com/apk/res/android"
     android:interpolator="@android:interpolator/accelerate_cubic">
     <translate
-        android:duration="@integer/rsb_config_mediumAnimTime"
+        android:duration="@integer/rsf_config_mediumAnimTime"
         android:fromYDelta="0"
         android:toYDelta="50%p" />
     <alpha
-        android:duration="@integer/rsb_config_mediumAnimTime"
+        android:duration="@integer/rsf_config_mediumAnimTime"
         android:fromAlpha="1.0"
         android:toAlpha="0.0" />
 </set>
diff --git a/foundation/src/main/res/anim/rsb_slide_out_left.xml b/foundation/src/main/res/anim/rsf_slide_out_left.xml
similarity index 87%
rename from foundation/src/main/res/anim/rsb_slide_out_left.xml
rename to foundation/src/main/res/anim/rsf_slide_out_left.xml
index 961697cfe..11b5c53c3 100644
--- a/foundation/src/main/res/anim/rsb_slide_out_left.xml
+++ b/foundation/src/main/res/anim/rsf_slide_out_left.xml
@@ -18,7 +18,7 @@
 -->
 
 <translate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="@integer/rsb_config_mediumAnimTime"
+    android:duration="@integer/rsf_config_mediumAnimTime"
     android:fromXDelta="0"
-    android:interpolator="@anim/rsb_interpolator_step_layout"
+    android:interpolator="@anim/rsf_interpolator_step_layout"
     android:toXDelta="-100%p" />
diff --git a/foundation/src/main/res/anim/rsb_slide_out_right.xml b/foundation/src/main/res/anim/rsf_slide_out_right.xml
similarity index 87%
rename from foundation/src/main/res/anim/rsb_slide_out_right.xml
rename to foundation/src/main/res/anim/rsf_slide_out_right.xml
index 7692f5a45..7c545a366 100644
--- a/foundation/src/main/res/anim/rsb_slide_out_right.xml
+++ b/foundation/src/main/res/anim/rsf_slide_out_right.xml
@@ -18,7 +18,7 @@
 -->
 
 <translate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="@integer/rsb_config_mediumAnimTime"
+    android:duration="@integer/rsf_config_mediumAnimTime"
     android:fromXDelta="0"
-    android:interpolator="@anim/rsb_interpolator_step_layout"
+    android:interpolator="@anim/rsf_interpolator_step_layout"
     android:toXDelta="100%p" />
diff --git a/foundation/src/main/res/drawable-hdpi/rsb_ic_check.png b/foundation/src/main/res/drawable-hdpi/rsf_ic_check.png
similarity index 100%
rename from foundation/src/main/res/drawable-hdpi/rsb_ic_check.png
rename to foundation/src/main/res/drawable-hdpi/rsf_ic_check.png
diff --git a/foundation/src/main/res/drawable-hdpi/rsb_ic_fullscreen.png b/foundation/src/main/res/drawable-hdpi/rsf_ic_fullscreen.png
similarity index 100%
rename from foundation/src/main/res/drawable-hdpi/rsb_ic_fullscreen.png
rename to foundation/src/main/res/drawable-hdpi/rsf_ic_fullscreen.png
diff --git a/foundation/src/main/res/drawable-hdpi/rsb_ic_x.png b/foundation/src/main/res/drawable-hdpi/rsf_ic_x.png
similarity index 100%
rename from foundation/src/main/res/drawable-hdpi/rsb_ic_x.png
rename to foundation/src/main/res/drawable-hdpi/rsf_ic_x.png
diff --git a/foundation/src/main/res/drawable-hdpi/rsb_illo_dashboard_empty.png b/foundation/src/main/res/drawable-hdpi/rsf_illo_dashboard_empty.png
similarity index 100%
rename from foundation/src/main/res/drawable-hdpi/rsb_illo_dashboard_empty.png
rename to foundation/src/main/res/drawable-hdpi/rsf_illo_dashboard_empty.png
diff --git a/foundation/src/main/res/drawable-mdpi/rsb_ic_check.png b/foundation/src/main/res/drawable-mdpi/rsf_ic_check.png
similarity index 100%
rename from foundation/src/main/res/drawable-mdpi/rsb_ic_check.png
rename to foundation/src/main/res/drawable-mdpi/rsf_ic_check.png
diff --git a/foundation/src/main/res/drawable-mdpi/rsb_ic_fullscreen.png b/foundation/src/main/res/drawable-mdpi/rsf_ic_fullscreen.png
similarity index 100%
rename from foundation/src/main/res/drawable-mdpi/rsb_ic_fullscreen.png
rename to foundation/src/main/res/drawable-mdpi/rsf_ic_fullscreen.png
diff --git a/foundation/src/main/res/drawable-mdpi/rsb_ic_x.png b/foundation/src/main/res/drawable-mdpi/rsf_ic_x.png
similarity index 100%
rename from foundation/src/main/res/drawable-mdpi/rsb_ic_x.png
rename to foundation/src/main/res/drawable-mdpi/rsf_ic_x.png
diff --git a/foundation/src/main/res/drawable-mdpi/rsb_illo_dashboard_empty.png b/foundation/src/main/res/drawable-mdpi/rsf_illo_dashboard_empty.png
similarity index 100%
rename from foundation/src/main/res/drawable-mdpi/rsb_illo_dashboard_empty.png
rename to foundation/src/main/res/drawable-mdpi/rsf_illo_dashboard_empty.png
diff --git a/foundation/src/main/res/drawable-xhdpi/rsb_ic_check.png b/foundation/src/main/res/drawable-xhdpi/rsf_ic_check.png
similarity index 100%
rename from foundation/src/main/res/drawable-xhdpi/rsb_ic_check.png
rename to foundation/src/main/res/drawable-xhdpi/rsf_ic_check.png
diff --git a/foundation/src/main/res/drawable-xhdpi/rsb_ic_fullscreen.png b/foundation/src/main/res/drawable-xhdpi/rsf_ic_fullscreen.png
similarity index 100%
rename from foundation/src/main/res/drawable-xhdpi/rsb_ic_fullscreen.png
rename to foundation/src/main/res/drawable-xhdpi/rsf_ic_fullscreen.png
diff --git a/foundation/src/main/res/drawable-xhdpi/rsb_ic_x.png b/foundation/src/main/res/drawable-xhdpi/rsf_ic_x.png
similarity index 100%
rename from foundation/src/main/res/drawable-xhdpi/rsb_ic_x.png
rename to foundation/src/main/res/drawable-xhdpi/rsf_ic_x.png
diff --git a/foundation/src/main/res/drawable-xhdpi/rsb_illo_dashboard_empty.png b/foundation/src/main/res/drawable-xhdpi/rsf_illo_dashboard_empty.png
similarity index 100%
rename from foundation/src/main/res/drawable-xhdpi/rsb_illo_dashboard_empty.png
rename to foundation/src/main/res/drawable-xhdpi/rsf_illo_dashboard_empty.png
diff --git a/foundation/src/main/res/drawable-xxhdpi/rsb_ic_check.png b/foundation/src/main/res/drawable-xxhdpi/rsf_ic_check.png
similarity index 100%
rename from foundation/src/main/res/drawable-xxhdpi/rsb_ic_check.png
rename to foundation/src/main/res/drawable-xxhdpi/rsf_ic_check.png
diff --git a/foundation/src/main/res/drawable-xxhdpi/rsb_ic_fullscreen.png b/foundation/src/main/res/drawable-xxhdpi/rsf_ic_fullscreen.png
similarity index 100%
rename from foundation/src/main/res/drawable-xxhdpi/rsb_ic_fullscreen.png
rename to foundation/src/main/res/drawable-xxhdpi/rsf_ic_fullscreen.png
diff --git a/foundation/src/main/res/drawable-xxhdpi/rsb_ic_x.png b/foundation/src/main/res/drawable-xxhdpi/rsf_ic_x.png
similarity index 100%
rename from foundation/src/main/res/drawable-xxhdpi/rsb_ic_x.png
rename to foundation/src/main/res/drawable-xxhdpi/rsf_ic_x.png
diff --git a/foundation/src/main/res/drawable-xxhdpi/rsb_illo_dashboard_empty.png b/foundation/src/main/res/drawable-xxhdpi/rsf_illo_dashboard_empty.png
similarity index 100%
rename from foundation/src/main/res/drawable-xxhdpi/rsb_illo_dashboard_empty.png
rename to foundation/src/main/res/drawable-xxhdpi/rsf_illo_dashboard_empty.png
diff --git a/foundation/src/main/res/drawable-xxxhdpi/rsb_ic_check.png b/foundation/src/main/res/drawable-xxxhdpi/rsf_ic_check.png
similarity index 100%
rename from foundation/src/main/res/drawable-xxxhdpi/rsb_ic_check.png
rename to foundation/src/main/res/drawable-xxxhdpi/rsf_ic_check.png
diff --git a/foundation/src/main/res/drawable-xxxhdpi/rsb_ic_fullscreen.png b/foundation/src/main/res/drawable-xxxhdpi/rsf_ic_fullscreen.png
similarity index 100%
rename from foundation/src/main/res/drawable-xxxhdpi/rsb_ic_fullscreen.png
rename to foundation/src/main/res/drawable-xxxhdpi/rsf_ic_fullscreen.png
diff --git a/foundation/src/main/res/drawable-xxxhdpi/rsb_ic_x.png b/foundation/src/main/res/drawable-xxxhdpi/rsf_ic_x.png
similarity index 100%
rename from foundation/src/main/res/drawable-xxxhdpi/rsb_ic_x.png
rename to foundation/src/main/res/drawable-xxxhdpi/rsf_ic_x.png
diff --git a/foundation/src/main/res/drawable-xxxhdpi/rsb_illo_dashboard_empty.png b/foundation/src/main/res/drawable-xxxhdpi/rsf_illo_dashboard_empty.png
similarity index 100%
rename from foundation/src/main/res/drawable-xxxhdpi/rsb_illo_dashboard_empty.png
rename to foundation/src/main/res/drawable-xxxhdpi/rsf_illo_dashboard_empty.png
diff --git a/foundation/src/main/res/drawable/rsb_debug_gray.xml b/foundation/src/main/res/drawable/rsf_debug_gray.xml
similarity index 100%
rename from foundation/src/main/res/drawable/rsb_debug_gray.xml
rename to foundation/src/main/res/drawable/rsf_debug_gray.xml
diff --git a/foundation/src/main/res/drawable/rsb_divider_empty_16dp.xml b/foundation/src/main/res/drawable/rsf_divider_empty_16dp.xml
similarity index 100%
rename from foundation/src/main/res/drawable/rsb_divider_empty_16dp.xml
rename to foundation/src/main/res/drawable/rsf_divider_empty_16dp.xml
diff --git a/foundation/src/main/res/drawable/rsb_divider_empty_8dp.xml b/foundation/src/main/res/drawable/rsf_divider_empty_8dp.xml
similarity index 100%
rename from foundation/src/main/res/drawable/rsb_divider_empty_8dp.xml
rename to foundation/src/main/res/drawable/rsf_divider_empty_8dp.xml
diff --git a/foundation/src/main/res/drawable/rsb_ic_circle_8dp.xml b/foundation/src/main/res/drawable/rsf_ic_circle_8dp.xml
similarity index 81%
rename from foundation/src/main/res/drawable/rsb_ic_circle_8dp.xml
rename to foundation/src/main/res/drawable/rsf_ic_circle_8dp.xml
index a8500cdb3..ed7548e86 100644
--- a/foundation/src/main/res/drawable/rsb_ic_circle_8dp.xml
+++ b/foundation/src/main/res/drawable/rsf_ic_circle_8dp.xml
@@ -6,6 +6,6 @@
         android:width="8dp"
         android:height="8dp" />
 
-    <solid android:color="@color/rsb_black" />
+    <solid android:color="@color/rsf_black" />
 
 </shape>
\ No newline at end of file
diff --git a/foundation/src/main/res/layout/rsb_activity_video_viewer.xml b/foundation/src/main/res/layout/rsf_activity_video_viewer.xml
similarity index 83%
rename from foundation/src/main/res/layout/rsb_activity_video_viewer.xml
rename to foundation/src/main/res/layout/rsf_activity_video_viewer.xml
index 84c6707cd..31546d464 100644
--- a/foundation/src/main/res/layout/rsb_activity_video_viewer.xml
+++ b/foundation/src/main/res/layout/rsf_activity_video_viewer.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <org.researchstack.backbone.ui.views.AssetVideoView
+    <org.researchstack.foundation.components.web.ui.views.AssetVideoView
         android:id="@+id/videoView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/foundation/src/main/res/layout/rsb_activity_web_document.xml b/foundation/src/main/res/layout/rsf_activity_web_document.xml
similarity index 76%
rename from foundation/src/main/res/layout/rsb_activity_web_document.xml
rename to foundation/src/main/res/layout/rsf_activity_web_document.xml
index d66651840..5ab942389 100644
--- a/foundation/src/main/res/layout/rsb_activity_web_document.xml
+++ b/foundation/src/main/res/layout/rsf_activity_web_document.xml
@@ -4,9 +4,9 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <include layout="@layout/rsb_layout_toolbar" />
+    <include layout="@layout/rsf_layout_toolbar" />
 
-    <org.researchstack.backbone.ui.views.LocalWebView
+    <org.researchstack.foundation.components.web.ui.views.LocalWebView
         android:id="@+id/webview"
         android:layout_width="match_parent"
         android:layout_height="0dp"
diff --git a/foundation/src/main/res/layout/rsf_fragment_step_compat.xml b/foundation/src/main/res/layout/rsf_fragment_step_compat.xml
new file mode 100644
index 000000000..6c6cf9bd9
--- /dev/null
+++ b/foundation/src/main/res/layout/rsf_fragment_step_compat.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    tools:context=".components.presentation.compatibility.BackwardsCompatibleStepFragment">
+
+    <FrameLayout
+        android:id="@+id/rsf_content_layout"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"  />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/foundation/src/main/res/layout/rsf_fragment_task_presentation.xml b/foundation/src/main/res/layout/rsf_fragment_task_presentation.xml
new file mode 100644
index 000000000..26e62852a
--- /dev/null
+++ b/foundation/src/main/res/layout/rsf_fragment_task_presentation.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    tools:context=".components.presentation.TaskPresentationFragment"
+    android:background="@android:color/white">
+
+    <include layout="@layout/rsf_layout_toolbar" />
+
+    <FrameLayout
+        android:id="@+id/rsf_content_step"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"  />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/foundation/src/main/res/layout/rsb_item_checkbox.xml b/foundation/src/main/res/layout/rsf_item_checkbox.xml
similarity index 87%
rename from foundation/src/main/res/layout/rsb_item_checkbox.xml
rename to foundation/src/main/res/layout/rsf_item_checkbox.xml
index eab13322f..3889a23b4 100644
--- a/foundation/src/main/res/layout/rsb_item_checkbox.xml
+++ b/foundation/src/main/res/layout/rsf_item_checkbox.xml
@@ -4,6 +4,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
-    android:minHeight="@dimen/rsb_item_size_default"
+    android:minHeight="@dimen/rsf_item_size_default"
     android:padding="8dp"
     tools:text="@string/lorem_name" />
diff --git a/foundation/src/main/res/layout/rsb_item_date_view.xml b/foundation/src/main/res/layout/rsf_item_date_view.xml
similarity index 89%
rename from foundation/src/main/res/layout/rsb_item_date_view.xml
rename to foundation/src/main/res/layout/rsf_item_date_view.xml
index c223e3748..e73fc53d4 100644
--- a/foundation/src/main/res/layout/rsb_item_date_view.xml
+++ b/foundation/src/main/res/layout/rsf_item_date_view.xml
@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
-        android:minHeight="@dimen/rsb_item_size_default"
+        android:minHeight="@dimen/rsf_item_size_default"
         android:textColor="?attr/colorAccent"
         android:textSize="16sp"
         tools:text="title" />
@@ -20,7 +20,7 @@
         style="?attr/editTextStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:minHeight="@dimen/rsb_item_size_default"
+        android:minHeight="@dimen/rsf_item_size_default"
         android:singleLine="true"
         android:textColor="?android:attr/textColorPrimary"
         android:textSize="14sp"
diff --git a/foundation/src/main/res/layout/rsb_item_edit_duration.xml b/foundation/src/main/res/layout/rsf_item_edit_duration.xml
similarity index 90%
rename from foundation/src/main/res/layout/rsb_item_edit_duration.xml
rename to foundation/src/main/res/layout/rsf_item_edit_duration.xml
index 07feec1a3..461edab98 100644
--- a/foundation/src/main/res/layout/rsb_item_edit_duration.xml
+++ b/foundation/src/main/res/layout/rsf_item_edit_duration.xml
@@ -17,7 +17,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:layout_weight="0.6"
-            android:text="@string/rsb_hours"
+            android:text="@string/rsf_hours"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <Spinner
@@ -25,7 +25,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="0.4"
-            android:minHeight="@dimen/rsb_item_size_default"
+            android:minHeight="@dimen/rsf_item_size_default"
             android:scrollIndicators="right"
             android:spinnerMode="dialog" />
     </LinearLayout>
@@ -43,7 +43,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:layout_weight="0.6"
-            android:text="@string/rsb_minutes"
+            android:text="@string/rsf_minutes"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <Spinner
@@ -51,7 +51,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="0.4"
-            android:minHeight="@dimen/rsb_item_size_default"
+            android:minHeight="@dimen/rsf_item_size_default"
             android:scrollIndicators="right"
             android:spinnerMode="dialog" />
     </LinearLayout>
diff --git a/foundation/src/main/res/layout/rsb_item_edit_text.xml b/foundation/src/main/res/layout/rsf_item_edit_text.xml
similarity index 89%
rename from foundation/src/main/res/layout/rsb_item_edit_text.xml
rename to foundation/src/main/res/layout/rsf_item_edit_text.xml
index b4dee8384..cf2777f32 100644
--- a/foundation/src/main/res/layout/rsb_item_edit_text.xml
+++ b/foundation/src/main/res/layout/rsf_item_edit_text.xml
@@ -6,7 +6,7 @@
     android:layout_height="wrap_content"
     android:imeOptions="actionNext"
     android:inputType="text"
-    android:minHeight="@dimen/rsb_item_size_default"
+    android:minHeight="@dimen/rsf_item_size_default"
     android:singleLine="true"
     android:textColor="?android:attr/textColorPrimary"
     android:textSize="14sp"
diff --git a/foundation/src/main/res/layout/rsb_item_edit_text_compact.xml b/foundation/src/main/res/layout/rsf_item_edit_text_compact.xml
similarity index 89%
rename from foundation/src/main/res/layout/rsb_item_edit_text_compact.xml
rename to foundation/src/main/res/layout/rsf_item_edit_text_compact.xml
index 557882298..96ac24d81 100644
--- a/foundation/src/main/res/layout/rsb_item_edit_text_compact.xml
+++ b/foundation/src/main/res/layout/rsf_item_edit_text_compact.xml
@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
-        android:minHeight="@dimen/rsb_item_size_default"
+        android:minHeight="@dimen/rsf_item_size_default"
         android:textColor="?attr/colorAccent"
         android:textSize="16sp"
         tools:text="title" />
@@ -22,7 +22,7 @@
         android:layout_height="wrap_content"
         android:imeOptions="actionNext"
         android:inputType="text"
-        android:minHeight="@dimen/rsb_item_size_default"
+        android:minHeight="@dimen/rsf_item_size_default"
         android:singleLine="true"
         android:textColor="?android:attr/textColorPrimary"
         android:textSize="14sp"
diff --git a/foundation/src/main/res/layout/rsb_item_radio.xml b/foundation/src/main/res/layout/rsf_item_radio.xml
similarity index 87%
rename from foundation/src/main/res/layout/rsb_item_radio.xml
rename to foundation/src/main/res/layout/rsf_item_radio.xml
index 6631b9b00..5559bd8f1 100644
--- a/foundation/src/main/res/layout/rsb_item_radio.xml
+++ b/foundation/src/main/res/layout/rsf_item_radio.xml
@@ -4,6 +4,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
-    android:minHeight="@dimen/rsb_item_size_default"
+    android:minHeight="@dimen/rsf_item_size_default"
     android:padding="8dp"
     tools:text="@string/lorem_name" />
diff --git a/foundation/src/main/res/layout/rsb_item_text_view_title_compact.xml b/foundation/src/main/res/layout/rsf_item_text_view_title_compact.xml
similarity index 100%
rename from foundation/src/main/res/layout/rsb_item_text_view_title_compact.xml
rename to foundation/src/main/res/layout/rsf_item_text_view_title_compact.xml
diff --git a/foundation/src/main/res/layout/rsb_layout_fixed_submit_bar.xml b/foundation/src/main/res/layout/rsf_layout_fixed_submit_bar.xml
similarity index 63%
rename from foundation/src/main/res/layout/rsb_layout_fixed_submit_bar.xml
rename to foundation/src/main/res/layout/rsf_layout_fixed_submit_bar.xml
index 22a398722..588c36538 100644
--- a/foundation/src/main/res/layout/rsb_layout_fixed_submit_bar.xml
+++ b/foundation/src/main/res/layout/rsf_layout_fixed_submit_bar.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <org.researchstack.backbone.ui.views.ObservableScrollView
-        android:id="@+id/rsb_content_container_scrollview"
+    <org.researchstack.foundation.components.common.ui.views.ObservableScrollView
+        android:id="@+id/rsf_content_container_scrollview"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
         <LinearLayout
-            android:id="@+id/rsb_content_container"
+            android:id="@+id/rsf_content_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
             <View
-                android:id="@+id/rsb_submit_bar_guide"
+                android:id="@+id/rsf_submit_bar_guide"
                 android:layout_width="match_parent"
                 android:layout_height="48dp"
                 android:layout_marginTop="16dp"
@@ -21,10 +21,10 @@
 
         </LinearLayout>
 
-    </org.researchstack.backbone.ui.views.ObservableScrollView>
+    </org.researchstack.foundation.components.common.ui.views.ObservableScrollView>
 
-    <org.researchstack.backbone.ui.views.SubmitBar
-        android:id="@+id/rsb_submit_bar"
+    <org.researchstack.foundation.components.common.ui.views.SubmitBar
+        android:id="@+id/rsf_submit_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom" />
diff --git a/foundation/src/main/res/layout/rsb_layout_toolbar.xml b/foundation/src/main/res/layout/rsf_layout_toolbar.xml
similarity index 100%
rename from foundation/src/main/res/layout/rsb_layout_toolbar.xml
rename to foundation/src/main/res/layout/rsf_layout_toolbar.xml
diff --git a/foundation/src/main/res/layout/rsb_progress.xml b/foundation/src/main/res/layout/rsf_progress.xml
similarity index 89%
rename from foundation/src/main/res/layout/rsb_progress.xml
rename to foundation/src/main/res/layout/rsf_progress.xml
index 1ea3e0755..571a28164 100644
--- a/foundation/src/main/res/layout/rsb_progress.xml
+++ b/foundation/src/main/res/layout/rsf_progress.xml
@@ -2,7 +2,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/rsb_white_60"
+    android:background="@color/rsf_white_60"
     android:clickable="true">
 
     <ProgressBar
diff --git a/foundation/src/main/res/layout/rsb_step_layout.xml b/foundation/src/main/res/layout/rsf_step_layout.xml
similarity index 77%
rename from foundation/src/main/res/layout/rsb_step_layout.xml
rename to foundation/src/main/res/layout/rsf_step_layout.xml
index 0cc7a0c9c..9426c8728 100644
--- a/foundation/src/main/res/layout/rsb_step_layout.xml
+++ b/foundation/src/main/res/layout/rsf_step_layout.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/rsb_survey_content_container"
+    android:id="@+id/rsf_survey_content_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:descendantFocusability="beforeDescendants"
@@ -9,8 +9,8 @@
     android:orientation="vertical">
 
     <TextView
-        android:id="@+id/rsb_survey_title"
-        style="@style/Backbone.Survey.Title"
+        android:id="@+id/rsf_survey_title"
+        style="@style/Foundation.Survey.Title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:visibility="gone"
@@ -18,8 +18,8 @@
         tools:visibility="visible" />
 
     <TextView
-        android:id="@+id/rsb_survey_text"
-        style="@style/Backbone.Survey.Summary"
+        android:id="@+id/rsf_survey_text"
+        style="@style/Foundation.Survey.Summary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textColorLink="?attr/colorAccent"
@@ -28,7 +28,7 @@
         tools:visibility="visible" />
 
     <Space
-        android:id="@+id/rsb_survey_step_body"
+        android:id="@+id/rsf_survey_step_body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
diff --git a/foundation/src/main/res/layout/rsb_step_layout_form_body.xml b/foundation/src/main/res/layout/rsf_step_layout_form_body.xml
similarity index 82%
rename from foundation/src/main/res/layout/rsb_step_layout_form_body.xml
rename to foundation/src/main/res/layout/rsf_step_layout_form_body.xml
index 993d22a51..cb6a1cac0 100644
--- a/foundation/src/main/res/layout/rsb_step_layout_form_body.xml
+++ b/foundation/src/main/res/layout/rsf_step_layout_form_body.xml
@@ -2,6 +2,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:divider="@drawable/rsb_divider_empty_16dp"
+    android:divider="@drawable/rsf_divider_empty_16dp"
     android:orientation="vertical"
     android:showDividers="middle" />
\ No newline at end of file
diff --git a/foundation/src/main/res/layout/rsb_step_layout_instruction.xml b/foundation/src/main/res/layout/rsf_step_layout_instruction.xml
similarity index 81%
rename from foundation/src/main/res/layout/rsb_step_layout_instruction.xml
rename to foundation/src/main/res/layout/rsf_step_layout_instruction.xml
index 0bd6e2e90..c49a000bf 100644
--- a/foundation/src/main/res/layout/rsb_step_layout_instruction.xml
+++ b/foundation/src/main/res/layout/rsf_step_layout_instruction.xml
@@ -6,8 +6,8 @@
     android:orientation="vertical">
 
     <TextView
-        android:id="@+id/rsb_intruction_title"
-        style="@style/Backbone.Survey.Title"
+        android:id="@+id/rsf_intruction_title"
+        style="@style/Foundation.Survey.Title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:visibility="gone"
@@ -15,8 +15,8 @@
         tools:visibility="visible" />
 
     <TextView
-        android:id="@+id/rsb_intruction_text"
-        style="@style/Backbone.Survey.Summary"
+        android:id="@+id/rsf_intruction_text"
+        style="@style/Foundation.Survey.Summary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textColorLink="?attr/colorAccent"
diff --git a/foundation/src/main/res/layout/rsb_view_icon_tab.xml b/foundation/src/main/res/layout/rsf_view_icon_tab.xml
similarity index 96%
rename from foundation/src/main/res/layout/rsb_view_icon_tab.xml
rename to foundation/src/main/res/layout/rsf_view_icon_tab.xml
index 615912e7f..aa80ad839 100644
--- a/foundation/src/main/res/layout/rsb_view_icon_tab.xml
+++ b/foundation/src/main/res/layout/rsf_view_icon_tab.xml
@@ -37,6 +37,6 @@
         android:layout_alignRight="@+id/title"
         android:layout_alignTop="@+id/title"
         android:adjustViewBounds="true"
-        android:src="@drawable/rsb_ic_circle_8dp" />
+        android:src="@drawable/rsf_ic_circle_8dp" />
 
 </merge>
\ No newline at end of file
diff --git a/foundation/src/main/res/layout/rsb_view_submitbar.xml b/foundation/src/main/res/layout/rsf_view_submitbar.xml
similarity index 100%
rename from foundation/src/main/res/layout/rsb_view_submitbar.xml
rename to foundation/src/main/res/layout/rsf_view_submitbar.xml
diff --git a/foundation/src/main/res/values-v17/themes.xml b/foundation/src/main/res/values-v17/themes.xml
new file mode 100644
index 000000000..72ecf2b3c
--- /dev/null
+++ b/foundation/src/main/res/values-v17/themes.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="ResourceName">
+
+    <style name="Theme.Foundation" parent="Base.Theme.Foundation">
+        <item name="android:listPreferredItemPaddingStart">50dp</item>
+        <item name="android:listPreferredItemPaddingEnd">16dp</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/foundation/src/main/res/values/attrs.xml b/foundation/src/main/res/values/attrs.xml
new file mode 100644
index 000000000..0597c0016
--- /dev/null
+++ b/foundation/src/main/res/values/attrs.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="ResourceName">
+
+    <declare-styleable name="Foundation">
+        <attr name="passcodeTheme" format="reference" />
+        <attr name="toolbarTheme" format="reference" />
+        <attr name="submitbarStyle" format="reference" />
+        <attr name="emptyviewStyle" format="reference" />
+        <attr name="signatureviewStyle" format="reference" />
+        <attr name="progressChartCardStyle" format="reference" />
+        <attr name="pieChartCardStyle" format="reference" />
+        <attr name="lineChartCardStyle" format="reference" />
+        <attr name="barChartCardStyle" format="reference" />
+        <attr name="icontablayoutStyle" format="reference" />
+    </declare-styleable>
+
+    <declare-styleable name="SubmitBar">
+        <attr name="android:background" />
+        <attr name="positiveActionTitle" format="string" />
+        <attr name="negativeActionTitle" format="string" />
+        <attr name="positiveActionColor" format="color" />
+        <attr name="negativeActionColor" format="color" />
+    </declare-styleable>
+
+    <declare-styleable name="IconTabLayout">
+        <attr name="android:background" />
+        <attr name="android:minHeight" />
+        <attr name="tabIconColor" format="color" />
+        <attr name="tabIconIndicatorColor" format="color" />
+        <attr name="tabTextColor" />
+    </declare-styleable>
+
+</resources>
\ No newline at end of file
diff --git a/foundation/src/main/res/values/colors.xml b/foundation/src/main/res/values/colors.xml
new file mode 100644
index 000000000..38faea889
--- /dev/null
+++ b/foundation/src/main/res/values/colors.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="rsf_colorPrimary">#3F51B5</color>
+    <color name="rsf_colorPrimaryDark">#303F9F</color>
+    <color name="rsf_colorAccent">#FF4081</color>
+    <color name="rsf_colorAccentDark">#cc3367</color>
+    <color name="rsf_black">#000</color>
+    <color name="rsf_black_20">#33000000</color>
+    <color name="rsf_black_40">#66000000</color>
+    <color name="rsf_white_60">#CCFFFFFF</color>
+    <color name="rsf_warm_gray">#FF757575</color>
+    <color name="rsf_warm_gray_20">#33757575</color>
+    <color name="rsf_submit_bar_gray">#EEEEEE</color>
+    <color name="rsf_submit_bar_negative">#979797</color>
+    <color name="rsf_list_divider">#e5e5e5</color>
+    <color name="rsf_error">#ffff5722</color>
+
+    <color name="rsf_tab_indicator">#2196f3</color>
+    <color name="rsf_tab_text_selected">#662196f3</color>
+</resources>
diff --git a/foundation/src/main/res/values/dimens.xml b/foundation/src/main/res/values/dimens.xml
new file mode 100644
index 000000000..aba39ca3c
--- /dev/null
+++ b/foundation/src/main/res/values/dimens.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Padding -->
+    <dimen name="rsf_padding_small">8dp</dimen>
+    <dimen name="rsf_padding_wedge">12dp</dimen>
+    <dimen name="rsf_padding_medium">16dp</dimen>
+    <dimen name="rsf_padding_large">24dp</dimen>
+
+    <!-- Item Height -->
+    <dimen name="rsf_item_size_small">48dp</dimen>
+    <dimen name="rsf_item_size_medium">56dp</dimen>
+    <dimen name="rsf_item_size_default">@dimen/rsf_item_size_small</dimen>
+    <dimen name="rsf_item_size_divider">1dp</dimen>
+
+    <!-- Item Margin -->
+    <dimen name="rsf_margin_left">48dp</dimen>
+    <dimen name="rsf_margin_right">16dp</dimen>
+
+    <!-- Text Size -->
+    <dimen name="rsf_text_size_title">20sp</dimen>
+
+</resources>
\ No newline at end of file
diff --git a/foundation/src/main/res/values/ids.xml b/foundation/src/main/res/values/ids.xml
new file mode 100644
index 000000000..866814485
--- /dev/null
+++ b/foundation/src/main/res/values/ids.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- These ID's are used when adding and removing child steps in ViewTaskActivity -->
+    <item name="rsf_current_step" type="id" />
+
+    <item name="rsf_step_layout_id" type="id" />
+
+</resources>
\ No newline at end of file
diff --git a/foundation/src/main/res/values/integers.xml b/foundation/src/main/res/values/integers.xml
new file mode 100644
index 000000000..865ea8487
--- /dev/null
+++ b/foundation/src/main/res/values/integers.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="rsf_config_mediumAnimTime">300</integer>
+</resources>
\ No newline at end of file
diff --git a/foundation/src/main/res/values/strings.xml b/foundation/src/main/res/values/strings.xml
index 1d8501575..b122b9465 100644
--- a/foundation/src/main/res/values/strings.xml
+++ b/foundation/src/main/res/values/strings.xml
@@ -1,3 +1,76 @@
-<resources>
-    <string name="app_name">Foundation</string>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Debug -->
+    <string name="lorem_name" tools:ignore="ResourceName">Lorem Ipsum</string>
+    <string name="lorem_short" tools:ignore="ResourceName">Lorem ipsum dolor sit amet, consectetur
+        adipiscing elit.
+    </string>
+    <string name="lorem_medium" tools:ignore="ResourceName">Lorem ipsum dolor sit amet, consectetur
+        adipiscing elit sed do
+        eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim.
+    </string>
+    <string name="lorem_long" tools:ignore="ResourceName">Lorem ipsum dolor sit amet, consectetur
+        adipiscing elit, sed do
+        eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis
+        nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute
+        irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
+        Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit
+        anim id est laborum.
+    </string>
+
+    <!-- Other -->
+    <string name="rsf_submit">Submit</string>
+    <string name="rsf_exit">Exit</string>
+    <string name="rsf_get_started">Get Started</string>
+    <string name="rsf_done">Done</string>
+    <string name="rsf_step_skip">Skip</string>
+    <string name="rsf_next">next</string>
+    <string name="rsf_what_to_expect">What to Expect</string>
+    <string name="rsf_name">Name</string>
+    <string name="rsf_email">Email</string>
+    <string name="rsf_disagree">Disagree</string>
+    <string name="rsf_agree">Agree</string>
+    <string name="rsf_ok">OK</string>
+    <string name="rsf_cancel">Cancel</string>
+    <string name="rsf_yes">Yes</string>
+    <string name="rsf_no">No</string>
+    <string name="rsf_format_step_title">Step %1$s of %2$s</string>
+    <string name="rsf_hours">Hours</string>
+    <string name="rsf_minutes">Minutes</string>
+
+    <!-- Step Errors -->
+    <string name="rsf_error_data_failed">Failed to load encrypted data, try again!</string>
+    <string name="rsf_error_invalid_signature">Signature Invalid</string>
+    <string name="rsf_invalid_answer_default">Invalid answer, try again!</string>
+    <string name="rsf_invalid_answer_date_over">Invalid answer, date must be before %1$s</string>
+    <string name="rsf_invalid_answer_date_under">Invalid answer, date must be after %1$s</string>
+    <string name="rsf_invalid_answer_integer_over">Invalid answer, your value must be %1$s or lower</string>
+    <string name="rsf_invalid_answer_integer_under">Invalid answer, your value must be %1$s or higher</string>
+    <string name="rsf_invalid_answer_choice">Please select a value!</string>
+    <string name="rsf_invalid_answer_date_none">Please choose a date.</string>
+    <string name="rsf_birth_date_too_old">You must be %1$s years or younger</string>
+    <string name="rsf_birth_date_too_young">You must be at least %1$s years old</string>
+
+    <!-- Body Hints -->
+    <string name="rsf_hint_step_body_int">Enter a number %1$d-%2$d</string>
+    <string name="rsf_hint_step_body_dec">Enter a number %1$.2f-%2$.2f</string>
+    <string name="rsf_hint_step_body_int_no_max">Enter a number</string>
+    <string name="rsf_hint_step_body_date">Enter a date</string>
+    <string name="rsf_hint_step_body_time">Enter a time</string>
+    <string name="rsf_hint_step_body_datetime">Enter a date and a time</string>
+    <string name="rsf_hint_step_body_text">Answer</string>
+
+    <!-- Graphing -->
+    <string name="rsf_chart_progress_center">%1$s of %2$s</string>
+    <string name="rsf_chart_pie_value">%1$s&#65285;</string>
+
+    <!-- AssetVideoView -->
+    <!-- Title for error alert when a video cannot be played.  it can be used by any app. -->
+    <string name="rsf_error_assetvideoview_title">Video problem</string>
+    <!-- Text for error alert when a video container is not valid for progressive download/playback. -->
+    <string name="rsf_error_assetvideoview_invalid_progressive_playback">This video isn\'t valid for streaming to this device.</string>
+    <!-- Text for error alert when a video cannot be played. it can be used by any app. -->
+    <string name="rsf_error_assetvideoview_unknown">Can\'t play this video.</string>
+    <!-- Button to close error alert when a video cannot be played -->
+    <string name="rsf_error_assetvideoview_button">OK</string>
+
 </resources>
diff --git a/foundation/src/main/res/values/styles.xml b/foundation/src/main/res/values/styles.xml
new file mode 100644
index 000000000..4b85840c4
--- /dev/null
+++ b/foundation/src/main/res/values/styles.xml
@@ -0,0 +1,49 @@
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="ResourceName">
+
+    <style name="Foundation.Survey.Title" parent="">
+        <item name="android:layout_marginTop">16dp</item>
+        <item name="android:minHeight">@dimen/rsf_item_size_default</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:paddingLeft">@dimen/rsf_margin_left</item>
+        <item name="android:paddingRight">@dimen/rsf_margin_right</item>
+        <item name="android:paddingTop">@dimen/rsf_padding_medium</item>
+        <item name="android:paddingBottom">@dimen/rsf_padding_medium</item>
+        <item name="android:textColor">?attr/colorAccent</item>
+        <item name="android:textSize">@dimen/rsf_text_size_title</item>
+    </style>
+
+    <style name="Foundation.Survey.Summary" parent="">
+        <item name="android:layout_marginTop">@dimen/rsf_padding_wedge</item>
+        <item name="android:layout_marginBottom">@dimen/rsf_padding_small</item>
+        <item name="android:paddingLeft">@dimen/rsf_margin_left</item>
+        <item name="android:paddingRight">@dimen/rsf_margin_right</item>
+        <item name="android:paddingTop">@dimen/rsf_padding_wedge</item>
+        <item name="android:paddingBottom">@dimen/rsf_padding_small</item>
+    </style>
+
+    <style name="Foundation.Survey.Summary.Link">
+        <item name="android:layout_marginTop">@dimen/rsf_padding_wedge</item>
+        <item name="android:paddingLeft">@dimen/rsf_margin_left</item>
+        <item name="android:paddingRight">@dimen/rsf_margin_right</item>
+        <item name="android:paddingTop">@dimen/rsf_padding_wedge</item>
+        <item name="android:paddingBottom">@dimen/rsf_padding_small</item>
+    </style>
+
+    <style name="Widget.Foundation.SubmitBar" parent="">
+        <item name="android:background">@color/rsf_submit_bar_gray</item>
+        <item name="positiveActionTitle">@string/rsf_next</item>
+        <item name="negativeActionTitle">@string/rsf_step_skip</item>
+        <item name="positiveActionColor">?attr/colorAccent</item>
+        <item name="negativeActionColor">@color/rsf_submit_bar_negative</item>
+    </style>
+
+    <style name="Widget.Foundation.IconTabLayout" parent="@style/Widget.Design.TabLayout">
+        <item name="android:background">?attr/colorPrimary</item>
+        <item name="android:minHeight">56dp</item>
+        <item name="tabIconColor">@android:color/white</item>
+        <item name="tabIconIndicatorColor">?attr/colorAccent</item>
+        <item name="tabTextColor">@color/rsf_white_60</item>
+        <item name="tabIndicatorColor">@android:color/white</item>
+    </style>
+
+</resources>
diff --git a/foundation/src/main/res/values/themes.xml b/foundation/src/main/res/values/themes.xml
new file mode 100644
index 000000000..69724d63c
--- /dev/null
+++ b/foundation/src/main/res/values/themes.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="ResourceName">
+
+    <style name="Base.Theme.Foundation" parent="Theme.AppCompat.Light.NoActionBar">
+
+        <!-- List item padding -->
+        <item name="android:listPreferredItemPaddingLeft">50dp</item>
+
+        <!-- Custom Styles for Views -->
+        <item name="toolbarTheme">@style/Theme.Foundation.Toolbar</item>
+        <item name="passcodeTheme">@style/Theme.AppCompat.Light.NoActionBar</item>
+        <item name="submitbarStyle">@style/Widget.Foundation.SubmitBar</item>
+    </style>
+
+    <style name="Theme.Foundation" parent="Base.Theme.Foundation" />
+
+    <style name="Theme.Foundation.Toolbar">
+        <item name="colorControlNormal">@android:color/white</item>
+    </style>
+
+
+</resources>
\ No newline at end of file

From a0df0915191c859b5d48ce949f0f75a8ceda8e4a Mon Sep 17 00:00:00 2001
From: James Kizer <james.kizer@gmail.com>
Date: Wed, 2 Jan 2019 18:57:11 -0500
Subject: [PATCH 27/53] Updated package names and imports, added new
 presentation and backwards compatibility

Added new TextViewLinkManager singleton to remove circular dependencies between layouts and activities / fragments
Minor additional updates to remove dependencies on Rx
---
 .../components/common/task/OrderedTask.java   |  15 +-
 .../common/ui/callbacks/StepCallbacks.java    |   9 +-
 .../ui/layout/FixedSubmitBarLayout.java       |  17 +-
 .../common/ui/layout/StepLayout.java          |   8 +-
 .../components/common/ui/views/IconTab.java   |   7 +-
 .../common/ui/views/IconTabLayout.java        |   6 +-
 .../common/ui/views/ObservableScrollView.java |   2 +-
 .../components/common/ui/views/SubmitBar.java |  27 +-
 .../common/ui/views/TextViewLinkHandler.java  |   2 +-
 .../components/presentation/ITaskProvider.kt  |   7 +
 .../presentation/TaskPresentationCallback.kt  |   8 +
 .../presentation/TaskPresentationFragment.kt  | 241 ++++++++++++++++++
 .../BackwardsCompatibleStepFragment.kt        |  69 +++++
 ...BackwardsCompatibleStepFragmentProvider.kt |  34 +++
 .../BackwardsCompatibleStepLayoutProvider.kt  |  10 +
 ...wardsCompatibleTaskPresentationFragment.kt |  74 ++++++
 .../compatibility/IStepLayoutProvider.kt      |   7 +
 .../presentation/interfaces/IStepFragment.kt  |  14 +
 .../interfaces/IStepFragmentProvider.kt       |   8 +
 .../presentation/interfaces/ITaskNavigator.kt |  17 ++
 .../singletons/ResourcePathManager.java       |   4 +-
 .../singletons/TextViewLinkManager.kt         |  48 ++++
 .../survey/answerformat/AnswerFormat.java     |  28 +-
 .../answerformat/BirthDateAnswerFormat.java   |  10 +-
 .../answerformat/BooleanAnswerFormat.java     |   4 +-
 .../answerformat/ChoiceAnswerFormat.java      |   7 +-
 .../survey/answerformat/DateAnswerFormat.java |  12 +-
 .../answerformat/DecimalAnswerFormat.java     |  13 +-
 .../answerformat/DurationAnswerFormat.java    |   2 +-
 .../answerformat/EmailAnswerFormat.java       |   5 +-
 .../survey/answerformat/FormAnswerFormat.java |   2 +-
 .../answerformat/IntegerAnswerFormat.java     |  14 +-
 .../survey/answerformat/TextAnswerFormat.java |   2 +-
 .../answerformat/UnknownAnswerFormat.java     |   2 +-
 .../components/survey/model/Choice.java       |   4 +-
 .../components/survey/step/FormStep.java      |   6 +-
 .../survey/step/InstructionStep.java          |   5 +-
 .../components/survey/step/QuestionStep.java  |  19 +-
 .../components/survey/ui/body/BodyAnswer.java |   6 +-
 .../survey/ui/body/DateQuestionBody.java      |  33 +--
 .../survey/ui/body/DecimalQuestionBody.java   |  28 +-
 .../survey/ui/body/DurationQuestionBody.java  |  18 +-
 .../components/survey/ui/body/FormBody.java   |  17 +-
 .../survey/ui/body/IntegerQuestionBody.java   |  28 +-
 .../ui/body/MultiChoiceQuestionBody.java      |  27 +-
 .../ui/body/NotImplementedStepBody.java       |   7 +-
 .../ui/body/SingleChoiceQuestionBody.java     |  27 +-
 .../components/survey/ui/body/StepBody.java   |   4 +-
 .../survey/ui/body/TextQuestionBody.java      |  44 ++--
 .../ui/layout/InstructionStepLayout.java      |  46 ++--
 .../survey/ui/layout/SurveyStepLayout.java    |  58 ++---
 .../components/utils/FormatHelper.java        |   4 +-
 .../foundation/components/utils/LogExt.java   |   2 +-
 .../foundation/components/utils/ResUtils.java |   5 +-
 .../components/utils/TextUtils.java           |   2 +-
 .../components/utils/ThemeUtils.java          |   6 +-
 .../components/utils/UiThreadContext.java     |   2 +-
 .../components/utils/ViewUtils.java           |   2 +-
 .../web/ui/activities/ViewVideoActivity.java  |   8 +-
 .../activities/ViewWebDocumentActivity.java   |  10 +-
 .../web/ui/views/AssetVideoView.java          |  10 +-
 .../components/web/ui/views/LocalWebView.java |  10 +-
 .../foundation/core/models/result/Result.java |  14 +-
 .../core/models/result/StepResult.java        |  46 ++--
 .../core/models/result/TaskResult.java        |   7 +-
 .../foundation/core/models/step/Step.java     |  43 +++-
 .../foundation/core/models/task/Task.java     |  61 +++--
 67 files changed, 969 insertions(+), 375 deletions(-)
 create mode 100644 foundation/src/main/java/org/researchstack/foundation/components/presentation/ITaskProvider.kt
 create mode 100644 foundation/src/main/java/org/researchstack/foundation/components/presentation/TaskPresentationCallback.kt
 create mode 100644 foundation/src/main/java/org/researchstack/foundation/components/presentation/TaskPresentationFragment.kt
 create mode 100644 foundation/src/main/java/org/researchstack/foundation/components/presentation/compatibility/BackwardsCompatibleStepFragment.kt
 create mode 100644 foundation/src/main/java/org/researchstack/foundation/components/presentation/compatibility/BackwardsCompatibleStepFragmentProvider.kt
 create mode 100644 foundation/src/main/java/org/researchstack/foundation/components/presentation/compatibility/BackwardsCompatibleStepLayoutProvider.kt
 create mode 100644 foundation/src/main/java/org/researchstack/foundation/components/presentation/compatibility/BackwardsCompatibleTaskPresentationFragment.kt
 create mode 100644 foundation/src/main/java/org/researchstack/foundation/components/presentation/compatibility/IStepLayoutProvider.kt
 create mode 100644 foundation/src/main/java/org/researchstack/foundation/components/presentation/interfaces/IStepFragment.kt
 create mode 100644 foundation/src/main/java/org/researchstack/foundation/components/presentation/interfaces/IStepFragmentProvider.kt
 create mode 100644 foundation/src/main/java/org/researchstack/foundation/components/presentation/interfaces/ITaskNavigator.kt
 create mode 100644 foundation/src/main/java/org/researchstack/foundation/components/singletons/TextViewLinkManager.kt

diff --git a/foundation/src/main/java/org/researchstack/foundation/components/common/task/OrderedTask.java b/foundation/src/main/java/org/researchstack/foundation/components/common/task/OrderedTask.java
index b2850676a..d3e094206 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/common/task/OrderedTask.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/common/task/OrderedTask.java
@@ -1,11 +1,12 @@
-package org.researchstack.backbone.task;
+package org.researchstack.foundation.components.common.task;
 
 import android.content.Context;
 
-import org.researchstack.backbone.R;
-import org.researchstack.backbone.result.TaskResult;
-import org.researchstack.backbone.step.Step;
-import org.researchstack.backbone.utils.TextUtils;
+import org.researchstack.foundation.R;
+import org.researchstack.foundation.components.utils.TextUtils;
+import org.researchstack.foundation.core.models.result.TaskResult;
+import org.researchstack.foundation.core.models.step.Step;
+import org.researchstack.foundation.core.models.task.Task;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -122,7 +123,7 @@ public String getTitleForStep(Context context, Step step) {
         String title = super.getTitleForStep(context, step);
         if (TextUtils.isEmpty(title)) {
             int currentIndex = steps.indexOf(step);
-            title = context.getString(R.string.rsb_format_step_title,
+            title = context.getString(R.string.rsf_format_step_title,
                     currentIndex + 1,
                     steps.size());
         }
@@ -132,7 +133,7 @@ public String getTitleForStep(Context context, Step step) {
     /**
      * Validates that there are no duplicate identifiers in the list of steps
      *
-     * @throws org.researchstack.backbone.task.Task.InvalidTaskException
+     * @throws org.researchstack.foundation.task.Task.InvalidTaskException
      */
     @Override
     public void validateParameters() {
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/common/ui/callbacks/StepCallbacks.java b/foundation/src/main/java/org/researchstack/foundation/components/common/ui/callbacks/StepCallbacks.java
index b18d79768..b62c76447 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/common/ui/callbacks/StepCallbacks.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/common/ui/callbacks/StepCallbacks.java
@@ -1,7 +1,8 @@
-package org.researchstack.backbone.ui.callbacks;
+package org.researchstack.foundation.components.common.ui.callbacks;
 
-import org.researchstack.backbone.result.StepResult;
-import org.researchstack.backbone.step.Step;
+import org.jetbrains.annotations.Nullable;
+import org.researchstack.foundation.core.interfaces.IResult;
+import org.researchstack.foundation.core.interfaces.IStep;
 
 public interface StepCallbacks {
     int ACTION_PREV = -1;
@@ -9,7 +10,7 @@ public interface StepCallbacks {
     int ACTION_NEXT = 1;
     int ACTION_END = 2;
 
-    void onSaveStep(int action, Step step, StepResult result);
+    void onSaveStep(int action, IStep step, @Nullable IResult result);
 
     @Deprecated
     void onCancelStep();
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/common/ui/layout/FixedSubmitBarLayout.java b/foundation/src/main/java/org/researchstack/foundation/components/common/ui/layout/FixedSubmitBarLayout.java
index bc5125378..6b82006c4 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/common/ui/layout/FixedSubmitBarLayout.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/common/ui/layout/FixedSubmitBarLayout.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.ui.views;
+package org.researchstack.foundation.components.common.ui.layout;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -11,8 +11,9 @@
 import android.widget.FrameLayout;
 import android.widget.ScrollView;
 
-import org.researchstack.backbone.R;
-import org.researchstack.backbone.ui.step.layout.StepLayout;
+import org.researchstack.foundation.R;
+import org.researchstack.foundation.components.common.ui.views.SubmitBar;
+import org.researchstack.foundation.components.common.ui.views.ObservableScrollView;
 
 public abstract class FixedSubmitBarLayout extends FrameLayout implements StepLayout {
     public FixedSubmitBarLayout(Context context) {
@@ -41,17 +42,17 @@ public FixedSubmitBarLayout(Context context, AttributeSet attrs, int defStyleAtt
     private void init() {
         // Init root
         LayoutInflater inflater = LayoutInflater.from(getContext());
-        inflater.inflate(R.layout.rsb_layout_fixed_submit_bar, this, true);
+        inflater.inflate(R.layout.rsf_layout_fixed_submit_bar, this, true);
 
         // Add contentContainer to the layout
-        ViewGroup contentContainer = (ViewGroup) findViewById(R.id.rsb_content_container);
+        ViewGroup contentContainer = (ViewGroup) findViewById(R.id.rsf_content_container);
         View content = inflater.inflate(getContentResourceId(), contentContainer, false);
         contentContainer.addView(content, 0);
 
         // Init scrollview and submit bar guide positioning
-        final View submitBarGuide = findViewById(R.id.rsb_submit_bar_guide);
-        final SubmitBar submitBar = (SubmitBar) findViewById(R.id.rsb_submit_bar);
-        ObservableScrollView scrollView = (ObservableScrollView) findViewById(R.id.rsb_content_container_scrollview);
+        final View submitBarGuide = findViewById(R.id.rsf_submit_bar_guide);
+        final SubmitBar submitBar = (SubmitBar) findViewById(R.id.rsf_submit_bar);
+        final ObservableScrollView scrollView = (ObservableScrollView) findViewById(R.id.rsf_content_container_scrollview);
         scrollView.setScrollListener(scrollY -> onScrollChanged(scrollView, submitBarGuide, submitBar));
         scrollView.getViewTreeObserver()
                 .addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/common/ui/layout/StepLayout.java b/foundation/src/main/java/org/researchstack/foundation/components/common/ui/layout/StepLayout.java
index 49f87245a..66936bd94 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/common/ui/layout/StepLayout.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/common/ui/layout/StepLayout.java
@@ -1,10 +1,10 @@
-package org.researchstack.backbone.ui.step.layout;
+package org.researchstack.foundation.components.common.ui.layout;
 
 import android.view.View;
 
-import org.researchstack.backbone.result.StepResult;
-import org.researchstack.backbone.step.Step;
-import org.researchstack.backbone.ui.callbacks.StepCallbacks;
+import org.researchstack.foundation.components.common.ui.callbacks.StepCallbacks;
+import org.researchstack.foundation.core.models.result.StepResult;
+import org.researchstack.foundation.core.models.step.Step;
 
 public interface StepLayout {
     void initialize(Step step, StepResult result);
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/IconTab.java b/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/IconTab.java
index 772edb7d0..c892d0ea4 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/IconTab.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/IconTab.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.ui.views;
+package org.researchstack.foundation.components.common.ui.views;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -17,8 +17,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import org.researchstack.backbone.R;
-
+import org.researchstack.foundation.R;
 
 public class IconTab extends RelativeLayout implements View.OnLongClickListener {
     private TextView title;
@@ -47,7 +46,7 @@ public IconTab(Context context, AttributeSet attrs, int defStyleAttr, int defSty
     }
 
     private void init() {
-        LayoutInflater.from(getContext()).inflate(R.layout.rsb_view_icon_tab, this, true);
+        LayoutInflater.from(getContext()).inflate(R.layout.rsf_view_icon_tab, this, true);
 
         title = (TextView) findViewById(R.id.title);
         icon = (ImageView) findViewById(R.id.icon);
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/IconTabLayout.java b/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/IconTabLayout.java
index 65f598a09..c056da635 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/IconTabLayout.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/IconTabLayout.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.ui.views;
+package org.researchstack.foundation.components.common.ui.views;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -8,7 +8,7 @@
 import android.support.design.widget.TabLayout;
 import android.util.AttributeSet;
 
-import org.researchstack.backbone.R;
+import org.researchstack.foundation.R;
 
 public class IconTabLayout extends TabLayout {
     private int tabIconColor = Color.WHITE;
@@ -29,7 +29,7 @@ public IconTabLayout(Context context, @Nullable AttributeSet attrs, int defStyle
         final TypedArray a = context.obtainStyledAttributes(attrs,
                 R.styleable.IconTabLayout,
                 defStyleAttr,
-                R.style.Widget_Backbone_IconTabLayout);
+                R.style.Widget_Foundation_IconTabLayout);
 
         Drawable background = a.getDrawable(R.styleable.IconTabLayout_android_background);
         setBackground(background);
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/ObservableScrollView.java b/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/ObservableScrollView.java
index 02065466a..04b689814 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/ObservableScrollView.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/ObservableScrollView.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.ui.views;
+package org.researchstack.foundation.components.common.ui.views;
 
 import android.annotation.TargetApi;
 import android.content.Context;
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/SubmitBar.java b/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/SubmitBar.java
index a927b53f9..322c7b319 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/SubmitBar.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/SubmitBar.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.ui.views;
+package org.researchstack.foundation.components.common.ui.views;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -10,12 +10,15 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.jakewharton.rxbinding.view.RxView;
+//TODO: remove RX dependency
+//import com.jakewharton.rxbinding.view.RxView;
 
-import org.researchstack.backbone.R;
-import org.researchstack.backbone.utils.ThemeUtils;
+import org.researchstack.foundation.R;
+import org.researchstack.foundation.components.utils.ThemeUtils;
 
-import rx.functions.Action1;
+import java.util.function.Consumer;
+
+//import rx.functions.Action1;
 
 public class SubmitBar extends LinearLayout {
     private TextView positiveView;
@@ -32,12 +35,12 @@ public SubmitBar(Context context, @Nullable AttributeSet attrs) {
     public SubmitBar(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
 
-        LayoutInflater.from(getContext()).inflate(R.layout.rsb_view_submitbar, this, true);
+        LayoutInflater.from(getContext()).inflate(R.layout.rsf_view_submitbar, this, true);
 
         TypedArray a = context.obtainStyledAttributes(attrs,
                 R.styleable.SubmitBar,
                 defStyleAttr,
-                R.style.Widget_Backbone_SubmitBar);
+                R.style.Widget_Foundation_SubmitBar);
 
         setBackground(a.getDrawable(R.styleable.SubmitBar_android_background));
 
@@ -49,7 +52,7 @@ public SubmitBar(Context context, @Nullable AttributeSet attrs, int defStyleAttr
         negativeView = (TextView) findViewById(R.id.bar_submit_negative);
         negativeView.setText(a.getString(R.styleable.SubmitBar_negativeActionTitle));
         negativeView.setTextColor(a.getColor(R.styleable.SubmitBar_negativeActionColor,
-                ContextCompat.getColor(context, R.color.rsb_submit_bar_negative)));
+                ContextCompat.getColor(context, R.color.rsf_submit_bar_negative)));
 
         a.recycle();
     }
@@ -66,8 +69,8 @@ public void setPositiveTitle(String title) {
         positiveView.setText(title);
     }
 
-    public void setPositiveAction(Action1 submit) {
-        RxView.clicks(this.positiveView).subscribe(submit);
+    public void setPositiveAction(OnClickListener listener) {
+        this.positiveView.setOnClickListener(listener);
     }
 
     public View getPositiveActionView() {
@@ -87,8 +90,8 @@ public void setNegativeTitle(String title) {
         negativeView.setText(title);
     }
 
-    public void setNegativeAction(Action1 submit) {
-        RxView.clicks(this.negativeView).subscribe(submit);
+    public void setNegativeAction(OnClickListener listener) {
+        this.negativeView.setOnClickListener(listener);
     }
 
     public View getNegativeActionView() {
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/TextViewLinkHandler.java b/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/TextViewLinkHandler.java
index 725e103af..ca334daa9 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/TextViewLinkHandler.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/TextViewLinkHandler.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.ui.step.layout;
+package org.researchstack.foundation.components.common.ui.views;
 
 import android.text.Layout;
 import android.text.Spannable;
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/presentation/ITaskProvider.kt b/foundation/src/main/java/org/researchstack/foundation/components/presentation/ITaskProvider.kt
new file mode 100644
index 000000000..56c950349
--- /dev/null
+++ b/foundation/src/main/java/org/researchstack/foundation/components/presentation/ITaskProvider.kt
@@ -0,0 +1,7 @@
+package org.researchstack.foundation.components.presentation
+
+import org.researchstack.foundation.core.interfaces.ITask
+
+interface ITaskProvider {
+    fun task(identifier: String): ITask?
+}
\ No newline at end of file
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/presentation/TaskPresentationCallback.kt b/foundation/src/main/java/org/researchstack/foundation/components/presentation/TaskPresentationCallback.kt
new file mode 100644
index 000000000..ecad3e41c
--- /dev/null
+++ b/foundation/src/main/java/org/researchstack/foundation/components/presentation/TaskPresentationCallback.kt
@@ -0,0 +1,8 @@
+package org.researchstack.foundation.components.presentation
+
+import org.researchstack.foundation.core.interfaces.IResult
+import org.researchstack.foundation.core.interfaces.ITask
+
+abstract class TaskPresentationCallback<ResultType: IResult, TaskType: ITask> {
+    abstract fun onTaskPresentationFinished(task: TaskType, result: ResultType?)
+}
\ No newline at end of file
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/presentation/TaskPresentationFragment.kt b/foundation/src/main/java/org/researchstack/foundation/components/presentation/TaskPresentationFragment.kt
new file mode 100644
index 000000000..5097b1568
--- /dev/null
+++ b/foundation/src/main/java/org/researchstack/foundation/components/presentation/TaskPresentationFragment.kt
@@ -0,0 +1,241 @@
+package org.researchstack.foundation.components.presentation
+
+import android.content.Context
+import android.os.Bundle
+import android.support.v4.app.Fragment
+import android.support.v7.app.AlertDialog
+import android.support.v7.app.AppCompatActivity
+import android.support.v7.widget.Toolbar
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import org.researchstack.foundation.R
+import org.researchstack.foundation.components.common.ui.callbacks.StepCallbacks
+import org.researchstack.foundation.components.presentation.interfaces.IStepFragment
+import org.researchstack.foundation.components.presentation.interfaces.IStepFragmentProvider
+import org.researchstack.foundation.components.presentation.interfaces.ITaskNavigator
+import org.researchstack.foundation.core.interfaces.IResult
+import org.researchstack.foundation.core.interfaces.IStep
+import org.researchstack.foundation.core.interfaces.ITask
+import java.lang.RuntimeException
+import java.util.*
+
+abstract class TaskPresentationFragment<StepType: IStep, ResultType: IResult, TaskType: ITask>(): Fragment(), StepCallbacks {
+
+    public var taskProvider: ITaskProvider? = null
+    public var stepFragmentProvider: IStepFragmentProvider? = null
+
+    protected var _task: TaskType? = null
+    public val task: TaskType
+        get() = this._task!!
+
+    protected var _taskNavigator: ITaskNavigator<StepType, ResultType>? = null
+    public val taskNavigator: ITaskNavigator<StepType, ResultType>
+        get() = this._taskNavigator!!
+
+    public var callback: TaskPresentationCallback<ResultType, TaskType>? = null
+
+    var _currentStep: StepType? = null
+    var _currentFragment: IStepFragment? = null
+
+    val currentStep: StepType?
+        get() = this._currentStep
+
+
+//    var _task: ITask? = null
+//    val task: ITask
+//        get() = this._task!!
+
+    var _result: ResultType? = null
+    val result: ResultType
+        get() = this._result!!
+
+//    var taskPresentaterDelegate: ITaskPresenterDelegate? = null
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+
+        val view = inflater.inflate(R.layout.rsf_fragment_task_presentation, container, false);
+
+        val toolbar = view.findViewById(R.id.toolbar) as Toolbar?
+
+        val appCompatActivity: AppCompatActivity = this.activity as AppCompatActivity
+        appCompatActivity.setSupportActionBar(toolbar)
+        appCompatActivity.supportActionBar!!.setDisplayHomeAsUpEnabled(true)
+
+        this.initialize(savedInstanceState)
+
+        return view
+    }
+
+    abstract fun initialize(savedInstanceState: Bundle?)
+
+    override fun onResume() {
+
+        val currentStep = this.currentStep
+
+        if (currentStep == null) {
+            this.taskNavigator.getStepAfterStep(null, this.result)?.let { firstStep ->
+                showStep(firstStep)
+            }
+        }
+        else {
+            showStep(currentStep)
+        }
+
+        super.onResume()
+    }
+
+    protected fun showNextStep() {
+        val nextStep = this.taskNavigator.getStepAfterStep(this.currentStep, this.result)
+        if (nextStep == null) {
+            this.saveAndFinish(false)
+        } else {
+            showStep(nextStep)
+        }
+    }
+
+    protected fun showPreviousStep() {
+        val previousStep = this.taskNavigator.getStepBeforeStep(this.currentStep, this.result)
+        if (previousStep == null) {
+            saveAndFinish(true)
+        } else {
+            showStep(previousStep)
+        }
+    }
+
+    private fun showStep(step: StepType) {
+        val currentStepPosition = this.currentStep?.let {
+            this.taskNavigator.getProgressOfCurrentStep(it, this.result).current
+        }
+
+        val newStepPosition = this.taskNavigator.getProgressOfCurrentStep(step, this.result).current
+
+        val stepFragment = this.getFragmentForStep(step)
+        this._currentFragment = stepFragment
+
+        val transaction = childFragmentManager.beginTransaction()
+
+        if (currentStepPosition != null) {
+            if (newStepPosition > currentStepPosition) {
+                transaction.setCustomAnimations(R.anim.rsf_slide_in_right, R.anim.rsf_slide_out_left)
+            }
+            else {
+                transaction.setCustomAnimations(R.anim.rsf_slide_in_left, R.anim.rsf_slide_out_right)
+            }
+
+            transaction
+                    .replace(R.id.rsf_content_step, stepFragment.fragment)
+                    .commit()
+        }
+        else {
+            transaction
+                    .add(R.id.rsf_content_step, stepFragment.fragment)
+                    .commit()
+        }
+
+        childFragmentManager.executePendingTransactions()
+
+        Log.d("DEBUG", ""+childFragmentManager.fragments.size)
+
+        this._currentStep = step
+    }
+
+    abstract fun getStepResult(taskResult: ResultType, stepIdentifier: String): IResult?
+    abstract fun setStepResult(taskResult: ResultType, stepIdentifier: String, stepResult: IResult)
+
+    protected fun getFragmentForStep(step: StepType): IStepFragment {
+
+        val hostFragment = this
+
+        // Change the title on the activity
+        val title: String = {
+            val title = this.taskNavigator.getTitleForStep(step)
+            if (title != "") {
+                title
+            }
+            else {
+                this.taskNavigator.getTitleForStep(this.activity!!, step)
+            }
+
+        }()
+
+        setActionBarTitle(title)
+
+        // Get result from the TaskResult, can be null
+
+        val stepResult: IResult? = this.getStepResult(this.result, step.identifier)
+
+        val fragment = createFragmentFromStep(step)
+        if (fragment == null) {
+            throw RuntimeException("Cannot create fragment for step ${step.identifier}")
+        }
+
+        val stepFragment: IStepFragment = fragment.apply {
+            this.initialize(step, stepResult)
+            this.setCallbacks(hostFragment)
+        }
+
+        return stepFragment
+    }
+
+    private fun createFragmentFromStep(step: IStep): IStepFragment? {
+        return this.stepFragmentProvider?.stepFragment(this.activity!! as Context, step)
+    }
+
+    protected abstract fun saveAndFinish(clearResult: Boolean)
+
+    fun setActionBarTitle(title: String) {
+
+        val appCompatActivity: AppCompatActivity = this.activity as AppCompatActivity
+
+        val actionBar = appCompatActivity.supportActionBar
+        if (actionBar != null) {
+            actionBar.setTitle(title)
+        }
+    }
+
+    protected fun onExecuteStepAction(action: Int) {
+        if (action == StepCallbacks.ACTION_NEXT) {
+            showNextStep()
+        } else if (action == StepCallbacks.ACTION_PREV) {
+            showPreviousStep()
+        } else if (action == StepCallbacks.ACTION_END) {
+            showConfirmExitDialog()
+        } else if (action == StepCallbacks.ACTION_NONE) {
+            // Used when onSaveInstanceState is called of a view. No action is taken.
+        } else {
+            throw IllegalArgumentException("Action with value " + action + " is invalid. " +
+                    "See StepCallbacks for allowable arguments")
+        }
+    }
+
+    private fun showConfirmExitDialog() {
+        val alertDialog = AlertDialog.Builder(this.activity!!).setTitle(
+                "Are you sure you want to exit?")
+                .setMessage(R.string.lorem_medium)
+                .setPositiveButton("End Task") { dialog, which -> saveAndFinish(true) }
+                .setNegativeButton("Cancel", null)
+                .create()
+        alertDialog.show()
+    }
+
+    public fun onBackPressed() {
+        notifyStepOfBackPress()
+    }
+
+    private fun notifyStepOfBackPress() {
+        this._currentFragment?.onBackPressed()
+    }
+
+
+    override fun onSaveStep(action: Int, step: IStep, result: IResult?) {
+        result?.let { setStepResult(this.result, step.identifier, it) }
+        onExecuteStepAction(action)
+    }
+
+    override fun onCancelStep() {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+}
\ No newline at end of file
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/presentation/compatibility/BackwardsCompatibleStepFragment.kt b/foundation/src/main/java/org/researchstack/foundation/components/presentation/compatibility/BackwardsCompatibleStepFragment.kt
new file mode 100644
index 000000000..41c581d94
--- /dev/null
+++ b/foundation/src/main/java/org/researchstack/foundation/components/presentation/compatibility/BackwardsCompatibleStepFragment.kt
@@ -0,0 +1,69 @@
+package org.researchstack.foundation.components.presentation.compatibility
+
+import android.os.Bundle
+import android.support.v4.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import org.researchstack.foundation.R
+import org.researchstack.foundation.components.common.ui.callbacks.StepCallbacks
+import org.researchstack.foundation.components.common.ui.layout.StepLayout
+import org.researchstack.foundation.components.presentation.interfaces.IStepFragment
+import org.researchstack.foundation.core.interfaces.IResult
+import org.researchstack.foundation.core.interfaces.IStep
+import org.researchstack.foundation.core.models.result.StepResult
+import org.researchstack.foundation.core.models.step.Step
+
+public class BackwardsCompatibleStepFragment(): Fragment(), IStepFragment {
+
+    companion object {
+
+        fun newInstance(stepLayout: StepLayout): BackwardsCompatibleStepFragment {
+            val fragment = BackwardsCompatibleStepFragment()
+            fragment.stepLayout = stepLayout
+            return fragment
+        }
+    }
+
+    //this will implement the traditional step layout
+    var stepLayout: StepLayout? = null
+
+    override val fragment: Fragment
+        get() = this
+
+    private fun getLayoutParams(stepLayout: StepLayout): FrameLayout.LayoutParams {
+        var lp: FrameLayout.LayoutParams? = stepLayout.layout.layoutParams?.let {
+            it as? FrameLayout.LayoutParams
+        }
+        if (lp == null) {
+            lp = FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT)
+        }
+        return lp
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+
+        val layout = this.stepLayout!!
+        val view = inflater.inflate(R.layout.rsf_fragment_step_compat, container, false)
+        val containerView: FrameLayout = view.findViewById(R.id.rsf_content_layout) as FrameLayout
+
+        val lp = getLayoutParams(layout)
+        containerView.addView(layout.layout, 0, lp)
+
+        return view
+    }
+
+    override fun onBackPressed() {
+        this.stepLayout!!.isBackEventConsumed
+    }
+
+    override fun initialize(step: IStep, result: IResult?) {
+        this.stepLayout!!.initialize(step as Step, result?.let { it as? StepResult<*> })
+    }
+
+    override fun setCallbacks(callbacks: StepCallbacks) {
+        this.stepLayout!!.setCallbacks(callbacks)
+    }
+
+}
\ No newline at end of file
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/presentation/compatibility/BackwardsCompatibleStepFragmentProvider.kt b/foundation/src/main/java/org/researchstack/foundation/components/presentation/compatibility/BackwardsCompatibleStepFragmentProvider.kt
new file mode 100644
index 000000000..fab849d94
--- /dev/null
+++ b/foundation/src/main/java/org/researchstack/foundation/components/presentation/compatibility/BackwardsCompatibleStepFragmentProvider.kt
@@ -0,0 +1,34 @@
+package org.researchstack.foundation.components.presentation.compatibility
+
+import android.content.Context
+import org.researchstack.foundation.components.common.ui.layout.StepLayout
+import org.researchstack.foundation.components.presentation.interfaces.IStepFragment
+import org.researchstack.foundation.components.presentation.interfaces.IStepFragmentProvider
+import org.researchstack.foundation.core.interfaces.IStep
+
+
+public class BackwardsCompatibleStepFragmentProvider(val stepLayoutProvider: IStepLayoutProvider): IStepFragmentProvider {
+
+    override fun stepFragment(context: Context, step: IStep): IStepFragment? {
+
+        try {
+
+            val stepLayout = this.stepLayoutProvider.stepLayout(step)?.let {
+                val constructor = it.getConstructor(Context::class.java)
+                constructor.newInstance(context)
+            } as? StepLayout
+
+            if (stepLayout != null) {
+                val fragment = BackwardsCompatibleStepFragment.newInstance(stepLayout)
+                return fragment
+            }
+            else {
+                throw RuntimeException("Could not instantiate Step Layout")
+            }
+
+        } catch (e: Exception) {
+            throw RuntimeException(e)
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/presentation/compatibility/BackwardsCompatibleStepLayoutProvider.kt b/foundation/src/main/java/org/researchstack/foundation/components/presentation/compatibility/BackwardsCompatibleStepLayoutProvider.kt
new file mode 100644
index 000000000..0fccb89f7
--- /dev/null
+++ b/foundation/src/main/java/org/researchstack/foundation/components/presentation/compatibility/BackwardsCompatibleStepLayoutProvider.kt
@@ -0,0 +1,10 @@
+package org.researchstack.foundation.components.presentation.compatibility
+
+import org.researchstack.foundation.core.interfaces.IStep
+import org.researchstack.foundation.core.models.step.Step
+
+public class BackwardsCompatibleStepLayoutProvider(): IStepLayoutProvider {
+    override fun stepLayout(step: IStep): Class<*>? {
+        return (step as? Step)?.stepLayoutClass
+    }
+}
\ No newline at end of file
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/presentation/compatibility/BackwardsCompatibleTaskPresentationFragment.kt b/foundation/src/main/java/org/researchstack/foundation/components/presentation/compatibility/BackwardsCompatibleTaskPresentationFragment.kt
new file mode 100644
index 000000000..ab6d23269
--- /dev/null
+++ b/foundation/src/main/java/org/researchstack/foundation/components/presentation/compatibility/BackwardsCompatibleTaskPresentationFragment.kt
@@ -0,0 +1,74 @@
+package org.researchstack.foundation.components.presentation.compatibility
+
+import android.os.Bundle
+import org.researchstack.foundation.components.common.ui.callbacks.StepCallbacks
+import org.researchstack.foundation.components.presentation.TaskPresentationCallback
+import org.researchstack.foundation.components.presentation.TaskPresentationFragment
+import org.researchstack.foundation.components.presentation.interfaces.IStepFragmentProvider
+import org.researchstack.foundation.core.interfaces.IResult
+import org.researchstack.foundation.core.models.result.StepResult
+import org.researchstack.foundation.core.models.result.TaskResult
+import org.researchstack.foundation.core.models.step.Step
+import org.researchstack.foundation.core.models.task.Task
+import java.util.*
+
+open class BackwardsCompatibleTaskPresentationFragment: TaskPresentationFragment<Step, TaskResult, Task>(), StepCallbacks {
+
+    companion object {
+        val EXTRA_TASK_IDENTIFIER = "BackwardsCompatibleTaskPresentationFragment.ExtraTaskIdentifier"
+        val EXTRA_TASK_RESULT = "BackwardsCompatibleTaskPresentationFragment.ExtraTaskResult"
+        val EXTRA_STEP = "BackwardsCompatibleTaskPresentationFragment.ExtraStep"
+
+        fun newInstance(
+                taskIdentifier: String,
+                stepFragmentProvider: IStepFragmentProvider,
+                callback: TaskPresentationCallback<TaskResult, Task>
+        ): BackwardsCompatibleTaskPresentationFragment {
+            val fragment = BackwardsCompatibleTaskPresentationFragment()
+            val args = Bundle()
+            args.putString(EXTRA_TASK_IDENTIFIER, taskIdentifier)
+            fragment.setArguments(args)
+            fragment.stepFragmentProvider = stepFragmentProvider
+            fragment.callback = callback
+            return fragment
+        }
+
+    }
+
+    override fun initialize(savedInstanceState: Bundle?) {
+
+        if (savedInstanceState == null) {
+            val taskIdentifier = this.arguments!!.getString(BackwardsCompatibleTaskPresentationFragment.EXTRA_TASK_IDENTIFIER)
+            this._task = this.taskProvider!!.task(taskIdentifier) as Task
+            this._taskNavigator = this.task
+            this._result = TaskResult(this.task.identifier)
+            this.result.setStartDate(Date())
+        } else {
+            val taskIdentifier = savedInstanceState.getString(BackwardsCompatibleTaskPresentationFragment.EXTRA_TASK_IDENTIFIER)
+            this._task = this.taskProvider!!.task(taskIdentifier) as Task
+            this._taskNavigator = this.task
+            this._result = savedInstanceState.getSerializable(BackwardsCompatibleTaskPresentationFragment.EXTRA_TASK_RESULT) as TaskResult
+            this._currentStep = savedInstanceState.getSerializable(BackwardsCompatibleTaskPresentationFragment.EXTRA_STEP) as Step
+        }
+
+        this.task.validateParameters()
+    }
+
+    override fun getStepResult(taskResult: TaskResult, stepIdentifier: String): IResult? {
+        return taskResult.getStepResult(stepIdentifier)
+    }
+
+    override fun setStepResult(taskResult: TaskResult, stepIdentifier: String, stepResult: IResult) {
+        taskResult.setStepResultForStepIdentifier(stepIdentifier, stepResult as StepResult<*>)
+    }
+
+    override fun saveAndFinish(clearResult: Boolean) {
+        if (clearResult) {
+            this.callback!!.onTaskPresentationFinished(this.task, null)
+        }
+        else {
+            this.result.setEndDate(Date())
+            this.callback!!.onTaskPresentationFinished(this.task, this.result)
+        }
+    }
+}
\ No newline at end of file
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/presentation/compatibility/IStepLayoutProvider.kt b/foundation/src/main/java/org/researchstack/foundation/components/presentation/compatibility/IStepLayoutProvider.kt
new file mode 100644
index 000000000..497192c92
--- /dev/null
+++ b/foundation/src/main/java/org/researchstack/foundation/components/presentation/compatibility/IStepLayoutProvider.kt
@@ -0,0 +1,7 @@
+package org.researchstack.foundation.components.presentation.compatibility
+
+import org.researchstack.foundation.core.interfaces.IStep
+
+interface IStepLayoutProvider {
+    fun stepLayout(step: IStep): Class<*>?
+}
\ No newline at end of file
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/presentation/interfaces/IStepFragment.kt b/foundation/src/main/java/org/researchstack/foundation/components/presentation/interfaces/IStepFragment.kt
new file mode 100644
index 000000000..2bb2deecf
--- /dev/null
+++ b/foundation/src/main/java/org/researchstack/foundation/components/presentation/interfaces/IStepFragment.kt
@@ -0,0 +1,14 @@
+package org.researchstack.foundation.components.presentation.interfaces
+
+import android.support.v4.app.Fragment
+import org.researchstack.foundation.components.common.ui.callbacks.StepCallbacks
+import org.researchstack.foundation.core.interfaces.IResult
+import org.researchstack.foundation.core.interfaces.IStep
+
+interface IStepFragment {
+    fun initialize(step: IStep, result: IResult?)
+    //TODO: Understand if we need to change StepCallbacks
+    fun setCallbacks(callbacks: StepCallbacks)
+    fun onBackPressed()
+    val fragment: Fragment
+}
\ No newline at end of file
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/presentation/interfaces/IStepFragmentProvider.kt b/foundation/src/main/java/org/researchstack/foundation/components/presentation/interfaces/IStepFragmentProvider.kt
new file mode 100644
index 000000000..6cdcde6d3
--- /dev/null
+++ b/foundation/src/main/java/org/researchstack/foundation/components/presentation/interfaces/IStepFragmentProvider.kt
@@ -0,0 +1,8 @@
+package org.researchstack.foundation.components.presentation.interfaces
+
+import android.content.Context
+import org.researchstack.foundation.core.interfaces.IStep
+
+interface IStepFragmentProvider {
+    fun stepFragment(context: Context, step: IStep): IStepFragment?
+}
\ No newline at end of file
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/presentation/interfaces/ITaskNavigator.kt b/foundation/src/main/java/org/researchstack/foundation/components/presentation/interfaces/ITaskNavigator.kt
new file mode 100644
index 000000000..dff1fa42f
--- /dev/null
+++ b/foundation/src/main/java/org/researchstack/foundation/components/presentation/interfaces/ITaskNavigator.kt
@@ -0,0 +1,17 @@
+package org.researchstack.foundation.components.presentation.interfaces
+
+import android.content.Context
+import org.researchstack.foundation.core.interfaces.IResult
+import org.researchstack.foundation.core.interfaces.IStep
+import org.researchstack.foundation.core.models.task.Task
+
+interface ITaskNavigator<StepType: IStep, ResultType: IResult> {
+    @Deprecated("Only here for backwards compatibilty. Will be removed soon")
+    fun getTitleForStep(context: Context, step: StepType): String
+    fun getTitleForStep(step: StepType): String
+    fun getStepWithIdentifier(identifier: String): StepType?
+    fun getStepAfterStep(step: StepType?, result: ResultType): StepType?
+    fun getStepBeforeStep(step: StepType?, result: ResultType): StepType?
+    fun getProgressOfCurrentStep(step: StepType, result: ResultType): Task.TaskProgress
+    fun validateParameters()
+}
\ No newline at end of file
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/singletons/ResourcePathManager.java b/foundation/src/main/java/org/researchstack/foundation/components/singletons/ResourcePathManager.java
index 3943deef6..0a7d60aca 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/singletons/ResourcePathManager.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/singletons/ResourcePathManager.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone;
+package org.researchstack.foundation.components.singletons;
 
 import android.app.Application;
 import android.content.Context;
@@ -8,7 +8,7 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
-import org.researchstack.backbone.utils.LogExt;
+import org.researchstack.foundation.components.utils.LogExt;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/singletons/TextViewLinkManager.kt b/foundation/src/main/java/org/researchstack/foundation/components/singletons/TextViewLinkManager.kt
new file mode 100644
index 000000000..a3497fadd
--- /dev/null
+++ b/foundation/src/main/java/org/researchstack/foundation/components/singletons/TextViewLinkManager.kt
@@ -0,0 +1,48 @@
+package org.researchstack.foundation.components.singletons
+
+import android.content.Context
+import org.researchstack.foundation.components.common.ui.views.TextViewLinkHandler
+import org.researchstack.foundation.components.web.ui.activities.ViewWebDocumentActivity
+import java.lang.RuntimeException
+
+public abstract class TextViewLinkManager {
+
+    companion object {
+
+        private var _sharedManager: TextViewLinkManager? = LegacyTextViewLinkManager()
+
+        fun setSharedManager(manager: TextViewLinkManager) {
+            this._sharedManager = manager
+        }
+
+        fun getSharedManager(): TextViewLinkManager {
+            val manager = this._sharedManager
+            if (manager == null) {
+                throw RuntimeException("Shared Manager instance is null. Make sure you configure this by calling TextViewLinkManager.init()")
+            }
+            return manager
+        }
+
+    }
+
+    abstract fun getHandler(context: Context, title: String): TextViewLinkHandler
+
+}
+
+public class LegacyTextViewLinkManager: TextViewLinkManager() {
+
+    public class LegacyTextViewLinkHandler(val context: Context, val title: String): TextViewLinkHandler() {
+        override fun onLinkClick(url: String?) {
+            val path = ResourcePathManager.getInstance().generateAbsolutePath(ResourcePathManager.Resource.TYPE_HTML, url)
+            val intent = ViewWebDocumentActivity.newIntentForPath(
+                    context,
+                    title,
+                    path)
+            context.startActivity(intent)
+        }
+    }
+
+    override fun getHandler(context: Context, title: String): TextViewLinkHandler {
+        return LegacyTextViewLinkHandler(context, title)
+    }
+}
\ No newline at end of file
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/AnswerFormat.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/AnswerFormat.java
index d489242bd..7b96f0163 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/AnswerFormat.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/AnswerFormat.java
@@ -1,26 +1,26 @@
-package org.researchstack.backbone.answerformat;
+package org.researchstack.foundation.components.survey.answerformat;
 
-import org.researchstack.backbone.ui.step.body.DateQuestionBody;
-import org.researchstack.backbone.ui.step.body.DecimalQuestionBody;
-import org.researchstack.backbone.ui.step.body.DurationQuestionBody;
-import org.researchstack.backbone.ui.step.body.FormBody;
-import org.researchstack.backbone.ui.step.body.IntegerQuestionBody;
-import org.researchstack.backbone.ui.step.body.MultiChoiceQuestionBody;
-import org.researchstack.backbone.ui.step.body.NotImplementedStepBody;
-import org.researchstack.backbone.ui.step.body.SingleChoiceQuestionBody;
-import org.researchstack.backbone.ui.step.body.TextQuestionBody;
+import org.researchstack.foundation.components.survey.ui.body.DateQuestionBody;
+import org.researchstack.foundation.components.survey.ui.body.DecimalQuestionBody;
+import org.researchstack.foundation.components.survey.ui.body.DurationQuestionBody;
+import org.researchstack.foundation.components.survey.ui.body.FormBody;
+import org.researchstack.foundation.components.survey.ui.body.IntegerQuestionBody;
+import org.researchstack.foundation.components.survey.ui.body.MultiChoiceQuestionBody;
+import org.researchstack.foundation.components.survey.ui.body.NotImplementedStepBody;
+import org.researchstack.foundation.components.survey.ui.body.SingleChoiceQuestionBody;
+import org.researchstack.foundation.components.survey.ui.body.TextQuestionBody;
 
 import java.io.Serializable;
 
 /**
  * The AnswerFormat class is the abstract base class for classes that describe the format in which a
  * survey question should be answered. The ResearchStack framework uses {@link
- * org.researchstack.backbone.step.QuestionStep} to represent questions to ask the user. Each
+ * org.researchstack.foundation.step.QuestionStep} to represent questions to ask the user. Each
  * question must have an associated answer format.
  * <p>
  * To use an answer format, instantiate the appropriate answer format subclass and attach it to a
  * question step or form item. Incorporate the resulting step into a task, and present the task with
- * a {@link org.researchstack.backbone.ui.ViewTaskActivity}.
+ * a {@link org.researchstack.foundation.ui.ViewTaskActivity}.
  */
 public abstract class AnswerFormat implements Serializable {
     /**
@@ -42,7 +42,7 @@ public QuestionType getQuestionType() {
     /**
      * The type of question. (read-only)
      * <p>
-     * The type provides a default {@link org.researchstack.backbone.ui.step.body.StepBody} for that
+     * The type provides a default {@link org.researchstack.foundation.ui.step.body.StepBody} for that
      * type of question. A custom StepLayout implementation may provide it's own StepBody rather
      * than using the default provided by this AnswerFormat.
      */
@@ -105,7 +105,7 @@ public enum DateAnswerStyle {
     /**
      * Interface that {@link Type} implements. Since you cannot add a value to an existing enum, you
      * may implement this interface instead to provide your own QuestionType that provides a {@link
-     * org.researchstack.backbone.ui.step.body.StepBody} class.
+     * org.researchstack.foundation.ui.step.body.StepBody} class.
      */
     public interface QuestionType {
         Class<?> getStepBodyClass();
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/BirthDateAnswerFormat.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/BirthDateAnswerFormat.java
index a7c3a55f0..5a5dc9f59 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/BirthDateAnswerFormat.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/BirthDateAnswerFormat.java
@@ -1,7 +1,7 @@
-package org.researchstack.backbone.answerformat;
+package org.researchstack.foundation.components.survey.answerformat;
 
-import org.researchstack.backbone.R;
-import org.researchstack.backbone.ui.step.body.BodyAnswer;
+import org.researchstack.foundation.R;
+import org.researchstack.foundation.components.survey.ui.body.BodyAnswer;
 
 import java.util.Calendar;
 import java.util.Date;
@@ -32,11 +32,11 @@ public BodyAnswer validateAnswer(Date resultDate) {
         Date maxDate = getMaximumDate();
 
         if (minDate != null && isOnOrBefore(resultDate, minDate)) {
-            return new BodyAnswer(false, R.string.rsb_birth_date_too_old, String.valueOf(maxAge));
+            return new BodyAnswer(false, R.string.rsf_birth_date_too_old, String.valueOf(maxAge));
         }
 
         if (maxDate != null && !isOnOrBefore(resultDate, maxDate)) {
-            return new BodyAnswer(false, R.string.rsb_birth_date_too_young, String.valueOf(minAge));
+            return new BodyAnswer(false, R.string.rsf_birth_date_too_young, String.valueOf(minAge));
         }
 
         return BodyAnswer.VALID;
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/BooleanAnswerFormat.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/BooleanAnswerFormat.java
index d4d40eae9..f8c67d2ef 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/BooleanAnswerFormat.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/BooleanAnswerFormat.java
@@ -1,7 +1,7 @@
-package org.researchstack.backbone.answerformat;
+package org.researchstack.foundation.components.survey.answerformat;
 
 
-import org.researchstack.backbone.model.Choice;
+import org.researchstack.foundation.components.survey.model.Choice;
 
 /**
  * A convenience subclass of {@link ChoiceAnswerFormat} that provides a simple true/false single
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/ChoiceAnswerFormat.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/ChoiceAnswerFormat.java
index d87ae7296..450d51fab 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/ChoiceAnswerFormat.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/ChoiceAnswerFormat.java
@@ -1,7 +1,6 @@
-package org.researchstack.backbone.answerformat;
+package org.researchstack.foundation.components.survey.answerformat;
 
-
-import org.researchstack.backbone.model.Choice;
+import org.researchstack.foundation.components.survey.model.Choice;
 
 /**
  * The ChoiceAnswerFormat class represents an answer format that lets participants choose from a
@@ -25,7 +24,7 @@ public ChoiceAnswerFormat(AnswerFormat.ChoiceAnswerStyle answerStyle, Choice...
 
     /**
      * Returns a multiple choice or single choice question type, which will decide which {@link
-     * org.researchstack.backbone.ui.step.body.StepBody} to use to display this question.
+     * org.researchstack.foundation.ui.step.body.StepBody} to use to display this question.
      *
      * @return the question type for this answer format
      */
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/DateAnswerFormat.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/DateAnswerFormat.java
index f4c06047c..e8a05c180 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/DateAnswerFormat.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/DateAnswerFormat.java
@@ -1,8 +1,8 @@
-package org.researchstack.backbone.answerformat;
+package org.researchstack.foundation.components.survey.answerformat;
 
-import org.researchstack.backbone.R;
-import org.researchstack.backbone.ui.step.body.BodyAnswer;
-import org.researchstack.backbone.utils.FormatHelper;
+import org.researchstack.foundation.R;
+import org.researchstack.foundation.components.survey.ui.body.BodyAnswer;
+import org.researchstack.foundation.components.utils.FormatHelper;
 
 import java.util.Date;
 
@@ -86,13 +86,13 @@ public QuestionType getQuestionType() {
     public BodyAnswer validateAnswer(Date resultDate) {
         if (minimumDate != null && resultDate.getTime() < minimumDate.getTime()) {
             return new BodyAnswer(false,
-                    R.string.rsb_invalid_answer_date_under,
+                    R.string.rsf_invalid_answer_date_under,
                     FormatHelper.SIMPLE_FORMAT_DATE.format(minimumDate));
         }
 
         if (maximumDate != null && resultDate.getTime() > maximumDate.getTime()) {
             return new BodyAnswer(false,
-                    R.string.rsb_invalid_answer_date_over,
+                    R.string.rsf_invalid_answer_date_over,
                     FormatHelper.SIMPLE_FORMAT_DATE.format(maximumDate));
         }
 
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/DecimalAnswerFormat.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/DecimalAnswerFormat.java
index 5c7714f50..c425d2eb6 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/DecimalAnswerFormat.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/DecimalAnswerFormat.java
@@ -1,8 +1,9 @@
-package org.researchstack.backbone.answerformat;
+package org.researchstack.foundation.components.survey.answerformat;
 
-import org.researchstack.backbone.R;
-import org.researchstack.backbone.ui.step.body.BodyAnswer;
-import org.researchstack.backbone.utils.TextUtils;
+
+import org.researchstack.foundation.R;
+import org.researchstack.foundation.components.survey.ui.body.BodyAnswer;
+import org.researchstack.foundation.components.utils.TextUtils;
 
 /**
  * This class defines the attributes for a decimal answer format that participants enter using a
@@ -59,10 +60,10 @@ public BodyAnswer validateAnswer(String inputString) {
             Float floatAnswer = Float.valueOf(inputString);
             if (floatAnswer < minValue) {
                 return new BodyAnswer(false,
-                        R.string.rsb_invalid_answer_integer_under, String.valueOf(getMinValue()));
+                        R.string.rsf_invalid_answer_integer_under, String.valueOf(getMinValue()));
             } else if (floatAnswer > maxValue) {
                 return new BodyAnswer(false,
-                        R.string.rsb_invalid_answer_integer_over, String.valueOf(getMaxValue()));
+                        R.string.rsf_invalid_answer_integer_over, String.valueOf(getMaxValue()));
             }
         }
 
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/DurationAnswerFormat.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/DurationAnswerFormat.java
index 94a6c3fd5..8da181ea4 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/DurationAnswerFormat.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/DurationAnswerFormat.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.answerformat;
+package org.researchstack.foundation.components.survey.answerformat;
 
 /**
  * Created by Dario Salvi on 29/04/2016.
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/EmailAnswerFormat.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/EmailAnswerFormat.java
index 5b7585b33..f15eead49 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/EmailAnswerFormat.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/EmailAnswerFormat.java
@@ -1,7 +1,6 @@
-package org.researchstack.backbone.answerformat;
+package org.researchstack.foundation.components.survey.answerformat;
 
-
-import org.researchstack.backbone.utils.TextUtils;
+import org.researchstack.foundation.components.utils.TextUtils;
 
 public class EmailAnswerFormat extends TextAnswerFormat {
     private static final int MAX_EMAIL_LENGTH = 255;
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/FormAnswerFormat.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/FormAnswerFormat.java
index dcd6fb85d..a0a0191b9 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/FormAnswerFormat.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/FormAnswerFormat.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.answerformat;
+package org.researchstack.foundation.components.survey.answerformat;
 
 /**
  * AnswerFormat indicating that the QuestionStep is a form step. This lets the layout know that it
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/IntegerAnswerFormat.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/IntegerAnswerFormat.java
index 7ccaae7dd..1a5205989 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/IntegerAnswerFormat.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/IntegerAnswerFormat.java
@@ -1,15 +1,15 @@
-package org.researchstack.backbone.answerformat;
+package org.researchstack.foundation.components.survey.answerformat;
 
-import org.researchstack.backbone.R;
-import org.researchstack.backbone.ui.step.body.BodyAnswer;
-import org.researchstack.backbone.utils.TextUtils;
+import org.researchstack.foundation.R;
+import org.researchstack.foundation.components.survey.ui.body.BodyAnswer;
+import org.researchstack.foundation.components.utils.TextUtils;
 
 /**
  * This class defines the attributes for an integer answer format that participants enter using a
  * numeric keyboard.
  * <p>
  * If you specify maximum or minimum values and the user enters a value outside the specified range,
- * the {@link org.researchstack.backbone.ui.step.body.IntegerQuestionBody} does not allow navigation
+ * the {@link org.researchstack.foundation.ui.step.body.IntegerQuestionBody} does not allow navigation
  * until the participant provides a value that is within the valid range.
  */
 public class IntegerAnswerFormat extends AnswerFormat {
@@ -60,11 +60,11 @@ public BodyAnswer validateAnswer(String inputString) {
             Integer intAnswer = Integer.valueOf(inputString);
             if (intAnswer < getMinValue()) {
                 return new BodyAnswer(false,
-                        R.string.rsb_invalid_answer_integer_under,
+                        R.string.rsf_invalid_answer_integer_under,
                         String.valueOf(getMinValue()));
             } else if (intAnswer > getMaxValue()) {
                 return new BodyAnswer(false,
-                        R.string.rsb_invalid_answer_integer_over,
+                        R.string.rsf_invalid_answer_integer_over,
                         String.valueOf(getMaxValue()));
             }
 
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/TextAnswerFormat.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/TextAnswerFormat.java
index 3cdda7726..2a29e3543 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/TextAnswerFormat.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/TextAnswerFormat.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.answerformat;
+package org.researchstack.foundation.components.survey.answerformat;
 
 
 /**
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/UnknownAnswerFormat.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/UnknownAnswerFormat.java
index 299dea72e..eac000ec3 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/UnknownAnswerFormat.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/survey/answerformat/UnknownAnswerFormat.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.answerformat;
+package org.researchstack.foundation.components.survey.answerformat;
 
 
 @Deprecated
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/survey/model/Choice.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/model/Choice.java
index e4c820e9b..361820b1f 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/survey/model/Choice.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/survey/model/Choice.java
@@ -1,9 +1,9 @@
-package org.researchstack.backbone.model;
+package org.researchstack.foundation.components.survey.model;
 
 import java.io.Serializable;
 
 /**
- * Choice objects for use in {@link org.researchstack.backbone.answerformat.ChoiceAnswerFormat}.
+ * Choice objects for use in {@link org.researchstack.foundation.answerformat.ChoiceAnswerFormat}.
  * They typically have an integer or string value, always with a string text representation of the
  * choice for the user.
  *
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/survey/step/FormStep.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/step/FormStep.java
index 94db97656..5af2d5bd7 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/survey/step/FormStep.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/survey/step/FormStep.java
@@ -1,6 +1,6 @@
-package org.researchstack.backbone.step;
+package org.researchstack.foundation.components.survey.step;
 
-import org.researchstack.backbone.answerformat.FormAnswerFormat;
+import org.researchstack.foundation.components.survey.answerformat.FormAnswerFormat;
 
 import java.util.Arrays;
 import java.util.List;
@@ -12,7 +12,7 @@
  * To use FormStep, instantiate the object, give it a list of {@link QuestionStep}s, and include it
  * in a task.
  * <p>
- * The result of a form step is an {@link org.researchstack.backbone.result.StepResult} object that
+ * The result of a form step is an {@link org.researchstack.foundation.result.StepResult} object that
  * includes a child StepResult object for each form item.
  */
 public class FormStep extends QuestionStep {
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/survey/step/InstructionStep.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/step/InstructionStep.java
index 8efbec31f..22bf1b98a 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/survey/step/InstructionStep.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/survey/step/InstructionStep.java
@@ -1,6 +1,7 @@
-package org.researchstack.backbone.step;
+package org.researchstack.foundation.components.survey.step;
 
-import org.researchstack.backbone.ui.step.layout.InstructionStepLayout;
+import org.researchstack.foundation.components.survey.ui.layout.InstructionStepLayout;
+import org.researchstack.foundation.core.models.step.Step;
 
 /**
  * An InstructionStep object gives the participant instructions for a task.
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/survey/step/QuestionStep.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/step/QuestionStep.java
index 014541465..bdb859fb3 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/survey/step/QuestionStep.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/survey/step/QuestionStep.java
@@ -1,7 +1,8 @@
-package org.researchstack.backbone.step;
+package org.researchstack.foundation.components.survey.step;
 
-import org.researchstack.backbone.answerformat.AnswerFormat;
-import org.researchstack.backbone.ui.step.layout.SurveyStepLayout;
+import org.researchstack.foundation.components.survey.answerformat.AnswerFormat;
+import org.researchstack.foundation.components.survey.ui.layout.SurveyStepLayout;
+import org.researchstack.foundation.core.models.step.Step;
 
 /**
  * The {@link QuestionStep} class is a concrete subclass of {@link Step} that represents a step in
@@ -9,16 +10,16 @@
  * <p>
  * To use a question step, instantiate an QuestionStep object, fill in its properties, and include
  * it in a task. When the task completes, the user's answer is encoded in the result hierarchy
- * returned from the {@link org.researchstack.backbone.ui.ViewTaskActivity}.
+ * returned from the {@link org.researchstack.foundation.ui.ViewTaskActivity}.
  * <p>
  * When the ViewTaskActivity presents a QuestionStep object, it instantiates a {@link
  * SurveyStepLayout} object to present the step. The actual visual presentation depends on the
- * answer format and its {@link org.researchstack.backbone.ui.step.body.StepBody}.
+ * answer format and its {@link org.researchstack.foundation.ui.step.body.StepBody}.
  * <p>
  * When you need to present more than one question at the same time, it can be appropriate to use
  * {@link FormStep} instead of QuestionStep.
  * <p>
- * The result of a question step is an {@link org.researchstack.backbone.result.StepResult} object.
+ * The result of a question step is an {@link org.researchstack.foundation.result.StepResult} object.
  */
 public class QuestionStep extends Step {
     private AnswerFormat answerFormat;
@@ -61,7 +62,7 @@ public QuestionStep(String identifier, String title, AnswerFormat format) {
     }
 
     /**
-     * Returns a special {@link org.researchstack.backbone.ui.step.layout.StepLayout} that is used
+     * Returns a special {@link org.researchstack.foundation.ui.step.layout.StepLayout} that is used
      * for all question steps.
      * <p>
      * This step layout uses the {@link #getStepBodyClass()} to fill in the user interaction portion
@@ -75,7 +76,7 @@ public Class getStepLayoutClass() {
     }
 
     /**
-     * Returns a subclass of {@link org.researchstack.backbone.ui.step.body.StepBody} responsible
+     * Returns a subclass of {@link org.researchstack.foundation.ui.step.body.StepBody} responsible
      * for creating the ui for answering the question, base on the AnswerFormat.
      * <p>
      * This class is used by {@link SurveyStepLayout} to create the part of the layout where the
@@ -96,7 +97,7 @@ public Class<?> getStepBodyClass() {
      * <p>
      * For example, the answer format might include the type of data to collect, the constraints to
      * place on the answer, or a list of available choices (in the case of single or multiple select
-     * questions). It also provides the default {@link org.researchstack.backbone.ui.step.body.StepBody}
+     * questions). It also provides the default {@link org.researchstack.foundation.ui.step.body.StepBody}
      * for questions of its type.
      *
      * @return the answer format for this question step
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/BodyAnswer.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/BodyAnswer.java
index 08c14361d..4f7650f3d 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/BodyAnswer.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/BodyAnswer.java
@@ -1,14 +1,14 @@
-package org.researchstack.backbone.ui.step.body;
+package org.researchstack.foundation.components.survey.ui.body;
 
 import android.content.Context;
 import android.support.annotation.StringRes;
 
-import org.researchstack.backbone.R;
+import org.researchstack.foundation.R;
 
 public class BodyAnswer {
     public static final BodyAnswer VALID = new BodyAnswer(true, 0);
     public static final BodyAnswer INVALID = new BodyAnswer(false,
-            R.string.rsb_invalid_answer_default);
+            R.string.rsf_invalid_answer_default);
 
     private boolean isValid;
     private int reason;
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/DateQuestionBody.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/DateQuestionBody.java
index fcdb5fd73..6b28e034b 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/DateQuestionBody.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/DateQuestionBody.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.ui.step.body;
+package org.researchstack.foundation.components.survey.ui.body;
 
 import android.app.DatePickerDialog;
 import android.app.TimePickerDialog;
@@ -10,13 +10,14 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import org.researchstack.backbone.R;
-import org.researchstack.backbone.answerformat.AnswerFormat;
-import org.researchstack.backbone.answerformat.DateAnswerFormat;
-import org.researchstack.backbone.result.StepResult;
-import org.researchstack.backbone.step.QuestionStep;
-import org.researchstack.backbone.step.Step;
-import org.researchstack.backbone.utils.FormatHelper;
+
+import org.researchstack.foundation.R;
+import org.researchstack.foundation.components.survey.answerformat.AnswerFormat;
+import org.researchstack.foundation.components.survey.answerformat.DateAnswerFormat;
+import org.researchstack.foundation.components.survey.step.QuestionStep;
+import org.researchstack.foundation.components.utils.FormatHelper;
+import org.researchstack.foundation.core.models.result.StepResult;
+import org.researchstack.foundation.core.models.step.Step;
 
 import java.text.DateFormat;
 import java.util.Calendar;
@@ -73,7 +74,7 @@ else if (format.getDefaultDate() != null) {
 
     @Override
     public View getBodyView(int viewType, LayoutInflater inflater, ViewGroup parent) {
-        View view = inflater.inflate(R.layout.rsb_item_date_view, parent, false);
+        View view = inflater.inflate(R.layout.rsf_item_date_view, parent, false);
 
         TextView title = (TextView) view.findViewById(R.id.label);
         if (viewType == VIEW_TYPE_COMPACT) {
@@ -88,11 +89,11 @@ public View getBodyView(int viewType, LayoutInflater inflater, ViewGroup parent)
             textView.setHint(step.getPlaceholder());
         } else {
             if (format.getStyle() == AnswerFormat.DateAnswerStyle.Date) {
-                textView.setHint(R.string.rsb_hint_step_body_date);
+                textView.setHint(R.string.rsf_hint_step_body_date);
             } else if (format.getStyle() == AnswerFormat.DateAnswerStyle.TimeOfDay) {
-                textView.setHint(R.string.rsb_hint_step_body_time);
+                textView.setHint(R.string.rsf_hint_step_body_time);
             } else if (format.getStyle() == AnswerFormat.DateAnswerStyle.DateAndTime) {
-                textView.setHint(R.string.rsb_hint_step_body_datetime);
+                textView.setHint(R.string.rsf_hint_step_body_datetime);
             }
         }
 
@@ -115,8 +116,8 @@ public View getBodyView(int viewType, LayoutInflater inflater, ViewGroup parent)
         Resources res = parent.getResources();
         LinearLayout.MarginLayoutParams layoutParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
                 ViewGroup.LayoutParams.WRAP_CONTENT);
-        layoutParams.leftMargin = res.getDimensionPixelSize(R.dimen.rsb_margin_left);
-        layoutParams.rightMargin = res.getDimensionPixelSize(R.dimen.rsb_margin_right);
+        layoutParams.leftMargin = res.getDimensionPixelSize(R.dimen.rsf_margin_left);
+        layoutParams.rightMargin = res.getDimensionPixelSize(R.dimen.rsf_margin_right);
         view.setLayoutParams(layoutParams);
 
         return view;
@@ -140,7 +141,7 @@ public StepResult getStepResult(boolean skipped) {
     @Override
     public BodyAnswer getBodyAnswerState() {
         if (!hasChosenDate) {
-            return new BodyAnswer(false, R.string.rsb_invalid_answer_date_none);
+            return new BodyAnswer(false, R.string.rsf_invalid_answer_date_none);
         }
 
         return format.validateAnswer(calendar.getTime());
@@ -149,7 +150,7 @@ public BodyAnswer getBodyAnswerState() {
     private void showDialog(TextView tv) {
         // need to find a material date picker, since it's not in the support library
         ContextThemeWrapper contextWrapper = new ContextThemeWrapper(tv.getContext(),
-                R.style.Theme_Backbone);
+                R.style.Theme_Foundation);
         if (format.getStyle() == AnswerFormat.DateAnswerStyle.Date) {
             new DatePickerDialog(contextWrapper,
                     (view, year, monthOfYear, dayOfMonth) -> {
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/DecimalQuestionBody.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/DecimalQuestionBody.java
index c88bea5ba..16e305693 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/DecimalQuestionBody.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/DecimalQuestionBody.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.ui.step.body;
+package org.researchstack.foundation.components.survey.ui.body;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -11,13 +11,13 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import org.researchstack.backbone.R;
-import org.researchstack.backbone.answerformat.DecimalAnswerFormat;
-import org.researchstack.backbone.result.StepResult;
-import org.researchstack.backbone.step.QuestionStep;
-import org.researchstack.backbone.step.Step;
-import org.researchstack.backbone.utils.TextUtils;
-import org.researchstack.backbone.utils.ViewUtils;
+import org.researchstack.foundation.R;
+import org.researchstack.foundation.components.survey.answerformat.DecimalAnswerFormat;
+import org.researchstack.foundation.components.survey.step.QuestionStep;
+import org.researchstack.foundation.components.utils.TextUtils;
+import org.researchstack.foundation.components.utils.ViewUtils;
+import org.researchstack.foundation.core.models.result.StepResult;
+import org.researchstack.foundation.core.models.step.Step;
 
 public class DecimalQuestionBody implements StepBody {
     //-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
@@ -48,8 +48,8 @@ public View getBodyView(int viewType, LayoutInflater inflater, ViewGroup parent)
         Resources res = parent.getResources();
         LinearLayout.MarginLayoutParams layoutParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
                 ViewGroup.LayoutParams.WRAP_CONTENT);
-        layoutParams.leftMargin = res.getDimensionPixelSize(R.dimen.rsb_margin_left);
-        layoutParams.rightMargin = res.getDimensionPixelSize(R.dimen.rsb_margin_right);
+        layoutParams.leftMargin = res.getDimensionPixelSize(R.dimen.rsf_margin_left);
+        layoutParams.rightMargin = res.getDimensionPixelSize(R.dimen.rsf_margin_right);
         view.setLayoutParams(layoutParams);
 
         return view;
@@ -66,14 +66,14 @@ private View getViewForType(int viewType, LayoutInflater inflater, ViewGroup par
     }
 
     private View initViewDefault(LayoutInflater inflater, ViewGroup parent) {
-        editText = (EditText) inflater.inflate(R.layout.rsb_item_edit_text, parent, false);
+        editText = (EditText) inflater.inflate(R.layout.rsf_item_edit_text, parent, false);
         setFilters(parent.getContext());
 
         return editText;
     }
 
     private View initViewCompact(LayoutInflater inflater, ViewGroup parent) {
-        View formItemView = inflater.inflate(R.layout.rsb_item_edit_text_compact, parent, false);
+        View formItemView = inflater.inflate(R.layout.rsf_item_edit_text_compact, parent, false);
 
         TextView title = (TextView) formItemView.findViewById(R.id.label);
         title.setText(step.getTitle());
@@ -93,9 +93,9 @@ private void setFilters(Context context) {
         if (step.getPlaceholder() != null) {
             editText.setHint(step.getPlaceholder());
         } else if (maxValue == Integer.MAX_VALUE) {
-            editText.setHint(context.getString(R.string.rsb_hint_step_body_int_no_max));
+            editText.setHint(context.getString(R.string.rsf_hint_step_body_int_no_max));
         } else {
-            editText.setHint(context.getString(R.string.rsb_hint_step_body_dec,
+            editText.setHint(context.getString(R.string.rsf_hint_step_body_dec,
                     minValue,
                     maxValue));
         }
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/DurationQuestionBody.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/DurationQuestionBody.java
index 73a1e3bed..fd6ea5c45 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/DurationQuestionBody.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/DurationQuestionBody.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.ui.step.body;
+package org.researchstack.foundation.components.survey.ui.body;
 
 import android.content.res.Resources;
 import android.view.LayoutInflater;
@@ -8,11 +8,11 @@
 import android.widget.LinearLayout;
 import android.widget.Spinner;
 
-import org.researchstack.backbone.R;
-import org.researchstack.backbone.answerformat.DurationAnswerFormat;
-import org.researchstack.backbone.result.StepResult;
-import org.researchstack.backbone.step.QuestionStep;
-import org.researchstack.backbone.step.Step;
+import org.researchstack.foundation.R;
+import org.researchstack.foundation.components.survey.answerformat.DurationAnswerFormat;
+import org.researchstack.foundation.components.survey.step.QuestionStep;
+import org.researchstack.foundation.core.models.result.StepResult;
+import org.researchstack.foundation.core.models.step.Step;
 
 /**
  * Implementation of the question type "duration".
@@ -59,8 +59,8 @@ public View getBodyView(int viewType, LayoutInflater inflater, ViewGroup parent)
         Resources res = parent.getResources();
         LinearLayout.MarginLayoutParams layoutParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
                 ViewGroup.LayoutParams.WRAP_CONTENT);
-        layoutParams.leftMargin = res.getDimensionPixelSize(R.dimen.rsb_margin_left);
-        layoutParams.rightMargin = res.getDimensionPixelSize(R.dimen.rsb_margin_right);
+        layoutParams.leftMargin = res.getDimensionPixelSize(R.dimen.rsf_margin_left);
+        layoutParams.rightMargin = res.getDimensionPixelSize(R.dimen.rsf_margin_right);
         view.setLayoutParams(layoutParams);
 
         return view;
@@ -75,7 +75,7 @@ private View getViewForType(int viewType, LayoutInflater inflater, ViewGroup par
     }
 
     private View initView(LayoutInflater inflater, ViewGroup parent) {
-        View v = inflater.inflate(R.layout.rsb_item_edit_duration, parent, false);
+        View v = inflater.inflate(R.layout.rsf_item_edit_duration, parent, false);
 
         String[] hoursStrs = new String[24];
         for (int i = 0; i < 24; i++) hoursStrs[i] = String.valueOf(i);
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/FormBody.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/FormBody.java
index d6c85f7e5..c27349ee6 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/FormBody.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/FormBody.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.ui.step.body;
+package org.researchstack.foundation.components.survey.ui.body;
 
 import android.support.annotation.NonNull;
 import android.view.LayoutInflater;
@@ -6,12 +6,13 @@
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 
-import org.researchstack.backbone.R;
-import org.researchstack.backbone.result.StepResult;
-import org.researchstack.backbone.step.FormStep;
-import org.researchstack.backbone.step.QuestionStep;
-import org.researchstack.backbone.step.Step;
-import org.researchstack.backbone.utils.LogExt;
+
+import org.researchstack.foundation.R;
+import org.researchstack.foundation.components.survey.step.FormStep;
+import org.researchstack.foundation.components.survey.step.QuestionStep;
+import org.researchstack.foundation.components.utils.LogExt;
+import org.researchstack.foundation.core.models.result.StepResult;
+import org.researchstack.foundation.core.models.step.Step;
 
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
@@ -37,7 +38,7 @@ public FormBody(Step step, StepResult result) {
     @Override
     public View getBodyView(int viewType, LayoutInflater inflater, ViewGroup parent) {
         // Inflate our container for each compact child StepBody
-        LinearLayout body = (LinearLayout) inflater.inflate(R.layout.rsb_step_layout_form_body,
+        LinearLayout body = (LinearLayout) inflater.inflate(R.layout.rsf_step_layout_form_body,
                 parent,
                 false);
 
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/IntegerQuestionBody.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/IntegerQuestionBody.java
index d06575237..112f0272b 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/IntegerQuestionBody.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/IntegerQuestionBody.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.ui.step.body;
+package org.researchstack.foundation.components.survey.ui.body;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -11,13 +11,13 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import org.researchstack.backbone.R;
-import org.researchstack.backbone.answerformat.IntegerAnswerFormat;
-import org.researchstack.backbone.result.StepResult;
-import org.researchstack.backbone.step.QuestionStep;
-import org.researchstack.backbone.step.Step;
-import org.researchstack.backbone.utils.TextUtils;
-import org.researchstack.backbone.utils.ViewUtils;
+import org.researchstack.foundation.R;
+import org.researchstack.foundation.components.survey.answerformat.IntegerAnswerFormat;
+import org.researchstack.foundation.components.survey.step.QuestionStep;
+import org.researchstack.foundation.components.utils.TextUtils;
+import org.researchstack.foundation.components.utils.ViewUtils;
+import org.researchstack.foundation.core.models.result.StepResult;
+import org.researchstack.foundation.core.models.step.Step;
 
 public class IntegerQuestionBody implements StepBody {
     //-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
@@ -48,8 +48,8 @@ public View getBodyView(int viewType, LayoutInflater inflater, ViewGroup parent)
         Resources res = parent.getResources();
         LinearLayout.MarginLayoutParams layoutParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
                 ViewGroup.LayoutParams.WRAP_CONTENT);
-        layoutParams.leftMargin = res.getDimensionPixelSize(R.dimen.rsb_margin_left);
-        layoutParams.rightMargin = res.getDimensionPixelSize(R.dimen.rsb_margin_right);
+        layoutParams.leftMargin = res.getDimensionPixelSize(R.dimen.rsf_margin_left);
+        layoutParams.rightMargin = res.getDimensionPixelSize(R.dimen.rsf_margin_right);
         view.setLayoutParams(layoutParams);
 
         return view;
@@ -66,14 +66,14 @@ private View getViewForType(int viewType, LayoutInflater inflater, ViewGroup par
     }
 
     private View initViewDefault(LayoutInflater inflater, ViewGroup parent) {
-        editText = (EditText) inflater.inflate(R.layout.rsb_item_edit_text, parent, false);
+        editText = (EditText) inflater.inflate(R.layout.rsf_item_edit_text, parent, false);
         setFilters(parent.getContext());
 
         return editText;
     }
 
     private View initViewCompact(LayoutInflater inflater, ViewGroup parent) {
-        View formItemView = inflater.inflate(R.layout.rsb_item_edit_text_compact, parent, false);
+        View formItemView = inflater.inflate(R.layout.rsf_item_edit_text_compact, parent, false);
 
         TextView title = (TextView) formItemView.findViewById(R.id.label);
         title.setText(step.getTitle());
@@ -93,9 +93,9 @@ private void setFilters(Context context) {
         if (step.getPlaceholder() != null) {
             editText.setHint(step.getPlaceholder());
         } else if (maxValue == Integer.MAX_VALUE) {
-            editText.setHint(context.getString(R.string.rsb_hint_step_body_int_no_max));
+            editText.setHint(context.getString(R.string.rsf_hint_step_body_int_no_max));
         } else {
-            editText.setHint(context.getString(R.string.rsb_hint_step_body_int,
+            editText.setHint(context.getString(R.string.rsf_hint_step_body_int,
                     minValue,
                     maxValue));
         }
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/MultiChoiceQuestionBody.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/MultiChoiceQuestionBody.java
index 2499de7aa..c1ee7329d 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/MultiChoiceQuestionBody.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/MultiChoiceQuestionBody.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.ui.step.body;
+package org.researchstack.foundation.components.survey.ui.body;
 
 import android.content.res.Resources;
 import android.support.v4.content.ContextCompat;
@@ -10,12 +10,13 @@
 import android.widget.RadioGroup;
 import android.widget.TextView;
 
-import org.researchstack.backbone.R;
-import org.researchstack.backbone.answerformat.ChoiceAnswerFormat;
-import org.researchstack.backbone.model.Choice;
-import org.researchstack.backbone.result.StepResult;
-import org.researchstack.backbone.step.QuestionStep;
-import org.researchstack.backbone.step.Step;
+
+import org.researchstack.foundation.R;
+import org.researchstack.foundation.components.survey.answerformat.ChoiceAnswerFormat;
+import org.researchstack.foundation.components.survey.model.Choice;
+import org.researchstack.foundation.components.survey.step.QuestionStep;
+import org.researchstack.foundation.core.models.result.StepResult;
+import org.researchstack.foundation.core.models.step.Step;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -53,8 +54,8 @@ public View getBodyView(int viewType, LayoutInflater inflater, ViewGroup parent)
         Resources res = parent.getResources();
         LinearLayout.MarginLayoutParams layoutParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
                 ViewGroup.LayoutParams.WRAP_CONTENT);
-        layoutParams.leftMargin = res.getDimensionPixelSize(R.dimen.rsb_margin_left);
-        layoutParams.rightMargin = res.getDimensionPixelSize(R.dimen.rsb_margin_right);
+        layoutParams.leftMargin = res.getDimensionPixelSize(R.dimen.rsf_margin_left);
+        layoutParams.rightMargin = res.getDimensionPixelSize(R.dimen.rsf_margin_right);
         view.setLayoutParams(layoutParams);
 
         return view;
@@ -74,13 +75,13 @@ private View initViewDefault(LayoutInflater inflater, ViewGroup parent) {
         RadioGroup radioGroup = new RadioGroup(inflater.getContext());
         radioGroup.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE);
         radioGroup.setDividerDrawable(ContextCompat.getDrawable(parent.getContext(),
-                R.drawable.rsb_divider_empty_8dp));
+                R.drawable.rsf_divider_empty_8dp));
 
         for (int i = 0; i < choices.length; i++) {
             Choice<T> item = choices[i];
 
             // Create & add the View to our body-view
-            AppCompatCheckBox checkBox = (AppCompatCheckBox) inflater.inflate(R.layout.rsb_item_checkbox,
+            AppCompatCheckBox checkBox = (AppCompatCheckBox) inflater.inflate(R.layout.rsf_item_checkbox,
                     radioGroup,
                     false);
             checkBox.setText(item.getText());
@@ -109,7 +110,7 @@ private View initViewDefault(LayoutInflater inflater, ViewGroup parent) {
     private View initViewCompact(LayoutInflater inflater, ViewGroup parent) {
         ViewGroup compactView = (ViewGroup) initViewDefault(inflater, parent);
 
-        TextView label = (TextView) inflater.inflate(R.layout.rsb_item_text_view_title_compact,
+        TextView label = (TextView) inflater.inflate(R.layout.rsf_item_text_view_title_compact,
                 compactView,
                 false);
         label.setText(step.getTitle());
@@ -133,7 +134,7 @@ public StepResult getStepResult(boolean skipped) {
     @Override
     public BodyAnswer getBodyAnswerState() {
         if (currentSelected.isEmpty()) {
-            return new BodyAnswer(false, R.string.rsb_invalid_answer_choice);
+            return new BodyAnswer(false, R.string.rsf_invalid_answer_choice);
         } else {
             return BodyAnswer.VALID;
         }
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/NotImplementedStepBody.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/NotImplementedStepBody.java
index 3d59fb387..70b0f261b 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/NotImplementedStepBody.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/NotImplementedStepBody.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.ui.step.body;
+package org.researchstack.foundation.components.survey.ui.body;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -6,8 +6,9 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import org.researchstack.backbone.result.StepResult;
-import org.researchstack.backbone.step.QuestionStep;
+import org.researchstack.foundation.components.survey.step.QuestionStep;
+import org.researchstack.foundation.core.models.result.StepResult;
+
 
 @Deprecated
 public class NotImplementedStepBody implements StepBody {
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/SingleChoiceQuestionBody.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/SingleChoiceQuestionBody.java
index d7a2ced1c..c7018745e 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/SingleChoiceQuestionBody.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/SingleChoiceQuestionBody.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.ui.step.body;
+package org.researchstack.foundation.components.survey.ui.body;
 
 import android.content.res.Resources;
 import android.support.v4.content.ContextCompat;
@@ -10,12 +10,13 @@
 import android.widget.RadioGroup;
 import android.widget.TextView;
 
-import org.researchstack.backbone.R;
-import org.researchstack.backbone.answerformat.ChoiceAnswerFormat;
-import org.researchstack.backbone.model.Choice;
-import org.researchstack.backbone.result.StepResult;
-import org.researchstack.backbone.step.QuestionStep;
-import org.researchstack.backbone.step.Step;
+import org.researchstack.foundation.R;
+import org.researchstack.foundation.components.survey.answerformat.ChoiceAnswerFormat;
+import org.researchstack.foundation.components.survey.model.Choice;
+import org.researchstack.foundation.components.survey.step.QuestionStep;
+import org.researchstack.foundation.core.models.result.StepResult;
+import org.researchstack.foundation.core.models.step.Step;
+
 
 public class SingleChoiceQuestionBody<T> implements StepBody {
     //-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
@@ -51,8 +52,8 @@ public View getBodyView(int viewType, LayoutInflater inflater, ViewGroup parent)
         Resources res = parent.getResources();
         LinearLayout.MarginLayoutParams layoutParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
                 ViewGroup.LayoutParams.WRAP_CONTENT);
-        layoutParams.leftMargin = res.getDimensionPixelSize(R.dimen.rsb_margin_left);
-        layoutParams.rightMargin = res.getDimensionPixelSize(R.dimen.rsb_margin_right);
+        layoutParams.leftMargin = res.getDimensionPixelSize(R.dimen.rsf_margin_left);
+        layoutParams.rightMargin = res.getDimensionPixelSize(R.dimen.rsf_margin_right);
         view.setLayoutParams(layoutParams);
 
         return view;
@@ -72,11 +73,11 @@ private View initViewDefault(LayoutInflater inflater, ViewGroup parent) {
         RadioGroup radioGroup = new RadioGroup(parent.getContext());
         radioGroup.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE);
         radioGroup.setDividerDrawable(ContextCompat.getDrawable(parent.getContext(),
-                R.drawable.rsb_divider_empty_8dp));
+                R.drawable.rsf_divider_empty_8dp));
 
         for (int i = 0; i < choices.length; i++) {
             Choice choice = choices[i];
-            RadioButton radioButton = (RadioButton) inflater.inflate(R.layout.rsb_item_radio,
+            RadioButton radioButton = (RadioButton) inflater.inflate(R.layout.rsf_item_radio,
                     radioGroup,
                     false);
             radioButton.setText(choice.getText());
@@ -100,7 +101,7 @@ private View initViewDefault(LayoutInflater inflater, ViewGroup parent) {
     private View initViewCompact(LayoutInflater inflater, ViewGroup parent) {
         ViewGroup compactView = (ViewGroup) initViewDefault(inflater, parent);
 
-        TextView label = (TextView) inflater.inflate(R.layout.rsb_item_text_view_title_compact,
+        TextView label = (TextView) inflater.inflate(R.layout.rsf_item_text_view_title_compact,
                 compactView,
                 false);
         label.setText(step.getTitle());
@@ -124,7 +125,7 @@ public StepResult getStepResult(boolean skipped) {
     @Override
     public BodyAnswer getBodyAnswerState() {
         if (currentSelected == null) {
-            return new BodyAnswer(false, R.string.rsb_invalid_answer_choice);
+            return new BodyAnswer(false, R.string.rsf_invalid_answer_choice);
         } else {
             return BodyAnswer.VALID;
         }
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/StepBody.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/StepBody.java
index d1658a7cd..e42b2afe3 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/StepBody.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/StepBody.java
@@ -1,10 +1,10 @@
-package org.researchstack.backbone.ui.step.body;
+package org.researchstack.foundation.components.survey.ui.body;
 
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import org.researchstack.backbone.result.StepResult;
+import org.researchstack.foundation.core.models.result.StepResult;
 
 public interface StepBody {
     int VIEW_TYPE_DEFAULT = 0;
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/TextQuestionBody.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/TextQuestionBody.java
index ad4a83505..2188a6b0d 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/TextQuestionBody.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/TextQuestionBody.java
@@ -1,7 +1,9 @@
-package org.researchstack.backbone.ui.step.body;
+package org.researchstack.foundation.components.survey.ui.body;
 
 import android.content.res.Resources;
+import android.text.Editable;
 import android.text.InputFilter;
+import android.text.TextWatcher;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -9,15 +11,14 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.jakewharton.rxbinding.widget.RxTextView;
+import org.researchstack.foundation.R;
+import org.researchstack.foundation.components.survey.answerformat.TextAnswerFormat;
+import org.researchstack.foundation.components.survey.step.QuestionStep;
+import org.researchstack.foundation.components.utils.TextUtils;
+import org.researchstack.foundation.components.utils.ViewUtils;
+import org.researchstack.foundation.core.models.result.StepResult;
+import org.researchstack.foundation.core.models.step.Step;
 
-import org.researchstack.backbone.R;
-import org.researchstack.backbone.answerformat.TextAnswerFormat;
-import org.researchstack.backbone.result.StepResult;
-import org.researchstack.backbone.step.QuestionStep;
-import org.researchstack.backbone.step.Step;
-import org.researchstack.backbone.utils.TextUtils;
-import org.researchstack.backbone.utils.ViewUtils;
 
 public class TextQuestionBody implements StepBody {
     //-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
@@ -38,13 +39,13 @@ public TextQuestionBody(Step step, StepResult result) {
 
     @Override
     public View getBodyView(int viewType, LayoutInflater inflater, ViewGroup parent) {
-        View body = inflater.inflate(R.layout.rsb_item_edit_text_compact, parent, false);
+        View body = inflater.inflate(R.layout.rsf_item_edit_text_compact, parent, false);
 
         editText = (EditText) body.findViewById(R.id.value);
         if (step.getPlaceholder() != null) {
             editText.setHint(step.getPlaceholder());
         } else {
-            editText.setHint(R.string.rsb_hint_step_body_text);
+            editText.setHint(R.string.rsf_hint_step_body_text);
         }
 
         TextView title = (TextView) body.findViewById(R.id.label);
@@ -62,8 +63,21 @@ public View getBodyView(int viewType, LayoutInflater inflater, ViewGroup parent)
         }
 
         // Set result on text change
-        RxTextView.textChanges(editText).subscribe(text -> {
-            result.setResult(text.toString());
+        editText.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                result.setResult(s.toString());
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+
+            }
         });
 
         // Format EditText from TextAnswerFormat
@@ -80,8 +94,8 @@ public View getBodyView(int viewType, LayoutInflater inflater, ViewGroup parent)
         Resources res = parent.getResources();
         LinearLayout.MarginLayoutParams layoutParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
                 ViewGroup.LayoutParams.WRAP_CONTENT);
-        layoutParams.leftMargin = res.getDimensionPixelSize(R.dimen.rsb_margin_left);
-        layoutParams.rightMargin = res.getDimensionPixelSize(R.dimen.rsb_margin_right);
+        layoutParams.leftMargin = res.getDimensionPixelSize(R.dimen.rsf_margin_left);
+        layoutParams.rightMargin = res.getDimensionPixelSize(R.dimen.rsf_margin_right);
         body.setLayoutParams(layoutParams);
 
         return body;
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/layout/InstructionStepLayout.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/layout/InstructionStepLayout.java
index 6e967df95..63526ef82 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/layout/InstructionStepLayout.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/layout/InstructionStepLayout.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.ui.step.layout;
+package org.researchstack.foundation.components.survey.ui.layout;
 
 import android.content.Context;
 import android.content.Intent;
@@ -7,15 +7,15 @@
 import android.view.View;
 import android.widget.TextView;
 
-import org.researchstack.backbone.R;
-import org.researchstack.backbone.ResourcePathManager;
-import org.researchstack.backbone.result.StepResult;
-import org.researchstack.backbone.step.Step;
-import org.researchstack.backbone.ui.ViewWebDocumentActivity;
-import org.researchstack.backbone.ui.callbacks.StepCallbacks;
-import org.researchstack.backbone.ui.views.FixedSubmitBarLayout;
-import org.researchstack.backbone.ui.views.SubmitBar;
-import org.researchstack.backbone.utils.TextUtils;
+import org.researchstack.foundation.R;
+import org.researchstack.foundation.components.common.ui.callbacks.StepCallbacks;
+import org.researchstack.foundation.components.common.ui.layout.FixedSubmitBarLayout;
+import org.researchstack.foundation.components.common.ui.layout.StepLayout;
+import org.researchstack.foundation.components.common.ui.views.SubmitBar;
+import org.researchstack.foundation.components.singletons.TextViewLinkManager;
+import org.researchstack.foundation.components.utils.TextUtils;
+import org.researchstack.foundation.core.models.result.StepResult;
+import org.researchstack.foundation.core.models.step.Step;
 
 public class InstructionStepLayout extends FixedSubmitBarLayout implements StepLayout {
     private StepCallbacks callbacks;
@@ -57,7 +57,7 @@ public void setCallbacks(StepCallbacks callbacks) {
 
     @Override
     public int getContentResourceId() {
-        return R.layout.rsb_step_layout_instruction;
+        return R.layout.rsf_step_layout_instruction;
     }
 
     private void initializeStep() {
@@ -65,38 +65,30 @@ private void initializeStep() {
 
             // Set Title
             if (!TextUtils.isEmpty(step.getTitle())) {
-                TextView title = (TextView) findViewById(R.id.rsb_intruction_title);
+                TextView title = (TextView) findViewById(R.id.rsf_intruction_title);
                 title.setVisibility(View.VISIBLE);
                 title.setText(step.getTitle());
             }
 
             // Set Summary
             if (!TextUtils.isEmpty(step.getText())) {
-                TextView summary = (TextView) findViewById(R.id.rsb_intruction_text);
+                TextView summary = (TextView) findViewById(R.id.rsf_intruction_text);
                 summary.setVisibility(View.VISIBLE);
                 summary.setText(Html.fromHtml(step.getText()));
-                summary.setMovementMethod(new TextViewLinkHandler() {
-                    @Override
-                    public void onLinkClick(String url) {
-                        String path = ResourcePathManager.getInstance().
-                                generateAbsolutePath(ResourcePathManager.Resource.TYPE_HTML, url);
-                        Intent intent = ViewWebDocumentActivity.newIntentForPath(getContext(),
-                                step.getTitle(),
-                                path);
-                        getContext().startActivity(intent);
-                    }
-                });
+                summary.setMovementMethod(
+                        TextViewLinkManager.Companion.getSharedManager().getHandler(getContext(), step.getTitle())
+                );
             }
 
             // Set Next / Skip
-            SubmitBar submitBar = (SubmitBar) findViewById(R.id.rsb_submit_bar);
-            submitBar.setPositiveTitle(R.string.rsb_next);
+            SubmitBar submitBar = (SubmitBar) findViewById(R.id.rsf_submit_bar);
+            submitBar.setPositiveTitle(R.string.rsf_next);
             submitBar.setPositiveAction(v -> callbacks.onSaveStep(StepCallbacks.ACTION_NEXT,
                     step,
                     null));
 
             if (step.isOptional()) {
-                submitBar.setNegativeTitle(R.string.rsb_step_skip);
+                submitBar.setNegativeTitle(R.string.rsf_step_skip);
                 submitBar.setNegativeAction(v -> {
                     if (callbacks != null) {
                         callbacks.onSaveStep(StepCallbacks.ACTION_NEXT, step, null);
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/layout/SurveyStepLayout.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/layout/SurveyStepLayout.java
index 4d27c1b4b..19a5f8840 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/layout/SurveyStepLayout.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/layout/SurveyStepLayout.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.ui.step.layout;
+package org.researchstack.foundation.components.survey.ui.layout;
 
 import android.content.Context;
 import android.content.Intent;
@@ -13,19 +13,19 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import org.researchstack.backbone.R;
-import org.researchstack.backbone.ResourcePathManager;
-import org.researchstack.backbone.result.StepResult;
-import org.researchstack.backbone.step.QuestionStep;
-import org.researchstack.backbone.step.Step;
-import org.researchstack.backbone.ui.ViewWebDocumentActivity;
-import org.researchstack.backbone.ui.callbacks.StepCallbacks;
-import org.researchstack.backbone.ui.step.body.BodyAnswer;
-import org.researchstack.backbone.ui.step.body.StepBody;
-import org.researchstack.backbone.ui.views.FixedSubmitBarLayout;
-import org.researchstack.backbone.ui.views.SubmitBar;
-import org.researchstack.backbone.utils.LogExt;
-import org.researchstack.backbone.utils.TextUtils;
+import org.researchstack.foundation.R;
+import org.researchstack.foundation.components.common.ui.callbacks.StepCallbacks;
+import org.researchstack.foundation.components.common.ui.layout.StepLayout;
+import org.researchstack.foundation.components.common.ui.views.SubmitBar;
+import org.researchstack.foundation.components.singletons.TextViewLinkManager;
+import org.researchstack.foundation.components.survey.ui.body.BodyAnswer;
+import org.researchstack.foundation.components.common.ui.layout.FixedSubmitBarLayout;
+import org.researchstack.foundation.components.survey.step.QuestionStep;
+import org.researchstack.foundation.components.survey.ui.body.StepBody;
+import org.researchstack.foundation.components.utils.LogExt;
+import org.researchstack.foundation.components.utils.TextUtils;
+import org.researchstack.foundation.core.models.result.StepResult;
+import org.researchstack.foundation.core.models.step.Step;
 
 import java.lang.reflect.Constructor;
 
@@ -100,7 +100,7 @@ public void setCallbacks(StepCallbacks callbacks) {
 
     @Override
     public int getContentResourceId() {
-        return R.layout.rsb_step_layout;
+        return R.layout.rsf_step_layout;
     }
 
     public void initializeStep() {
@@ -111,10 +111,10 @@ public void initializeStep() {
     public void initStepLayout() {
         LogExt.i(getClass(), "initStepLayout()");
 
-        container = (LinearLayout) findViewById(R.id.rsb_survey_content_container);
-        TextView title = (TextView) findViewById(R.id.rsb_survey_title);
-        TextView summary = (TextView) findViewById(R.id.rsb_survey_text);
-        SubmitBar submitBar = (SubmitBar) findViewById(R.id.rsb_submit_bar);
+        container = (LinearLayout) findViewById(R.id.rsf_survey_content_container);
+        TextView title = (TextView) findViewById(R.id.rsf_survey_title);
+        TextView summary = (TextView) findViewById(R.id.rsf_survey_text);
+        SubmitBar submitBar = (SubmitBar) findViewById(R.id.rsf_submit_bar);
         submitBar.setPositiveAction(v -> onNextClicked());
 
         if (questionStep != null) {
@@ -126,21 +126,13 @@ public void initStepLayout() {
             if (!TextUtils.isEmpty(questionStep.getText())) {
                 summary.setVisibility(View.VISIBLE);
                 summary.setText(Html.fromHtml(questionStep.getText()));
-                summary.setMovementMethod(new TextViewLinkHandler() {
-                    @Override
-                    public void onLinkClick(String url) {
-                        String path = ResourcePathManager.getInstance().
-                                generateAbsolutePath(ResourcePathManager.Resource.TYPE_HTML, url);
-                        Intent intent = ViewWebDocumentActivity.newIntentForPath(getContext(),
-                                questionStep.getTitle(),
-                                path);
-                        getContext().startActivity(intent);
-                    }
-                });
+                summary.setMovementMethod(
+                        TextViewLinkManager.Companion.getSharedManager().getHandler(getContext(), questionStep.getTitle())
+                );
             }
 
             if (questionStep.isOptional()) {
-                submitBar.setNegativeTitle(R.string.rsb_step_skip);
+                submitBar.setNegativeTitle(R.string.rsf_step_skip);
                 submitBar.setNegativeAction(v -> onSkipClicked());
             } else {
                 submitBar.getNegativeActionView().setVisibility(View.GONE);
@@ -156,11 +148,11 @@ public void initStepBody() {
         View body = stepBody.getBodyView(StepBody.VIEW_TYPE_DEFAULT, inflater, this);
 
         if (body != null) {
-            View oldView = container.findViewById(R.id.rsb_survey_step_body);
+            View oldView = container.findViewById(R.id.rsf_survey_step_body);
             int bodyIndex = container.indexOfChild(oldView);
             container.removeView(oldView);
             container.addView(body, bodyIndex);
-            body.setId(R.id.rsb_survey_step_body);
+            body.setId(R.id.rsf_survey_step_body);
         }
     }
 
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/utils/FormatHelper.java b/foundation/src/main/java/org/researchstack/foundation/components/utils/FormatHelper.java
index 721cdfbdc..f0d07bd7d 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/utils/FormatHelper.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/utils/FormatHelper.java
@@ -1,6 +1,4 @@
-package org.researchstack.backbone.utils;
-
-import org.researchstack.backbone.ui.step.layout.ConsentSignatureStepLayout;
+package org.researchstack.foundation.components.utils;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/utils/LogExt.java b/foundation/src/main/java/org/researchstack/foundation/components/utils/LogExt.java
index 991adcc8c..bafc04e26 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/utils/LogExt.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/utils/LogExt.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.utils;
+package org.researchstack.foundation.components.utils;
 
 import android.util.Log;
 
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/utils/ResUtils.java b/foundation/src/main/java/org/researchstack/foundation/components/utils/ResUtils.java
index 07010fae8..7436e76f9 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/utils/ResUtils.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/utils/ResUtils.java
@@ -1,10 +1,7 @@
-package org.researchstack.backbone.utils;
+package org.researchstack.foundation.components.utils;
 
 import android.content.Context;
 
-import org.researchstack.backbone.StorageAccess;
-
-
 public class ResUtils {
 
     private ResUtils() {
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/utils/TextUtils.java b/foundation/src/main/java/org/researchstack/foundation/components/utils/TextUtils.java
index c658096cf..987dfd0f0 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/utils/TextUtils.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/utils/TextUtils.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.utils;
+package org.researchstack.foundation.components.utils;
 
 import android.text.InputFilter;
 import android.text.Spanned;
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/utils/ThemeUtils.java b/foundation/src/main/java/org/researchstack/foundation/components/utils/ThemeUtils.java
index b9df9c894..d2a93e329 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/utils/ThemeUtils.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/utils/ThemeUtils.java
@@ -1,11 +1,11 @@
-package org.researchstack.backbone.utils;
+package org.researchstack.foundation.components.utils;
 
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.util.TypedValue;
 
-import org.researchstack.backbone.R;
+import org.researchstack.foundation.R;
 
 import java.lang.reflect.Method;
 
@@ -38,7 +38,7 @@ public static int getPassCodeTheme(Context context) {
                 new int[]{R.attr.passcodeTheme});
         int themeResId = a.getResourceId(0, 0);
         if (themeResId == 0) {
-            throw new RuntimeException("Theme must define attribute passCodeTheme or extend from @style/Base.Theme.Backbone");
+            throw new RuntimeException("Theme must define attribute passCodeTheme or extend from @style/Base.Theme.Foundation");
         }
 
         a.recycle();
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/utils/UiThreadContext.java b/foundation/src/main/java/org/researchstack/foundation/components/utils/UiThreadContext.java
index 918d6453e..90e0dda15 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/utils/UiThreadContext.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/utils/UiThreadContext.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.utils;
+package org.researchstack.foundation.components.utils;
 
 import android.os.Looper;
 
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/utils/ViewUtils.java b/foundation/src/main/java/org/researchstack/foundation/components/utils/ViewUtils.java
index 2eb753cd3..b8aafc4ea 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/utils/ViewUtils.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/utils/ViewUtils.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.utils;
+package org.researchstack.foundation.components.utils;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/web/ui/activities/ViewVideoActivity.java b/foundation/src/main/java/org/researchstack/foundation/components/web/ui/activities/ViewVideoActivity.java
index a5db40bee..cf37d05d3 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/web/ui/activities/ViewVideoActivity.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/web/ui/activities/ViewVideoActivity.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.ui;
+package org.researchstack.foundation.components.web.ui.activities;
 
 import android.content.Context;
 import android.content.Intent;
@@ -7,8 +7,8 @@
 import android.support.v7.app.AppCompatActivity;
 import android.widget.MediaController;
 
-import org.researchstack.backbone.R;
-import org.researchstack.backbone.ui.views.AssetVideoView;
+import org.researchstack.foundation.R;
+import org.researchstack.foundation.components.web.ui.views.AssetVideoView;
 
 import java.io.IOException;
 
@@ -27,7 +27,7 @@ public static Intent newIntent(Context context, String relativeVideoPath) {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        super.setContentView(R.layout.rsb_activity_video_viewer);
+        super.setContentView(R.layout.rsf_activity_video_viewer);
 
         videoView = (AssetVideoView) findViewById(R.id.videoView);
 
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/web/ui/activities/ViewWebDocumentActivity.java b/foundation/src/main/java/org/researchstack/foundation/components/web/ui/activities/ViewWebDocumentActivity.java
index 8c9bbaffe..006f660bc 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/web/ui/activities/ViewWebDocumentActivity.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/web/ui/activities/ViewWebDocumentActivity.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.ui;
+package org.researchstack.foundation.components.web.ui.activities;
 
 import android.content.Context;
 import android.content.Intent;
@@ -8,9 +8,9 @@
 import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
 
-import org.researchstack.backbone.R;
-import org.researchstack.backbone.ui.views.LocalWebView;
-import org.researchstack.backbone.utils.ThemeUtils;
+import org.researchstack.foundation.R;
+import org.researchstack.foundation.components.utils.ThemeUtils;
+import org.researchstack.foundation.components.web.ui.views.LocalWebView;
 
 /**
  * The ViewWebDocumentActivity is used for viewing both local and network HTML docs. This activity
@@ -62,7 +62,7 @@ protected void onCreate(Bundle savedInstanceState) {
             setTheme(getIntent().getIntExtra(KEY_THEME, 0));
         }
         super.onCreate(savedInstanceState);
-        super.setContentView(R.layout.rsb_activity_web_document);
+        super.setContentView(R.layout.rsf_activity_web_document);
 
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/web/ui/views/AssetVideoView.java b/foundation/src/main/java/org/researchstack/foundation/components/web/ui/views/AssetVideoView.java
index 65c5777a7..d718d388d 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/web/ui/views/AssetVideoView.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/web/ui/views/AssetVideoView.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.researchstack.backbone.ui.views;
+package org.researchstack.foundation.components.web.ui.views;
 
 import android.annotation.TargetApi;
 import android.app.AlertDialog;
@@ -33,7 +33,7 @@
 import android.widget.MediaController;
 import android.widget.VideoView;
 
-import org.researchstack.backbone.R;
+import org.researchstack.foundation.R;
 
 import java.io.FileDescriptor;
 import java.io.IOException;
@@ -192,13 +192,13 @@ public boolean onError(MediaPlayer mp, int framework_err, int impl_err) {
                 int messageId;
 
                 if (framework_err == MediaPlayer.MEDIA_ERROR_NOT_VALID_FOR_PROGRESSIVE_PLAYBACK) {
-                    messageId = R.string.rsb_error_assetvideoview_invalid_progressive_playback;
+                    messageId = R.string.rsf_error_assetvideoview_invalid_progressive_playback;
                 } else {
-                    messageId = R.string.rsb_error_assetvideoview_unknown;
+                    messageId = R.string.rsf_error_assetvideoview_unknown;
                 }
 
                 new AlertDialog.Builder(getContext()).setMessage(messageId)
-                        .setPositiveButton(R.string.rsb_error_assetvideoview_button,
+                        .setPositiveButton(R.string.rsf_error_assetvideoview_button,
                                 new DialogInterface.OnClickListener() {
                                     public void onClick(DialogInterface dialog, int whichButton) {
                                         /* If we get here, there is no onError listener, so
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/web/ui/views/LocalWebView.java b/foundation/src/main/java/org/researchstack/foundation/components/web/ui/views/LocalWebView.java
index 80574090d..a9e7f6018 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/web/ui/views/LocalWebView.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/web/ui/views/LocalWebView.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.ui.views;
+package org.researchstack.foundation.components.web.ui.views;
 
 import android.content.Context;
 import android.content.Intent;
@@ -9,10 +9,10 @@
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
-import org.researchstack.backbone.ResourcePathManager;
-import org.researchstack.backbone.ui.ViewVideoActivity;
-import org.researchstack.backbone.ui.ViewWebDocumentActivity;
-import org.researchstack.backbone.utils.LogExt;
+import org.researchstack.foundation.components.singletons.ResourcePathManager;
+import org.researchstack.foundation.components.utils.LogExt;
+import org.researchstack.foundation.components.web.ui.activities.ViewVideoActivity;
+import org.researchstack.foundation.components.web.ui.activities.ViewWebDocumentActivity;
 
 import java.io.File;
 
diff --git a/foundation/src/main/java/org/researchstack/foundation/core/models/result/Result.java b/foundation/src/main/java/org/researchstack/foundation/core/models/result/Result.java
index b64ff5571..97e8e9274 100644
--- a/foundation/src/main/java/org/researchstack/foundation/core/models/result/Result.java
+++ b/foundation/src/main/java/org/researchstack/foundation/core/models/result/Result.java
@@ -1,4 +1,6 @@
-package org.researchstack.backbone.result;
+package org.researchstack.foundation.core.models.result;
+
+import org.researchstack.foundation.core.interfaces.IResult;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -6,8 +8,8 @@
 /**
  * The Result class defines the attributes of a result from one step or a group of steps. When you
  * use the ResearchStack framework APIs, you typically get a result from the Result property of
- * either {@link org.researchstack.backbone.ui.ViewTaskActivity} or {@link
- * org.researchstack.backbone.ui.step.layout.StepLayout}. Certain types of results can contain other
+ * either {@link org.researchstack.foundation.ui.ViewTaskActivity} or {@link
+ * org.researchstack.foundation.ui.step.layout.StepLayout}. Certain types of results can contain other
  * results, which together express a hierarchy; examples of these types of results are {@link
  * StepResult} and {@link TaskResult}.
  * <p>
@@ -21,7 +23,7 @@
  * hold the type of result data the step can generate, unless it makes sense to use an existing
  * subclass.
  */
-public class Result implements Serializable {
+public class Result implements Serializable, IResult {
     private String identifier;
 
     private Date startDate;
@@ -34,8 +36,8 @@ public class Result implements Serializable {
     /**
      * Returns an initialized result using the specified identifier.
      * <p>
-     * Typically, objects such as {@link org.researchstack.backbone.ui.ViewTaskActivity} and {@link
-     * org.researchstack.backbone.ui.step.layout.StepLayout} instantiate result (and Result
+     * Typically, objects such as {@link org.researchstack.foundation.ui.ViewTaskActivity} and {@link
+     * org.researchstack.foundation.ui.step.layout.StepLayout} instantiate result (and Result
      * subclass) objects; you seldom need to instantiate a result object in your code.
      *
      * @param identifier The unique identifier of the result.
diff --git a/foundation/src/main/java/org/researchstack/foundation/core/models/result/StepResult.java b/foundation/src/main/java/org/researchstack/foundation/core/models/result/StepResult.java
index 603beb1db..4b9903b04 100644
--- a/foundation/src/main/java/org/researchstack/foundation/core/models/result/StepResult.java
+++ b/foundation/src/main/java/org/researchstack/foundation/core/models/result/StepResult.java
@@ -1,15 +1,16 @@
-package org.researchstack.backbone.result;
+package org.researchstack.foundation.core.models.result;
 
-import org.researchstack.backbone.answerformat.AnswerFormat;
-import org.researchstack.backbone.step.QuestionStep;
-import org.researchstack.backbone.step.Step;
+//import org.researchstack.foundation.step.QuestionStep;
+//import org.researchstack.foundation.step.Step;
+
+import org.researchstack.foundation.core.models.step.Step;
 
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
 /**
- * The StepResult class represents a result produced by a {@link org.researchstack.backbone.ui.step.layout.StepLayout}
+ * The StepResult class represents a result produced by a {@link org.researchstack.foundation.ui.step.layout.StepLayout}
  * to hold all child results of type <code>T</code> produced by the step.
  * <p>
  * A step result is typically generated by the framework as the task proceeds. When the task
@@ -27,7 +28,10 @@ public class StepResult<T> extends Result {
 
     private Map<String, T> results;
 
-    private AnswerFormat answerFormat;
+    private Step step;
+
+    //TODO: See if we can remove this... What if we remove this for foundation, but add it for backwards compat foundation
+//    private AnswerFormat answerFormat;
 
     /**
      * Creates a StepResult from a {@link Step}.
@@ -40,10 +44,11 @@ public class StepResult<T> extends Result {
     public StepResult(Step step) {
         super(step.getIdentifier());
         this.results = new HashMap<>();
+        this.step = step;
 
-        if (step instanceof QuestionStep) {
-            answerFormat = ((QuestionStep) step).getAnswerFormat();
-        }
+//        if (step instanceof QuestionStep) {
+//            answerFormat = ((QuestionStep) step).getAnswerFormat();
+//        }
         setStartDate(new Date());
         // this will be updated when the result is set
         setEndDate(new Date());
@@ -99,13 +104,20 @@ public void setResultForIdentifier(String identifier, T result) {
         results.put(identifier, result);
     }
 
-    /**
-     * Gets the {@link AnswerFormat} for this step result. May be useful when processing the
-     * result.
-     *
-     * @return the answer format associated with the step
-     */
-    public AnswerFormat getAnswerFormat() {
-        return answerFormat;
+    //TODO: See if we can remove this... What if we remove this for foundation, but add it for backwards compat foundation
+//    /**
+//     * Gets the {@link AnswerFormat} for this step result. May be useful when processing the
+//     * result.
+//     *
+//     * @return the answer format associated with the step
+//     */
+//
+//    public AnswerFormat getAnswerFormat() {
+//        return answerFormat;
+//    }
+
+    public Step getStep() {
+        return this.step;
     }
 }
+
diff --git a/foundation/src/main/java/org/researchstack/foundation/core/models/result/TaskResult.java b/foundation/src/main/java/org/researchstack/foundation/core/models/result/TaskResult.java
index f7abc5249..bdf14a7f0 100644
--- a/foundation/src/main/java/org/researchstack/foundation/core/models/result/TaskResult.java
+++ b/foundation/src/main/java/org/researchstack/foundation/core/models/result/TaskResult.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.result;
+package org.researchstack.foundation.core.models.result;
 
 import android.net.Uri;
 
@@ -8,8 +8,8 @@
 
 /**
  * An TaskResult object is a result that contains all the step results generated from one run of a
- * task or ordered task (that is, {@link org.researchstack.backbone.task.Task} or {@link
- * org.researchstack.backbone.task.OrderedTask}).
+ * task or ordered task (that is, {@link org.researchstack.foundation.task.Task} or {@link
+ * org.researchstack.foundation.task.OrderedTask}).
  * <p>
  * A task result is typically generated by the framework as the task proceeds. When the task
  * completes, it may be appropriate to serialize it for transmission to a server, or to immediately
@@ -20,6 +20,7 @@
 public class TaskResult extends Result {
     private Map<String, StepResult> results;
 
+    //TODO: add support for this
     // unimplemented but exists in RK, implement or delete if not needed
     private UUID uuidTask;
 
diff --git a/foundation/src/main/java/org/researchstack/foundation/core/models/step/Step.java b/foundation/src/main/java/org/researchstack/foundation/core/models/step/Step.java
index af059ab52..899aa08d6 100644
--- a/foundation/src/main/java/org/researchstack/foundation/core/models/step/Step.java
+++ b/foundation/src/main/java/org/researchstack/foundation/core/models/step/Step.java
@@ -1,31 +1,34 @@
-package org.researchstack.backbone.step;
+package org.researchstack.foundation.core.models.step;
 
-import org.researchstack.backbone.task.Task;
+import org.researchstack.foundation.core.interfaces.IStep;
+import org.researchstack.foundation.core.models.task.Task;
 
 import java.io.Serializable;
 
 /**
  * Step is the base class for the steps that can compose a task for presentation in an {@link
- * org.researchstack.backbone.ui.ViewTaskActivity} object. Each Step object represents one logical
+ * org.researchstack.foundation.ui.ViewTaskActivity} object. Each Step object represents one logical
  * piece of data entry or activity in a larger task.
  * <p>
  * A step can be a question, an active test, or a simple instruction. An Step subclass is usually
- * paired with an {@link org.researchstack.backbone.ui.step.layout.StepLayout} subclass that
+ * paired with an {@link org.researchstack.foundation.ui.step.layout.StepLayout} subclass that
  * displays the step.
  * <p>
  * To use a step, instantiate an Step object and populate its properties. Add the step to a task,
- * such as an {@link org.researchstack.backbone.task.OrderedTask} object, and then present the task
+ * such as an {@link org.researchstack.foundation.task.OrderedTask} object, and then present the task
  * using a ViewTaskActivity.
  * <p>
  * To implement a new type of step, subclass Step and add your additional properties. Separately,
  * subclass StepLayout and implement your user interface.
  */
-public class Step implements Serializable {
+public class Step implements Serializable, IStep {
     private String identifier;
 
     private Class stepLayoutClass;
 
+    @Deprecated()
     private int stepTitle;
+    private String stepTitleString;
 
     private boolean optional = true;
 
@@ -66,7 +69,7 @@ public Step(String identifier, String title) {
      * A short string that uniquely identifies the step within the task.
      * <p>
      * The identifier is reproduced in the results of a step. In fact, the only way to link a result
-     * (a {@link org.researchstack.backbone.result.StepResult} object) to the step that generated it
+     * (a {@link org.researchstack.foundation.result.StepResult} object) to the step that generated it
      * is to look at the value of <code>identifier</code>. To accurately identify step results, you
      * need to ensure that step identifiers are unique within each task.
      * <p>
@@ -152,6 +155,7 @@ public void setText(String text) {
      *
      * @return the id for the title to display in the action bar
      */
+    @Deprecated
     public int getStepTitle() {
         return stepTitle;
     }
@@ -161,12 +165,31 @@ public int getStepTitle() {
      *
      * @param stepTitle the Android resource id for the title
      */
+    @Deprecated
     public void setStepTitle(int stepTitle) {
         this.stepTitle = stepTitle;
     }
 
     /**
-     * Returns the class that the {@link org.researchstack.backbone.ui.ViewTaskActivity} should
+     * Gets the string the title to display in the action bar (optional).
+     *
+     * @return the string for the title to display in the action bar
+     */
+    public String getStepTitleString() {
+        return stepTitleString;
+    }
+
+    /**
+     * Gets the string for the title to display in the action bar (optional).
+     *
+     * @param stepTitle the string for the title
+     */
+    public void setStepTitle(String stepTitle) {
+        this.stepTitleString = stepTitle;
+    }
+
+    /**
+     * Returns the class that the {@link org.researchstack.foundation.ui.ViewTaskActivity} should
      * instantiate to display this step.
      * <p>
      * This method is used within the framework so that steps can define their step view controller
@@ -175,7 +198,7 @@ public void setStepTitle(int stepTitle) {
      * Outside the framework, developers should instantiate the required view controller in their
      * ViewTaskActivity delegate to override the ViewTaskActivity's default.
      *
-     * @return the class of the {@link org.researchstack.backbone.ui.step.layout.StepLayout} for
+     * @return the class of the {@link org.researchstack.foundation.ui.step.layout.StepLayout} for
      * this step
      */
     public Class getStepLayoutClass() {
@@ -185,7 +208,7 @@ public Class getStepLayoutClass() {
     /**
      * Sets the class that should be used to display this step
      *
-     * @param stepLayoutClass the {@link org.researchstack.backbone.ui.step.layout.StepLayout} class
+     * @param stepLayoutClass the {@link org.researchstack.foundation.ui.step.layout.StepLayout} class
      *                        to be used to display this step
      */
     public void setStepLayoutClass(Class stepLayoutClass) {
diff --git a/foundation/src/main/java/org/researchstack/foundation/core/models/task/Task.java b/foundation/src/main/java/org/researchstack/foundation/core/models/task/Task.java
index ea21b3e5a..59e1071e5 100644
--- a/foundation/src/main/java/org/researchstack/foundation/core/models/task/Task.java
+++ b/foundation/src/main/java/org/researchstack/foundation/core/models/task/Task.java
@@ -1,10 +1,12 @@
-package org.researchstack.backbone.task;
+package org.researchstack.foundation.core.models.task;
 
 import android.content.Context;
 
-import org.researchstack.backbone.result.TaskResult;
-import org.researchstack.backbone.step.Step;
-import org.researchstack.backbone.ui.ViewTaskActivity;
+import org.jetbrains.annotations.NotNull;
+import org.researchstack.foundation.components.presentation.interfaces.ITaskNavigator;
+import org.researchstack.foundation.core.interfaces.ITask;
+import org.researchstack.foundation.core.models.result.TaskResult;
+import org.researchstack.foundation.core.models.step.Step;
 
 import java.io.Serializable;
 
@@ -13,19 +15,24 @@
  * <p>
  * To present the ResearchStack framework UI in your app, instantiate an object that extends the
  * Task class (such as {@link OrderedTask}) and provide it to a {@link
- * org.researchstack.backbone.ui.ViewTaskActivity}.
+ * org.researchstack.foundation.ui.ViewTaskActivity}.
  * <p>
  * Implement this protocol to enable dynamic selection of the steps for a given task. By default,
  * OrderedTask implements this protocol for simple sequential tasks.
  * <p>
  * Each {@link Step} in a task roughly corresponds to one screen, and represents the primary unit of
- * work in any task. For example, a {@link org.researchstack.backbone.step.QuestionStep} object
+ * work in any task. For example, a {@link org.researchstack.foundation.step.QuestionStep} object
  * corresponds to a single question presented on screen, together with controls the participant uses
- * to answer the question. Another example is {@link org.researchstack.backbone.step.FormStep},
+ * to answer the question. Another example is {@link org.researchstack.foundation.step.FormStep},
  * which corresponds to a single screen that displays multiple questions or items for which
  * participants provide information, such as first name, last name, and birth date.
  */
-public abstract class Task implements Serializable {
+public abstract class Task implements Serializable, ITask, ITaskNavigator<Step, TaskResult> {
+
+    public interface TaskLifecycleObserver {
+
+    }
+
     private String identifier;
 
     /**
@@ -56,6 +63,7 @@ public String getIdentifier() {
         return identifier;
     }
 
+    //TODO: probably want to update / remove this method due to dependency on Android Context
     /**
      * Gets the title to display in the toolbar for a given step.
      * <p>
@@ -69,16 +77,22 @@ public String getIdentifier() {
      * @param step    the current step
      * @return the title to display
      */
+    @Deprecated
     public String getTitleForStep(Context context, Step step) {
         return step.getStepTitle() != 0 ? context.getString(step.getStepTitle()) : "";
     }
 
+    public String getTitleForStep(Step step) {
+        String titleString = step.getStepTitleString();
+        return  titleString != null ? titleString : "";
+    }
+
     /**
      * Returns the step after the specified step, if there is one.
      * <p>
      * This method lets you use a result to determine the next step.
      * <p>
-     * The {@link org.researchstack.backbone.ui.ViewTaskActivity}  calls this method to determine
+     * The {@link org.researchstack.foundation.ui.ViewTaskActivity}  calls this method to determine
      * the step to display after the specified step. The ViewTaskActivity can also call this
      * method every time the result updates, to determine if the new result changes which steps are
      * available.
@@ -95,7 +109,7 @@ public String getTitleForStep(Context context, Step step) {
     /**
      * Returns the step that precedes the specified step, if there is one.
      * <p>
-     * The {@link org.researchstack.backbone.ui.ViewTaskActivity} calls this method to determine the
+     * The {@link org.researchstack.foundation.ui.ViewTaskActivity} calls this method to determine the
      * step to display before the specified step. The ViewTaskActivity
      * can also call this method every time the result changes, to determine if the new result
      * changes which steps are available.
@@ -121,7 +135,7 @@ public String getTitleForStep(Context context, Step step) {
     /**
      * Returns the progress of the current step.
      * <p>
-     * During a task, the {@link org.researchstack.backbone.ui.ViewTaskActivity}  can display the
+     * During a task, the {@link org.researchstack.foundation.ui.ViewTaskActivity}  can display the
      * progress (that is, the current step number out of the total number of steps) in the
      * navigation bar. Implement this method to control what is displayed; if you don't implement
      * this method, the progress label does not appear.
@@ -144,23 +158,24 @@ public String getTitleForStep(Context context, Step step) {
      * implementation makes sure that all its step identifiers are unique, throwing an exception
      * otherwise.
      * <p>
-     * This method is usually called by {@link org.researchstack.backbone.ui.ViewTaskActivity} when
+     * This method is usually called by {@link org.researchstack.foundation.ui.ViewTaskActivity} when
      * its task is set.
      *
      * @throws InvalidTaskException
      */
     public abstract void validateParameters();
 
-    /**
-     * Function that can be overridden in order to access the low level changes in the view.
-     * The function is called at Activity lifecycle events (creation, pause, resume, stop and whenever
-     * the content of the activity is changed, according to the step.
-     *
-     * @param type        lifecycle event
-     * @param activity    current activity
-     * @param currentStep the current step being shown
-     */
-    public void onViewChange(ViewChangeType type, ViewTaskActivity activity, Step currentStep) {
+    //TODO: probably want to remove this due to dependency on ViewTaskActivity
+//    /**
+//     * Function that can be overridden in order to access the low level changes in the view.
+//     * The function is called at Activity lifecycle events (creation, pause, resume, stop and whenever
+//     * the content of the activity is changed, according to the step.
+//     *
+//     * @param type        lifecycle event
+//     * @param activity    current activity
+//     * @param currentStep the current step being shown
+//     */
+    public void onViewChange(ViewChangeType type, TaskLifecycleObserver observer, Step currentStep) {
 
     }
 
@@ -176,7 +191,7 @@ public static enum ViewChangeType {
      * A structure that represents how far a task has progressed.
      * <p>
      * Objects that extend Task return the task progress structure to indicate to the {@link
-     * org.researchstack.backbone.ui.ViewTaskActivity} how far the task has progressed.
+     * org.researchstack.foundation.ui.ViewTaskActivity} how far the task has progressed.
      * <p>
      * Note that the values in an {@link TaskProgress} structure are used only for display; you
      * don't use the values to access the steps in a task.

From 6cacbb31a6c704a3fc80ff7ff68493fb618072e3 Mon Sep 17 00:00:00 2001
From: James Kizer <james.kizer@gmail.com>
Date: Wed, 2 Jan 2019 18:59:10 -0500
Subject: [PATCH 28/53] Renamed layout file and merged in values

---
 ...ncode.xml => rsfa_step_layout_pincode.xml} | 14 ++++++-------
 .../src/main/res/values/strings.xml           | 21 ++++++++++++++++++-
 2 files changed, 27 insertions(+), 8 deletions(-)
 rename authentication/src/main/res/layout/{rsb_step_layout_pincode.xml => rsfa_step_layout_pincode.xml} (76%)

diff --git a/authentication/src/main/res/layout/rsb_step_layout_pincode.xml b/authentication/src/main/res/layout/rsfa_step_layout_pincode.xml
similarity index 76%
rename from authentication/src/main/res/layout/rsb_step_layout_pincode.xml
rename to authentication/src/main/res/layout/rsfa_step_layout_pincode.xml
index a5ec568a5..b016481c3 100644
--- a/authentication/src/main/res/layout/rsb_step_layout_pincode.xml
+++ b/authentication/src/main/res/layout/rsfa_step_layout_pincode.xml
@@ -6,26 +6,26 @@
 
     <TextView
         android:id="@+id/title"
-        style="@style/Backbone.Survey.Title"
+        style="@style/Foundation.Survey.Title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/rsb_pincode_enter_title" />
+        android:text="@string/rsfa_pincode_enter_title" />
 
     <TextView
         android:id="@+id/text"
-        style="@style/Backbone.Survey.Summary"
+        style="@style/Foundation.Survey.Summary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/title"
         android:minHeight="52dp"
-        android:paddingTop="@dimen/rsb_padding_small"
-        android:text="@string/rsb_pincode_enter_summary"
+        android:paddingTop="@dimen/rsf_padding_small"
+        android:text="@string/rsfa_pincode_enter_summary"
         android:textColorLink="?attr/colorAccent" />
 
     <android.support.v7.widget.AppCompatEditText
         android:id="@+id/pincode"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/rsb_item_size_default"
+        android:layout_height="@dimen/rsf_item_size_default"
         android:layout_below="@+id/text"
         android:background="@null"
         android:gravity="center"
@@ -36,7 +36,7 @@
 
     <include
         android:id="@+id/progress"
-        layout="@layout/rsb_progress"
+        layout="@layout/rsf_progress"
         android:visibility="gone"
         tools:visibility="gone" />
 
diff --git a/authentication/src/main/res/values/strings.xml b/authentication/src/main/res/values/strings.xml
index 3ca9920b6..d4ad0454a 100644
--- a/authentication/src/main/res/values/strings.xml
+++ b/authentication/src/main/res/values/strings.xml
@@ -1,3 +1,22 @@
 <resources>
-    <string name="app_name">Authentication</string>
+    <!-- Pin Code -->
+    <string name="rsfa_pincode_enter_title">Enter your passcode</string>
+    <string name="rsfa_pincode_enter_summary">Enter your %1$d-%2$s code to confirm your identity.</string>
+    <string name="rsfa_pincode_enter_digit">digit</string>
+    <string name="rsfa_pincode_enter_letter">letter</string>
+    <string name="rsfa_pincode_enter_character">character</string>
+    <string name="rsfa_pincode_enter_error">That code doesn’t match the one you entered, Try again!</string>
+
+    <!-- Passcode -->
+    <string name="rsfa_passcode_change_title">Change Passcode</string>
+    <string name="rsfa_passcode">Passcode</string>
+    <string name="rsfa_passcode_create_title">Choose a passcode</string>
+    <string name="rsfa_passcode_create_summary">Enter a secure, %1$d-%2$s code to protect your data and log in
+        faster.
+    </string>
+    <string name="rsfa_passcode_confirm_title">Confirm your passcode</string>
+    <string name="rsfa_passcode_confirm_summary">Enter your %1$d-%2$s code one more time to confirm.</string>
+    <string name="rsfa_passcode_confirm_error">That code doesn’t match the one you entered. Try again
+        or go back to choose a different %1$d-%2$s code.
+    </string>
 </resources>

From 8f2ff4a3309223b0424841d76f4c56ebf7fd7343 Mon Sep 17 00:00:00 2001
From: James Kizer <james.kizer@gmail.com>
Date: Wed, 2 Jan 2019 19:03:00 -0500
Subject: [PATCH 29/53] Added working authentication

Added authenticator abstraction
Added concrete passcode authenticator implementation
Updated imports and package names
Refactored to remove dependency on Rx
---
 .../feature/authentication/Authenticator.kt   |  24 +++
 .../pincode/PasscodeAuthenticator.kt          | 106 +++++++++++++
 .../authentication/pincode/PinCodeConfig.java |  12 +-
 .../pincode/PinCodeConfigProvider.kt          |  13 ++
 .../pincode/SimplePasscodeStore.kt            |  46 ++++++
 .../pincode/step/PassCodeCreationStep.java    |   6 +-
 .../ui/PasscodeAuthenticationFragment.kt      | 141 ++++++++++++++++++
 .../pincode/ui/PinCodeLayout.java             |  18 +--
 .../ui/SignUpPinCodeCreationStepLayout.java   |  68 +++++----
 9 files changed, 390 insertions(+), 44 deletions(-)
 create mode 100644 authentication/src/main/java/org/researchstack/feature/authentication/Authenticator.kt
 create mode 100644 authentication/src/main/java/org/researchstack/feature/authentication/pincode/PasscodeAuthenticator.kt
 create mode 100644 authentication/src/main/java/org/researchstack/feature/authentication/pincode/PinCodeConfigProvider.kt
 create mode 100644 authentication/src/main/java/org/researchstack/feature/authentication/pincode/SimplePasscodeStore.kt
 create mode 100644 authentication/src/main/java/org/researchstack/feature/authentication/pincode/ui/PasscodeAuthenticationFragment.kt

diff --git a/authentication/src/main/java/org/researchstack/feature/authentication/Authenticator.kt b/authentication/src/main/java/org/researchstack/feature/authentication/Authenticator.kt
new file mode 100644
index 000000000..7148d9b56
--- /dev/null
+++ b/authentication/src/main/java/org/researchstack/feature/authentication/Authenticator.kt
@@ -0,0 +1,24 @@
+package org.researchstack.feature.authentication
+
+import android.support.v4.os.CancellationSignal
+
+open abstract class Authenticator<Result: Authenticator.AuthenticationResult, Callback: Authenticator.AuthenticationCallback<Result>> {
+
+    open class AuthenticationResult {
+
+    }
+
+    open class AuthenticationCallback<Result: AuthenticationResult> {
+        open fun onAuthenticationError(errorCode: Int, errString: String) {}
+
+        open fun onAuthenticationFailed() {}
+
+        open fun onAuthenticationHelp(helpCode: Int, helpString: String) {}
+
+        open fun onAuthenticationSucceeded(result: Result) {}
+    }
+
+    abstract fun isRegistered(): Boolean
+    abstract fun authenticate(cancel: CancellationSignal, callback: Callback)
+
+}
\ No newline at end of file
diff --git a/authentication/src/main/java/org/researchstack/feature/authentication/pincode/PasscodeAuthenticator.kt b/authentication/src/main/java/org/researchstack/feature/authentication/pincode/PasscodeAuthenticator.kt
new file mode 100644
index 000000000..dc36ebaea
--- /dev/null
+++ b/authentication/src/main/java/org/researchstack/feature/authentication/pincode/PasscodeAuthenticator.kt
@@ -0,0 +1,106 @@
+package org.researchstack.feature.authentication.pincode
+
+import android.support.v4.os.CancellationSignal
+import java.lang.ref.WeakReference
+import org.researchstack.feature.authentication.Authenticator
+
+//there are two things that need to be delegated
+//how to store the passcode
+//how to present the authentication
+//also, we need to think about how one might register, but for now, let's assume that
+//This class will need to define some type of storage backend
+//this class will also need to figure out how to present the passcode authentication view
+
+//in one case, this would be a fragment and we would pass it a cancelation signal and a callback
+//however, it's not exactly clear how the fragment would be presented. The activity / app delegate would be re
+
+//in another case,
+
+
+open class PasscodeAuthenticator(val passcodeConfig: PinCodeConfig, val store: PasscodeStore): Authenticator<PasscodeAuthenticator.PasscodeAuthenticationResult, PasscodeAuthenticator.PasscodeAuthenticationCallback>() {
+
+    open interface PasscodeStore {
+        fun hasPasscode(): Boolean
+        fun registerPasscode(passcode: String)
+        fun checkPasscode(passcode: String)
+        fun removePasscode()
+        fun changePasscode(oldPasscode: String, newPasscode: String)
+    }
+
+    open interface PresentationDelegate {
+        //this should present a way to get a passcode
+        //note that in order to support combined passcode + biometric, this should probably only
+        //return a yes / no response
+        //therefore, we probably need to pass it some type of
+        fun presentPasscodeAuthentication(authenticator: PasscodeAuthenticator, cancel: CancellationSignal, callback: PasscodeAuthenticator.PasscodeAuthenticationCallback)
+    }
+
+    companion object {
+
+    }
+
+    var presentationDelegate: WeakReference<PresentationDelegate>? = null
+    fun setPresentationDelegate(presentationDelegate: PresentationDelegate) {
+        this.presentationDelegate = WeakReference(presentationDelegate)
+    }
+
+    open class PasscodeAuthenticationResult(): Authenticator.AuthenticationResult() {
+
+    }
+
+    open class PasscodeAuthenticationCallback(): Authenticator.AuthenticationCallback<PasscodeAuthenticationResult>() {
+        open fun onForgotPasscode() {}
+    }
+
+    sealed class PasscodeAuthenticatorException: RuntimeException {
+
+        constructor() {}
+        constructor(detailMessage: String) : super(detailMessage) {}
+        constructor(detailMessage: String, throwable: Throwable) : super(detailMessage, throwable) {}
+        constructor(throwable: Throwable) : super(throwable) {}
+
+        class InvalidPasscodeException : PasscodeAuthenticatorException {
+            constructor() {}
+            constructor(detailMessage: String) : super(detailMessage) {}
+            constructor(detailMessage: String, throwable: Throwable) : super(detailMessage, throwable) {}
+            constructor(throwable: Throwable) : super(throwable) {}
+        }
+
+        class PasscodeExistsException : PasscodeAuthenticatorException {
+            constructor() {}
+            constructor(detailMessage: String) : super(detailMessage) {}
+            constructor(detailMessage: String, throwable: Throwable) : super(detailMessage, throwable) {}
+            constructor(throwable: Throwable) : super(throwable) {}
+        }
+
+        class PasscodeDoesNotExistException : PasscodeAuthenticatorException {
+            constructor() {}
+            constructor(detailMessage: String) : super(detailMessage) {}
+            constructor(detailMessage: String, throwable: Throwable) : super(detailMessage, throwable) {}
+            constructor(throwable: Throwable) : super(throwable) {}
+        }
+
+        class PresentationDelegateNotSetException : PasscodeAuthenticatorException {
+            constructor() {}
+            constructor(detailMessage: String) : super(detailMessage) {}
+            constructor(detailMessage: String, throwable: Throwable) : super(detailMessage, throwable) {}
+            constructor(throwable: Throwable) : super(throwable) {}
+        }
+
+    }
+
+    override fun isRegistered(): Boolean {
+        return this.store.hasPasscode()
+    }
+
+    override fun authenticate(cancel: CancellationSignal, callback: PasscodeAuthenticationCallback) {
+        val delegate = this.presentationDelegate?.get()
+        if (delegate == null) {
+            throw PasscodeAuthenticatorException.PresentationDelegateNotSetException();
+        }
+        else {
+            delegate.presentPasscodeAuthentication(this, cancel, callback)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/authentication/src/main/java/org/researchstack/feature/authentication/pincode/PinCodeConfig.java b/authentication/src/main/java/org/researchstack/feature/authentication/pincode/PinCodeConfig.java
index b3a4be7d5..73e6f1b56 100644
--- a/authentication/src/main/java/org/researchstack/feature/authentication/pincode/PinCodeConfig.java
+++ b/authentication/src/main/java/org/researchstack/feature/authentication/pincode/PinCodeConfig.java
@@ -1,11 +1,11 @@
-package org.researchstack.backbone.storage.file;
+package org.researchstack.feature.authentication.pincode;
 
 import android.text.InputFilter;
 import android.text.InputType;
 import android.text.format.DateUtils;
 
-import org.researchstack.backbone.R;
-import org.researchstack.backbone.utils.TextUtils;
+import org.researchstack.feature.authentication.R;
+import org.researchstack.foundation.components.utils.TextUtils;
 
 /**
  * This class allows you to customize the type/strength of the pin code that the user must create to
@@ -126,11 +126,11 @@ public int getInputType() {
         @Override
         public int getInputTypeStringId() {
             if (this == PinCodeType.Numeric) {
-                return R.string.rsb_pincode_enter_digit;
+                return R.string.rsfa_pincode_enter_digit;
             } else if (this == PinCodeType.Alphabetic) {
-                return R.string.rsb_pincode_enter_letter;
+                return R.string.rsfa_pincode_enter_letter;
             } else {
-                return R.string.rsb_pincode_enter_character;
+                return R.string.rsfa_pincode_enter_character;
             }
         }
 
diff --git a/authentication/src/main/java/org/researchstack/feature/authentication/pincode/PinCodeConfigProvider.kt b/authentication/src/main/java/org/researchstack/feature/authentication/pincode/PinCodeConfigProvider.kt
new file mode 100644
index 000000000..60a94ed7f
--- /dev/null
+++ b/authentication/src/main/java/org/researchstack/feature/authentication/pincode/PinCodeConfigProvider.kt
@@ -0,0 +1,13 @@
+package org.researchstack.feature.authentication.pincode
+
+public class PinCodeConfigProvider() {
+    companion object {
+        private var _pinCodeConfig: PinCodeConfig? = null
+        fun config(pinCodeConfig: PinCodeConfig) {
+            this._pinCodeConfig = pinCodeConfig
+        }
+
+        val pinCodeConfig: PinCodeConfig
+            get() = this._pinCodeConfig!!
+    }
+}
\ No newline at end of file
diff --git a/authentication/src/main/java/org/researchstack/feature/authentication/pincode/SimplePasscodeStore.kt b/authentication/src/main/java/org/researchstack/feature/authentication/pincode/SimplePasscodeStore.kt
new file mode 100644
index 000000000..c0d95f144
--- /dev/null
+++ b/authentication/src/main/java/org/researchstack/feature/authentication/pincode/SimplePasscodeStore.kt
@@ -0,0 +1,46 @@
+package org.researchstack.feature.authentication.pincode
+
+//This is for demonstration purposes only!
+class SimplePasscodeStore: PasscodeAuthenticator.PasscodeStore {
+
+    private var passcode: String? = null
+
+    override fun hasPasscode(): Boolean {
+        return this.passcode != null
+    }
+
+    override fun registerPasscode(passcode: String) {
+        if (this.hasPasscode()) {
+            throw PasscodeAuthenticator.PasscodeAuthenticatorException.PasscodeExistsException()
+        }
+
+        this.passcode = passcode
+    }
+
+    override fun checkPasscode(passcode: String) {
+        if (this.passcode == null) {
+            throw PasscodeAuthenticator.PasscodeAuthenticatorException.PasscodeDoesNotExistException()
+        }
+
+        if (this.passcode != passcode) {
+            throw PasscodeAuthenticator.PasscodeAuthenticatorException.InvalidPasscodeException()
+        }
+    }
+
+    override fun removePasscode() {
+        this.passcode == null
+    }
+
+    override fun changePasscode(oldPasscode: String, newPasscode: String) {
+
+        if (this.passcode == null) {
+            throw PasscodeAuthenticator.PasscodeAuthenticatorException.PasscodeDoesNotExistException()
+        }
+
+        if (this.passcode != oldPasscode) {
+            throw PasscodeAuthenticator.PasscodeAuthenticatorException.InvalidPasscodeException()
+        }
+
+        this.passcode = newPasscode
+    }
+}
\ No newline at end of file
diff --git a/authentication/src/main/java/org/researchstack/feature/authentication/pincode/step/PassCodeCreationStep.java b/authentication/src/main/java/org/researchstack/feature/authentication/pincode/step/PassCodeCreationStep.java
index 0e819774e..f10de7510 100644
--- a/authentication/src/main/java/org/researchstack/feature/authentication/pincode/step/PassCodeCreationStep.java
+++ b/authentication/src/main/java/org/researchstack/feature/authentication/pincode/step/PassCodeCreationStep.java
@@ -1,7 +1,7 @@
-package org.researchstack.skin.step;
+package org.researchstack.feature.authentication.pincode.step;
 
-import org.researchstack.backbone.step.Step;
-import org.researchstack.skin.ui.layout.SignUpPinCodeCreationStepLayout;
+import org.researchstack.feature.authentication.pincode.ui.SignUpPinCodeCreationStepLayout;
+import org.researchstack.foundation.core.models.step.Step;
 
 public class PassCodeCreationStep extends Step {
 
diff --git a/authentication/src/main/java/org/researchstack/feature/authentication/pincode/ui/PasscodeAuthenticationFragment.kt b/authentication/src/main/java/org/researchstack/feature/authentication/pincode/ui/PasscodeAuthenticationFragment.kt
new file mode 100644
index 000000000..8b86fdef2
--- /dev/null
+++ b/authentication/src/main/java/org/researchstack/feature/authentication/pincode/ui/PasscodeAuthenticationFragment.kt
@@ -0,0 +1,141 @@
+package org.researchstack.feature.authentication.pincode.ui
+
+import android.content.Context
+import android.graphics.Color
+import android.os.AsyncTask
+import android.os.Build
+import android.os.Bundle
+import android.support.v4.app.Fragment
+import android.text.Editable
+import android.text.TextWatcher
+import android.view.ContextThemeWrapper
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.inputmethod.InputMethodManager
+import android.widget.EditText
+import android.widget.TextView
+import org.researchstack.feature.authentication.R
+import org.researchstack.feature.authentication.pincode.PasscodeAuthenticator
+import org.researchstack.foundation.components.utils.ThemeUtils
+
+open class PasscodeAuthenticationFragment: Fragment() {
+
+    open class AuthenticationCallback {
+        open fun onAuthenticationFailed() {}
+        open fun onAuthenticationSucceeded() {}
+    }
+
+    companion object {
+        fun newInstance(
+                authenticator: PasscodeAuthenticator,
+                callback: AuthenticationCallback
+        ): PasscodeAuthenticationFragment {
+            val fragment = PasscodeAuthenticationFragment()
+            fragment.authenticator = authenticator
+            fragment.callback = callback
+            return fragment
+        }
+    }
+
+    private var authenticator: PasscodeAuthenticator? = null
+    private var callback: AuthenticationCallback? = null
+    private var toggleKeyboardAction: ((Boolean) -> Unit)? = null
+
+    override open fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+
+        // Show pincode layout
+        val authenticator = this.authenticator!!
+        val config = authenticator.passcodeConfig
+
+        val themeResId = ThemeUtils.getPassCodeTheme(this.activity as Context)
+        val context = ContextThemeWrapper(this.activity, themeResId)
+        val pinCodeLayout = PinCodeLayout(context)
+        pinCodeLayout.setBackgroundColor(Color.WHITE)
+
+        val errorColor = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            resources.getColor(R.color.rsf_error, context.theme)
+        } else {
+            resources.getColor(R.color.rsf_error)
+        }
+
+        val summary = pinCodeLayout.findViewById(R.id.text) as TextView
+        val pincode = pinCodeLayout.findViewById(R.id.pincode) as EditText
+
+        this.toggleKeyboardAction = { enable ->
+            pincode.isEnabled = enable
+            pincode.setText("")
+            pincode.requestFocus()
+            if (enable) {
+                val imm = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+                imm.showSoftInput(pincode, InputMethodManager.SHOW_FORCED)
+            }
+        }
+
+        val pinCodeWatcher = object: TextWatcher {
+            override fun afterTextChanged(s: Editable?) {
+
+            }
+
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+
+            }
+
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+
+                if (summary.currentTextColor == errorColor) {
+                    summary.setTextColor(ThemeUtils.getTextColorPrimary(context))
+                    pinCodeLayout.resetSummaryText()
+                }
+
+                val fullLengthPin: String? = s?.toString()?.let { pin ->
+                    //check to see if pin is the right length
+                    if (pin.length == config.pinLength) pin else null
+                }
+
+                if (fullLengthPin != null) {
+
+                    pincode.isEnabled = false
+                    pinCodeLayout.showProgress(true)
+                    //check to see if pin matches
+
+                    class CheckPinCodeTask(val pinCode: String) : AsyncTask<Void, Void, Boolean>() {
+                        override fun doInBackground(vararg params: Void?): Boolean {
+                            try {
+                                authenticator.store.checkPasscode(pinCode)
+                                return true
+                            }
+                            catch (e: PasscodeAuthenticator.PasscodeAuthenticatorException) {
+                                e.printStackTrace()
+                                return false
+                            }
+                        }
+
+                        override fun onPostExecute(result: Boolean) {
+
+                            if (result) {
+                                callback!!.onAuthenticationSucceeded()
+                            }
+                            else {
+                                toggleKeyboardAction?.invoke(true)
+                                summary.setText(R.string.rsfa_pincode_enter_error)
+                                summary.setTextColor(errorColor)
+                                pinCodeLayout.showProgress(false)
+                                callback!!.onAuthenticationFailed()
+                            }
+                        }
+
+                    }
+
+                    CheckPinCodeTask(fullLengthPin).execute()
+
+                }
+            }
+        }
+
+        pincode.addTextChangedListener(pinCodeWatcher)
+
+        return pinCodeLayout
+    }
+
+}
\ No newline at end of file
diff --git a/authentication/src/main/java/org/researchstack/feature/authentication/pincode/ui/PinCodeLayout.java b/authentication/src/main/java/org/researchstack/feature/authentication/pincode/ui/PinCodeLayout.java
index b6c4a6518..870fd53b5 100644
--- a/authentication/src/main/java/org/researchstack/feature/authentication/pincode/ui/PinCodeLayout.java
+++ b/authentication/src/main/java/org/researchstack/feature/authentication/pincode/ui/PinCodeLayout.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.ui.views;
+package org.researchstack.feature.authentication.pincode.ui;
 
 import android.content.Context;
 import android.support.annotation.CallSuper;
@@ -11,10 +11,10 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import org.researchstack.backbone.R;
-import org.researchstack.backbone.StorageAccess;
-import org.researchstack.backbone.storage.file.PinCodeConfig;
-import org.researchstack.backbone.utils.ViewUtils;
+import org.researchstack.feature.authentication.R;
+import org.researchstack.feature.authentication.pincode.PinCodeConfig;
+import org.researchstack.feature.authentication.pincode.PinCodeConfigProvider;
+import org.researchstack.foundation.components.utils.ViewUtils;
 
 import java.util.Arrays;
 
@@ -44,13 +44,13 @@ public PinCodeLayout(Context context, AttributeSet attrs, int defStyleAttr) {
 
     @CallSuper
     protected void init() {
-        config = StorageAccess.getInstance().getPinCodeConfig();
+        config = PinCodeConfigProvider.Companion.getPinCodeConfig();
         imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
 
-        LayoutInflater.from(getContext()).inflate(R.layout.rsb_step_layout_pincode, this, true);
+        LayoutInflater.from(getContext()).inflate(R.layout.rsfa_step_layout_pincode, this, true);
 
         title = (TextView) findViewById(R.id.title);
-        title.setText(R.string.rsb_pincode_enter_title);
+        title.setText(R.string.rsfa_pincode_enter_title);
 
         resetSummaryText();
 
@@ -75,7 +75,7 @@ protected void init() {
     public void resetSummaryText() {
         summary = (TextView) findViewById(R.id.text);
         String characterType = getContext().getString(config.getPinType().getInputTypeStringId());
-        String pinCodeInstructions = getContext().getString(R.string.rsb_pincode_enter_summary,
+        String pinCodeInstructions = getContext().getString(R.string.rsfa_pincode_enter_summary,
                 config.getPinLength(),
                 characterType);
         summary.setText(pinCodeInstructions);
diff --git a/authentication/src/main/java/org/researchstack/feature/authentication/pincode/ui/SignUpPinCodeCreationStepLayout.java b/authentication/src/main/java/org/researchstack/feature/authentication/pincode/ui/SignUpPinCodeCreationStepLayout.java
index 03900bdaf..b24025c4d 100644
--- a/authentication/src/main/java/org/researchstack/feature/authentication/pincode/ui/SignUpPinCodeCreationStepLayout.java
+++ b/authentication/src/main/java/org/researchstack/feature/authentication/pincode/ui/SignUpPinCodeCreationStepLayout.java
@@ -1,23 +1,21 @@
-package org.researchstack.skin.ui.layout;
+package org.researchstack.feature.authentication.pincode.ui;
 
 import android.content.Context;
 import android.content.res.Resources;
 import android.os.Handler;
 import android.support.v4.content.ContextCompat;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
-
-import com.jakewharton.rxbinding.widget.RxTextView;
-
-import org.researchstack.backbone.result.StepResult;
-import org.researchstack.backbone.step.Step;
-import org.researchstack.backbone.ui.callbacks.StepCallbacks;
-import org.researchstack.backbone.ui.step.layout.StepLayout;
-import org.researchstack.backbone.ui.views.PinCodeLayout;
-import org.researchstack.backbone.utils.ThemeUtils;
-import org.researchstack.skin.R;
-import org.researchstack.skin.step.PassCodeCreationStep;
+import org.researchstack.feature.authentication.R;
+import org.researchstack.feature.authentication.pincode.step.PassCodeCreationStep;
+import org.researchstack.foundation.components.common.ui.callbacks.StepCallbacks;
+import org.researchstack.foundation.components.common.ui.layout.StepLayout;
+import org.researchstack.foundation.components.utils.ThemeUtils;
+import org.researchstack.foundation.core.models.result.StepResult;
+import org.researchstack.foundation.core.models.step.Step;
 
 public class SignUpPinCodeCreationStepLayout extends PinCodeLayout implements StepLayout {
     public static final String RESULT_OLD_PIN = "PassCodeCreationStep.oldPin";
@@ -56,10 +54,18 @@ public void initialize(Step step, StepResult result) {
     private void initializeLayout() {
         refreshState();
 
-        RxTextView.textChanges(editText)
-                .map(CharSequence::toString)
-                .filter(pin -> pin.length() == config.getPinLength())
-                .subscribe(pin -> {
+        TextWatcher pinCodeWatcher = new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+                String pin = s.toString();
+                if (pin.length() == config.getPinLength()) {
+
                     if (state == State.CHANGE) {
                         result.setResultForIdentifier(RESULT_OLD_PIN, pin);
 
@@ -85,7 +91,17 @@ private void initializeLayout() {
                             refreshState();
                         }
                     }
-                });
+                }
+
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+
+            }
+        };
+
+        editText.addTextChangedListener(pinCodeWatcher);
 
         editText.post(() -> imm.toggleSoftInput(InputMethodManager.SHOW_FORCED,
                 InputMethodManager.HIDE_IMPLICIT_ONLY));
@@ -126,33 +142,33 @@ private void refreshState() {
         String characterType = res.getString(config.getPinType().getInputTypeStringId());
         switch (state) {
             case CONFIRM:
-                pinCodeTitle = res.getString(R.string.rss_passcode_confirm_title);
-                pinCodeInstructions = res.getString(R.string.rss_passcode_confirm_summary,
+                pinCodeTitle = res.getString(R.string.rsfa_passcode_confirm_title);
+                pinCodeInstructions = res.getString(R.string.rsfa_passcode_confirm_summary,
                         pinLength,
                         characterType);
                 summaryColor = ThemeUtils.getTextColorPrimary(getContext());
                 break;
 
             case RETRY:
-                pinCodeTitle = res.getString(R.string.rss_passcode_confirm_title);
-                pinCodeInstructions = res.getString(R.string.rss_passcode_confirm_error,
+                pinCodeTitle = res.getString(R.string.rsfa_passcode_confirm_title);
+                pinCodeInstructions = res.getString(R.string.rsfa_passcode_confirm_error,
                         pinLength,
                         characterType);
-                summaryColor = ContextCompat.getColor(getContext(), R.color.rsb_error);
+                summaryColor = ContextCompat.getColor(getContext(), R.color.rsf_error);
                 break;
 
             case CREATE:
             default:
-                pinCodeTitle = res.getString(R.string.rss_passcode_create_title);
-                pinCodeInstructions = res.getString(R.string.rss_passcode_create_summary,
+                pinCodeTitle = res.getString(R.string.rsfa_passcode_create_title);
+                pinCodeInstructions = res.getString(R.string.rsfa_passcode_create_summary,
                         pinLength,
                         characterType);
                 summaryColor = ThemeUtils.getTextColorPrimary(getContext());
                 break;
 
             case CHANGE:
-                pinCodeTitle = res.getString(R.string.rsb_pincode_enter_title);
-                pinCodeInstructions = res.getString(R.string.rsb_pincode_enter_summary,
+                pinCodeTitle = res.getString(R.string.rsfa_pincode_enter_title);
+                pinCodeInstructions = res.getString(R.string.rsfa_pincode_enter_summary,
                         pinLength,
                         characterType);
                 summaryColor = ThemeUtils.getTextColorPrimary(getContext());

From 172b433c1151247385a7b0f6cb46af194366668f Mon Sep 17 00:00:00 2001
From: James Kizer <james.kizer@gmail.com>
Date: Wed, 2 Jan 2019 19:06:15 -0500
Subject: [PATCH 30/53] Updates to chart module

Fixed package name + imports
Renamed layout files
Merged in values
---
 .../feature/chart/ui/BarChartCard.java        |  8 +-
 .../feature/chart/ui/EmptyView.java           | 12 +--
 .../feature/chart/ui/LineChartCard.java       |  8 +-
 .../feature/chart/ui/PieChartCard.java        | 10 +--
 .../feature/chart/ui/ProgressChartCard.java   | 13 ++--
 ...chart_pie.xml => rsfch_item_chart_pie.xml} |  0
 ...chart_bar.xml => rsfch_view_chart_bar.xml} |  4 +-
 ...art_line.xml => rsfch_view_chart_line.xml} |  4 +-
 ...chart_pie.xml => rsfch_view_chart_pie.xml} |  2 +-
 ...ress.xml => rsfch_view_chart_progress.xml} |  4 +-
 ...sb_view_empty.xml => rsfch_view_empty.xml} |  2 +-
 chart/src/main/res/values/attrs.xml           | 76 +++++++++++++++++++
 chart/src/main/res/values/styles.xml          | 75 ++++++++++++++++++
 chart/src/main/res/values/themes.xml          | 13 ++++
 14 files changed, 198 insertions(+), 33 deletions(-)
 rename chart/src/main/res/layout/{rsb_item_chart_pie.xml => rsfch_item_chart_pie.xml} (100%)
 rename chart/src/main/res/layout/{rsb_view_chart_bar.xml => rsfch_view_chart_bar.xml} (92%)
 rename chart/src/main/res/layout/{rsb_view_chart_line.xml => rsfch_view_chart_line.xml} (92%)
 rename chart/src/main/res/layout/{rsb_view_chart_pie.xml => rsfch_view_chart_pie.xml} (95%)
 rename chart/src/main/res/layout/{rsb_view_chart_progress.xml => rsfch_view_chart_progress.xml} (93%)
 rename chart/src/main/res/layout/{rsb_view_empty.xml => rsfch_view_empty.xml} (92%)
 create mode 100644 chart/src/main/res/values/attrs.xml
 create mode 100644 chart/src/main/res/values/styles.xml
 create mode 100644 chart/src/main/res/values/themes.xml

diff --git a/chart/src/main/java/org/researchstack/feature/chart/ui/BarChartCard.java b/chart/src/main/java/org/researchstack/feature/chart/ui/BarChartCard.java
index d683ba71b..7d7e69a06 100644
--- a/chart/src/main/java/org/researchstack/feature/chart/ui/BarChartCard.java
+++ b/chart/src/main/java/org/researchstack/feature/chart/ui/BarChartCard.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.ui.graph;
+package org.researchstack.feature.chart.ui;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -20,7 +20,7 @@
 import com.github.mikephil.charting.data.BarData;
 import com.jakewharton.rxbinding.view.RxView;
 
-import org.researchstack.backbone.R;
+import org.researchstack.feature.chart.R;
 
 import rx.Subscription;
 import rx.functions.Action1;
@@ -59,12 +59,12 @@ public BarChartCard(Context context, AttributeSet attrs, int defStyleAttr) {
     }
 
     private void initializeRoot(AttributeSet attrs, int defStyleAttr) {
-        LayoutInflater.from(getContext()).inflate(R.layout.rsb_view_chart_bar, this, true);
+        LayoutInflater.from(getContext()).inflate(R.layout.rsfch_view_chart_bar, this, true);
 
         final TypedArray a = getContext().obtainStyledAttributes(attrs,
                 R.styleable.BarChartCard,
                 defStyleAttr,
-                R.style.Widget_Backbone_Chart_Bar);
+                R.style.Widget_Feature_Chart_Chart_Bar);
 
         titleText = a.getString(R.styleable.BarChartCard_titleText);
         titleTextColor = a.getColor(R.styleable.BarChartCard_titleTextColor, 0);
diff --git a/chart/src/main/java/org/researchstack/feature/chart/ui/EmptyView.java b/chart/src/main/java/org/researchstack/feature/chart/ui/EmptyView.java
index 12c6c994d..20168b5bc 100644
--- a/chart/src/main/java/org/researchstack/feature/chart/ui/EmptyView.java
+++ b/chart/src/main/java/org/researchstack/feature/chart/ui/EmptyView.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.ui.graph;
+package org.researchstack.feature.chart.ui;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -11,22 +11,22 @@
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
-import org.researchstack.backbone.R;
+import org.researchstack.feature.chart.R;
 
 public class EmptyView extends FrameLayout {
     public EmptyView(Context context) {
         super(context);
-        init(null, R.attr.emptyviewStyle, R.style.Widget_Backbone_EmptyView);
+        init(null, R.attr.emptyviewStyle, R.style.Widget_Feature_Chart_EmptyView);
     }
 
     public EmptyView(Context context, @Nullable AttributeSet attrs) {
         super(context, attrs, R.attr.emptyviewStyle);
-        init(attrs, R.attr.emptyviewStyle, R.style.Widget_Backbone_EmptyView);
+        init(attrs, R.attr.emptyviewStyle, R.style.Widget_Feature_Chart_EmptyView);
     }
 
     public EmptyView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
-        init(attrs, defStyleAttr, R.style.Widget_Backbone_EmptyView);
+        init(attrs, defStyleAttr, R.style.Widget_Feature_Chart_EmptyView);
     }
 
     @TargetApi(21)
@@ -36,7 +36,7 @@ public EmptyView(Context context, AttributeSet attrs, int defStyleAttr, int defS
     }
 
     private void init(AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        LayoutInflater.from(getContext()).inflate(R.layout.rsb_view_empty, this, true);
+        LayoutInflater.from(getContext()).inflate(R.layout.rsfch_view_empty, this, true);
 
         final TypedArray a = getContext().obtainStyledAttributes(attrs,
                 R.styleable.EmptyView,
diff --git a/chart/src/main/java/org/researchstack/feature/chart/ui/LineChartCard.java b/chart/src/main/java/org/researchstack/feature/chart/ui/LineChartCard.java
index edf0179f8..b41bbce26 100644
--- a/chart/src/main/java/org/researchstack/feature/chart/ui/LineChartCard.java
+++ b/chart/src/main/java/org/researchstack/feature/chart/ui/LineChartCard.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.ui.graph;
+package org.researchstack.feature.chart.ui;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -20,7 +20,7 @@
 import com.github.mikephil.charting.data.LineData;
 import com.jakewharton.rxbinding.view.RxView;
 
-import org.researchstack.backbone.R;
+import org.researchstack.feature.chart.R;
 
 import rx.Subscription;
 import rx.functions.Action1;
@@ -62,12 +62,12 @@ public LineChartCard(Context context, AttributeSet attrs, int defStyleAttr) {
     }
 
     private void initializeRoot(AttributeSet attrs, int defStyleAttr) {
-        LayoutInflater.from(getContext()).inflate(R.layout.rsb_view_chart_line, this, true);
+        LayoutInflater.from(getContext()).inflate(R.layout.rsfch_view_chart_line, this, true);
 
         final TypedArray a = getContext().obtainStyledAttributes(attrs,
                 R.styleable.LineChartCard,
                 defStyleAttr,
-                R.style.Widget_Backbone_Chart_Line);
+                R.style.Widget_Feature_Chart_Chart_Line);
 
         titleText = a.getString(R.styleable.LineChartCard_titleText);
         titleTextColor = a.getColor(R.styleable.LineChartCard_titleTextColor, 0);
diff --git a/chart/src/main/java/org/researchstack/feature/chart/ui/PieChartCard.java b/chart/src/main/java/org/researchstack/feature/chart/ui/PieChartCard.java
index eba851a2e..4003a4886 100644
--- a/chart/src/main/java/org/researchstack/feature/chart/ui/PieChartCard.java
+++ b/chart/src/main/java/org/researchstack/feature/chart/ui/PieChartCard.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.ui.graph;
+package org.researchstack.feature.chart.ui;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -15,7 +15,7 @@
 import com.github.mikephil.charting.charts.PieChart;
 import com.github.mikephil.charting.data.PieData;
 
-import org.researchstack.backbone.R;
+import org.researchstack.feature.chart.R;
 
 import java.text.NumberFormat;
 
@@ -51,7 +51,7 @@ public PieChartCard(Context context, AttributeSet attrs, int defStyleAttr) {
     }
 
     private void initializeRoot(AttributeSet attrs, int defStyleAttr) {
-        LayoutInflater.from(getContext()).inflate(R.layout.rsb_view_chart_pie, this, true);
+        LayoutInflater.from(getContext()).inflate(R.layout.rsfch_view_chart_pie, this, true);
 
         numberFormat = NumberFormat.getInstance();
         numberFormat.setMinimumFractionDigits(0);
@@ -60,7 +60,7 @@ private void initializeRoot(AttributeSet attrs, int defStyleAttr) {
         final TypedArray a = getContext().obtainStyledAttributes(attrs,
                 R.styleable.PieChartCard,
                 defStyleAttr,
-                R.style.Widget_Backbone_Chart_Pie);
+                R.style.Widget_Feature_Chart_Chart_Pie);
 
         titleText = a.getString(R.styleable.PieChartCard_titleText);
         titleTextColor = a.getColor(R.styleable.PieChartCard_titleTextColor, 0);
@@ -111,7 +111,7 @@ public void setData(PieData data) {
             String xVal = data.getXVals().get(i);
             float entryValue = data.getDataSet().getEntryForIndex(i).getVal();
 
-            View row = inflater.inflate(R.layout.rsb_item_chart_pie, rowContainer, false);
+            View row = inflater.inflate(R.layout.rsfch_item_chart_pie, rowContainer, false);
 
             TextView label = (TextView) row.findViewById(R.id.item_chart_pie_label);
             label.setText(xVal);
diff --git a/chart/src/main/java/org/researchstack/feature/chart/ui/ProgressChartCard.java b/chart/src/main/java/org/researchstack/feature/chart/ui/ProgressChartCard.java
index b94d906f4..7af3e6b9e 100644
--- a/chart/src/main/java/org/researchstack/feature/chart/ui/ProgressChartCard.java
+++ b/chart/src/main/java/org/researchstack/feature/chart/ui/ProgressChartCard.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.ui.graph;
+package org.researchstack.feature.chart.ui;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -18,8 +18,8 @@
 import com.github.mikephil.charting.data.PieData;
 import com.jakewharton.rxbinding.view.RxView;
 
-import org.researchstack.backbone.R;
-import org.researchstack.backbone.ui.views.IconTabLayout;
+import org.researchstack.feature.chart.R;
+import org.researchstack.foundation.components.common.ui.views.IconTabLayout;
 
 import java.text.NumberFormat;
 import java.util.List;
@@ -69,7 +69,7 @@ public ProgressChartCard(Context context, AttributeSet attrs, int defStyleAttr)
     }
 
     private void initializeRoot(AttributeSet attrs, int defStyleAttr) {
-        LayoutInflater.from(getContext()).inflate(R.layout.rsb_view_chart_progress, this, true);
+        LayoutInflater.from(getContext()).inflate(R.layout.rsfch_view_chart_progress, this, true);
 
         numberFormat = NumberFormat.getInstance();
         numberFormat.setMinimumFractionDigits(0);
@@ -78,7 +78,7 @@ private void initializeRoot(AttributeSet attrs, int defStyleAttr) {
         final TypedArray a = getContext().obtainStyledAttributes(attrs,
                 R.styleable.ProgressChartCard,
                 defStyleAttr,
-                R.style.Widget_Backbone_Chart_Progress);
+                R.style.Widget_Feature_Chart_Chart_Progress);
 
         titleText = a.getString(R.styleable.ProgressChartCard_titleText);
         titleTextColor = a.getColor(R.styleable.ProgressChartCard_titleTextColor, 0);
@@ -167,7 +167,7 @@ public void setData(List<PieData> dataSet) {
             }
         }
 
-        tabLayout.setOnTabSelectedListener(new IconTabLayout.OnTabSelectedListenerAdapter() {
+        tabLayout.addOnTabSelectedListener(new IconTabLayout.OnTabSelectedListenerAdapter() {
             @Override
             public void onTabSelected(TabLayout.Tab tab) {
                 PieData data = dataSet.get(tab.getPosition());
@@ -187,6 +187,7 @@ public void onTabReselected(TabLayout.Tab tab) {
                 onTabSelected(tab);
             }
         });
+
     }
 
     public PieChart getChart() {
diff --git a/chart/src/main/res/layout/rsb_item_chart_pie.xml b/chart/src/main/res/layout/rsfch_item_chart_pie.xml
similarity index 100%
rename from chart/src/main/res/layout/rsb_item_chart_pie.xml
rename to chart/src/main/res/layout/rsfch_item_chart_pie.xml
diff --git a/chart/src/main/res/layout/rsb_view_chart_bar.xml b/chart/src/main/res/layout/rsfch_view_chart_bar.xml
similarity index 92%
rename from chart/src/main/res/layout/rsb_view_chart_bar.xml
rename to chart/src/main/res/layout/rsfch_view_chart_bar.xml
index e4d54686f..2c0e19f1a 100644
--- a/chart/src/main/res/layout/rsb_view_chart_bar.xml
+++ b/chart/src/main/res/layout/rsfch_view_chart_bar.xml
@@ -10,7 +10,7 @@
 
         <TextView
             android:id="@+id/view_chart_bar_title"
-            style="@style/Widget.Backbone.Chart.Title"
+            style="@style/Widget.Feature.Chart.Chart.Title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             tools:text="Amount of pie eaten" />
@@ -22,7 +22,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:minHeight="48dp"
-            android:src="@drawable/rsb_ic_fullscreen"
+            android:src="@drawable/rsf_ic_fullscreen"
             android:visibility="gone"
             tools:visibility="visible" />
 
diff --git a/chart/src/main/res/layout/rsb_view_chart_line.xml b/chart/src/main/res/layout/rsfch_view_chart_line.xml
similarity index 92%
rename from chart/src/main/res/layout/rsb_view_chart_line.xml
rename to chart/src/main/res/layout/rsfch_view_chart_line.xml
index b587ad4dc..37cb7d823 100644
--- a/chart/src/main/res/layout/rsb_view_chart_line.xml
+++ b/chart/src/main/res/layout/rsfch_view_chart_line.xml
@@ -11,7 +11,7 @@
 
         <TextView
             android:id="@+id/view_chart_line_title"
-            style="@style/Widget.Backbone.Chart.Title"
+            style="@style/Widget.Feature.Chart.Chart.Title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             tools:text="Amount of pie eaten" />
@@ -23,7 +23,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:minHeight="48dp"
-            android:src="@drawable/rsb_ic_fullscreen"
+            android:src="@drawable/rsf_ic_fullscreen"
             android:visibility="gone"
             tools:visibility="visible" />
 
diff --git a/chart/src/main/res/layout/rsb_view_chart_pie.xml b/chart/src/main/res/layout/rsfch_view_chart_pie.xml
similarity index 95%
rename from chart/src/main/res/layout/rsb_view_chart_pie.xml
rename to chart/src/main/res/layout/rsfch_view_chart_pie.xml
index cbb60ecdb..0235bbc5a 100644
--- a/chart/src/main/res/layout/rsb_view_chart_pie.xml
+++ b/chart/src/main/res/layout/rsfch_view_chart_pie.xml
@@ -11,7 +11,7 @@
 
         <TextView
             android:id="@+id/view_chart_pie_title"
-            style="@style/Widget.Backbone.Chart.Title"
+            style="@style/Widget.Feature.Chart.Chart.Title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             tools:text="Amount of pie eaten" />
diff --git a/chart/src/main/res/layout/rsb_view_chart_progress.xml b/chart/src/main/res/layout/rsfch_view_chart_progress.xml
similarity index 93%
rename from chart/src/main/res/layout/rsb_view_chart_progress.xml
rename to chart/src/main/res/layout/rsfch_view_chart_progress.xml
index 9d97fe998..7ed8ddbb9 100644
--- a/chart/src/main/res/layout/rsb_view_chart_progress.xml
+++ b/chart/src/main/res/layout/rsfch_view_chart_progress.xml
@@ -10,7 +10,7 @@
 
         <TextView
             android:id="@+id/view_chart_progress_title"
-            style="@style/Widget.Backbone.Chart.Title"
+            style="@style/Widget.Feature.Chart.Chart.Title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             tools:text="Amount of pie eaten" />
@@ -38,7 +38,7 @@
 
         <android.support.design.widget.TabLayout
             android:id="@+id/view_chart_progress_tabs"
-            style="@style/Widget.Backbone.TabLayout.Chart"
+            style="@style/Widget.Feature.Chart.TabLayout.Chart"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
diff --git a/chart/src/main/res/layout/rsb_view_empty.xml b/chart/src/main/res/layout/rsfch_view_empty.xml
similarity index 92%
rename from chart/src/main/res/layout/rsb_view_empty.xml
rename to chart/src/main/res/layout/rsfch_view_empty.xml
index ce6479546..a265f7acf 100644
--- a/chart/src/main/res/layout/rsb_view_empty.xml
+++ b/chart/src/main/res/layout/rsfch_view_empty.xml
@@ -14,7 +14,7 @@
         android:layout_marginTop="72dp"
         android:drawablePadding="16dp"
         tools:drawableTint="?attr/colorPrimary"
-        tools:drawableTop="@drawable/rsb_illo_dashboard_empty"
+        tools:drawableTop="@drawable/rsf_illo_dashboard_empty"
         tools:text="No data recorded yet…"
         tools:textColor="?attr/colorPrimary" />
 
diff --git a/chart/src/main/res/values/attrs.xml b/chart/src/main/res/values/attrs.xml
new file mode 100644
index 000000000..1566856f0
--- /dev/null
+++ b/chart/src/main/res/values/attrs.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <declare-styleable name="Feature.Chart">
+        <attr name="emptyviewStyle" format="reference" />
+        <attr name="progressChartCardStyle" format="reference" />
+        <attr name="pieChartCardStyle" format="reference" />
+        <attr name="lineChartCardStyle" format="reference" />
+        <attr name="barChartCardStyle" format="reference" />
+    </declare-styleable>
+
+    <declare-styleable name="EmptyView">
+        <attr name="android:background" />
+        <attr name="emptyIcon" format="reference" />
+        <attr name="emptyIconTint" format="color" />
+        <attr name="emptyText" format="string" />
+        <attr name="emptyTextAppearance" format="reference" />
+    </declare-styleable>
+
+    <declare-styleable name="ChartCard">
+        <attr name="titleText" format="string" />
+        <attr name="titleTextColor" />
+        <attr name="titleTextSize" format="dimension" />
+        <attr name="titleTextTypeface" format="string" />
+    </declare-styleable>
+
+    <declare-styleable name="ProgressChartCard">
+        <attr name="centerTextFormat" format="reference" />
+        <attr name="centerTextColor" format="color" />
+        <attr name="centerTextSize" format="dimension" />
+        <attr name="centerTextTypeface" format="string" />
+        <attr name="titleText" />
+        <attr name="titleTextColor" />
+        <attr name="titleTextSize" />
+        <attr name="titleTextTypeface" />
+        <attr name="finishText" format="string" />
+        <attr name="finishTextColor" format="color" />
+        <attr name="tabIndicatorColor" />
+        <attr name="tabTextColor" />
+        <attr name="tabSelectedTextColor" />
+    </declare-styleable>
+
+    <declare-styleable name="PieChartCard">
+        <attr name="valueTextFormat" format="reference" />
+        <attr name="titleText" />
+        <attr name="titleTextColor" />
+        <attr name="titleTextSize" />
+        <attr name="titleTextTypeface" />
+    </declare-styleable>
+
+    <declare-styleable name="LineChartCard">
+        <attr name="chartXAxisTextColor" format="color" />
+        <attr name="chartXAxisTextSize" format="dimension" />
+        <attr name="chartXAxisTextTypeface" format="string" />
+        <attr name="chartYAxisTextColor" format="color" />
+        <attr name="chartYAxisTextSize" format="dimension" />
+        <attr name="chartYAxisTextTypeface" format="string" />
+        <attr name="expandTintColor" format="color" />
+        <attr name="titleText" />
+        <attr name="titleTextColor" />
+        <attr name="titleTextSize" />
+        <attr name="titleTextTypeface" />
+    </declare-styleable>
+
+    <declare-styleable name="BarChartCard">
+        <attr name="chartXAxisTextColor" />
+        <attr name="chartXAxisTextSize" />
+        <attr name="chartXAxisTextTypeface" />
+        <attr name="expandTintColor" />
+        <attr name="titleText" />
+        <attr name="titleTextColor" />
+        <attr name="titleTextSize" />
+        <attr name="titleTextTypeface" />
+    </declare-styleable>
+
+</resources>
\ No newline at end of file
diff --git a/chart/src/main/res/values/styles.xml b/chart/src/main/res/values/styles.xml
new file mode 100644
index 000000000..585af2ebf
--- /dev/null
+++ b/chart/src/main/res/values/styles.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Widget.Feature.Chart.TabLayout.Chart" parent="@style/Widget.Design.TabLayout">
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:paddingRight">50dp</item>
+        <item name="android:clipToPadding">false</item>
+        <item name="android:minHeight">48dp</item>
+        <item name="tabMode">scrollable</item>
+    </style>
+
+    <style name="Widget.Feature.Chart.EmptyView" parent="">
+        <item name="android:background">#d5e8ff</item>
+        <item name="emptyIcon">@drawable/rsf_illo_dashboard_empty</item>
+        <item name="emptyIconTint">?attr/colorPrimaryDark</item>
+        <item name="emptyText">No data recorded yet…</item>
+        <item name="emptyTextAppearance">@style/TextAppearance.Widget.Feature.Chart.EmptyView</item>
+    </style>
+
+    <style name="TextAppearance.Widget.Feature.Chart.EmptyView" parent="@style/TextAppearance.AppCompat">
+        <item name="android:textColor">?attr/colorPrimaryDark</item>
+        <item name="android:textSize">16sp</item>
+    </style>
+
+    <style name="Widget.Feature.Chart.Chart" parent="">
+        <item name="titleText">Amount of pie eaten</item>
+        <item name="titleTextColor">@color/rsf_warm_gray</item>
+        <item name="titleTextSize">14sp</item>
+        <item name="titleTextTypeface">sans-serif-medium</item>
+    </style>
+
+    <style name="Widget.Feature.Chart.Chart.Progress">
+        <item name="centerTextFormat">@string/rsf_chart_progress_center</item>
+        <item name="centerTextColor">?attr/colorPrimary</item>
+        <item name="centerTextSize">20sp</item>
+        <item name="centerTextTypeface">sans-serif-medium</item>
+        <item name="finishText">Finish</item>
+        <item name="finishTextColor">@color/rsf_error</item>
+        <item name="tabIndicatorColor">@color/rsf_tab_indicator</item>
+        <item name="tabTextColor">@color/rsf_tab_text_selected</item>
+        <item name="tabSelectedTextColor">@color/rsf_tab_indicator</item>
+    </style>
+
+    <style name="Widget.Feature.Chart.Chart.Pie">
+        <item name="valueTextFormat">@string/rsf_chart_pie_value</item>
+    </style>
+
+    <style name="Widget.Feature.Chart.Chart.Line">
+        <item name="valueTextFormat">@string/rsf_chart_pie_value</item>
+        <item name="chartXAxisTextColor">@color/rsf_warm_gray</item>
+        <item name="chartXAxisTextSize">14sp</item>
+        <item name="chartXAxisTextTypeface">sans-serif-medium</item>
+        <item name="chartYAxisTextColor">@color/rsf_warm_gray</item>
+        <item name="chartYAxisTextSize">14sp</item>
+        <item name="chartYAxisTextTypeface">sans-serif-medium</item>
+        <item name="expandTintColor">@color/rsf_warm_gray</item>
+    </style>
+
+    <style name="Widget.Feature.Chart.Chart.Bar">
+        <item name="chartXAxisTextColor">@color/rsf_warm_gray</item>
+        <item name="chartXAxisTextSize">14sp</item>
+        <item name="chartXAxisTextTypeface">sans-serif-medium</item>
+        <item name="chartYAxisTextColor">@color/rsf_warm_gray</item>
+        <item name="chartYAxisTextSize">14sp</item>
+        <item name="chartYAxisTextTypeface">sans-serif-medium</item>
+        <item name="expandTintColor">@color/rsf_warm_gray</item>
+    </style>
+
+    <style name="Widget.Feature.Chart.Chart.Title" parent="">
+        <item name="android:padding">16dp</item>
+        <item name="android:minHeight">48dp</item>
+        <item name="android:gravity">center_vertical</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/chart/src/main/res/values/themes.xml b/chart/src/main/res/values/themes.xml
new file mode 100644
index 000000000..815614633
--- /dev/null
+++ b/chart/src/main/res/values/themes.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.Feature.Chart" parent="Theme.Foundation">
+
+        <!-- Custom Styles for Views -->
+        <item name="emptyviewStyle">@style/Widget.Feature.Chart.EmptyView</item>
+        <item name="progressChartCardStyle">@style/Widget.Feature.Chart.Chart.Progress</item>
+        <item name="pieChartCardStyle">@style/Widget.Feature.Chart.Chart.Pie</item>
+        <item name="lineChartCardStyle">@style/Widget.Feature.Chart.Chart.Line</item>
+        <item name="barChartCardStyle">@style/Widget.Feature.Chart.Chart.Bar</item>
+    </style>
+
+</resources>
\ No newline at end of file

From 085382478baef34ac2ab656274de9a2c388f24c9 Mon Sep 17 00:00:00 2001
From: James Kizer <james.kizer@gmail.com>
Date: Wed, 2 Jan 2019 19:07:50 -0500
Subject: [PATCH 31/53] Updates to consent module

Updated package names and imports
Renamed layouts + drawables
Merged in values
---
 .../consent/model/ConsentDocument.java        |   2 +-
 .../feature/consent/model/ConsentSection.java |  56 ++++++------
 .../consent/model/ConsentSignature.java       |   2 +-
 .../consent/step/ConsentDocumentStep.java     |   9 +-
 .../consent/step/ConsentSharingStep.java      |   5 +-
 .../consent/step/ConsentSignatureStep.java    |   4 +-
 .../consent/step/ConsentVisualStep.java       |  10 ++-
 .../ui/callbacks/SignatureCallbacks.java      |   2 +-
 .../ui/layout/ConsentDocumentStepLayout.java  |  23 ++---
 .../ui/layout/ConsentSignatureStepLayout.java |  31 ++++---
 .../ui/layout/ConsentVisualStepLayout.java    |  35 ++++----
 .../consent/ui/views/SignatureView.java       |   8 +-
 ...> rsfc_consent_section_data_gathering.png} | Bin
 ....png => rsfc_consent_section_data_use.png} | Bin
 ...onsent_section_potential_benefits_alt.png} | Bin
 ...y.png => rsfc_consent_section_privacy.png} | Bin
 ...png => rsfc_consent_section_recontact.png} | Bin
 ... => rsfc_consent_section_study_survey.png} | Bin
 ...g => rsfc_consent_section_study_tasks.png} | Bin
 ... rsfc_consent_section_time_commitment.png} | Bin
 ... rsfc_consent_section_visiting_doctor.png} | Bin
 ...g => rsfc_consent_section_withdrawing.png} | Bin
 ...> rsfc_consent_section_data_gathering.png} | Bin
 ....png => rsfc_consent_section_data_use.png} | Bin
 ...onsent_section_potential_benefits_alt.png} | Bin
 ...y.png => rsfc_consent_section_privacy.png} | Bin
 ...png => rsfc_consent_section_recontact.png} | Bin
 ... => rsfc_consent_section_study_survey.png} | Bin
 ...g => rsfc_consent_section_study_tasks.png} | Bin
 ... rsfc_consent_section_time_commitment.png} | Bin
 ... rsfc_consent_section_visiting_doctor.png} | Bin
 ...g => rsfc_consent_section_withdrawing.png} | Bin
 ...> rsfc_consent_section_data_gathering.png} | Bin
 ....png => rsfc_consent_section_data_use.png} | Bin
 ...onsent_section_potential_benefits_alt.png} | Bin
 ...y.png => rsfc_consent_section_privacy.png} | Bin
 ...png => rsfc_consent_section_recontact.png} | Bin
 ... => rsfc_consent_section_study_survey.png} | Bin
 ...g => rsfc_consent_section_study_tasks.png} | Bin
 ... rsfc_consent_section_time_commitment.png} | Bin
 ... rsfc_consent_section_visiting_doctor.png} | Bin
 ...g => rsfc_consent_section_withdrawing.png} | Bin
 ...> rsfc_consent_section_data_gathering.png} | Bin
 ....png => rsfc_consent_section_data_use.png} | Bin
 ...onsent_section_potential_benefits_alt.png} | Bin
 ...y.png => rsfc_consent_section_privacy.png} | Bin
 ...png => rsfc_consent_section_recontact.png} | Bin
 ... => rsfc_consent_section_study_survey.png} | Bin
 ...g => rsfc_consent_section_study_tasks.png} | Bin
 ... rsfc_consent_section_time_commitment.png} | Bin
 ... rsfc_consent_section_visiting_doctor.png} | Bin
 ...g => rsfc_consent_section_withdrawing.png} | Bin
 ...> rsfc_consent_section_data_gathering.png} | Bin
 ....png => rsfc_consent_section_data_use.png} | Bin
 ...onsent_section_potential_benefits_alt.png} | Bin
 ...y.png => rsfc_consent_section_privacy.png} | Bin
 ...png => rsfc_consent_section_recontact.png} | Bin
 ... => rsfc_consent_section_study_survey.png} | Bin
 ...g => rsfc_consent_section_study_tasks.png} | Bin
 ... rsfc_consent_section_time_commitment.png} | Bin
 ... rsfc_consent_section_visiting_doctor.png} | Bin
 ...g => rsfc_consent_section_withdrawing.png} | Bin
 ...c.xml => rsfc_step_layout_consent_doc.xml} |   6 +-
 ...=> rsfc_step_layout_consent_signature.xml} |  20 ++---
 ...ml => rsfc_step_layout_consent_visual.xml} |  18 ++--
 consent/src/main/res/values/attrs.xml         |  19 ++++
 consent/src/main/res/values/strings.xml       |  82 +++++++++++++++++-
 consent/src/main/res/values/styles.xml        |  15 ++++
 68 files changed, 233 insertions(+), 114 deletions(-)
 rename consent/src/main/res/drawable-hdpi/{rsb_consent_section_data_gathering.png => rsfc_consent_section_data_gathering.png} (100%)
 rename consent/src/main/res/drawable-hdpi/{rsb_consent_section_data_use.png => rsfc_consent_section_data_use.png} (100%)
 rename consent/src/main/res/drawable-hdpi/{rsb_consent_section_potential_benefits_alt.png => rsfc_consent_section_potential_benefits_alt.png} (100%)
 rename consent/src/main/res/drawable-hdpi/{rsb_consent_section_privacy.png => rsfc_consent_section_privacy.png} (100%)
 rename consent/src/main/res/drawable-hdpi/{rsb_consent_section_recontact.png => rsfc_consent_section_recontact.png} (100%)
 rename consent/src/main/res/drawable-hdpi/{rsb_consent_section_study_survey.png => rsfc_consent_section_study_survey.png} (100%)
 rename consent/src/main/res/drawable-hdpi/{rsb_consent_section_study_tasks.png => rsfc_consent_section_study_tasks.png} (100%)
 rename consent/src/main/res/drawable-hdpi/{rsb_consent_section_time_commitment.png => rsfc_consent_section_time_commitment.png} (100%)
 rename consent/src/main/res/drawable-hdpi/{rsb_consent_section_visiting_doctor.png => rsfc_consent_section_visiting_doctor.png} (100%)
 rename consent/src/main/res/drawable-hdpi/{rsb_consent_section_withdrawing.png => rsfc_consent_section_withdrawing.png} (100%)
 rename consent/src/main/res/drawable-mdpi/{rsb_consent_section_data_gathering.png => rsfc_consent_section_data_gathering.png} (100%)
 rename consent/src/main/res/drawable-mdpi/{rsb_consent_section_data_use.png => rsfc_consent_section_data_use.png} (100%)
 rename consent/src/main/res/drawable-mdpi/{rsb_consent_section_potential_benefits_alt.png => rsfc_consent_section_potential_benefits_alt.png} (100%)
 rename consent/src/main/res/drawable-mdpi/{rsb_consent_section_privacy.png => rsfc_consent_section_privacy.png} (100%)
 rename consent/src/main/res/drawable-mdpi/{rsb_consent_section_recontact.png => rsfc_consent_section_recontact.png} (100%)
 rename consent/src/main/res/drawable-mdpi/{rsb_consent_section_study_survey.png => rsfc_consent_section_study_survey.png} (100%)
 rename consent/src/main/res/drawable-mdpi/{rsb_consent_section_study_tasks.png => rsfc_consent_section_study_tasks.png} (100%)
 rename consent/src/main/res/drawable-mdpi/{rsb_consent_section_time_commitment.png => rsfc_consent_section_time_commitment.png} (100%)
 rename consent/src/main/res/drawable-mdpi/{rsb_consent_section_visiting_doctor.png => rsfc_consent_section_visiting_doctor.png} (100%)
 rename consent/src/main/res/drawable-mdpi/{rsb_consent_section_withdrawing.png => rsfc_consent_section_withdrawing.png} (100%)
 rename consent/src/main/res/drawable-xhdpi/{rsb_consent_section_data_gathering.png => rsfc_consent_section_data_gathering.png} (100%)
 rename consent/src/main/res/drawable-xhdpi/{rsb_consent_section_data_use.png => rsfc_consent_section_data_use.png} (100%)
 rename consent/src/main/res/drawable-xhdpi/{rsb_consent_section_potential_benefits_alt.png => rsfc_consent_section_potential_benefits_alt.png} (100%)
 rename consent/src/main/res/drawable-xhdpi/{rsb_consent_section_privacy.png => rsfc_consent_section_privacy.png} (100%)
 rename consent/src/main/res/drawable-xhdpi/{rsb_consent_section_recontact.png => rsfc_consent_section_recontact.png} (100%)
 rename consent/src/main/res/drawable-xhdpi/{rsb_consent_section_study_survey.png => rsfc_consent_section_study_survey.png} (100%)
 rename consent/src/main/res/drawable-xhdpi/{rsb_consent_section_study_tasks.png => rsfc_consent_section_study_tasks.png} (100%)
 rename consent/src/main/res/drawable-xhdpi/{rsb_consent_section_time_commitment.png => rsfc_consent_section_time_commitment.png} (100%)
 rename consent/src/main/res/drawable-xhdpi/{rsb_consent_section_visiting_doctor.png => rsfc_consent_section_visiting_doctor.png} (100%)
 rename consent/src/main/res/drawable-xhdpi/{rsb_consent_section_withdrawing.png => rsfc_consent_section_withdrawing.png} (100%)
 rename consent/src/main/res/drawable-xxhdpi/{rsb_consent_section_data_gathering.png => rsfc_consent_section_data_gathering.png} (100%)
 rename consent/src/main/res/drawable-xxhdpi/{rsb_consent_section_data_use.png => rsfc_consent_section_data_use.png} (100%)
 rename consent/src/main/res/drawable-xxhdpi/{rsb_consent_section_potential_benefits_alt.png => rsfc_consent_section_potential_benefits_alt.png} (100%)
 rename consent/src/main/res/drawable-xxhdpi/{rsb_consent_section_privacy.png => rsfc_consent_section_privacy.png} (100%)
 rename consent/src/main/res/drawable-xxhdpi/{rsb_consent_section_recontact.png => rsfc_consent_section_recontact.png} (100%)
 rename consent/src/main/res/drawable-xxhdpi/{rsb_consent_section_study_survey.png => rsfc_consent_section_study_survey.png} (100%)
 rename consent/src/main/res/drawable-xxhdpi/{rsb_consent_section_study_tasks.png => rsfc_consent_section_study_tasks.png} (100%)
 rename consent/src/main/res/drawable-xxhdpi/{rsb_consent_section_time_commitment.png => rsfc_consent_section_time_commitment.png} (100%)
 rename consent/src/main/res/drawable-xxhdpi/{rsb_consent_section_visiting_doctor.png => rsfc_consent_section_visiting_doctor.png} (100%)
 rename consent/src/main/res/drawable-xxhdpi/{rsb_consent_section_withdrawing.png => rsfc_consent_section_withdrawing.png} (100%)
 rename consent/src/main/res/drawable-xxxhdpi/{rsb_consent_section_data_gathering.png => rsfc_consent_section_data_gathering.png} (100%)
 rename consent/src/main/res/drawable-xxxhdpi/{rsb_consent_section_data_use.png => rsfc_consent_section_data_use.png} (100%)
 rename consent/src/main/res/drawable-xxxhdpi/{rsb_consent_section_potential_benefits_alt.png => rsfc_consent_section_potential_benefits_alt.png} (100%)
 rename consent/src/main/res/drawable-xxxhdpi/{rsb_consent_section_privacy.png => rsfc_consent_section_privacy.png} (100%)
 rename consent/src/main/res/drawable-xxxhdpi/{rsb_consent_section_recontact.png => rsfc_consent_section_recontact.png} (100%)
 rename consent/src/main/res/drawable-xxxhdpi/{rsb_consent_section_study_survey.png => rsfc_consent_section_study_survey.png} (100%)
 rename consent/src/main/res/drawable-xxxhdpi/{rsb_consent_section_study_tasks.png => rsfc_consent_section_study_tasks.png} (100%)
 rename consent/src/main/res/drawable-xxxhdpi/{rsb_consent_section_time_commitment.png => rsfc_consent_section_time_commitment.png} (100%)
 rename consent/src/main/res/drawable-xxxhdpi/{rsb_consent_section_visiting_doctor.png => rsfc_consent_section_visiting_doctor.png} (100%)
 rename consent/src/main/res/drawable-xxxhdpi/{rsb_consent_section_withdrawing.png => rsfc_consent_section_withdrawing.png} (100%)
 rename consent/src/main/res/layout/{rsb_step_layout_consent_doc.xml => rsfc_step_layout_consent_doc.xml} (77%)
 rename consent/src/main/res/layout/{rsb_step_layout_consent_signature.xml => rsfc_step_layout_consent_signature.xml} (76%)
 rename consent/src/main/res/layout/{rsb_step_layout_consent_visual.xml => rsfc_step_layout_consent_visual.xml} (75%)
 create mode 100644 consent/src/main/res/values/attrs.xml
 create mode 100644 consent/src/main/res/values/styles.xml

diff --git a/consent/src/main/java/org/researchstack/feature/consent/model/ConsentDocument.java b/consent/src/main/java/org/researchstack/feature/consent/model/ConsentDocument.java
index c83f713dc..c9b6d822b 100644
--- a/consent/src/main/java/org/researchstack/feature/consent/model/ConsentDocument.java
+++ b/consent/src/main/java/org/researchstack/feature/consent/model/ConsentDocument.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.model;
+package org.researchstack.feature.consent.model;
 
 import android.support.annotation.StringRes;
 
diff --git a/consent/src/main/java/org/researchstack/feature/consent/model/ConsentSection.java b/consent/src/main/java/org/researchstack/feature/consent/model/ConsentSection.java
index 13f232117..976e34b2b 100644
--- a/consent/src/main/java/org/researchstack/feature/consent/model/ConsentSection.java
+++ b/consent/src/main/java/org/researchstack/feature/consent/model/ConsentSection.java
@@ -1,9 +1,9 @@
-package org.researchstack.backbone.model;
+package org.researchstack.feature.consent.model;
 
 import com.google.gson.annotations.SerializedName;
 
-import org.researchstack.backbone.R;
-import org.researchstack.backbone.utils.TextUtils;
+import org.researchstack.feature.consent.R;
+import org.researchstack.foundation.components.utils.TextUtils;
 
 import java.io.Serializable;
 
@@ -73,7 +73,7 @@ public class ConsentSection implements Serializable {
      * A custom illustration for the consent.
      * <p>
      * The custom image can override the image associated with any of the predefined section types
-     * for an {@link org.researchstack.backbone.step.ConsentVisualStep} object. It is ignored for a
+     * for an {@link org.researchstack.foundation.step.ConsentVisualStep} object. It is ignored for a
      * consent review step and for PDF generation.
      * <p>
      * The image is used in template rendering mode, and is tinted using the tint color.
@@ -267,21 +267,21 @@ public enum Type implements Serializable {
         public int getTitleResId() {
             switch (this) {
                 case Overview:
-                    return R.string.rsb_consent_section_welcome;
+                    return R.string.rsfc_consent_section_welcome;
                 case DataGathering:
-                    return R.string.rsb_consent_section_data_gathering;
+                    return R.string.rsfc_consent_section_data_gathering;
                 case Privacy:
-                    return R.string.rsb_consent_section_privacy;
+                    return R.string.rsfc_consent_section_privacy;
                 case DataUse:
-                    return R.string.rsb_consent_section_data_use;
+                    return R.string.rsfc_consent_section_data_use;
                 case TimeCommitment:
-                    return R.string.rsb_consent_section_time_commitment;
+                    return R.string.rsfc_consent_section_time_commitment;
                 case StudySurvey:
-                    return R.string.rsb_consent_section_study_survey;
+                    return R.string.rsfc_consent_section_study_survey;
                 case StudyTasks:
-                    return R.string.rsb_consent_section_study_tasks;
+                    return R.string.rsfc_consent_section_study_tasks;
                 case Withdrawing:
-                    return R.string.rsb_consent_section_withdrawing;
+                    return R.string.rsfc_consent_section_withdrawing;
                 default:
                     return -1;
             }
@@ -290,19 +290,19 @@ public int getTitleResId() {
         public String getImageName() {
             switch (this) {
                 case DataGathering:
-                    return "rsb_consent_section_data_gathering";
+                    return "rsfc_consent_section_data_gathering";
                 case Privacy:
-                    return "rsb_consent_section_privacy";
+                    return "rsfc_consent_section_privacy";
                 case DataUse:
-                    return "rsb_consent_section_data_use";
+                    return "rsfc_consent_section_data_use";
                 case TimeCommitment:
-                    return "rsb_consent_section_time_commitment";
+                    return "rsfc_consent_section_time_commitment";
                 case StudySurvey:
-                    return "rsb_consent_section_study_survey";
+                    return "rsfc_consent_section_study_survey";
                 case StudyTasks:
-                    return "rsb_consent_section_study_tasks";
+                    return "rsfc_consent_section_study_tasks";
                 case Withdrawing:
-                    return "rsb_consent_section_withdrawing";
+                    return "rsfc_consent_section_withdrawing";
                 default:
                     return null;
             }
@@ -311,23 +311,23 @@ public String getImageName() {
         public int getMoreInfoResId() {
             switch (this) {
                 case Overview:
-                    return R.string.rsb_consent_section_more_info_welcome;
+                    return R.string.rsfc_consent_section_more_info_welcome;
                 case DataGathering:
-                    return R.string.rsb_consent_section_more_info_data_gathering;
+                    return R.string.rsfc_consent_section_more_info_data_gathering;
                 case Privacy:
-                    return R.string.rsb_consent_section_more_info_privacy;
+                    return R.string.rsfc_consent_section_more_info_privacy;
                 case DataUse:
-                    return R.string.rsb_consent_section_more_info_data_use;
+                    return R.string.rsfc_consent_section_more_info_data_use;
                 case TimeCommitment:
-                    return R.string.rsb_consent_section_more_info_time_commitment;
+                    return R.string.rsfc_consent_section_more_info_time_commitment;
                 case StudySurvey:
-                    return R.string.rsb_consent_section_more_info_study_survey;
+                    return R.string.rsfc_consent_section_more_info_study_survey;
                 case StudyTasks:
-                    return R.string.rsb_consent_section_more_info_study_tasks;
+                    return R.string.rsfc_consent_section_more_info_study_tasks;
                 case Withdrawing:
-                    return R.string.rsb_consent_section_more_info_withdrawing;
+                    return R.string.rsfc_consent_section_more_info_withdrawing;
                 default:
-                    return R.string.rsb_consent_section_more_info;
+                    return R.string.rsfc_consent_section_more_info;
             }
         }
 
diff --git a/consent/src/main/java/org/researchstack/feature/consent/model/ConsentSignature.java b/consent/src/main/java/org/researchstack/feature/consent/model/ConsentSignature.java
index 1a27e7ea3..ed8416c70 100644
--- a/consent/src/main/java/org/researchstack/feature/consent/model/ConsentSignature.java
+++ b/consent/src/main/java/org/researchstack/feature/consent/model/ConsentSignature.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.model;
+package org.researchstack.feature.consent.model;
 
 import android.support.annotation.NonNull;
 
diff --git a/consent/src/main/java/org/researchstack/feature/consent/step/ConsentDocumentStep.java b/consent/src/main/java/org/researchstack/feature/consent/step/ConsentDocumentStep.java
index a587fe68b..b444b5e72 100644
--- a/consent/src/main/java/org/researchstack/feature/consent/step/ConsentDocumentStep.java
+++ b/consent/src/main/java/org/researchstack/feature/consent/step/ConsentDocumentStep.java
@@ -1,7 +1,8 @@
-package org.researchstack.backbone.step;
+package org.researchstack.feature.consent.step;
 
-import org.researchstack.backbone.R;
-import org.researchstack.backbone.ui.step.layout.ConsentDocumentStepLayout;
+import org.researchstack.feature.consent.R;
+import org.researchstack.feature.consent.ui.layout.ConsentDocumentStepLayout;
+import org.researchstack.foundation.core.models.step.Step;
 
 /**
  * This step shows an HTML version of your consent document to the user and allows them to indicate
@@ -18,7 +19,7 @@ public ConsentDocumentStep(String identifier) {
 
     @Override
     public int getStepTitle() {
-        return R.string.rsb_consent;
+        return R.string.rsfc_consent;
     }
 
     @Override
diff --git a/consent/src/main/java/org/researchstack/feature/consent/step/ConsentSharingStep.java b/consent/src/main/java/org/researchstack/feature/consent/step/ConsentSharingStep.java
index ca27ec0d1..00c051ad8 100644
--- a/consent/src/main/java/org/researchstack/feature/consent/step/ConsentSharingStep.java
+++ b/consent/src/main/java/org/researchstack/feature/consent/step/ConsentSharingStep.java
@@ -1,6 +1,7 @@
-package org.researchstack.backbone.step;
+package org.researchstack.feature.consent.step;
 
-import org.researchstack.backbone.ui.step.body.SingleChoiceQuestionBody;
+import org.researchstack.foundation.components.survey.step.QuestionStep;
+import org.researchstack.foundation.components.survey.ui.body.SingleChoiceQuestionBody;
 
 /**
  * This class represents a question step that includes prepopulated content that asks users about
diff --git a/consent/src/main/java/org/researchstack/feature/consent/step/ConsentSignatureStep.java b/consent/src/main/java/org/researchstack/feature/consent/step/ConsentSignatureStep.java
index 3cf36e23e..cd30f3581 100644
--- a/consent/src/main/java/org/researchstack/feature/consent/step/ConsentSignatureStep.java
+++ b/consent/src/main/java/org/researchstack/feature/consent/step/ConsentSignatureStep.java
@@ -1,4 +1,6 @@
-package org.researchstack.backbone.step;
+package org.researchstack.feature.consent.step;
+
+import org.researchstack.foundation.core.models.step.Step;
 
 /**
  * This class represents the final step in the consent process, collecting the signature from the
diff --git a/consent/src/main/java/org/researchstack/feature/consent/step/ConsentVisualStep.java b/consent/src/main/java/org/researchstack/feature/consent/step/ConsentVisualStep.java
index 00ca0d6df..8e9f35440 100644
--- a/consent/src/main/java/org/researchstack/feature/consent/step/ConsentVisualStep.java
+++ b/consent/src/main/java/org/researchstack/feature/consent/step/ConsentVisualStep.java
@@ -1,7 +1,9 @@
-package org.researchstack.backbone.step;
+package org.researchstack.feature.consent.step;
 
-import org.researchstack.backbone.model.ConsentSection;
-import org.researchstack.backbone.ui.step.layout.ConsentVisualStepLayout;
+import org.researchstack.feature.consent.R;
+import org.researchstack.feature.consent.model.ConsentSection;
+import org.researchstack.feature.consent.ui.layout.ConsentVisualStepLayout;
+import org.researchstack.foundation.core.models.step.Step;
 
 /**
  * The {@link ConsentVisualStep} class represents a step in the visual consent sequence.
@@ -21,7 +23,7 @@ public ConsentVisualStep(String identifier) {
 
     @Override
     public int getStepTitle() {
-        return org.researchstack.backbone.R.string.rsb_consent;
+        return R.string.rsfc_consent;
     }
 
     @Override
diff --git a/consent/src/main/java/org/researchstack/feature/consent/ui/callbacks/SignatureCallbacks.java b/consent/src/main/java/org/researchstack/feature/consent/ui/callbacks/SignatureCallbacks.java
index 096857845..e46fd1c76 100644
--- a/consent/src/main/java/org/researchstack/feature/consent/ui/callbacks/SignatureCallbacks.java
+++ b/consent/src/main/java/org/researchstack/feature/consent/ui/callbacks/SignatureCallbacks.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.ui.callbacks;
+package org.researchstack.feature.consent.ui.callbacks;
 
 public interface SignatureCallbacks {
     void onSignatureStarted();
diff --git a/consent/src/main/java/org/researchstack/feature/consent/ui/layout/ConsentDocumentStepLayout.java b/consent/src/main/java/org/researchstack/feature/consent/ui/layout/ConsentDocumentStepLayout.java
index fd1a297b1..6abc33b4e 100644
--- a/consent/src/main/java/org/researchstack/feature/consent/ui/layout/ConsentDocumentStepLayout.java
+++ b/consent/src/main/java/org/researchstack/feature/consent/ui/layout/ConsentDocumentStepLayout.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.ui.step.layout;
+package org.researchstack.feature.consent.ui.layout;
 
 import android.content.Context;
 import android.support.v7.app.AlertDialog;
@@ -8,12 +8,13 @@
 import android.webkit.WebView;
 import android.widget.LinearLayout;
 
-import org.researchstack.backbone.R;
-import org.researchstack.backbone.result.StepResult;
-import org.researchstack.backbone.step.ConsentDocumentStep;
-import org.researchstack.backbone.step.Step;
-import org.researchstack.backbone.ui.callbacks.StepCallbacks;
-import org.researchstack.backbone.ui.views.SubmitBar;
+import org.researchstack.feature.consent.R;
+import org.researchstack.foundation.components.common.ui.callbacks.StepCallbacks;
+import org.researchstack.foundation.components.common.ui.layout.StepLayout;
+import org.researchstack.foundation.components.common.ui.views.SubmitBar;
+import org.researchstack.feature.consent.step.ConsentDocumentStep;
+import org.researchstack.foundation.core.models.result.StepResult;
+import org.researchstack.foundation.core.models.step.Step;
 
 /**
  * Implement saved state for the following objects:
@@ -75,7 +76,7 @@ public void setCallbacks(StepCallbacks callbacks) {
 
     private void initializeStep() {
         setOrientation(VERTICAL);
-        LayoutInflater.from(getContext()).inflate(R.layout.rsb_step_layout_consent_doc, this, true);
+        LayoutInflater.from(getContext()).inflate(R.layout.rsfc_step_layout_consent_doc, this, true);
 
         WebView pdfView = (WebView) findViewById(R.id.webview);
         pdfView.loadData(htmlContent, "text/html; charset=UTF-8", null);
@@ -86,14 +87,14 @@ private void initializeStep() {
     }
 
     private void showDialog() {
-        new AlertDialog.Builder(getContext()).setTitle(R.string.rsb_consent_review_alert_title)
+        new AlertDialog.Builder(getContext()).setTitle(R.string.rsfc_consent_review_alert_title)
                 .setMessage(confirmationDialogBody)
                 .setCancelable(false)
-                .setPositiveButton(R.string.rsb_agree, (dialog, which) -> {
+                .setPositiveButton(R.string.rsf_agree, (dialog, which) -> {
                     stepResult.setResult(true);
                     callbacks.onSaveStep(StepCallbacks.ACTION_NEXT, step, stepResult);
                 })
-                .setNegativeButton(R.string.rsb_consent_review_cancel, (dialog, which) -> {
+                .setNegativeButton(R.string.rsfc_consent_review_cancel, (dialog, which) -> {
                     // Gives them a chance to read it again
                 })
                 .show();
diff --git a/consent/src/main/java/org/researchstack/feature/consent/ui/layout/ConsentSignatureStepLayout.java b/consent/src/main/java/org/researchstack/feature/consent/ui/layout/ConsentSignatureStepLayout.java
index 2c7ba7734..5c3300c1f 100644
--- a/consent/src/main/java/org/researchstack/feature/consent/ui/layout/ConsentSignatureStepLayout.java
+++ b/consent/src/main/java/org/researchstack/feature/consent/ui/layout/ConsentSignatureStepLayout.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.ui.step.layout;
+package org.researchstack.feature.consent.ui.layout;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -10,18 +10,17 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.jakewharton.rxbinding.view.RxView;
-
-import org.researchstack.backbone.R;
-import org.researchstack.backbone.result.StepResult;
-import org.researchstack.backbone.step.ConsentSignatureStep;
-import org.researchstack.backbone.step.Step;
-import org.researchstack.backbone.ui.callbacks.SignatureCallbacks;
-import org.researchstack.backbone.ui.callbacks.StepCallbacks;
-import org.researchstack.backbone.ui.views.SignatureView;
-import org.researchstack.backbone.ui.views.SubmitBar;
-import org.researchstack.backbone.utils.FormatHelper;
-import org.researchstack.backbone.utils.TextUtils;
+import org.researchstack.feature.consent.R;
+import org.researchstack.foundation.components.common.ui.callbacks.StepCallbacks;
+import org.researchstack.foundation.components.common.ui.layout.StepLayout;
+import org.researchstack.foundation.components.common.ui.views.SubmitBar;
+import org.researchstack.feature.consent.step.ConsentSignatureStep;
+import org.researchstack.feature.consent.ui.callbacks.SignatureCallbacks;
+import org.researchstack.feature.consent.ui.views.SignatureView;
+import org.researchstack.foundation.components.utils.FormatHelper;
+import org.researchstack.foundation.components.utils.TextUtils;
+import org.researchstack.foundation.core.models.result.StepResult;
+import org.researchstack.foundation.core.models.step.Step;
 
 import java.io.ByteArrayOutputStream;
 import java.text.DateFormat;
@@ -76,7 +75,7 @@ public void setCallbacks(StepCallbacks callbacks) {
 
     private void initializeStep() {
         LayoutInflater.from(getContext())
-                .inflate(R.layout.rsb_step_layout_consent_signature, this, true);
+                .inflate(R.layout.rsfc_step_layout_consent_signature, this, true);
 
         TextView title = (TextView) findViewById(R.id.title);
         title.setText(step.getTitle());
@@ -101,7 +100,7 @@ public void onSignatureCleared() {
             }
         });
 
-        RxView.clicks(clear).subscribe(v -> {
+        clear.setOnClickListener(v -> {
             signatureView.clearSignature();
         });
 
@@ -117,7 +116,7 @@ public void onSignatureCleared() {
                 setDataToResult();
                 callbacks.onSaveStep(StepCallbacks.ACTION_NEXT, step, result);
             } else {
-                Toast.makeText(getContext(), R.string.rsb_error_invalid_signature, Toast.LENGTH_SHORT).show();
+                Toast.makeText(getContext(), R.string.rsf_error_invalid_signature, Toast.LENGTH_SHORT).show();
             }
         });
     }
diff --git a/consent/src/main/java/org/researchstack/feature/consent/ui/layout/ConsentVisualStepLayout.java b/consent/src/main/java/org/researchstack/feature/consent/ui/layout/ConsentVisualStepLayout.java
index 815c13095..1cd07f5e9 100644
--- a/consent/src/main/java/org/researchstack/feature/consent/ui/layout/ConsentVisualStepLayout.java
+++ b/consent/src/main/java/org/researchstack/feature/consent/ui/layout/ConsentVisualStepLayout.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.ui.step.layout;
+package org.researchstack.feature.consent.ui.layout;
 
 import android.content.Context;
 import android.content.Intent;
@@ -11,19 +11,18 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.jakewharton.rxbinding.view.RxView;
-
-import org.researchstack.backbone.R;
-import org.researchstack.backbone.model.ConsentSection;
-import org.researchstack.backbone.result.StepResult;
-import org.researchstack.backbone.step.ConsentVisualStep;
-import org.researchstack.backbone.step.Step;
-import org.researchstack.backbone.ui.ViewWebDocumentActivity;
-import org.researchstack.backbone.ui.callbacks.StepCallbacks;
-import org.researchstack.backbone.ui.views.FixedSubmitBarLayout;
-import org.researchstack.backbone.ui.views.SubmitBar;
-import org.researchstack.backbone.utils.ResUtils;
-import org.researchstack.backbone.utils.TextUtils;
+import org.researchstack.feature.consent.R;
+import org.researchstack.foundation.components.common.ui.callbacks.StepCallbacks;
+import org.researchstack.foundation.components.common.ui.layout.FixedSubmitBarLayout;
+import org.researchstack.foundation.components.common.ui.layout.StepLayout;
+import org.researchstack.foundation.components.common.ui.views.SubmitBar;
+import org.researchstack.feature.consent.model.ConsentSection;
+import org.researchstack.feature.consent.step.ConsentVisualStep;
+import org.researchstack.foundation.components.utils.ResUtils;
+import org.researchstack.foundation.components.utils.TextUtils;
+import org.researchstack.foundation.components.web.ui.activities.ViewWebDocumentActivity;
+import org.researchstack.foundation.core.models.result.StepResult;
+import org.researchstack.foundation.core.models.step.Step;
 
 public class ConsentVisualStepLayout extends FixedSubmitBarLayout implements StepLayout {
 
@@ -66,7 +65,7 @@ public void setCallbacks(StepCallbacks callbacks) {
 
     @Override
     public int getContentResourceId() {
-        return R.layout.rsb_step_layout_consent_visual;
+        return R.layout.rsfc_step_layout_consent_visual;
     }
 
     private void initializeStep() {
@@ -117,8 +116,8 @@ private void initializeStep() {
                 moreInfoView.setText(data.getType().getMoreInfoResId());
             }
 
-            RxView.clicks(moreInfoView).subscribe(v -> {
-                String webTitle = getResources().getString(R.string.rsb_consent_section_more_info);
+            moreInfoView.setOnClickListener(v -> {
+                String webTitle = getResources().getString(R.string.rsfc_consent_section_more_info);
                 Intent webDoc = ViewWebDocumentActivity.newIntentForContent(getContext(), webTitle,
                         TextUtils.isEmpty(data.getContent()) ? data.getHtmlContent() : data.getContent());
                 getContext().startActivity(webDoc);
@@ -127,7 +126,7 @@ private void initializeStep() {
             moreInfoView.setVisibility(View.GONE);
         }
 
-        SubmitBar submitBar = (SubmitBar) findViewById(R.id.rsb_submit_bar);
+        SubmitBar submitBar = (SubmitBar) findViewById(R.id.rsf_submit_bar);
         submitBar.setPositiveTitle(step.getNextButtonString());
         submitBar.setPositiveAction(v -> callbacks.onSaveStep(StepCallbacks.ACTION_NEXT,
                 step,
diff --git a/consent/src/main/java/org/researchstack/feature/consent/ui/views/SignatureView.java b/consent/src/main/java/org/researchstack/feature/consent/ui/views/SignatureView.java
index c06faa3d1..82766f8ce 100644
--- a/consent/src/main/java/org/researchstack/feature/consent/ui/views/SignatureView.java
+++ b/consent/src/main/java/org/researchstack/feature/consent/ui/views/SignatureView.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.ui.views;
+package org.researchstack.feature.consent.ui.views;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -19,8 +19,8 @@
 import android.view.MotionEvent;
 import android.view.View;
 
-import org.researchstack.backbone.R;
-import org.researchstack.backbone.ui.callbacks.SignatureCallbacks;
+import org.researchstack.feature.consent.R;
+import org.researchstack.feature.consent.ui.callbacks.SignatureCallbacks;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -78,7 +78,7 @@ private void init(Context context, AttributeSet attrs, int defStyleAttr) {
         TypedArray a = context.obtainStyledAttributes(attrs,
                 R.styleable.SignatureView,
                 defStyleAttr,
-                R.style.Widget_Backbone_SignatureView);
+                R.style.Widget_Feature_Consent_SignatureView);
 
         int signatureColor = a.getColor(R.styleable.SignatureView_signatureColor, Color.BLACK);
 
diff --git a/consent/src/main/res/drawable-hdpi/rsb_consent_section_data_gathering.png b/consent/src/main/res/drawable-hdpi/rsfc_consent_section_data_gathering.png
similarity index 100%
rename from consent/src/main/res/drawable-hdpi/rsb_consent_section_data_gathering.png
rename to consent/src/main/res/drawable-hdpi/rsfc_consent_section_data_gathering.png
diff --git a/consent/src/main/res/drawable-hdpi/rsb_consent_section_data_use.png b/consent/src/main/res/drawable-hdpi/rsfc_consent_section_data_use.png
similarity index 100%
rename from consent/src/main/res/drawable-hdpi/rsb_consent_section_data_use.png
rename to consent/src/main/res/drawable-hdpi/rsfc_consent_section_data_use.png
diff --git a/consent/src/main/res/drawable-hdpi/rsb_consent_section_potential_benefits_alt.png b/consent/src/main/res/drawable-hdpi/rsfc_consent_section_potential_benefits_alt.png
similarity index 100%
rename from consent/src/main/res/drawable-hdpi/rsb_consent_section_potential_benefits_alt.png
rename to consent/src/main/res/drawable-hdpi/rsfc_consent_section_potential_benefits_alt.png
diff --git a/consent/src/main/res/drawable-hdpi/rsb_consent_section_privacy.png b/consent/src/main/res/drawable-hdpi/rsfc_consent_section_privacy.png
similarity index 100%
rename from consent/src/main/res/drawable-hdpi/rsb_consent_section_privacy.png
rename to consent/src/main/res/drawable-hdpi/rsfc_consent_section_privacy.png
diff --git a/consent/src/main/res/drawable-hdpi/rsb_consent_section_recontact.png b/consent/src/main/res/drawable-hdpi/rsfc_consent_section_recontact.png
similarity index 100%
rename from consent/src/main/res/drawable-hdpi/rsb_consent_section_recontact.png
rename to consent/src/main/res/drawable-hdpi/rsfc_consent_section_recontact.png
diff --git a/consent/src/main/res/drawable-hdpi/rsb_consent_section_study_survey.png b/consent/src/main/res/drawable-hdpi/rsfc_consent_section_study_survey.png
similarity index 100%
rename from consent/src/main/res/drawable-hdpi/rsb_consent_section_study_survey.png
rename to consent/src/main/res/drawable-hdpi/rsfc_consent_section_study_survey.png
diff --git a/consent/src/main/res/drawable-hdpi/rsb_consent_section_study_tasks.png b/consent/src/main/res/drawable-hdpi/rsfc_consent_section_study_tasks.png
similarity index 100%
rename from consent/src/main/res/drawable-hdpi/rsb_consent_section_study_tasks.png
rename to consent/src/main/res/drawable-hdpi/rsfc_consent_section_study_tasks.png
diff --git a/consent/src/main/res/drawable-hdpi/rsb_consent_section_time_commitment.png b/consent/src/main/res/drawable-hdpi/rsfc_consent_section_time_commitment.png
similarity index 100%
rename from consent/src/main/res/drawable-hdpi/rsb_consent_section_time_commitment.png
rename to consent/src/main/res/drawable-hdpi/rsfc_consent_section_time_commitment.png
diff --git a/consent/src/main/res/drawable-hdpi/rsb_consent_section_visiting_doctor.png b/consent/src/main/res/drawable-hdpi/rsfc_consent_section_visiting_doctor.png
similarity index 100%
rename from consent/src/main/res/drawable-hdpi/rsb_consent_section_visiting_doctor.png
rename to consent/src/main/res/drawable-hdpi/rsfc_consent_section_visiting_doctor.png
diff --git a/consent/src/main/res/drawable-hdpi/rsb_consent_section_withdrawing.png b/consent/src/main/res/drawable-hdpi/rsfc_consent_section_withdrawing.png
similarity index 100%
rename from consent/src/main/res/drawable-hdpi/rsb_consent_section_withdrawing.png
rename to consent/src/main/res/drawable-hdpi/rsfc_consent_section_withdrawing.png
diff --git a/consent/src/main/res/drawable-mdpi/rsb_consent_section_data_gathering.png b/consent/src/main/res/drawable-mdpi/rsfc_consent_section_data_gathering.png
similarity index 100%
rename from consent/src/main/res/drawable-mdpi/rsb_consent_section_data_gathering.png
rename to consent/src/main/res/drawable-mdpi/rsfc_consent_section_data_gathering.png
diff --git a/consent/src/main/res/drawable-mdpi/rsb_consent_section_data_use.png b/consent/src/main/res/drawable-mdpi/rsfc_consent_section_data_use.png
similarity index 100%
rename from consent/src/main/res/drawable-mdpi/rsb_consent_section_data_use.png
rename to consent/src/main/res/drawable-mdpi/rsfc_consent_section_data_use.png
diff --git a/consent/src/main/res/drawable-mdpi/rsb_consent_section_potential_benefits_alt.png b/consent/src/main/res/drawable-mdpi/rsfc_consent_section_potential_benefits_alt.png
similarity index 100%
rename from consent/src/main/res/drawable-mdpi/rsb_consent_section_potential_benefits_alt.png
rename to consent/src/main/res/drawable-mdpi/rsfc_consent_section_potential_benefits_alt.png
diff --git a/consent/src/main/res/drawable-mdpi/rsb_consent_section_privacy.png b/consent/src/main/res/drawable-mdpi/rsfc_consent_section_privacy.png
similarity index 100%
rename from consent/src/main/res/drawable-mdpi/rsb_consent_section_privacy.png
rename to consent/src/main/res/drawable-mdpi/rsfc_consent_section_privacy.png
diff --git a/consent/src/main/res/drawable-mdpi/rsb_consent_section_recontact.png b/consent/src/main/res/drawable-mdpi/rsfc_consent_section_recontact.png
similarity index 100%
rename from consent/src/main/res/drawable-mdpi/rsb_consent_section_recontact.png
rename to consent/src/main/res/drawable-mdpi/rsfc_consent_section_recontact.png
diff --git a/consent/src/main/res/drawable-mdpi/rsb_consent_section_study_survey.png b/consent/src/main/res/drawable-mdpi/rsfc_consent_section_study_survey.png
similarity index 100%
rename from consent/src/main/res/drawable-mdpi/rsb_consent_section_study_survey.png
rename to consent/src/main/res/drawable-mdpi/rsfc_consent_section_study_survey.png
diff --git a/consent/src/main/res/drawable-mdpi/rsb_consent_section_study_tasks.png b/consent/src/main/res/drawable-mdpi/rsfc_consent_section_study_tasks.png
similarity index 100%
rename from consent/src/main/res/drawable-mdpi/rsb_consent_section_study_tasks.png
rename to consent/src/main/res/drawable-mdpi/rsfc_consent_section_study_tasks.png
diff --git a/consent/src/main/res/drawable-mdpi/rsb_consent_section_time_commitment.png b/consent/src/main/res/drawable-mdpi/rsfc_consent_section_time_commitment.png
similarity index 100%
rename from consent/src/main/res/drawable-mdpi/rsb_consent_section_time_commitment.png
rename to consent/src/main/res/drawable-mdpi/rsfc_consent_section_time_commitment.png
diff --git a/consent/src/main/res/drawable-mdpi/rsb_consent_section_visiting_doctor.png b/consent/src/main/res/drawable-mdpi/rsfc_consent_section_visiting_doctor.png
similarity index 100%
rename from consent/src/main/res/drawable-mdpi/rsb_consent_section_visiting_doctor.png
rename to consent/src/main/res/drawable-mdpi/rsfc_consent_section_visiting_doctor.png
diff --git a/consent/src/main/res/drawable-mdpi/rsb_consent_section_withdrawing.png b/consent/src/main/res/drawable-mdpi/rsfc_consent_section_withdrawing.png
similarity index 100%
rename from consent/src/main/res/drawable-mdpi/rsb_consent_section_withdrawing.png
rename to consent/src/main/res/drawable-mdpi/rsfc_consent_section_withdrawing.png
diff --git a/consent/src/main/res/drawable-xhdpi/rsb_consent_section_data_gathering.png b/consent/src/main/res/drawable-xhdpi/rsfc_consent_section_data_gathering.png
similarity index 100%
rename from consent/src/main/res/drawable-xhdpi/rsb_consent_section_data_gathering.png
rename to consent/src/main/res/drawable-xhdpi/rsfc_consent_section_data_gathering.png
diff --git a/consent/src/main/res/drawable-xhdpi/rsb_consent_section_data_use.png b/consent/src/main/res/drawable-xhdpi/rsfc_consent_section_data_use.png
similarity index 100%
rename from consent/src/main/res/drawable-xhdpi/rsb_consent_section_data_use.png
rename to consent/src/main/res/drawable-xhdpi/rsfc_consent_section_data_use.png
diff --git a/consent/src/main/res/drawable-xhdpi/rsb_consent_section_potential_benefits_alt.png b/consent/src/main/res/drawable-xhdpi/rsfc_consent_section_potential_benefits_alt.png
similarity index 100%
rename from consent/src/main/res/drawable-xhdpi/rsb_consent_section_potential_benefits_alt.png
rename to consent/src/main/res/drawable-xhdpi/rsfc_consent_section_potential_benefits_alt.png
diff --git a/consent/src/main/res/drawable-xhdpi/rsb_consent_section_privacy.png b/consent/src/main/res/drawable-xhdpi/rsfc_consent_section_privacy.png
similarity index 100%
rename from consent/src/main/res/drawable-xhdpi/rsb_consent_section_privacy.png
rename to consent/src/main/res/drawable-xhdpi/rsfc_consent_section_privacy.png
diff --git a/consent/src/main/res/drawable-xhdpi/rsb_consent_section_recontact.png b/consent/src/main/res/drawable-xhdpi/rsfc_consent_section_recontact.png
similarity index 100%
rename from consent/src/main/res/drawable-xhdpi/rsb_consent_section_recontact.png
rename to consent/src/main/res/drawable-xhdpi/rsfc_consent_section_recontact.png
diff --git a/consent/src/main/res/drawable-xhdpi/rsb_consent_section_study_survey.png b/consent/src/main/res/drawable-xhdpi/rsfc_consent_section_study_survey.png
similarity index 100%
rename from consent/src/main/res/drawable-xhdpi/rsb_consent_section_study_survey.png
rename to consent/src/main/res/drawable-xhdpi/rsfc_consent_section_study_survey.png
diff --git a/consent/src/main/res/drawable-xhdpi/rsb_consent_section_study_tasks.png b/consent/src/main/res/drawable-xhdpi/rsfc_consent_section_study_tasks.png
similarity index 100%
rename from consent/src/main/res/drawable-xhdpi/rsb_consent_section_study_tasks.png
rename to consent/src/main/res/drawable-xhdpi/rsfc_consent_section_study_tasks.png
diff --git a/consent/src/main/res/drawable-xhdpi/rsb_consent_section_time_commitment.png b/consent/src/main/res/drawable-xhdpi/rsfc_consent_section_time_commitment.png
similarity index 100%
rename from consent/src/main/res/drawable-xhdpi/rsb_consent_section_time_commitment.png
rename to consent/src/main/res/drawable-xhdpi/rsfc_consent_section_time_commitment.png
diff --git a/consent/src/main/res/drawable-xhdpi/rsb_consent_section_visiting_doctor.png b/consent/src/main/res/drawable-xhdpi/rsfc_consent_section_visiting_doctor.png
similarity index 100%
rename from consent/src/main/res/drawable-xhdpi/rsb_consent_section_visiting_doctor.png
rename to consent/src/main/res/drawable-xhdpi/rsfc_consent_section_visiting_doctor.png
diff --git a/consent/src/main/res/drawable-xhdpi/rsb_consent_section_withdrawing.png b/consent/src/main/res/drawable-xhdpi/rsfc_consent_section_withdrawing.png
similarity index 100%
rename from consent/src/main/res/drawable-xhdpi/rsb_consent_section_withdrawing.png
rename to consent/src/main/res/drawable-xhdpi/rsfc_consent_section_withdrawing.png
diff --git a/consent/src/main/res/drawable-xxhdpi/rsb_consent_section_data_gathering.png b/consent/src/main/res/drawable-xxhdpi/rsfc_consent_section_data_gathering.png
similarity index 100%
rename from consent/src/main/res/drawable-xxhdpi/rsb_consent_section_data_gathering.png
rename to consent/src/main/res/drawable-xxhdpi/rsfc_consent_section_data_gathering.png
diff --git a/consent/src/main/res/drawable-xxhdpi/rsb_consent_section_data_use.png b/consent/src/main/res/drawable-xxhdpi/rsfc_consent_section_data_use.png
similarity index 100%
rename from consent/src/main/res/drawable-xxhdpi/rsb_consent_section_data_use.png
rename to consent/src/main/res/drawable-xxhdpi/rsfc_consent_section_data_use.png
diff --git a/consent/src/main/res/drawable-xxhdpi/rsb_consent_section_potential_benefits_alt.png b/consent/src/main/res/drawable-xxhdpi/rsfc_consent_section_potential_benefits_alt.png
similarity index 100%
rename from consent/src/main/res/drawable-xxhdpi/rsb_consent_section_potential_benefits_alt.png
rename to consent/src/main/res/drawable-xxhdpi/rsfc_consent_section_potential_benefits_alt.png
diff --git a/consent/src/main/res/drawable-xxhdpi/rsb_consent_section_privacy.png b/consent/src/main/res/drawable-xxhdpi/rsfc_consent_section_privacy.png
similarity index 100%
rename from consent/src/main/res/drawable-xxhdpi/rsb_consent_section_privacy.png
rename to consent/src/main/res/drawable-xxhdpi/rsfc_consent_section_privacy.png
diff --git a/consent/src/main/res/drawable-xxhdpi/rsb_consent_section_recontact.png b/consent/src/main/res/drawable-xxhdpi/rsfc_consent_section_recontact.png
similarity index 100%
rename from consent/src/main/res/drawable-xxhdpi/rsb_consent_section_recontact.png
rename to consent/src/main/res/drawable-xxhdpi/rsfc_consent_section_recontact.png
diff --git a/consent/src/main/res/drawable-xxhdpi/rsb_consent_section_study_survey.png b/consent/src/main/res/drawable-xxhdpi/rsfc_consent_section_study_survey.png
similarity index 100%
rename from consent/src/main/res/drawable-xxhdpi/rsb_consent_section_study_survey.png
rename to consent/src/main/res/drawable-xxhdpi/rsfc_consent_section_study_survey.png
diff --git a/consent/src/main/res/drawable-xxhdpi/rsb_consent_section_study_tasks.png b/consent/src/main/res/drawable-xxhdpi/rsfc_consent_section_study_tasks.png
similarity index 100%
rename from consent/src/main/res/drawable-xxhdpi/rsb_consent_section_study_tasks.png
rename to consent/src/main/res/drawable-xxhdpi/rsfc_consent_section_study_tasks.png
diff --git a/consent/src/main/res/drawable-xxhdpi/rsb_consent_section_time_commitment.png b/consent/src/main/res/drawable-xxhdpi/rsfc_consent_section_time_commitment.png
similarity index 100%
rename from consent/src/main/res/drawable-xxhdpi/rsb_consent_section_time_commitment.png
rename to consent/src/main/res/drawable-xxhdpi/rsfc_consent_section_time_commitment.png
diff --git a/consent/src/main/res/drawable-xxhdpi/rsb_consent_section_visiting_doctor.png b/consent/src/main/res/drawable-xxhdpi/rsfc_consent_section_visiting_doctor.png
similarity index 100%
rename from consent/src/main/res/drawable-xxhdpi/rsb_consent_section_visiting_doctor.png
rename to consent/src/main/res/drawable-xxhdpi/rsfc_consent_section_visiting_doctor.png
diff --git a/consent/src/main/res/drawable-xxhdpi/rsb_consent_section_withdrawing.png b/consent/src/main/res/drawable-xxhdpi/rsfc_consent_section_withdrawing.png
similarity index 100%
rename from consent/src/main/res/drawable-xxhdpi/rsb_consent_section_withdrawing.png
rename to consent/src/main/res/drawable-xxhdpi/rsfc_consent_section_withdrawing.png
diff --git a/consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_data_gathering.png b/consent/src/main/res/drawable-xxxhdpi/rsfc_consent_section_data_gathering.png
similarity index 100%
rename from consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_data_gathering.png
rename to consent/src/main/res/drawable-xxxhdpi/rsfc_consent_section_data_gathering.png
diff --git a/consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_data_use.png b/consent/src/main/res/drawable-xxxhdpi/rsfc_consent_section_data_use.png
similarity index 100%
rename from consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_data_use.png
rename to consent/src/main/res/drawable-xxxhdpi/rsfc_consent_section_data_use.png
diff --git a/consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_potential_benefits_alt.png b/consent/src/main/res/drawable-xxxhdpi/rsfc_consent_section_potential_benefits_alt.png
similarity index 100%
rename from consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_potential_benefits_alt.png
rename to consent/src/main/res/drawable-xxxhdpi/rsfc_consent_section_potential_benefits_alt.png
diff --git a/consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_privacy.png b/consent/src/main/res/drawable-xxxhdpi/rsfc_consent_section_privacy.png
similarity index 100%
rename from consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_privacy.png
rename to consent/src/main/res/drawable-xxxhdpi/rsfc_consent_section_privacy.png
diff --git a/consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_recontact.png b/consent/src/main/res/drawable-xxxhdpi/rsfc_consent_section_recontact.png
similarity index 100%
rename from consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_recontact.png
rename to consent/src/main/res/drawable-xxxhdpi/rsfc_consent_section_recontact.png
diff --git a/consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_study_survey.png b/consent/src/main/res/drawable-xxxhdpi/rsfc_consent_section_study_survey.png
similarity index 100%
rename from consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_study_survey.png
rename to consent/src/main/res/drawable-xxxhdpi/rsfc_consent_section_study_survey.png
diff --git a/consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_study_tasks.png b/consent/src/main/res/drawable-xxxhdpi/rsfc_consent_section_study_tasks.png
similarity index 100%
rename from consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_study_tasks.png
rename to consent/src/main/res/drawable-xxxhdpi/rsfc_consent_section_study_tasks.png
diff --git a/consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_time_commitment.png b/consent/src/main/res/drawable-xxxhdpi/rsfc_consent_section_time_commitment.png
similarity index 100%
rename from consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_time_commitment.png
rename to consent/src/main/res/drawable-xxxhdpi/rsfc_consent_section_time_commitment.png
diff --git a/consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_visiting_doctor.png b/consent/src/main/res/drawable-xxxhdpi/rsfc_consent_section_visiting_doctor.png
similarity index 100%
rename from consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_visiting_doctor.png
rename to consent/src/main/res/drawable-xxxhdpi/rsfc_consent_section_visiting_doctor.png
diff --git a/consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_withdrawing.png b/consent/src/main/res/drawable-xxxhdpi/rsfc_consent_section_withdrawing.png
similarity index 100%
rename from consent/src/main/res/drawable-xxxhdpi/rsb_consent_section_withdrawing.png
rename to consent/src/main/res/drawable-xxxhdpi/rsfc_consent_section_withdrawing.png
diff --git a/consent/src/main/res/layout/rsb_step_layout_consent_doc.xml b/consent/src/main/res/layout/rsfc_step_layout_consent_doc.xml
similarity index 77%
rename from consent/src/main/res/layout/rsb_step_layout_consent_doc.xml
rename to consent/src/main/res/layout/rsfc_step_layout_consent_doc.xml
index fbba22e12..85102ad1b 100644
--- a/consent/src/main/res/layout/rsb_step_layout_consent_doc.xml
+++ b/consent/src/main/res/layout/rsfc_step_layout_consent_doc.xml
@@ -11,11 +11,11 @@
         android:layout_height="0dp"
         android:layout_weight="1" />
 
-    <org.researchstack.backbone.ui.views.SubmitBar
+    <org.researchstack.foundation.components.common.ui.views.SubmitBar
         android:id="@+id/submit_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:negativeActionTitle="@string/rsb_disagree"
-        app:positiveActionTitle="@string/rsb_agree" />
+        app:negativeActionTitle="@string/rsf_disagree"
+        app:positiveActionTitle="@string/rsf_agree" />
 
 </merge>
\ No newline at end of file
diff --git a/consent/src/main/res/layout/rsb_step_layout_consent_signature.xml b/consent/src/main/res/layout/rsfc_step_layout_consent_signature.xml
similarity index 76%
rename from consent/src/main/res/layout/rsb_step_layout_consent_signature.xml
rename to consent/src/main/res/layout/rsfc_step_layout_consent_signature.xml
index 8cd2c3a5f..541153da3 100644
--- a/consent/src/main/res/layout/rsb_step_layout_consent_signature.xml
+++ b/consent/src/main/res/layout/rsfc_step_layout_consent_signature.xml
@@ -10,8 +10,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/image"
-        android:layout_marginLeft="@dimen/rsb_margin_left"
-        android:layout_marginRight="@dimen/rsb_margin_right"
+        android:layout_marginLeft="@dimen/rsf_margin_left"
+        android:layout_marginRight="@dimen/rsf_margin_right"
         android:layout_marginTop="20dp"
 
         android:textColor="?attr/colorAccent"
@@ -25,25 +25,25 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/title"
-        android:layout_marginLeft="@dimen/rsb_margin_left"
-        android:layout_marginRight="@dimen/rsb_margin_right"
+        android:layout_marginLeft="@dimen/rsf_margin_left"
+        android:layout_marginRight="@dimen/rsf_margin_right"
         android:layout_marginTop="36dp"
         tools:text="@string/lorem_medium" />
 
-    <org.researchstack.backbone.ui.views.SignatureView
+    <org.researchstack.feature.consent.ui.views.SignatureView
         android:id="@+id/layout_consent_review_signature"
         android:layout_width="match_parent"
         android:layout_height="186dp"
         android:layout_below="@+id/summary"
-        android:layout_marginLeft="@dimen/rsb_padding_medium"
-        android:layout_marginRight="@dimen/rsb_padding_medium"
+        android:layout_marginLeft="@dimen/rsf_padding_medium"
+        android:layout_marginRight="@dimen/rsf_padding_medium"
         android:layout_marginTop="20dp"
         android:paddingBottom="52dp"
         android:paddingLeft="32dp"
         android:paddingRight="32dp"
         app:signatureColor="?attr/colorAccent" />
 
-    <org.researchstack.backbone.ui.views.SubmitBar
+    <org.researchstack.foundation.components.common.ui.views.SubmitBar
         android:id="@+id/submit_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -59,8 +59,8 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:layout_alignTop="@+id/submit_bar"
-        android:text="@string/rsb_consent_signature_clear"
-        android:textColor="@color/rsb_submit_bar_negative" />
+        android:text="@string/rsfc_consent_signature_clear"
+        android:textColor="@color/rsf_submit_bar_negative" />
 
 </merge>
 
diff --git a/consent/src/main/res/layout/rsb_step_layout_consent_visual.xml b/consent/src/main/res/layout/rsfc_step_layout_consent_visual.xml
similarity index 75%
rename from consent/src/main/res/layout/rsb_step_layout_consent_visual.xml
rename to consent/src/main/res/layout/rsfc_step_layout_consent_visual.xml
index 5a4dcf88f..c5f33512a 100644
--- a/consent/src/main/res/layout/rsb_step_layout_consent_visual.xml
+++ b/consent/src/main/res/layout/rsfc_step_layout_consent_visual.xml
@@ -11,15 +11,15 @@
         android:layout_height="180dp"
         android:layout_centerHorizontal="true"
         android:scaleType="centerInside"
-        tools:src="@drawable/rsb_debug_gray" />
+        tools:src="@drawable/rsf_debug_gray" />
 
     <TextView
         android:id="@+id/title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/image"
-        android:layout_marginLeft="@dimen/rsb_margin_left"
-        android:layout_marginRight="@dimen/rsb_margin_right"
+        android:layout_marginLeft="@dimen/rsf_margin_left"
+        android:layout_marginRight="@dimen/rsf_margin_right"
         android:layout_marginTop="20dp"
 
         android:textColor="?attr/colorAccent"
@@ -33,8 +33,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/title"
-        android:layout_marginLeft="@dimen/rsb_margin_left"
-        android:layout_marginRight="@dimen/rsb_margin_right"
+        android:layout_marginLeft="@dimen/rsf_margin_left"
+        android:layout_marginRight="@dimen/rsf_margin_right"
         android:layout_marginTop="36dp"
         tools:text="@string/lorem_medium" />
 
@@ -45,10 +45,10 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/summary"
         android:layout_marginLeft="48dp"
-        android:layout_marginRight="@dimen/rsb_margin_right"
-        android:paddingBottom="@dimen/rsb_padding_medium"
-        android:paddingRight="@dimen/rsb_padding_medium"
-        android:paddingTop="@dimen/rsb_padding_medium"
+        android:layout_marginRight="@dimen/rsf_margin_right"
+        android:paddingBottom="@dimen/rsf_padding_medium"
+        android:paddingRight="@dimen/rsf_padding_medium"
+        android:paddingTop="@dimen/rsf_padding_medium"
         android:textColor="?attr/colorAccent"
         tools:text="More Info" />
 
diff --git a/consent/src/main/res/values/attrs.xml b/consent/src/main/res/values/attrs.xml
new file mode 100644
index 000000000..a91557fe5
--- /dev/null
+++ b/consent/src/main/res/values/attrs.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <declare-styleable name="Feature.Consent">
+        <attr name="signatureviewStyle" format="reference" />
+    </declare-styleable>
+
+    <declare-styleable name="SignatureView">
+        <attr name="signatureColor" format="color" />
+        <attr name="signaturePrintColor" format="color" />
+        <attr name="signatureStrokeSize" format="dimension" />
+        <attr name="hintText" format="string" />
+        <attr name="hintTextColor" format="color" />
+        <attr name="hintTextSize" format="dimension" />
+        <attr name="guidelineColor" format="color" />
+        <attr name="guidelineMargin" format="dimension" />
+        <attr name="guidelineHeight" format="dimension" />
+    </declare-styleable>
+</resources>
\ No newline at end of file
diff --git a/consent/src/main/res/values/strings.xml b/consent/src/main/res/values/strings.xml
index 67cceb3f1..b44d202d9 100644
--- a/consent/src/main/res/values/strings.xml
+++ b/consent/src/main/res/values/strings.xml
@@ -1,3 +1,83 @@
 <resources>
-    <string name="app_name">Consent</string>
+
+    <!-- Consent Section -->
+    <string name="rsfc_consent">Consent</string>
+    <string name="rsfc_consent_section_welcome">Welcome</string>
+    <string name="rsfc_consent_section_data_gathering">Data Gathering</string>
+    <string name="rsfc_consent_section_privacy">Privacy</string>
+    <string name="rsfc_consent_section_data_use">Data Use</string>
+    <string name="rsfc_consent_section_time_commitment">Time Commitment</string>
+    <string name="rsfc_consent_section_study_survey">Study Survey</string>
+    <string name="rsfc_consent_section_study_tasks">Study Tasks</string>
+    <string name="rsfc_consent_section_withdrawing">Withdrawing</string>
+    <string name="rsfc_consent_learn_more">Learn More</string>
+
+    <!-- Consent section learn more -->
+    <string name="rsfc_consent_section_more_info">Learn more</string>
+    <string name="rsfc_consent_section_more_info_data_gathering">Learn more about how data is
+        gathered
+    </string>
+    <string name="rsfc_consent_section_more_info_data_use">Learn more about how data is used</string>
+    <string name="rsfc_consent_section_more_info_privacy">Learn more about how your privacy and
+        identity are protected
+    </string>
+    <string name="rsfc_consent_section_more_info_welcome">Learn more about the study first</string>
+    <string name="rsfc_consent_section_more_info_study_survey">Learn more about the study survey
+    </string>
+    <string name="rsfc_consent_section_more_info_time_commitment">Learn more about the study\'s
+        impact on your time
+    </string>
+    <string name="rsfc_consent_section_more_info_study_tasks">Learn more about the tasks involved
+    </string>
+    <string name="rsfc_consent_section_more_info_withdrawing">Learn more about withdrawing</string>
+
+    <!-- Consent sharing step -->
+    <string name="rsfc_consent_share_title">Sharing Options</string>
+    <string name="rsfc_consent_share_widely">Share my data with %1$s and qualified researchers
+        worldwide
+    </string>
+    <string name="rsfc_consent_share_no">Not sharing your data</string>
+    <string name="rsfc_consent_share_only">Only share my data with %1$s</string>
+    <string name="rsfc_consent_share_description"><![CDATA[%1$s will receive your study data from your
+        participation in this study. \n\nSharing your coded study data more broadly (without
+        information such as your name) may benefit this and future research.<br/><br/><a href="%2$s">
+        Learn more about data sharing</a>]]>
+    </string>
+
+    <!-- Consent doc step -->
+    <string name="rsfc_consent_review_title">Review</string>
+    <string name="rsfc_consent_review_alert_title">Review</string>
+    <string name="rsfc_consent_review_reason">By agreeing you confirm that you read the information
+        and that you wish to take part in this research study.
+    </string>
+    <string name="rsfc_consent_review_instruction">Review the form below, and tap Agree if you\'re
+        ready to continue.
+    </string>
+    <string name="rsfc_consent_review_cancel">Cancel</string>
+
+    <!-- Consent form step -->
+    <string name="rsfc_consent_form_title">Consent</string>
+    <string name="rsfc_consent_name_full">Full Name</string>
+    <string name="rsfc_consent_dob_full">Date of Birth</string>
+    <string name="rsfc_consent_name_placeholder">Required</string>
+
+    <!-- Consent sig step -->
+    <string name="rsfc_consent_signature_title">Signature</string>
+    <string name="rsfc_consent_signature_content">By agreeing you confirm that you read the consent
+        and that you wish to take part in this research study.
+    </string>
+    <string name="rsfc_consent_signature_instruction">Please sign using your finger on the line
+        below.
+    </string>
+    <string name="rsfc_consent_signature_placeholder">Sign Here</string>
+    <string name="rsfc_consent_signature_clear">Clear</string>
+
+    <!-- Quiz -->
+    <string name="rsfc_quiz">Quiz</string>
+    <string name="rsfc_quiz_evaluation">Quiz Evaluation</string>
+    <string name="rsfc_quiz_evaluation_try_again">Try Again</string>
+    <string name="rsfc_quiz_evaluation_review_consent">Review Consent</string>
+    <string name="rsfc_quiz_evaluation_retake">Retake Quiz</string>
+    <string name="rsfc_quiz_evaluation_great_job">Great Job!</string>
+    
 </resources>
diff --git a/consent/src/main/res/values/styles.xml b/consent/src/main/res/values/styles.xml
new file mode 100644
index 000000000..2e0460f14
--- /dev/null
+++ b/consent/src/main/res/values/styles.xml
@@ -0,0 +1,15 @@
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="ResourceName">
+
+    <style name="Widget.Feature.Consent.SignatureView" parent="">
+        <item name="signatureColor">?android:attr/textColorPrimary</item>
+        <item name="signaturePrintColor">@android:color/black</item>
+        <item name="signatureStrokeSize">1dp</item>
+        <item name="hintText">@string/rsfc_consent_signature_placeholder</item>
+        <item name="hintTextColor">#ccc</item>
+        <item name="hintTextSize">16sp</item>
+        <item name="guidelineColor">#ccc</item>
+        <item name="guidelineMargin">12dp</item>
+        <item name="guidelineHeight">1dp</item>
+    </style>
+
+</resources>

From caed195b76b48a7808d89be1e7e6631abb29e042 Mon Sep 17 00:00:00 2001
From: James Kizer <james.kizer@gmail.com>
Date: Wed, 2 Jan 2019 19:10:38 -0500
Subject: [PATCH 32/53] Updates to Storage module

Updated package names + imports
Added concrete implementation of passcode store that uses storage access infrastructure
Merged in values
---
 .../feature/storage/NotificationHelper.java   |  6 ++--
 .../feature/storage/StorageAccess.java        | 19 ++++++-------
 .../storage/StorageAccessPasscodeStore.kt     | 28 +++++++++++++++++++
 .../feature/storage/database/AppDatabase.java |  6 ++--
 .../feature/storage/database/StepRecord.java  | 10 +++----
 .../storage/database/TaskNotification.java    |  2 +-
 .../feature/storage/database/TaskRecord.java  |  6 ++--
 .../database/sqlite/DatabaseHelper.java       | 16 +++++------
 .../sqlite/SqlCipherDatabaseHelper.java       | 16 +++++------
 .../sqlite/UpdatablePassphraseProvider.java   |  2 +-
 .../storage/file/EncryptionProvider.java      |  5 ++--
 .../feature/storage/file/FileAccess.java      |  4 +--
 .../storage/file/SimpleFileAccess.java        |  6 ++--
 .../storage/file/StorageAccessException.java  |  2 +-
 .../storage/file/StorageAccessListener.java   |  2 +-
 .../storage/file/UnencryptedProvider.java     |  7 +++--
 .../storage/file/aes/AesEncrypter.java        |  2 +-
 .../feature/storage/file/aes/AesProvider.java |  2 +-
 .../storage/file/aes/ClearEncrypter.java      |  2 +-
 .../feature/storage/file/aes/Encrypter.java   |  6 ++--
 .../file/aes/PinProtectedProvider.java        | 10 +++----
 .../file/aes/UnencryptedPinProvider.java      |  2 +-
 .../feature/storage/utils/FileUtils.java      |  6 ++--
 storage/src/main/res/values/strings.xml       |  2 +-
 24 files changed, 100 insertions(+), 69 deletions(-)
 create mode 100644 storage/src/main/java/org/researchstack/feature/storage/StorageAccessPasscodeStore.kt

diff --git a/storage/src/main/java/org/researchstack/feature/storage/NotificationHelper.java b/storage/src/main/java/org/researchstack/feature/storage/NotificationHelper.java
index f327ffa14..98b1af1f1 100644
--- a/storage/src/main/java/org/researchstack/feature/storage/NotificationHelper.java
+++ b/storage/src/main/java/org/researchstack/feature/storage/NotificationHelper.java
@@ -1,9 +1,9 @@
-package org.researchstack.backbone.storage;
+package org.researchstack.feature.storage;
 
 import android.content.Context;
 
-import org.researchstack.backbone.storage.database.TaskNotification;
-import org.researchstack.backbone.utils.LogExt;
+import org.researchstack.foundation.components.utils.LogExt;
+import org.researchstack.feature.storage.database.TaskNotification;
 
 import java.sql.SQLException;
 import java.util.List;
diff --git a/storage/src/main/java/org/researchstack/feature/storage/StorageAccess.java b/storage/src/main/java/org/researchstack/feature/storage/StorageAccess.java
index a810e15c0..9e203e152 100644
--- a/storage/src/main/java/org/researchstack/feature/storage/StorageAccess.java
+++ b/storage/src/main/java/org/researchstack/feature/storage/StorageAccess.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone;
+package org.researchstack.feature.storage;
 
 import android.app.Application;
 import android.content.Context;
@@ -6,14 +6,13 @@
 import android.os.Looper;
 import android.support.annotation.MainThread;
 
-import org.researchstack.backbone.storage.database.AppDatabase;
-import org.researchstack.backbone.storage.file.EncryptionProvider;
-import org.researchstack.backbone.storage.file.FileAccess;
-import org.researchstack.backbone.storage.file.PinCodeConfig;
-import org.researchstack.backbone.storage.file.StorageAccessException;
-import org.researchstack.backbone.storage.file.StorageAccessListener;
-import org.researchstack.backbone.ui.PinCodeActivity;
-import org.researchstack.backbone.utils.UiThreadContext;
+import org.researchstack.foundation.components.utils.UiThreadContext;
+import org.researchstack.feature.storage.database.AppDatabase;
+import org.researchstack.feature.storage.file.EncryptionProvider;
+import org.researchstack.feature.storage.file.FileAccess;
+import org.researchstack.feature.authentication.pincode.PinCodeConfig;
+import org.researchstack.feature.storage.file.StorageAccessException;
+import org.researchstack.feature.storage.file.StorageAccessListener;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -28,7 +27,7 @@
  * If {@link StorageAccessListener#onDataAuth()} is called, then you must prompt the user for their
  * pin and authenticate using {@link #authenticate}.
  * <p>
- * {@link org.researchstack.backbone.ui.PinCodeActivity} handles almost all of this for you,
+ * {@link org.researchstack.foundation.ui.PinCodeActivity} handles almost all of this for you,
  * including presenting the pin code screen to the user. PinCodeActivity should be used, extended,
  * or it's fuctionality copied to your application's own base Activity. Make sure to delay any data
  * access until {@link PinCodeActivity#onDataReady()} has been called.
diff --git a/storage/src/main/java/org/researchstack/feature/storage/StorageAccessPasscodeStore.kt b/storage/src/main/java/org/researchstack/feature/storage/StorageAccessPasscodeStore.kt
new file mode 100644
index 000000000..fafb20e8c
--- /dev/null
+++ b/storage/src/main/java/org/researchstack/feature/storage/StorageAccessPasscodeStore.kt
@@ -0,0 +1,28 @@
+package org.researchstack.feature.storage
+
+import android.content.Context
+import org.researchstack.feature.authentication.pincode.PasscodeAuthenticator
+
+class StorageAccessPasscodeStore(val context: Context): PasscodeAuthenticator.PasscodeStore {
+
+    override fun hasPasscode(): Boolean {
+        return StorageAccess.getInstance().hasPinCode(context)
+    }
+
+    override fun registerPasscode(passcode: String) {
+        StorageAccess.getInstance().createPinCode(context, passcode)
+    }
+
+    override fun checkPasscode(passcode: String) {
+        StorageAccess.getInstance().authenticate(context, passcode)
+    }
+
+    override fun removePasscode() {
+        StorageAccess.getInstance().removePinCode(context)
+    }
+
+    override fun changePasscode(oldPasscode: String, newPasscode: String) {
+        StorageAccess.getInstance().changePinCode(context, oldPasscode, newPasscode)
+    }
+
+}
\ No newline at end of file
diff --git a/storage/src/main/java/org/researchstack/feature/storage/database/AppDatabase.java b/storage/src/main/java/org/researchstack/feature/storage/database/AppDatabase.java
index 7e1a529a5..46d25e9a1 100644
--- a/storage/src/main/java/org/researchstack/feature/storage/database/AppDatabase.java
+++ b/storage/src/main/java/org/researchstack/feature/storage/database/AppDatabase.java
@@ -1,7 +1,7 @@
-package org.researchstack.backbone.storage.database;
+package org.researchstack.feature.storage.database;
 
-import org.researchstack.backbone.result.StepResult;
-import org.researchstack.backbone.result.TaskResult;
+import org.researchstack.foundation.core.models.result.StepResult;
+import org.researchstack.foundation.core.models.result.TaskResult;
 
 import java.util.List;
 
diff --git a/storage/src/main/java/org/researchstack/feature/storage/database/StepRecord.java b/storage/src/main/java/org/researchstack/feature/storage/database/StepRecord.java
index 196743cd7..45a103124 100644
--- a/storage/src/main/java/org/researchstack/feature/storage/database/StepRecord.java
+++ b/storage/src/main/java/org/researchstack/feature/storage/database/StepRecord.java
@@ -1,12 +1,12 @@
-package org.researchstack.backbone.storage.database;
+package org.researchstack.feature.storage.database;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
-import org.researchstack.backbone.result.StepResult;
-import org.researchstack.backbone.step.Step;
-import org.researchstack.backbone.utils.FormatHelper;
-import org.researchstack.backbone.utils.TextUtils;
+import org.researchstack.foundation.components.utils.FormatHelper;
+import org.researchstack.foundation.components.utils.TextUtils;
+import org.researchstack.foundation.core.models.result.StepResult;
+import org.researchstack.foundation.core.models.step.Step;
 
 import java.util.Date;
 import java.util.Map;
diff --git a/storage/src/main/java/org/researchstack/feature/storage/database/TaskNotification.java b/storage/src/main/java/org/researchstack/feature/storage/database/TaskNotification.java
index 7ba21945e..8d798d68d 100644
--- a/storage/src/main/java/org/researchstack/feature/storage/database/TaskNotification.java
+++ b/storage/src/main/java/org/researchstack/feature/storage/database/TaskNotification.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.storage.database;
+package org.researchstack.feature.storage.database;
 
 import java.io.Serializable;
 import java.util.Date;
diff --git a/storage/src/main/java/org/researchstack/feature/storage/database/TaskRecord.java b/storage/src/main/java/org/researchstack/feature/storage/database/TaskRecord.java
index 2c8600a42..3992adf5e 100644
--- a/storage/src/main/java/org/researchstack/feature/storage/database/TaskRecord.java
+++ b/storage/src/main/java/org/researchstack/feature/storage/database/TaskRecord.java
@@ -1,7 +1,7 @@
-package org.researchstack.backbone.storage.database;
+package org.researchstack.feature.storage.database;
 
-import org.researchstack.backbone.result.StepResult;
-import org.researchstack.backbone.result.TaskResult;
+import org.researchstack.foundation.core.models.result.StepResult;
+import org.researchstack.foundation.core.models.result.TaskResult;
 
 import java.util.Date;
 import java.util.List;
diff --git a/storage/src/main/java/org/researchstack/feature/storage/database/sqlite/DatabaseHelper.java b/storage/src/main/java/org/researchstack/feature/storage/database/sqlite/DatabaseHelper.java
index 9dae5cead..8063956fa 100644
--- a/storage/src/main/java/org/researchstack/feature/storage/database/sqlite/DatabaseHelper.java
+++ b/storage/src/main/java/org/researchstack/feature/storage/database/sqlite/DatabaseHelper.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.storage.database.sqlite;
+package org.researchstack.feature.storage.database.sqlite;
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
@@ -6,13 +6,13 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
-import org.researchstack.backbone.result.StepResult;
-import org.researchstack.backbone.result.TaskResult;
-import org.researchstack.backbone.storage.database.AppDatabase;
-import org.researchstack.backbone.storage.database.StepRecord;
-import org.researchstack.backbone.storage.database.TaskRecord;
-import org.researchstack.backbone.utils.FormatHelper;
-import org.researchstack.backbone.utils.LogExt;
+import org.researchstack.foundation.components.utils.FormatHelper;
+import org.researchstack.foundation.components.utils.LogExt;
+import org.researchstack.foundation.core.models.result.StepResult;
+import org.researchstack.foundation.core.models.result.TaskResult;
+import org.researchstack.feature.storage.database.AppDatabase;
+import org.researchstack.feature.storage.database.StepRecord;
+import org.researchstack.feature.storage.database.TaskRecord;
 
 import java.sql.SQLException;
 import java.util.ArrayList;
diff --git a/storage/src/main/java/org/researchstack/feature/storage/database/sqlite/SqlCipherDatabaseHelper.java b/storage/src/main/java/org/researchstack/feature/storage/database/sqlite/SqlCipherDatabaseHelper.java
index fea741c9d..b36fa44f2 100644
--- a/storage/src/main/java/org/researchstack/feature/storage/database/sqlite/SqlCipherDatabaseHelper.java
+++ b/storage/src/main/java/org/researchstack/feature/storage/database/sqlite/SqlCipherDatabaseHelper.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.storage.database.sqlite;
+package org.researchstack.feature.storage.database.sqlite;
 
 import android.content.Context;
 
@@ -7,13 +7,13 @@
 
 import net.sqlcipher.database.SQLiteDatabase;
 
-import org.researchstack.backbone.result.StepResult;
-import org.researchstack.backbone.result.TaskResult;
-import org.researchstack.backbone.storage.database.AppDatabase;
-import org.researchstack.backbone.storage.database.StepRecord;
-import org.researchstack.backbone.storage.database.TaskRecord;
-import org.researchstack.backbone.utils.FormatHelper;
-import org.researchstack.backbone.utils.LogExt;
+import org.researchstack.foundation.components.utils.FormatHelper;
+import org.researchstack.foundation.components.utils.LogExt;
+import org.researchstack.foundation.core.models.result.StepResult;
+import org.researchstack.foundation.core.models.result.TaskResult;
+import org.researchstack.feature.storage.database.AppDatabase;
+import org.researchstack.feature.storage.database.StepRecord;
+import org.researchstack.feature.storage.database.TaskRecord;
 
 import java.sql.SQLException;
 import java.util.ArrayList;
diff --git a/storage/src/main/java/org/researchstack/feature/storage/database/sqlite/UpdatablePassphraseProvider.java b/storage/src/main/java/org/researchstack/feature/storage/database/sqlite/UpdatablePassphraseProvider.java
index 11b713b10..32de2db5f 100644
--- a/storage/src/main/java/org/researchstack/feature/storage/database/sqlite/UpdatablePassphraseProvider.java
+++ b/storage/src/main/java/org/researchstack/feature/storage/database/sqlite/UpdatablePassphraseProvider.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.storage.database.sqlite;
+package org.researchstack.feature.storage.database.sqlite;
 
 import co.touchlab.squeaky.db.sqlcipher.PassphraseProvider;
 
diff --git a/storage/src/main/java/org/researchstack/feature/storage/file/EncryptionProvider.java b/storage/src/main/java/org/researchstack/feature/storage/file/EncryptionProvider.java
index 5852f6aae..3399ef985 100644
--- a/storage/src/main/java/org/researchstack/feature/storage/file/EncryptionProvider.java
+++ b/storage/src/main/java/org/researchstack/feature/storage/file/EncryptionProvider.java
@@ -1,8 +1,9 @@
-package org.researchstack.backbone.storage.file;
+package org.researchstack.feature.storage.file;
 
 import android.content.Context;
 
-import org.researchstack.backbone.storage.file.aes.Encrypter;
+import org.researchstack.feature.storage.file.aes.Encrypter;
+import org.researchstack.feature.authentication.pincode.PinCodeConfig;
 
 /**
  * This interface is used to create, change, and authenticate pin codes provided by the user.
diff --git a/storage/src/main/java/org/researchstack/feature/storage/file/FileAccess.java b/storage/src/main/java/org/researchstack/feature/storage/file/FileAccess.java
index 41945cf75..0ed084fb0 100644
--- a/storage/src/main/java/org/researchstack/feature/storage/file/FileAccess.java
+++ b/storage/src/main/java/org/researchstack/feature/storage/file/FileAccess.java
@@ -1,8 +1,8 @@
-package org.researchstack.backbone.storage.file;
+package org.researchstack.feature.storage.file;
 
 import android.content.Context;
 
-import org.researchstack.backbone.storage.file.aes.Encrypter;
+import org.researchstack.feature.storage.file.aes.Encrypter;
 
 /**
  * Generic file access contract for the app.  Depending on the type, there may need to be auth
diff --git a/storage/src/main/java/org/researchstack/feature/storage/file/SimpleFileAccess.java b/storage/src/main/java/org/researchstack/feature/storage/file/SimpleFileAccess.java
index 550da5e85..747ab09eb 100644
--- a/storage/src/main/java/org/researchstack/feature/storage/file/SimpleFileAccess.java
+++ b/storage/src/main/java/org/researchstack/feature/storage/file/SimpleFileAccess.java
@@ -1,11 +1,11 @@
-package org.researchstack.backbone.storage.file;
+package org.researchstack.feature.storage.file;
 
 import android.content.Context;
 import android.support.annotation.NonNull;
 import android.support.annotation.WorkerThread;
 
-import org.researchstack.backbone.storage.file.aes.Encrypter;
-import org.researchstack.backbone.utils.FileUtils;
+import org.researchstack.feature.storage.utils.FileUtils;
+import org.researchstack.feature.storage.file.aes.Encrypter;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/storage/src/main/java/org/researchstack/feature/storage/file/StorageAccessException.java b/storage/src/main/java/org/researchstack/feature/storage/file/StorageAccessException.java
index 1d73f846b..5f5424f42 100644
--- a/storage/src/main/java/org/researchstack/feature/storage/file/StorageAccessException.java
+++ b/storage/src/main/java/org/researchstack/feature/storage/file/StorageAccessException.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.storage.file;
+package org.researchstack.feature.storage.file;
 
 public class StorageAccessException extends RuntimeException {
     public StorageAccessException() {
diff --git a/storage/src/main/java/org/researchstack/feature/storage/file/StorageAccessListener.java b/storage/src/main/java/org/researchstack/feature/storage/file/StorageAccessListener.java
index afac8f42e..6d90903ea 100644
--- a/storage/src/main/java/org/researchstack/feature/storage/file/StorageAccessListener.java
+++ b/storage/src/main/java/org/researchstack/feature/storage/file/StorageAccessListener.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.storage.file;
+package org.researchstack.feature.storage.file;
 
 /**
  * Callback for data access.  This will change a lot soon.
diff --git a/storage/src/main/java/org/researchstack/feature/storage/file/UnencryptedProvider.java b/storage/src/main/java/org/researchstack/feature/storage/file/UnencryptedProvider.java
index 95f041358..a9e639043 100644
--- a/storage/src/main/java/org/researchstack/feature/storage/file/UnencryptedProvider.java
+++ b/storage/src/main/java/org/researchstack/feature/storage/file/UnencryptedProvider.java
@@ -1,9 +1,10 @@
-package org.researchstack.backbone.storage.file;
+package org.researchstack.feature.storage.file;
 
 import android.content.Context;
 
-import org.researchstack.backbone.storage.file.aes.ClearEncrypter;
-import org.researchstack.backbone.storage.file.aes.Encrypter;
+import org.researchstack.feature.storage.file.aes.ClearEncrypter;
+import org.researchstack.feature.storage.file.aes.Encrypter;
+import org.researchstack.feature.authentication.pincode.PinCodeConfig;
 
 /**
  * Use this class as the EncryptionProvider when you want to store all data without encryption. Pin
diff --git a/storage/src/main/java/org/researchstack/feature/storage/file/aes/AesEncrypter.java b/storage/src/main/java/org/researchstack/feature/storage/file/aes/AesEncrypter.java
index 21712f9ae..280ba275a 100644
--- a/storage/src/main/java/org/researchstack/feature/storage/file/aes/AesEncrypter.java
+++ b/storage/src/main/java/org/researchstack/feature/storage/file/aes/AesEncrypter.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.storage.file.aes;
+package org.researchstack.feature.storage.file.aes;
 
 import com.tozny.crypto.android.AesCbcWithIntegrity;
 
diff --git a/storage/src/main/java/org/researchstack/feature/storage/file/aes/AesProvider.java b/storage/src/main/java/org/researchstack/feature/storage/file/aes/AesProvider.java
index e901df21b..95ec7e45a 100644
--- a/storage/src/main/java/org/researchstack/feature/storage/file/aes/AesProvider.java
+++ b/storage/src/main/java/org/researchstack/feature/storage/file/aes/AesProvider.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.storage.file.aes;
+package org.researchstack.feature.storage.file.aes;
 
 
 import com.tozny.crypto.android.AesCbcWithIntegrity;
diff --git a/storage/src/main/java/org/researchstack/feature/storage/file/aes/ClearEncrypter.java b/storage/src/main/java/org/researchstack/feature/storage/file/aes/ClearEncrypter.java
index ca8a3eee3..30eb0ad46 100644
--- a/storage/src/main/java/org/researchstack/feature/storage/file/aes/ClearEncrypter.java
+++ b/storage/src/main/java/org/researchstack/feature/storage/file/aes/ClearEncrypter.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.storage.file.aes;
+package org.researchstack.feature.storage.file.aes;
 
 /**
  * This encrypter doesn't actually encrypt or decrypt anything that passes through it. Allows for
diff --git a/storage/src/main/java/org/researchstack/feature/storage/file/aes/Encrypter.java b/storage/src/main/java/org/researchstack/feature/storage/file/aes/Encrypter.java
index f62d147ce..18d8a0ebf 100644
--- a/storage/src/main/java/org/researchstack/feature/storage/file/aes/Encrypter.java
+++ b/storage/src/main/java/org/researchstack/feature/storage/file/aes/Encrypter.java
@@ -1,10 +1,10 @@
-package org.researchstack.backbone.storage.file.aes;
+package org.researchstack.feature.storage.file.aes;
 
 import java.security.GeneralSecurityException;
 
 /**
- * Implement this class and use in your {@link org.researchstack.backbone.storage.file.EncryptionProvider}
- * to encrypt/decrypt all date before it is written using {@link org.researchstack.backbone.storage.file.FileAccess}.
+ * Implement this class and use in your {@link org.researchstack.foundation.storage.file.EncryptionProvider}
+ * to encrypt/decrypt all date before it is written using {@link org.researchstack.foundation.storage.file.FileAccess}.
  */
 public interface Encrypter {
     /**
diff --git a/storage/src/main/java/org/researchstack/feature/storage/file/aes/PinProtectedProvider.java b/storage/src/main/java/org/researchstack/feature/storage/file/aes/PinProtectedProvider.java
index ed94960af..a791b6b1f 100644
--- a/storage/src/main/java/org/researchstack/feature/storage/file/aes/PinProtectedProvider.java
+++ b/storage/src/main/java/org/researchstack/feature/storage/file/aes/PinProtectedProvider.java
@@ -1,14 +1,14 @@
-package org.researchstack.backbone.storage.file.aes;
+package org.researchstack.feature.storage.file.aes;
 
 import android.content.Context;
 import android.support.annotation.NonNull;
 
 import com.tozny.crypto.android.AesCbcWithIntegrity;
 
-import org.researchstack.backbone.storage.file.EncryptionProvider;
-import org.researchstack.backbone.storage.file.PinCodeConfig;
-import org.researchstack.backbone.storage.file.StorageAccessException;
-import org.researchstack.backbone.utils.FileUtils;
+import org.researchstack.feature.storage.utils.FileUtils;
+import org.researchstack.feature.storage.file.EncryptionProvider;
+import org.researchstack.feature.authentication.pincode.PinCodeConfig;
+import org.researchstack.feature.storage.file.StorageAccessException;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/storage/src/main/java/org/researchstack/feature/storage/file/aes/UnencryptedPinProvider.java b/storage/src/main/java/org/researchstack/feature/storage/file/aes/UnencryptedPinProvider.java
index 56a4301f8..c7e33ea1b 100644
--- a/storage/src/main/java/org/researchstack/feature/storage/file/aes/UnencryptedPinProvider.java
+++ b/storage/src/main/java/org/researchstack/feature/storage/file/aes/UnencryptedPinProvider.java
@@ -1,4 +1,4 @@
-package org.researchstack.backbone.storage.file.aes;
+package org.researchstack.feature.storage.file.aes;
 
 import com.tozny.crypto.android.AesCbcWithIntegrity;
 
diff --git a/storage/src/main/java/org/researchstack/feature/storage/utils/FileUtils.java b/storage/src/main/java/org/researchstack/feature/storage/utils/FileUtils.java
index e3d9954b3..15032b3ec 100644
--- a/storage/src/main/java/org/researchstack/feature/storage/utils/FileUtils.java
+++ b/storage/src/main/java/org/researchstack/feature/storage/utils/FileUtils.java
@@ -1,8 +1,10 @@
-package org.researchstack.backbone.utils;
+package org.researchstack.feature.storage.utils;
+
+//TODO: MOVE TO STORAGE MODULE
 
 import android.support.annotation.NonNull;
 
-import org.researchstack.backbone.storage.file.StorageAccessException;
+import org.researchstack.feature.storage.file.StorageAccessException;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
diff --git a/storage/src/main/res/values/strings.xml b/storage/src/main/res/values/strings.xml
index 48044a87d..f11f7450a 100644
--- a/storage/src/main/res/values/strings.xml
+++ b/storage/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">Storage</string>
+
 </resources>

From 7e75a5dcdb64fd8c76ade7735a18e04f32c143ac Mon Sep 17 00:00:00 2001
From: James Kizer <james.kizer@gmail.com>
Date: Wed, 2 Jan 2019 19:14:45 -0500
Subject: [PATCH 33/53] Updates to backbone

Updated imports
Updated ViewTaskActivity for new TaskLifecycleObserver interface conformance
Removed unused values
---
 backbone/build.gradle                         |   4 +-
 .../backbone/ui/PinCodeActivity.java          |  12 +--
 .../backbone/ui/ViewTaskActivity.java         |  23 ++--
 .../backbone/ui/views/StepSwitcher.java       |   2 +-
 backbone/src/main/res/values/attrs.xml        | 100 ------------------
 backbone/src/main/res/values/strings.xml      |   2 +-
 backbone/src/main/res/values/styles.xml       | 100 ------------------
 backbone/src/main/res/values/themes.xml       |   8 --
 8 files changed, 25 insertions(+), 226 deletions(-)

diff --git a/backbone/build.gradle b/backbone/build.gradle
index b56f8fcc4..6b16849b8 100644
--- a/backbone/build.gradle
+++ b/backbone/build.gradle
@@ -77,8 +77,10 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     implementation project(':foundation')
+    implementation project(':authentication')
+    implementation project(':storage')
 
-    implementation 'com.google.code.gson:gson:2.4'
+    implementation "com.google.code.gson:gson:$gson_version"
     implementation 'io.reactivex:rxjava:1.2.5'
     implementation 'io.reactivex:rxandroid:1.2.1'
     implementation 'com.jakewharton.rxbinding:rxbinding:0.4.0'
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/PinCodeActivity.java b/backbone/src/main/java/org/researchstack/backbone/ui/PinCodeActivity.java
index 08408b78d..b5f084f9d 100644
--- a/backbone/src/main/java/org/researchstack/backbone/ui/PinCodeActivity.java
+++ b/backbone/src/main/java/org/researchstack/backbone/ui/PinCodeActivity.java
@@ -16,13 +16,13 @@
 import com.jakewharton.rxbinding.widget.RxTextView;
 
 import org.researchstack.backbone.R;
-import org.researchstack.backbone.StorageAccess;
-import org.researchstack.backbone.storage.file.PinCodeConfig;
-import org.researchstack.backbone.storage.file.StorageAccessListener;
-import org.researchstack.backbone.ui.views.PinCodeLayout;
-import org.researchstack.backbone.utils.LogExt;
 import org.researchstack.backbone.utils.ObservableUtils;
-import org.researchstack.backbone.utils.ThemeUtils;
+import org.researchstack.feature.authentication.pincode.PinCodeConfig;
+import org.researchstack.feature.authentication.pincode.ui.PinCodeLayout;
+import org.researchstack.feature.storage.StorageAccess;
+import org.researchstack.feature.storage.file.StorageAccessListener;
+import org.researchstack.foundation.components.utils.LogExt;
+import org.researchstack.foundation.components.utils.ThemeUtils;
 
 import java.util.List;
 
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/ViewTaskActivity.java b/backbone/src/main/java/org/researchstack/backbone/ui/ViewTaskActivity.java
index 6f07e2134..7ed1216b7 100644
--- a/backbone/src/main/java/org/researchstack/backbone/ui/ViewTaskActivity.java
+++ b/backbone/src/main/java/org/researchstack/backbone/ui/ViewTaskActivity.java
@@ -12,19 +12,22 @@
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Toast;
 
+import org.jetbrains.annotations.Nullable;
 import org.researchstack.backbone.R;
-import org.researchstack.backbone.result.StepResult;
-import org.researchstack.backbone.result.TaskResult;
-import org.researchstack.backbone.step.Step;
-import org.researchstack.backbone.task.Task;
-import org.researchstack.backbone.ui.callbacks.StepCallbacks;
-import org.researchstack.backbone.ui.step.layout.StepLayout;
+import org.researchstack.foundation.components.common.ui.callbacks.StepCallbacks;
+import org.researchstack.foundation.components.common.ui.layout.StepLayout;
 import org.researchstack.backbone.ui.views.StepSwitcher;
+import org.researchstack.foundation.core.interfaces.IResult;
+import org.researchstack.foundation.core.interfaces.IStep;
+import org.researchstack.foundation.core.models.result.StepResult;
+import org.researchstack.foundation.core.models.result.TaskResult;
+import org.researchstack.foundation.core.models.step.Step;
+import org.researchstack.foundation.core.models.task.Task;
 
 import java.lang.reflect.Constructor;
 import java.util.Date;
 
-public class ViewTaskActivity extends PinCodeActivity implements StepCallbacks {
+public class ViewTaskActivity extends PinCodeActivity implements StepCallbacks, Task.TaskLifecycleObserver {
     public static final String EXTRA_TASK = "ViewTaskActivity.ExtraTask";
     public static final String EXTRA_TASK_RESULT = "ViewTaskActivity.ExtraTaskResult";
     public static final String EXTRA_STEP = "ViewTaskActivity.ExtraStep";
@@ -211,8 +214,10 @@ public void onDataFailed() {
     }
 
     @Override
-    public void onSaveStep(int action, Step step, StepResult result) {
-        onSaveStepResult(step.getIdentifier(), result);
+    public void onSaveStep(int action, IStep step, @Nullable IResult result) {
+        if (result instanceof StepResult) {
+            onSaveStepResult(step.getIdentifier(), (StepResult)result);
+        }
 
         onExecuteStepAction(action);
     }
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/views/StepSwitcher.java b/backbone/src/main/java/org/researchstack/backbone/ui/views/StepSwitcher.java
index b2b44daa8..1cc00a065 100644
--- a/backbone/src/main/java/org/researchstack/backbone/ui/views/StepSwitcher.java
+++ b/backbone/src/main/java/org/researchstack/backbone/ui/views/StepSwitcher.java
@@ -28,7 +28,7 @@
 import android.widget.FrameLayout;
 
 import org.researchstack.backbone.R;
-import org.researchstack.backbone.ui.step.layout.StepLayout;
+import org.researchstack.foundation.components.common.ui.layout.StepLayout;
 
 import java.security.InvalidParameterException;
 
diff --git a/backbone/src/main/res/values/attrs.xml b/backbone/src/main/res/values/attrs.xml
index 89d65f4ce..1f1ddfc78 100644
--- a/backbone/src/main/res/values/attrs.xml
+++ b/backbone/src/main/res/values/attrs.xml
@@ -4,106 +4,6 @@
     <declare-styleable name="Backbone">
         <attr name="passcodeTheme" format="reference" />
         <attr name="toolbarTheme" format="reference" />
-        <attr name="submitbarStyle" format="reference" />
-        <attr name="icontablayoutStyle" format="reference" />
-        <attr name="emptyviewStyle" format="reference" />
-        <attr name="signatureviewStyle" format="reference" />
-        <attr name="progressChartCardStyle" format="reference" />
-        <attr name="pieChartCardStyle" format="reference" />
-        <attr name="lineChartCardStyle" format="reference" />
-        <attr name="barChartCardStyle" format="reference" />
-    </declare-styleable>
-
-    <declare-styleable name="IconTabLayout">
-        <attr name="android:background" />
-        <attr name="android:minHeight" />
-        <attr name="tabIconColor" format="color" />
-        <attr name="tabIconIndicatorColor" format="color" />
-        <attr name="tabTextColor" />
-    </declare-styleable>
-
-    <declare-styleable name="EmptyView">
-        <attr name="android:background" />
-        <attr name="emptyIcon" format="reference" />
-        <attr name="emptyIconTint" format="color" />
-        <attr name="emptyText" format="string" />
-        <attr name="emptyTextAppearance" format="reference" />
-    </declare-styleable>
-
-    <declare-styleable name="SubmitBar">
-        <attr name="android:background" />
-        <attr name="positiveActionTitle" format="string" />
-        <attr name="negativeActionTitle" format="string" />
-        <attr name="positiveActionColor" format="color" />
-        <attr name="negativeActionColor" format="color" />
-    </declare-styleable>
-
-    <declare-styleable name="SignatureView">
-        <attr name="signatureColor" format="color" />
-        <attr name="signaturePrintColor" format="color" />
-        <attr name="signatureStrokeSize" format="dimension" />
-        <attr name="hintText" format="string" />
-        <attr name="hintTextColor" format="color" />
-        <attr name="hintTextSize" format="dimension" />
-        <attr name="guidelineColor" format="color" />
-        <attr name="guidelineMargin" format="dimension" />
-        <attr name="guidelineHeight" format="dimension" />
-    </declare-styleable>
-
-    <declare-styleable name="ChartCard">
-        <attr name="titleText" format="string" />
-        <attr name="titleTextColor" />
-        <attr name="titleTextSize" format="dimension" />
-        <attr name="titleTextTypeface" format="string" />
-    </declare-styleable>
-
-    <declare-styleable name="ProgressChartCard">
-        <attr name="centerTextFormat" format="reference" />
-        <attr name="centerTextColor" format="color" />
-        <attr name="centerTextSize" format="dimension" />
-        <attr name="centerTextTypeface" format="string" />
-        <attr name="titleText" />
-        <attr name="titleTextColor" />
-        <attr name="titleTextSize" />
-        <attr name="titleTextTypeface" />
-        <attr name="finishText" format="string" />
-        <attr name="finishTextColor" format="color" />
-        <attr name="tabIndicatorColor" />
-        <attr name="tabTextColor" />
-        <attr name="tabSelectedTextColor" />
-    </declare-styleable>
-
-    <declare-styleable name="PieChartCard">
-        <attr name="valueTextFormat" format="reference" />
-        <attr name="titleText" />
-        <attr name="titleTextColor" />
-        <attr name="titleTextSize" />
-        <attr name="titleTextTypeface" />
-    </declare-styleable>
-
-    <declare-styleable name="LineChartCard">
-        <attr name="chartXAxisTextColor" format="color" />
-        <attr name="chartXAxisTextSize" format="dimension" />
-        <attr name="chartXAxisTextTypeface" format="string" />
-        <attr name="chartYAxisTextColor" format="color" />
-        <attr name="chartYAxisTextSize" format="dimension" />
-        <attr name="chartYAxisTextTypeface" format="string" />
-        <attr name="expandTintColor" format="color" />
-        <attr name="titleText" />
-        <attr name="titleTextColor" />
-        <attr name="titleTextSize" />
-        <attr name="titleTextTypeface" />
-    </declare-styleable>
-
-    <declare-styleable name="BarChartCard">
-        <attr name="chartXAxisTextColor" />
-        <attr name="chartXAxisTextSize" />
-        <attr name="chartXAxisTextTypeface" />
-        <attr name="expandTintColor" />
-        <attr name="titleText" />
-        <attr name="titleTextColor" />
-        <attr name="titleTextSize" />
-        <attr name="titleTextTypeface" />
     </declare-styleable>
 
 </resources>
\ No newline at end of file
diff --git a/backbone/src/main/res/values/strings.xml b/backbone/src/main/res/values/strings.xml
index f4500d602..0af128914 100644
--- a/backbone/src/main/res/values/strings.xml
+++ b/backbone/src/main/res/values/strings.xml
@@ -113,7 +113,7 @@
     <string name="rsb_cancel">Cancel</string>
     <string name="rsb_yes">Yes</string>
     <string name="rsb_no">No</string>
-    <string name="rsb_format_step_title">Step %1$s of %2$s</string>
+    <string name="rsb_format_step_title">Step %1$d of %2$d</string>
     <string name="rsb_hours">Hours</string>
     <string name="rsb_minutes">Minutes</string>
 
diff --git a/backbone/src/main/res/values/styles.xml b/backbone/src/main/res/values/styles.xml
index 31d7b0abb..743323ced 100644
--- a/backbone/src/main/res/values/styles.xml
+++ b/backbone/src/main/res/values/styles.xml
@@ -29,104 +29,4 @@
         <item name="android:paddingBottom">@dimen/rsb_padding_small</item>
     </style>
 
-    <style name="Widget.Backbone.IconTabLayout" parent="@style/Widget.Design.TabLayout">
-        <item name="android:background">?attr/colorPrimary</item>
-        <item name="android:minHeight">56dp</item>
-        <item name="tabIconColor">@android:color/white</item>
-        <item name="tabIconIndicatorColor">?attr/colorAccent</item>
-        <item name="tabTextColor">@color/rsb_white_60</item>
-        <item name="tabIndicatorColor">@android:color/white</item>
-    </style>
-
-    <style name="Widget.Backbone.TabLayout.Chart" parent="@style/Widget.Design.TabLayout">
-        <item name="android:background">@android:color/transparent</item>
-        <item name="android:paddingRight">50dp</item>
-        <item name="android:clipToPadding">false</item>
-        <item name="android:minHeight">48dp</item>
-        <item name="tabMode">scrollable</item>
-    </style>
-
-    <style name="Widget.Backbone.SubmitBar" parent="">
-        <item name="android:background">@color/rsb_submit_bar_gray</item>
-        <item name="positiveActionTitle">@string/rsb_next</item>
-        <item name="negativeActionTitle">@string/rsb_step_skip</item>
-        <item name="positiveActionColor">?attr/colorAccent</item>
-        <item name="negativeActionColor">@color/rsb_submit_bar_negative</item>
-    </style>
-
-    <style name="Widget.Backbone.SignatureView" parent="">
-        <item name="signatureColor">?android:attr/textColorPrimary</item>
-        <item name="signaturePrintColor">@android:color/black</item>
-        <item name="signatureStrokeSize">1dp</item>
-        <item name="hintText">@string/rsb_consent_signature_placeholder</item>
-        <item name="hintTextColor">#ccc</item>
-        <item name="hintTextSize">16sp</item>
-        <item name="guidelineColor">#ccc</item>
-        <item name="guidelineMargin">12dp</item>
-        <item name="guidelineHeight">1dp</item>
-    </style>
-
-    <style name="Widget.Backbone.EmptyView" parent="">
-        <item name="android:background">#d5e8ff</item>
-        <item name="emptyIcon">@drawable/rsb_illo_dashboard_empty</item>
-        <item name="emptyIconTint">?attr/colorPrimaryDark</item>
-        <item name="emptyText">No data recorded yet…</item>
-        <item name="emptyTextAppearance">@style/TextAppearance.Widget.Backbone.EmptyView</item>
-    </style>
-
-    <style name="TextAppearance.Widget.Backbone.EmptyView" parent="@style/TextAppearance.AppCompat">
-        <item name="android:textColor">?attr/colorPrimaryDark</item>
-        <item name="android:textSize">16sp</item>
-    </style>
-
-    <style name="Widget.Backbone.Chart" parent="">
-        <item name="titleText">Amount of pie eaten</item>
-        <item name="titleTextColor">@color/rsb_warm_gray</item>
-        <item name="titleTextSize">14sp</item>
-        <item name="titleTextTypeface">sans-serif-medium</item>
-    </style>
-
-    <style name="Widget.Backbone.Chart.Progress">
-        <item name="centerTextFormat">@string/rsb_chart_progress_center</item>
-        <item name="centerTextColor">?attr/colorPrimary</item>
-        <item name="centerTextSize">20sp</item>
-        <item name="centerTextTypeface">sans-serif-medium</item>
-        <item name="finishText">Finish</item>
-        <item name="finishTextColor">@color/rsb_error</item>
-        <item name="tabIndicatorColor">@color/rsb_tab_indicator</item>
-        <item name="tabTextColor">@color/rsb_tab_text_selected</item>
-        <item name="tabSelectedTextColor">@color/rsb_tab_indicator</item>
-    </style>
-
-    <style name="Widget.Backbone.Chart.Pie">
-        <item name="valueTextFormat">@string/rsb_chart_pie_value</item>
-    </style>
-
-    <style name="Widget.Backbone.Chart.Line">
-        <item name="valueTextFormat">@string/rsb_chart_pie_value</item>
-        <item name="chartXAxisTextColor">@color/rsb_warm_gray</item>
-        <item name="chartXAxisTextSize">14sp</item>
-        <item name="chartXAxisTextTypeface">sans-serif-medium</item>
-        <item name="chartYAxisTextColor">@color/rsb_warm_gray</item>
-        <item name="chartYAxisTextSize">14sp</item>
-        <item name="chartYAxisTextTypeface">sans-serif-medium</item>
-        <item name="expandTintColor">@color/rsb_warm_gray</item>
-    </style>
-
-    <style name="Widget.Backbone.Chart.Bar">
-        <item name="chartXAxisTextColor">@color/rsb_warm_gray</item>
-        <item name="chartXAxisTextSize">14sp</item>
-        <item name="chartXAxisTextTypeface">sans-serif-medium</item>
-        <item name="chartYAxisTextColor">@color/rsb_warm_gray</item>
-        <item name="chartYAxisTextSize">14sp</item>
-        <item name="chartYAxisTextTypeface">sans-serif-medium</item>
-        <item name="expandTintColor">@color/rsb_warm_gray</item>
-    </style>
-
-    <style name="Widget.Backbone.Chart.Title" parent="">
-        <item name="android:padding">16dp</item>
-        <item name="android:minHeight">48dp</item>
-        <item name="android:gravity">center_vertical</item>
-    </style>
-
 </resources>
diff --git a/backbone/src/main/res/values/themes.xml b/backbone/src/main/res/values/themes.xml
index 6ba784da7..e1fe522fa 100644
--- a/backbone/src/main/res/values/themes.xml
+++ b/backbone/src/main/res/values/themes.xml
@@ -9,14 +9,6 @@
         <!-- Custom Styles for Views -->
         <item name="toolbarTheme">@style/Theme.Backbone.Toolbar</item>
         <item name="passcodeTheme">@style/Theme.AppCompat.Light.NoActionBar</item>
-        <item name="submitbarStyle">@style/Widget.Backbone.SubmitBar</item>
-        <item name="icontablayoutStyle">@style/Widget.Backbone.IconTabLayout</item>
-        <item name="signatureviewStyle">@style/Widget.Backbone.SignatureView</item>
-        <item name="emptyviewStyle">@style/Widget.Backbone.EmptyView</item>
-        <item name="progressChartCardStyle">@style/Widget.Backbone.Chart.Progress</item>
-        <item name="pieChartCardStyle">@style/Widget.Backbone.Chart.Pie</item>
-        <item name="lineChartCardStyle">@style/Widget.Backbone.Chart.Line</item>
-        <item name="barChartCardStyle">@style/Widget.Backbone.Chart.Bar</item>
     </style>
 
     <style name="Theme.Backbone" parent="Base.Theme.Backbone" />

From 4921bc37712d6a50d28fdbed7d854af8a2ffc977 Mon Sep 17 00:00:00 2001
From: James Kizer <james.kizer@gmail.com>
Date: Wed, 2 Jan 2019 19:19:51 -0500
Subject: [PATCH 34/53] Updates to Skin module

Updated imports
Updated to support new pin code authentication
Updated to support new ITaskProvider interface
Added item section learn layout to support onboarding
---
 skin/build.gradle                             |  4 ++
 .../org/researchstack/skin/DataProvider.java  |  5 +-
 .../org/researchstack/skin/ResearchStack.java | 15 +++---
 .../researchstack/skin/ResourceManager.java   |  2 +-
 .../org/researchstack/skin/TaskProvider.java  | 14 +++++-
 .../org/researchstack/skin/UiManager.java     |  4 +-
 .../skin/model/ConsentSectionModel.java       |  2 +-
 .../skin/notification/TaskAlertReceiver.java  |  8 ++--
 .../skin/step/ConsentQuizEvaluationStep.java  |  2 +-
 .../skin/step/ConsentQuizQuestionStep.java    |  2 +-
 .../researchstack/skin/task/ConsentTask.java  | 44 ++++++++---------
 .../skin/task/OnboardingTask.java             | 10 ++--
 .../researchstack/skin/task/SignInTask.java   |  4 +-
 .../researchstack/skin/task/SignUpTask.java   |  4 +-
 .../skin/task/SmartSurveyTask.java            | 32 ++++++-------
 .../researchstack/skin/ui/BaseActivity.java   |  8 ++--
 .../skin/ui/ConsentTaskActivity.java          |  4 +-
 .../skin/ui/EmailVerificationActivity.java    | 12 ++---
 .../researchstack/skin/ui/MainActivity.java   | 12 ++---
 .../skin/ui/OnboardingActivity.java           | 10 ++--
 .../skin/ui/SignUpTaskActivity.java           | 47 +++++++++++--------
 .../researchstack/skin/ui/SplashActivity.java |  2 +-
 .../skin/ui/adapter/MainPagerAdapter.java     |  2 +-
 .../ui/adapter/OnboardingPagerAdapter.java    |  6 +--
 .../skin/ui/fragment/ActivitiesFragment.java  | 10 ++--
 .../skin/ui/fragment/LearnFragment.java       |  6 +--
 .../skin/ui/fragment/SettingsFragment.java    | 24 +++++-----
 .../ConsentQuizEvaluationStepLayout.java      | 16 +++----
 .../layout/ConsentQuizQuestionStepLayout.java | 12 ++---
 .../skin/ui/layout/PermissionStepLayout.java  | 12 ++---
 .../skin/ui/layout/SignInStepLayout.java      | 12 ++---
 .../ui/layout/SignUpEligibleStepLayout.java   | 10 ++--
 .../ui/layout/SignUpIneligibleStepLayout.java |  8 ++--
 .../skin/ui/layout/SignUpStepLayout.java      | 12 ++---
 .../skin/utils/ConsentFormUtils.java          |  6 +--
 .../layout-v21/rss_layout_toolbar_tabs.xml    |  2 +-
 .../rss_activity_email_verification.xml       |  2 +-
 .../res/layout/rss_fragment_dashboard.xml     | 12 ++---
 .../res/layout/rss_item_section_learn.xml     | 16 +++++++
 .../main/res/layout/rss_layout_eligible.xml   |  2 +-
 .../main/res/layout/rss_layout_permission.xml |  2 +-
 .../res/layout/rss_layout_quiz_question.xml   |  2 +-
 .../main/res/layout/rss_layout_sign_in.xml    |  2 +-
 .../main/res/layout/rss_layout_sign_up.xml    |  2 +-
 .../res/layout/rss_layout_toolbar_tabs.xml    |  2 +-
 skin/src/main/res/values/strings.xml          |  2 +-
 46 files changed, 234 insertions(+), 195 deletions(-)
 create mode 100644 skin/src/main/res/layout/rss_item_section_learn.xml

diff --git a/skin/build.gradle b/skin/build.gradle
index 8c0c93730..e312d961d 100644
--- a/skin/build.gradle
+++ b/skin/build.gradle
@@ -72,6 +72,10 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar', '*.so'])
     implementation 'com.cronutils:cron-utils:3.1.2'
     implementation project(':foundation')
+    implementation project(':authentication')
+    implementation project(':storage')
+    implementation project(':consent')
+
     implementation project(':backbone')
 
     implementation "com.android.support:appcompat-v7:$support_library_version"
diff --git a/skin/src/main/java/org/researchstack/skin/DataProvider.java b/skin/src/main/java/org/researchstack/skin/DataProvider.java
index 3cbfd5a58..f3e32b8b8 100644
--- a/skin/src/main/java/org/researchstack/skin/DataProvider.java
+++ b/skin/src/main/java/org/researchstack/skin/DataProvider.java
@@ -3,9 +3,8 @@
 import android.app.Application;
 import android.content.Context;
 
-import org.researchstack.backbone.result.TaskResult;
-import org.researchstack.backbone.storage.file.FileAccess;
-import org.researchstack.backbone.task.Task;
+import org.researchstack.foundation.core.models.result.TaskResult;
+import org.researchstack.foundation.core.models.task.Task;
 import org.researchstack.skin.model.SchedulesAndTasksModel;
 import org.researchstack.skin.model.User;
 import org.researchstack.skin.ui.EmailVerificationActivity;
diff --git a/skin/src/main/java/org/researchstack/skin/ResearchStack.java b/skin/src/main/java/org/researchstack/skin/ResearchStack.java
index 84b3500ea..584580452 100644
--- a/skin/src/main/java/org/researchstack/skin/ResearchStack.java
+++ b/skin/src/main/java/org/researchstack/skin/ResearchStack.java
@@ -3,11 +3,12 @@
 import android.app.Application;
 import android.content.Context;
 
-import org.researchstack.backbone.StorageAccess;
-import org.researchstack.backbone.storage.database.AppDatabase;
-import org.researchstack.backbone.storage.file.EncryptionProvider;
-import org.researchstack.backbone.storage.file.FileAccess;
-import org.researchstack.backbone.storage.file.PinCodeConfig;
+import org.researchstack.feature.authentication.pincode.PinCodeConfig;
+import org.researchstack.feature.authentication.pincode.PinCodeConfigProvider;
+import org.researchstack.feature.storage.StorageAccess;
+import org.researchstack.feature.storage.database.AppDatabase;
+import org.researchstack.feature.storage.file.EncryptionProvider;
+import org.researchstack.feature.storage.file.FileAccess;
 import org.researchstack.skin.notification.NotificationConfig;
 
 /**
@@ -53,8 +54,10 @@ public static void init(Context context, ResearchStack concreteResearchStack) {
 
         DataProvider.init(concreteResearchStack.createDataProviderImplementation(context));
 
+        PinCodeConfig pinCodeConfig = concreteResearchStack.getPinCodeConfig(context);
+        PinCodeConfigProvider.Companion.config(pinCodeConfig);
         StorageAccess.getInstance()
-                .init(concreteResearchStack.getPinCodeConfig(context),
+                .init(pinCodeConfig,
                         concreteResearchStack.getEncryptionProvider(context),
                         concreteResearchStack.createFileAccessImplementation(context),
                         concreteResearchStack.createAppDatabaseImplementation(context));
diff --git a/skin/src/main/java/org/researchstack/skin/ResourceManager.java b/skin/src/main/java/org/researchstack/skin/ResourceManager.java
index e3ded729e..e9cec4e66 100644
--- a/skin/src/main/java/org/researchstack/skin/ResourceManager.java
+++ b/skin/src/main/java/org/researchstack/skin/ResourceManager.java
@@ -1,6 +1,6 @@
 package org.researchstack.skin;
 
-import org.researchstack.backbone.ResourcePathManager;
+import org.researchstack.foundation.components.singletons.ResourcePathManager;
 
 /**
  * This class is responsible for returning paths of resources defined in the assets folder. This
diff --git a/skin/src/main/java/org/researchstack/skin/TaskProvider.java b/skin/src/main/java/org/researchstack/skin/TaskProvider.java
index b3b9658ff..a3b6b3d2e 100644
--- a/skin/src/main/java/org/researchstack/skin/TaskProvider.java
+++ b/skin/src/main/java/org/researchstack/skin/TaskProvider.java
@@ -2,13 +2,17 @@
 
 import android.app.Application;
 
-import org.researchstack.backbone.task.Task;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.researchstack.foundation.components.presentation.ITaskProvider;
+import org.researchstack.foundation.core.interfaces.ITask;
+import org.researchstack.foundation.core.models.task.Task;
 
 /**
  * TaskProvider is used as a way for the Framework to get Tasks needed throughout the onboarding
  * process. This allows you to implement your own Tasks if needed.
  */
-public abstract class TaskProvider {
+public abstract class TaskProvider implements ITaskProvider {
     /**
      * Task ID used by the framework for looking up the "initial" task
      */
@@ -64,6 +68,12 @@ public static TaskProvider getInstance() {
      */
     public abstract Task get(String taskId);
 
+    @Nullable
+    @Override
+    public ITask task(@NotNull String identifier) {
+        return this.get(identifier);
+    }
+
     /**
      * Used to store a task object for reuse
      *
diff --git a/skin/src/main/java/org/researchstack/skin/UiManager.java b/skin/src/main/java/org/researchstack/skin/UiManager.java
index c3849d8ff..60fb0220a 100644
--- a/skin/src/main/java/org/researchstack/skin/UiManager.java
+++ b/skin/src/main/java/org/researchstack/skin/UiManager.java
@@ -3,8 +3,8 @@
 import android.app.Application;
 import android.content.Context;
 
-import org.researchstack.backbone.result.StepResult;
-import org.researchstack.backbone.step.Step;
+import org.researchstack.foundation.core.models.result.StepResult;
+import org.researchstack.foundation.core.models.step.Step;
 import org.researchstack.skin.notification.TaskNotificationReceiver;
 
 import java.util.List;
diff --git a/skin/src/main/java/org/researchstack/skin/model/ConsentSectionModel.java b/skin/src/main/java/org/researchstack/skin/model/ConsentSectionModel.java
index 092a091b7..a933272d1 100644
--- a/skin/src/main/java/org/researchstack/skin/model/ConsentSectionModel.java
+++ b/skin/src/main/java/org/researchstack/skin/model/ConsentSectionModel.java
@@ -2,8 +2,8 @@
 
 import com.google.gson.annotations.SerializedName;
 
-import org.researchstack.backbone.model.ConsentSection;
 import org.researchstack.backbone.model.DocumentProperties;
+import org.researchstack.feature.consent.model.ConsentSection;
 
 import java.util.List;
 
diff --git a/skin/src/main/java/org/researchstack/skin/notification/TaskAlertReceiver.java b/skin/src/main/java/org/researchstack/skin/notification/TaskAlertReceiver.java
index 425ea40a6..c82c8acc3 100644
--- a/skin/src/main/java/org/researchstack/skin/notification/TaskAlertReceiver.java
+++ b/skin/src/main/java/org/researchstack/skin/notification/TaskAlertReceiver.java
@@ -7,11 +7,11 @@
 import android.content.Intent;
 import android.util.Log;
 
-import org.researchstack.backbone.storage.NotificationHelper;
-import org.researchstack.backbone.storage.database.TaskNotification;
-import org.researchstack.backbone.utils.FormatHelper;
-import org.researchstack.backbone.utils.LogExt;
 import org.researchstack.backbone.utils.ObservableUtils;
+import org.researchstack.feature.storage.NotificationHelper;
+import org.researchstack.feature.storage.database.TaskNotification;
+import org.researchstack.foundation.components.utils.FormatHelper;
+import org.researchstack.foundation.components.utils.LogExt;
 import org.researchstack.skin.UiManager;
 import org.researchstack.skin.schedule.ScheduleHelper;
 
diff --git a/skin/src/main/java/org/researchstack/skin/step/ConsentQuizEvaluationStep.java b/skin/src/main/java/org/researchstack/skin/step/ConsentQuizEvaluationStep.java
index 778bd071c..9e84a5437 100644
--- a/skin/src/main/java/org/researchstack/skin/step/ConsentQuizEvaluationStep.java
+++ b/skin/src/main/java/org/researchstack/skin/step/ConsentQuizEvaluationStep.java
@@ -1,6 +1,6 @@
 package org.researchstack.skin.step;
 
-import org.researchstack.backbone.step.Step;
+import org.researchstack.foundation.core.models.step.Step;
 import org.researchstack.skin.R;
 import org.researchstack.skin.model.ConsentQuizModel;
 import org.researchstack.skin.ui.layout.ConsentQuizEvaluationStepLayout;
diff --git a/skin/src/main/java/org/researchstack/skin/step/ConsentQuizQuestionStep.java b/skin/src/main/java/org/researchstack/skin/step/ConsentQuizQuestionStep.java
index fb844a464..71231ac28 100644
--- a/skin/src/main/java/org/researchstack/skin/step/ConsentQuizQuestionStep.java
+++ b/skin/src/main/java/org/researchstack/skin/step/ConsentQuizQuestionStep.java
@@ -1,6 +1,6 @@
 package org.researchstack.skin.step;
 
-import org.researchstack.backbone.step.Step;
+import org.researchstack.foundation.core.models.step.Step;
 import org.researchstack.skin.R;
 import org.researchstack.skin.model.ConsentQuizModel;
 import org.researchstack.skin.ui.layout.ConsentQuizQuestionStepLayout;
diff --git a/skin/src/main/java/org/researchstack/skin/task/ConsentTask.java b/skin/src/main/java/org/researchstack/skin/task/ConsentTask.java
index 34ecb7fbc..7c26e85b6 100644
--- a/skin/src/main/java/org/researchstack/skin/task/ConsentTask.java
+++ b/skin/src/main/java/org/researchstack/skin/task/ConsentTask.java
@@ -3,29 +3,29 @@
 import android.content.Context;
 import android.content.res.Resources;
 
-import org.researchstack.backbone.answerformat.AnswerFormat;
-import org.researchstack.backbone.answerformat.BirthDateAnswerFormat;
-import org.researchstack.backbone.answerformat.ChoiceAnswerFormat;
-import org.researchstack.backbone.answerformat.DateAnswerFormat;
-import org.researchstack.backbone.answerformat.TextAnswerFormat;
-import org.researchstack.backbone.model.Choice;
-import org.researchstack.backbone.model.ConsentDocument;
-import org.researchstack.backbone.model.ConsentSection;
-import org.researchstack.backbone.model.ConsentSignature;
 import org.researchstack.backbone.model.DocumentProperties;
-import org.researchstack.backbone.result.StepResult;
-import org.researchstack.backbone.result.TaskResult;
-import org.researchstack.backbone.step.ConsentDocumentStep;
-import org.researchstack.backbone.step.ConsentSharingStep;
-import org.researchstack.backbone.step.ConsentSignatureStep;
-import org.researchstack.backbone.step.ConsentVisualStep;
-import org.researchstack.backbone.step.FormStep;
-import org.researchstack.backbone.step.QuestionStep;
-import org.researchstack.backbone.step.Step;
-import org.researchstack.backbone.task.OrderedTask;
-import org.researchstack.backbone.ui.step.layout.ConsentSignatureStepLayout;
-import org.researchstack.backbone.utils.LogExt;
-import org.researchstack.backbone.utils.TextUtils;
+import org.researchstack.feature.consent.model.ConsentDocument;
+import org.researchstack.feature.consent.model.ConsentSection;
+import org.researchstack.feature.consent.model.ConsentSignature;
+import org.researchstack.feature.consent.step.ConsentDocumentStep;
+import org.researchstack.feature.consent.step.ConsentSharingStep;
+import org.researchstack.feature.consent.step.ConsentSignatureStep;
+import org.researchstack.feature.consent.step.ConsentVisualStep;
+import org.researchstack.feature.consent.ui.layout.ConsentSignatureStepLayout;
+import org.researchstack.foundation.components.common.task.OrderedTask;
+import org.researchstack.foundation.components.survey.answerformat.AnswerFormat;
+import org.researchstack.foundation.components.survey.answerformat.BirthDateAnswerFormat;
+import org.researchstack.foundation.components.survey.answerformat.ChoiceAnswerFormat;
+import org.researchstack.foundation.components.survey.answerformat.DateAnswerFormat;
+import org.researchstack.foundation.components.survey.answerformat.TextAnswerFormat;
+import org.researchstack.foundation.components.survey.model.Choice;
+import org.researchstack.foundation.components.survey.step.FormStep;
+import org.researchstack.foundation.components.survey.step.QuestionStep;
+import org.researchstack.foundation.components.utils.LogExt;
+import org.researchstack.foundation.components.utils.TextUtils;
+import org.researchstack.foundation.core.models.result.StepResult;
+import org.researchstack.foundation.core.models.result.TaskResult;
+import org.researchstack.foundation.core.models.step.Step;
 import org.researchstack.skin.R;
 import org.researchstack.skin.ResourceManager;
 import org.researchstack.skin.model.ConsentQuizModel;
diff --git a/skin/src/main/java/org/researchstack/skin/task/OnboardingTask.java b/skin/src/main/java/org/researchstack/skin/task/OnboardingTask.java
index 921f67aaf..42ebe2d93 100644
--- a/skin/src/main/java/org/researchstack/skin/task/OnboardingTask.java
+++ b/skin/src/main/java/org/researchstack/skin/task/OnboardingTask.java
@@ -1,10 +1,10 @@
 package org.researchstack.skin.task;
 
-import org.researchstack.backbone.result.StepResult;
-import org.researchstack.backbone.result.TaskResult;
-import org.researchstack.backbone.step.Step;
-import org.researchstack.backbone.task.Task;
-import org.researchstack.backbone.ui.step.body.NotImplementedStepBody;
+import org.researchstack.foundation.components.survey.ui.body.NotImplementedStepBody;
+import org.researchstack.foundation.core.models.result.StepResult;
+import org.researchstack.foundation.core.models.result.TaskResult;
+import org.researchstack.foundation.core.models.step.Step;
+import org.researchstack.foundation.core.models.task.Task;
 import org.researchstack.skin.R;
 import org.researchstack.skin.step.PassCodeCreationStep;
 import org.researchstack.skin.ui.layout.PermissionStepLayout;
diff --git a/skin/src/main/java/org/researchstack/skin/task/SignInTask.java b/skin/src/main/java/org/researchstack/skin/task/SignInTask.java
index 20d1812f5..e238b5929 100644
--- a/skin/src/main/java/org/researchstack/skin/task/SignInTask.java
+++ b/skin/src/main/java/org/researchstack/skin/task/SignInTask.java
@@ -2,8 +2,8 @@
 
 import android.content.Context;
 
-import org.researchstack.backbone.result.TaskResult;
-import org.researchstack.backbone.step.Step;
+import org.researchstack.foundation.core.models.result.TaskResult;
+import org.researchstack.foundation.core.models.step.Step;
 import org.researchstack.skin.PermissionRequestManager;
 import org.researchstack.skin.TaskProvider;
 
diff --git a/skin/src/main/java/org/researchstack/skin/task/SignUpTask.java b/skin/src/main/java/org/researchstack/skin/task/SignUpTask.java
index 8a34ea529..bc787e4f1 100644
--- a/skin/src/main/java/org/researchstack/skin/task/SignUpTask.java
+++ b/skin/src/main/java/org/researchstack/skin/task/SignUpTask.java
@@ -2,8 +2,8 @@
 
 import android.content.Context;
 
-import org.researchstack.backbone.result.TaskResult;
-import org.researchstack.backbone.step.Step;
+import org.researchstack.foundation.core.models.result.TaskResult;
+import org.researchstack.foundation.core.models.step.Step;
 import org.researchstack.skin.PermissionRequestManager;
 import org.researchstack.skin.TaskProvider;
 import org.researchstack.skin.UiManager;
diff --git a/skin/src/main/java/org/researchstack/skin/task/SmartSurveyTask.java b/skin/src/main/java/org/researchstack/skin/task/SmartSurveyTask.java
index 88896590f..164b6081a 100644
--- a/skin/src/main/java/org/researchstack/skin/task/SmartSurveyTask.java
+++ b/skin/src/main/java/org/researchstack/skin/task/SmartSurveyTask.java
@@ -2,22 +2,22 @@
 
 import android.content.Context;
 
-import org.researchstack.backbone.answerformat.AnswerFormat;
-import org.researchstack.backbone.answerformat.BooleanAnswerFormat;
-import org.researchstack.backbone.answerformat.ChoiceAnswerFormat;
-import org.researchstack.backbone.answerformat.DateAnswerFormat;
-import org.researchstack.backbone.answerformat.DecimalAnswerFormat;
-import org.researchstack.backbone.answerformat.DurationAnswerFormat;
-import org.researchstack.backbone.answerformat.IntegerAnswerFormat;
-import org.researchstack.backbone.answerformat.TextAnswerFormat;
-import org.researchstack.backbone.answerformat.UnknownAnswerFormat;
-import org.researchstack.backbone.model.Choice;
-import org.researchstack.backbone.result.TaskResult;
-import org.researchstack.backbone.step.InstructionStep;
-import org.researchstack.backbone.step.QuestionStep;
-import org.researchstack.backbone.step.Step;
-import org.researchstack.backbone.task.Task;
-import org.researchstack.backbone.utils.LogExt;
+import org.researchstack.foundation.components.survey.answerformat.AnswerFormat;
+import org.researchstack.foundation.components.survey.answerformat.BooleanAnswerFormat;
+import org.researchstack.foundation.components.survey.answerformat.ChoiceAnswerFormat;
+import org.researchstack.foundation.components.survey.answerformat.DateAnswerFormat;
+import org.researchstack.foundation.components.survey.answerformat.DecimalAnswerFormat;
+import org.researchstack.foundation.components.survey.answerformat.DurationAnswerFormat;
+import org.researchstack.foundation.components.survey.answerformat.IntegerAnswerFormat;
+import org.researchstack.foundation.components.survey.answerformat.TextAnswerFormat;
+import org.researchstack.foundation.components.survey.answerformat.UnknownAnswerFormat;
+import org.researchstack.foundation.components.survey.model.Choice;
+import org.researchstack.foundation.components.survey.step.InstructionStep;
+import org.researchstack.foundation.components.survey.step.QuestionStep;
+import org.researchstack.foundation.components.utils.LogExt;
+import org.researchstack.foundation.core.models.result.TaskResult;
+import org.researchstack.foundation.core.models.step.Step;
+import org.researchstack.foundation.core.models.task.Task;
 import org.researchstack.skin.R;
 import org.researchstack.skin.model.TaskModel;
 
diff --git a/skin/src/main/java/org/researchstack/skin/ui/BaseActivity.java b/skin/src/main/java/org/researchstack/skin/ui/BaseActivity.java
index 95b662c3a..b9a082276 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/BaseActivity.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/BaseActivity.java
@@ -12,13 +12,13 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import org.researchstack.backbone.StorageAccess;
-import org.researchstack.backbone.result.TaskResult;
-import org.researchstack.backbone.task.Task;
 import org.researchstack.backbone.ui.PinCodeActivity;
 import org.researchstack.backbone.ui.ViewTaskActivity;
-import org.researchstack.backbone.utils.LogExt;
 import org.researchstack.backbone.utils.ObservableUtils;
+import org.researchstack.feature.storage.StorageAccess;
+import org.researchstack.foundation.components.utils.LogExt;
+import org.researchstack.foundation.core.models.result.TaskResult;
+import org.researchstack.foundation.core.models.task.Task;
 import org.researchstack.skin.AppPrefs;
 import org.researchstack.skin.DataProvider;
 import org.researchstack.skin.R;
diff --git a/skin/src/main/java/org/researchstack/skin/ui/ConsentTaskActivity.java b/skin/src/main/java/org/researchstack/skin/ui/ConsentTaskActivity.java
index 5d7b5970d..180e1fe39 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/ConsentTaskActivity.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/ConsentTaskActivity.java
@@ -3,9 +3,9 @@
 import android.content.Context;
 import android.content.Intent;
 
-import org.researchstack.backbone.StorageAccess;
-import org.researchstack.backbone.task.Task;
 import org.researchstack.backbone.ui.ViewTaskActivity;
+import org.researchstack.feature.storage.StorageAccess;
+import org.researchstack.foundation.core.models.task.Task;
 
 public class ConsentTaskActivity extends ViewTaskActivity {
     public static Intent newIntent(Context context, Task task) {
diff --git a/skin/src/main/java/org/researchstack/skin/ui/EmailVerificationActivity.java b/skin/src/main/java/org/researchstack/skin/ui/EmailVerificationActivity.java
index de49c50a7..3a2be325e 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/EmailVerificationActivity.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/EmailVerificationActivity.java
@@ -12,15 +12,15 @@
 
 import com.jakewharton.rxbinding.view.RxView;
 
-import org.researchstack.backbone.result.StepResult;
-import org.researchstack.backbone.result.TaskResult;
-import org.researchstack.backbone.step.Step;
-import org.researchstack.backbone.task.OrderedTask;
 import org.researchstack.backbone.ui.PinCodeActivity;
 import org.researchstack.backbone.ui.ViewTaskActivity;
-import org.researchstack.backbone.ui.views.SubmitBar;
 import org.researchstack.backbone.utils.ObservableUtils;
-import org.researchstack.backbone.utils.ThemeUtils;
+import org.researchstack.foundation.components.common.task.OrderedTask;
+import org.researchstack.foundation.components.common.ui.views.SubmitBar;
+import org.researchstack.foundation.components.utils.ThemeUtils;
+import org.researchstack.foundation.core.models.result.StepResult;
+import org.researchstack.foundation.core.models.result.TaskResult;
+import org.researchstack.foundation.core.models.step.Step;
 import org.researchstack.skin.DataProvider;
 import org.researchstack.skin.R;
 import org.researchstack.skin.task.OnboardingTask;
diff --git a/skin/src/main/java/org/researchstack/skin/ui/MainActivity.java b/skin/src/main/java/org/researchstack/skin/ui/MainActivity.java
index 057894633..16a5b4dab 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/MainActivity.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/MainActivity.java
@@ -10,14 +10,14 @@
 import android.view.Menu;
 import android.view.MenuItem;
 
-import org.researchstack.backbone.StorageAccess;
-import org.researchstack.backbone.result.TaskResult;
-import org.researchstack.backbone.task.Task;
 import org.researchstack.backbone.ui.ViewTaskActivity;
-import org.researchstack.backbone.ui.views.IconTabLayout;
-import org.researchstack.backbone.utils.LogExt;
 import org.researchstack.backbone.utils.ObservableUtils;
-import org.researchstack.backbone.utils.UiThreadContext;
+import org.researchstack.feature.storage.StorageAccess;
+import org.researchstack.foundation.components.common.ui.views.IconTabLayout;
+import org.researchstack.foundation.components.utils.LogExt;
+import org.researchstack.foundation.components.utils.UiThreadContext;
+import org.researchstack.foundation.core.models.result.TaskResult;
+import org.researchstack.foundation.core.models.task.Task;
 import org.researchstack.skin.ActionItem;
 import org.researchstack.skin.DataProvider;
 import org.researchstack.skin.R;
diff --git a/skin/src/main/java/org/researchstack/skin/ui/OnboardingActivity.java b/skin/src/main/java/org/researchstack/skin/ui/OnboardingActivity.java
index 9a3a1cda1..8031c81a5 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/OnboardingActivity.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/OnboardingActivity.java
@@ -15,13 +15,13 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import org.researchstack.backbone.StorageAccess;
-import org.researchstack.backbone.result.TaskResult;
-import org.researchstack.backbone.task.OrderedTask;
 import org.researchstack.backbone.ui.PinCodeActivity;
 import org.researchstack.backbone.ui.ViewTaskActivity;
-import org.researchstack.backbone.utils.ResUtils;
-import org.researchstack.backbone.utils.TextUtils;
+import org.researchstack.feature.storage.StorageAccess;
+import org.researchstack.foundation.components.common.task.OrderedTask;
+import org.researchstack.foundation.components.utils.ResUtils;
+import org.researchstack.foundation.components.utils.TextUtils;
+import org.researchstack.foundation.core.models.result.TaskResult;
 import org.researchstack.skin.AppPrefs;
 import org.researchstack.skin.R;
 import org.researchstack.skin.ResourceManager;
diff --git a/skin/src/main/java/org/researchstack/skin/ui/SignUpTaskActivity.java b/skin/src/main/java/org/researchstack/skin/ui/SignUpTaskActivity.java
index 65e21d03c..584ca4084 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/SignUpTaskActivity.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/SignUpTaskActivity.java
@@ -6,16 +6,19 @@
 import android.content.Intent;
 import android.os.Build;
 
-import org.researchstack.backbone.StorageAccess;
-import org.researchstack.backbone.result.StepResult;
-import org.researchstack.backbone.result.TaskResult;
-import org.researchstack.backbone.step.Step;
-import org.researchstack.backbone.task.Task;
+import org.jetbrains.annotations.Nullable;
 import org.researchstack.backbone.ui.ViewTaskActivity;
 import org.researchstack.backbone.ui.callbacks.ActivityCallback;
-import org.researchstack.backbone.ui.step.layout.StepLayout;
 import org.researchstack.backbone.ui.step.layout.StepPermissionRequest;
-import org.researchstack.backbone.utils.TextUtils;
+import org.researchstack.feature.storage.StorageAccess;
+import org.researchstack.foundation.components.common.ui.layout.StepLayout;
+import org.researchstack.foundation.components.utils.TextUtils;
+import org.researchstack.foundation.core.interfaces.IResult;
+import org.researchstack.foundation.core.interfaces.IStep;
+import org.researchstack.foundation.core.models.result.StepResult;
+import org.researchstack.foundation.core.models.result.TaskResult;
+import org.researchstack.foundation.core.models.step.Step;
+import org.researchstack.foundation.core.models.task.Task;
 import org.researchstack.skin.DataProvider;
 import org.researchstack.skin.PermissionRequestManager;
 import org.researchstack.skin.R;
@@ -44,20 +47,24 @@ public void onDataAuth() {
     }
 
     @Override
-    public void onSaveStep(int action, Step step, StepResult result) {
-        // Save result to task
-        onSaveStepResult(step.getIdentifier(), result);
-
-        // Save Pin to disk, then save our consent info
-        if (action == ACTION_NEXT &&
-                step.getIdentifier().equals(OnboardingTask.SignUpPassCodeCreationStepIdentifier)) {
-            String pin = (String) result.getResult();
-            if (!TextUtils.isEmpty(pin)) {
-                StorageAccess.getInstance().createPinCode(this, pin);
-            }
+    public void onSaveStep(int action, IStep step, @Nullable IResult result) {
+
+        if (result instanceof StepResult) {
+            StepResult stepResult = (StepResult) result;
+            // Save result to task
+            onSaveStepResult(step.getIdentifier(), stepResult);
+
+            // Save Pin to disk, then save our consent info
+            if (action == ACTION_NEXT &&
+                    step.getIdentifier().equals(OnboardingTask.SignUpPassCodeCreationStepIdentifier)) {
+                String pin = (String) stepResult.getResult();
+                if (!TextUtils.isEmpty(pin)) {
+                    StorageAccess.getInstance().createPinCode(this, pin);
+                }
 
-            if (consentResult != null) {
-                saveConsentResultInfo();
+                if (consentResult != null) {
+                    saveConsentResultInfo();
+                }
             }
         }
 
diff --git a/skin/src/main/java/org/researchstack/skin/ui/SplashActivity.java b/skin/src/main/java/org/researchstack/skin/ui/SplashActivity.java
index 9098f1bbe..94cdc8b6e 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/SplashActivity.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/SplashActivity.java
@@ -3,9 +3,9 @@
 import android.content.Intent;
 import android.os.Bundle;
 
-import org.researchstack.backbone.StorageAccess;
 import org.researchstack.backbone.ui.PinCodeActivity;
 import org.researchstack.backbone.utils.ObservableUtils;
+import org.researchstack.feature.storage.StorageAccess;
 import org.researchstack.skin.AppPrefs;
 import org.researchstack.skin.DataProvider;
 import org.researchstack.skin.notification.TaskAlertReceiver;
diff --git a/skin/src/main/java/org/researchstack/skin/ui/adapter/MainPagerAdapter.java b/skin/src/main/java/org/researchstack/skin/ui/adapter/MainPagerAdapter.java
index 852cfc026..2b3e14538 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/adapter/MainPagerAdapter.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/adapter/MainPagerAdapter.java
@@ -4,7 +4,7 @@
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
 
-import org.researchstack.backbone.utils.ViewUtils;
+import org.researchstack.foundation.components.utils.ViewUtils;
 import org.researchstack.skin.ActionItem;
 
 import java.util.List;
diff --git a/skin/src/main/java/org/researchstack/skin/ui/adapter/OnboardingPagerAdapter.java b/skin/src/main/java/org/researchstack/skin/ui/adapter/OnboardingPagerAdapter.java
index e877604d0..df1c56311 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/adapter/OnboardingPagerAdapter.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/adapter/OnboardingPagerAdapter.java
@@ -9,9 +9,9 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import org.researchstack.backbone.ui.ViewVideoActivity;
-import org.researchstack.backbone.ui.views.LocalWebView;
-import org.researchstack.backbone.utils.TextUtils;
+import org.researchstack.foundation.components.utils.TextUtils;
+import org.researchstack.foundation.components.web.ui.activities.ViewVideoActivity;
+import org.researchstack.foundation.components.web.ui.views.LocalWebView;
 import org.researchstack.skin.R;
 import org.researchstack.skin.ResourceManager;
 import org.researchstack.skin.model.StudyOverviewModel;
diff --git a/skin/src/main/java/org/researchstack/skin/ui/fragment/ActivitiesFragment.java b/skin/src/main/java/org/researchstack/skin/ui/fragment/ActivitiesFragment.java
index 1732c9ad1..cefdf75d3 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/fragment/ActivitiesFragment.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/fragment/ActivitiesFragment.java
@@ -18,13 +18,13 @@
 import android.widget.ImageView;
 import android.widget.Toast;
 
-import org.researchstack.backbone.StorageAccess;
-import org.researchstack.backbone.result.TaskResult;
-import org.researchstack.backbone.storage.file.StorageAccessListener;
-import org.researchstack.backbone.task.Task;
 import org.researchstack.backbone.ui.ViewTaskActivity;
-import org.researchstack.backbone.utils.LogExt;
 import org.researchstack.backbone.utils.ObservableUtils;
+import org.researchstack.feature.storage.StorageAccess;
+import org.researchstack.feature.storage.file.StorageAccessListener;
+import org.researchstack.foundation.components.utils.LogExt;
+import org.researchstack.foundation.core.models.result.TaskResult;
+import org.researchstack.foundation.core.models.task.Task;
 import org.researchstack.skin.DataProvider;
 import org.researchstack.skin.R;
 import org.researchstack.skin.model.SchedulesAndTasksModel;
diff --git a/skin/src/main/java/org/researchstack/skin/ui/fragment/LearnFragment.java b/skin/src/main/java/org/researchstack/skin/ui/fragment/LearnFragment.java
index 0e78c7d5b..36f1deabf 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/fragment/LearnFragment.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/fragment/LearnFragment.java
@@ -13,7 +13,7 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import org.researchstack.backbone.ui.ViewWebDocumentActivity;
+import org.researchstack.foundation.components.web.ui.activities.ViewWebDocumentActivity;
 import org.researchstack.skin.R;
 import org.researchstack.skin.ResourceManager;
 import org.researchstack.skin.model.SectionModel;
@@ -63,7 +63,7 @@ public LearnAdapter(Context context, SectionModel sections) {
         @Override
         public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
             if (viewType == VIEW_TYPE_HEADER) {
-                View view = inflater.inflate(R.layout.preference_category_material, parent, false);
+                View view = inflater.inflate(R.layout.rss_item_section_learn, parent, false);
                 return new HeaderViewHolder(view);
             } else {
                 View view = inflater.inflate(R.layout.rss_item_row_learn, parent, false);
@@ -114,7 +114,7 @@ public static class HeaderViewHolder extends RecyclerView.ViewHolder {
 
             public HeaderViewHolder(View itemView) {
                 super(itemView);
-                title = (TextView) itemView;
+                title = (AppCompatTextView) itemView.findViewById(R.id.learn_item_title);
             }
         }
 
diff --git a/skin/src/main/java/org/researchstack/skin/ui/fragment/SettingsFragment.java b/skin/src/main/java/org/researchstack/skin/ui/fragment/SettingsFragment.java
index 2ee0e0482..697602b3a 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/fragment/SettingsFragment.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/fragment/SettingsFragment.java
@@ -17,20 +17,20 @@
 import android.widget.FrameLayout;
 import android.widget.Toast;
 
-import org.researchstack.backbone.StorageAccess;
-import org.researchstack.backbone.answerformat.AnswerFormat;
-import org.researchstack.backbone.answerformat.ChoiceAnswerFormat;
-import org.researchstack.backbone.model.Choice;
-import org.researchstack.backbone.result.TaskResult;
-import org.researchstack.backbone.step.ConsentSharingStep;
-import org.researchstack.backbone.storage.file.StorageAccessListener;
-import org.researchstack.backbone.task.OrderedTask;
-import org.researchstack.backbone.task.Task;
 import org.researchstack.backbone.ui.ViewTaskActivity;
-import org.researchstack.backbone.ui.ViewWebDocumentActivity;
-import org.researchstack.backbone.utils.FormatHelper;
-import org.researchstack.backbone.utils.LogExt;
 import org.researchstack.backbone.utils.ObservableUtils;
+import org.researchstack.feature.consent.step.ConsentSharingStep;
+import org.researchstack.feature.storage.StorageAccess;
+import org.researchstack.feature.storage.file.StorageAccessListener;
+import org.researchstack.foundation.components.common.task.OrderedTask;
+import org.researchstack.foundation.components.survey.answerformat.AnswerFormat;
+import org.researchstack.foundation.components.survey.answerformat.ChoiceAnswerFormat;
+import org.researchstack.foundation.components.survey.model.Choice;
+import org.researchstack.foundation.components.utils.FormatHelper;
+import org.researchstack.foundation.components.utils.LogExt;
+import org.researchstack.foundation.components.web.ui.activities.ViewWebDocumentActivity;
+import org.researchstack.foundation.core.models.result.TaskResult;
+import org.researchstack.foundation.core.models.task.Task;
 import org.researchstack.skin.AppPrefs;
 import org.researchstack.skin.DataProvider;
 import org.researchstack.skin.R;
diff --git a/skin/src/main/java/org/researchstack/skin/ui/layout/ConsentQuizEvaluationStepLayout.java b/skin/src/main/java/org/researchstack/skin/ui/layout/ConsentQuizEvaluationStepLayout.java
index f101095b4..dce010e24 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/layout/ConsentQuizEvaluationStepLayout.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/layout/ConsentQuizEvaluationStepLayout.java
@@ -6,13 +6,13 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import org.researchstack.backbone.result.StepResult;
-import org.researchstack.backbone.step.Step;
-import org.researchstack.backbone.ui.callbacks.StepCallbacks;
-import org.researchstack.backbone.ui.step.layout.StepLayout;
-import org.researchstack.backbone.ui.views.FixedSubmitBarLayout;
-import org.researchstack.backbone.ui.views.SubmitBar;
-import org.researchstack.backbone.utils.ResUtils;
+import org.researchstack.foundation.components.common.ui.callbacks.StepCallbacks;
+import org.researchstack.foundation.components.common.ui.layout.FixedSubmitBarLayout;
+import org.researchstack.foundation.components.common.ui.layout.StepLayout;
+import org.researchstack.foundation.components.common.ui.views.SubmitBar;
+import org.researchstack.foundation.components.utils.ResUtils;
+import org.researchstack.foundation.core.models.result.StepResult;
+import org.researchstack.foundation.core.models.step.Step;
 import org.researchstack.skin.R;
 import org.researchstack.skin.step.ConsentQuizEvaluationStep;
 
@@ -52,7 +52,7 @@ private void initializeStep() {
         TextView title = (TextView) findViewById(R.id.rss_quiz_eval_title);
         TextView summary = (TextView) findViewById(R.id.rss_quiz_eval_summary);
 
-        SubmitBar submitBar = (SubmitBar) findViewById(R.id.rsb_submit_bar);
+        SubmitBar submitBar = (SubmitBar) findViewById(R.id.rsf_submit_bar);
         submitBar.getNegativeActionView().setVisibility(View.GONE);
         submitBar.setPositiveAction(v -> callbacks.onSaveStep(StepCallbacks.ACTION_NEXT,
                 step,
diff --git a/skin/src/main/java/org/researchstack/skin/ui/layout/ConsentQuizQuestionStepLayout.java b/skin/src/main/java/org/researchstack/skin/ui/layout/ConsentQuizQuestionStepLayout.java
index 48d3831b0..b22ee401d 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/layout/ConsentQuizQuestionStepLayout.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/layout/ConsentQuizQuestionStepLayout.java
@@ -18,12 +18,12 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import org.researchstack.backbone.model.Choice;
-import org.researchstack.backbone.result.StepResult;
-import org.researchstack.backbone.step.Step;
-import org.researchstack.backbone.ui.callbacks.StepCallbacks;
-import org.researchstack.backbone.ui.step.layout.StepLayout;
-import org.researchstack.backbone.ui.views.SubmitBar;
+import org.researchstack.foundation.components.common.ui.callbacks.StepCallbacks;
+import org.researchstack.foundation.components.common.ui.layout.StepLayout;
+import org.researchstack.foundation.components.common.ui.views.SubmitBar;
+import org.researchstack.foundation.components.survey.model.Choice;
+import org.researchstack.foundation.core.models.result.StepResult;
+import org.researchstack.foundation.core.models.step.Step;
 import org.researchstack.skin.R;
 import org.researchstack.skin.model.ConsentQuizModel;
 import org.researchstack.skin.step.ConsentQuizQuestionStep;
diff --git a/skin/src/main/java/org/researchstack/skin/ui/layout/PermissionStepLayout.java b/skin/src/main/java/org/researchstack/skin/ui/layout/PermissionStepLayout.java
index 5a50e09ab..b6de09d0a 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/layout/PermissionStepLayout.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/layout/PermissionStepLayout.java
@@ -14,14 +14,14 @@
 
 import com.jakewharton.rxbinding.view.RxView;
 
-import org.researchstack.backbone.result.StepResult;
-import org.researchstack.backbone.step.Step;
 import org.researchstack.backbone.ui.callbacks.ActivityCallback;
-import org.researchstack.backbone.ui.callbacks.StepCallbacks;
-import org.researchstack.backbone.ui.step.layout.StepLayout;
 import org.researchstack.backbone.ui.step.layout.StepPermissionRequest;
-import org.researchstack.backbone.ui.views.SubmitBar;
-import org.researchstack.backbone.utils.ThemeUtils;
+import org.researchstack.foundation.components.common.ui.callbacks.StepCallbacks;
+import org.researchstack.foundation.components.common.ui.layout.StepLayout;
+import org.researchstack.foundation.components.common.ui.views.SubmitBar;
+import org.researchstack.foundation.components.utils.ThemeUtils;
+import org.researchstack.foundation.core.models.result.StepResult;
+import org.researchstack.foundation.core.models.step.Step;
 import org.researchstack.skin.PermissionRequestManager;
 import org.researchstack.skin.R;
 
diff --git a/skin/src/main/java/org/researchstack/skin/ui/layout/SignInStepLayout.java b/skin/src/main/java/org/researchstack/skin/ui/layout/SignInStepLayout.java
index d76dcae2d..77bd550aa 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/layout/SignInStepLayout.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/layout/SignInStepLayout.java
@@ -13,13 +13,13 @@
 
 import com.jakewharton.rxbinding.view.RxView;
 
-import org.researchstack.backbone.result.StepResult;
-import org.researchstack.backbone.step.Step;
-import org.researchstack.backbone.ui.callbacks.StepCallbacks;
-import org.researchstack.backbone.ui.step.layout.StepLayout;
-import org.researchstack.backbone.ui.views.SubmitBar;
 import org.researchstack.backbone.utils.ObservableUtils;
-import org.researchstack.backbone.utils.TextUtils;
+import org.researchstack.foundation.components.common.ui.callbacks.StepCallbacks;
+import org.researchstack.foundation.components.common.ui.layout.StepLayout;
+import org.researchstack.foundation.components.common.ui.views.SubmitBar;
+import org.researchstack.foundation.components.utils.TextUtils;
+import org.researchstack.foundation.core.models.result.StepResult;
+import org.researchstack.foundation.core.models.step.Step;
 import org.researchstack.skin.DataProvider;
 import org.researchstack.skin.R;
 import org.researchstack.skin.task.SignInTask;
diff --git a/skin/src/main/java/org/researchstack/skin/ui/layout/SignUpEligibleStepLayout.java b/skin/src/main/java/org/researchstack/skin/ui/layout/SignUpEligibleStepLayout.java
index 80dd361df..1a5bd70c6 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/layout/SignUpEligibleStepLayout.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/layout/SignUpEligibleStepLayout.java
@@ -6,12 +6,12 @@
 import android.view.View;
 import android.widget.RelativeLayout;
 
-import org.researchstack.backbone.result.StepResult;
-import org.researchstack.backbone.step.Step;
 import org.researchstack.backbone.ui.callbacks.ActivityCallback;
-import org.researchstack.backbone.ui.callbacks.StepCallbacks;
-import org.researchstack.backbone.ui.step.layout.StepLayout;
-import org.researchstack.backbone.ui.views.SubmitBar;
+import org.researchstack.foundation.components.common.ui.callbacks.StepCallbacks;
+import org.researchstack.foundation.components.common.ui.layout.StepLayout;
+import org.researchstack.foundation.components.common.ui.views.SubmitBar;
+import org.researchstack.foundation.core.models.result.StepResult;
+import org.researchstack.foundation.core.models.step.Step;
 import org.researchstack.skin.R;
 
 public class SignUpEligibleStepLayout extends RelativeLayout implements StepLayout {
diff --git a/skin/src/main/java/org/researchstack/skin/ui/layout/SignUpIneligibleStepLayout.java b/skin/src/main/java/org/researchstack/skin/ui/layout/SignUpIneligibleStepLayout.java
index 0abb6bc18..0de3a462d 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/layout/SignUpIneligibleStepLayout.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/layout/SignUpIneligibleStepLayout.java
@@ -6,10 +6,10 @@
 import android.view.View;
 import android.widget.LinearLayout;
 
-import org.researchstack.backbone.result.StepResult;
-import org.researchstack.backbone.step.Step;
-import org.researchstack.backbone.ui.callbacks.StepCallbacks;
-import org.researchstack.backbone.ui.step.layout.StepLayout;
+import org.researchstack.foundation.components.common.ui.callbacks.StepCallbacks;
+import org.researchstack.foundation.components.common.ui.layout.StepLayout;
+import org.researchstack.foundation.core.models.result.StepResult;
+import org.researchstack.foundation.core.models.step.Step;
 import org.researchstack.skin.R;
 
 public class SignUpIneligibleStepLayout extends LinearLayout implements StepLayout {
diff --git a/skin/src/main/java/org/researchstack/skin/ui/layout/SignUpStepLayout.java b/skin/src/main/java/org/researchstack/skin/ui/layout/SignUpStepLayout.java
index b2e23c00a..8187db200 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/layout/SignUpStepLayout.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/layout/SignUpStepLayout.java
@@ -10,13 +10,13 @@
 import android.widget.RelativeLayout;
 import android.widget.Toast;
 
-import org.researchstack.backbone.result.StepResult;
-import org.researchstack.backbone.step.Step;
-import org.researchstack.backbone.ui.callbacks.StepCallbacks;
-import org.researchstack.backbone.ui.step.layout.StepLayout;
-import org.researchstack.backbone.ui.views.SubmitBar;
 import org.researchstack.backbone.utils.ObservableUtils;
-import org.researchstack.backbone.utils.TextUtils;
+import org.researchstack.foundation.components.common.ui.callbacks.StepCallbacks;
+import org.researchstack.foundation.components.common.ui.layout.StepLayout;
+import org.researchstack.foundation.components.common.ui.views.SubmitBar;
+import org.researchstack.foundation.components.utils.TextUtils;
+import org.researchstack.foundation.core.models.result.StepResult;
+import org.researchstack.foundation.core.models.step.Step;
 import org.researchstack.skin.DataProvider;
 import org.researchstack.skin.R;
 import org.researchstack.skin.task.SignUpTask;
diff --git a/skin/src/main/java/org/researchstack/skin/utils/ConsentFormUtils.java b/skin/src/main/java/org/researchstack/skin/utils/ConsentFormUtils.java
index b35056223..e38437c51 100644
--- a/skin/src/main/java/org/researchstack/skin/utils/ConsentFormUtils.java
+++ b/skin/src/main/java/org/researchstack/skin/utils/ConsentFormUtils.java
@@ -6,10 +6,10 @@
 import android.os.Environment;
 import android.support.annotation.NonNull;
 
-import org.researchstack.backbone.ui.ViewWebDocumentActivity;
-import org.researchstack.backbone.utils.LogExt;
 import org.researchstack.backbone.utils.ObservableUtils;
-import org.researchstack.backbone.utils.ResUtils;
+import org.researchstack.foundation.components.utils.LogExt;
+import org.researchstack.foundation.components.utils.ResUtils;
+import org.researchstack.foundation.components.web.ui.activities.ViewWebDocumentActivity;
 import org.researchstack.skin.R;
 import org.researchstack.skin.ResourceManager;
 
diff --git a/skin/src/main/res/layout-v21/rss_layout_toolbar_tabs.xml b/skin/src/main/res/layout-v21/rss_layout_toolbar_tabs.xml
index f19de74ed..12dba4e7b 100644
--- a/skin/src/main/res/layout-v21/rss_layout_toolbar_tabs.xml
+++ b/skin/src/main/res/layout-v21/rss_layout_toolbar_tabs.xml
@@ -13,7 +13,7 @@
         android:layout_height="wrap_content"
         app:theme="?attr/toolbarTheme" />
 
-    <org.researchstack.backbone.ui.views.IconTabLayout
+    <org.researchstack.foundation.components.common.ui.views.IconTabLayout
         android:id="@+id/tabLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
diff --git a/skin/src/main/res/layout/rss_activity_email_verification.xml b/skin/src/main/res/layout/rss_activity_email_verification.xml
index 7df7401e5..467de9be4 100644
--- a/skin/src/main/res/layout/rss_activity_email_verification.xml
+++ b/skin/src/main/res/layout/rss_activity_email_verification.xml
@@ -46,7 +46,7 @@
         android:textColor="?attr/colorAccent" />
 
 
-    <org.researchstack.backbone.ui.views.SubmitBar
+    <org.researchstack.foundation.components.common.ui.views.SubmitBar
         android:id="@+id/submit_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/skin/src/main/res/layout/rss_fragment_dashboard.xml b/skin/src/main/res/layout/rss_fragment_dashboard.xml
index 54d66fc83..4ebfb24c9 100644
--- a/skin/src/main/res/layout/rss_fragment_dashboard.xml
+++ b/skin/src/main/res/layout/rss_fragment_dashboard.xml
@@ -19,27 +19,27 @@
             android:paddingTop="16dp"
             android:showDividers="middle">
 
-            <org.researchstack.backbone.ui.graph.ProgressChartCard
+            <org.researchstack.feature.chart.ui.graph.ProgressChartCard
                 android:id="@+id/dashboard_chart_progress"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
 
-            <org.researchstack.backbone.ui.graph.PieChartCard
+            <org.researchstack.feature.chart.ui.graph.PieChartCard
                 android:id="@+id/dashboard_chart_pie"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
 
-            <org.researchstack.backbone.ui.graph.BarChartCard
+            <org.researchstack.feature.chart.ui.graph.BarChartCard
                 android:id="@+id/dashboard_chart_bar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
 
-            <org.researchstack.backbone.ui.graph.BarChartCard
+            <org.researchstack.feature.chart.ui.graph.BarChartCard
                 android:id="@+id/dashboard_chart_bar_stacked"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
 
-            <org.researchstack.backbone.ui.graph.LineChartCard
+            <org.researchstack.feature.chart.ui.graph.LineChartCard
                 android:id="@+id/dashboard_chart_line"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
@@ -48,7 +48,7 @@
 
     </ScrollView>
 
-    <org.researchstack.backbone.ui.graph.EmptyView
+    <org.researchstack.feature.chart.ui.graph.EmptyView
         android:id="@+id/dashboard_empty"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/skin/src/main/res/layout/rss_item_section_learn.xml b/skin/src/main/res/layout/rss_item_section_learn.xml
new file mode 100644
index 000000000..7c44ad971
--- /dev/null
+++ b/skin/src/main/res/layout/rss_item_section_learn.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.AppCompatTextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/learn_item_title"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
+    android:clipToPadding="false"
+    android:focusable="true"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+    android:paddingRight="?android:attr/listPreferredItemPaddingRight"
+    android:singleLine="true"
+    android:textAppearance="@style/Preference_TextAppearanceMaterialSubhead"
+    tools:text="@string/lorem_name" />
\ No newline at end of file
diff --git a/skin/src/main/res/layout/rss_layout_eligible.xml b/skin/src/main/res/layout/rss_layout_eligible.xml
index 0e85ebbaf..5914f2424 100644
--- a/skin/src/main/res/layout/rss_layout_eligible.xml
+++ b/skin/src/main/res/layout/rss_layout_eligible.xml
@@ -26,7 +26,7 @@
         android:layout_marginTop="24dp"
         android:text="@string/rss_eligibility_tap_below" />
 
-    <org.researchstack.backbone.ui.views.SubmitBar
+    <org.researchstack.foundation.components.common.ui.views.SubmitBar
         android:id="@+id/submit_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/skin/src/main/res/layout/rss_layout_permission.xml b/skin/src/main/res/layout/rss_layout_permission.xml
index b1e105743..50a48efdd 100644
--- a/skin/src/main/res/layout/rss_layout_permission.xml
+++ b/skin/src/main/res/layout/rss_layout_permission.xml
@@ -34,7 +34,7 @@
 
     </ScrollView>
 
-    <org.researchstack.backbone.ui.views.SubmitBar
+    <org.researchstack.foundation.components.common.ui.views.SubmitBar
         android:id="@+id/submit_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/skin/src/main/res/layout/rss_layout_quiz_question.xml b/skin/src/main/res/layout/rss_layout_quiz_question.xml
index 777e6649f..f93d715cb 100644
--- a/skin/src/main/res/layout/rss_layout_quiz_question.xml
+++ b/skin/src/main/res/layout/rss_layout_quiz_question.xml
@@ -98,7 +98,7 @@
 
     </ScrollView>
 
-    <org.researchstack.backbone.ui.views.SubmitBar
+    <org.researchstack.foundation.components.common.ui.views.SubmitBar
         android:id="@+id/submit_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/skin/src/main/res/layout/rss_layout_sign_in.xml b/skin/src/main/res/layout/rss_layout_sign_in.xml
index 411a18c50..40dfbd151 100644
--- a/skin/src/main/res/layout/rss_layout_sign_in.xml
+++ b/skin/src/main/res/layout/rss_layout_sign_in.xml
@@ -74,7 +74,7 @@
 
     </TableLayout>
 
-    <org.researchstack.backbone.ui.views.SubmitBar
+    <org.researchstack.foundation.components.common.ui.views.SubmitBar
         android:id="@+id/submit_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/skin/src/main/res/layout/rss_layout_sign_up.xml b/skin/src/main/res/layout/rss_layout_sign_up.xml
index 99dfdc745..972b419af 100644
--- a/skin/src/main/res/layout/rss_layout_sign_up.xml
+++ b/skin/src/main/res/layout/rss_layout_sign_up.xml
@@ -85,7 +85,7 @@
 
     </TableLayout>
 
-    <org.researchstack.backbone.ui.views.SubmitBar
+    <org.researchstack.foundation.components.common.ui.views.SubmitBar
         android:id="@+id/submit_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/skin/src/main/res/layout/rss_layout_toolbar_tabs.xml b/skin/src/main/res/layout/rss_layout_toolbar_tabs.xml
index c8a83b5dc..31474927f 100644
--- a/skin/src/main/res/layout/rss_layout_toolbar_tabs.xml
+++ b/skin/src/main/res/layout/rss_layout_toolbar_tabs.xml
@@ -12,7 +12,7 @@
         android:layout_height="wrap_content"
         app:theme="?attr/toolbarTheme" />
 
-    <org.researchstack.backbone.ui.views.IconTabLayout
+    <org.researchstack.foundation.components.common.ui.views.IconTabLayout
         android:id="@+id/tabLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
diff --git a/skin/src/main/res/values/strings.xml b/skin/src/main/res/values/strings.xml
index d413d21b5..b1a1b6465 100644
--- a/skin/src/main/res/values/strings.xml
+++ b/skin/src/main/res/values/strings.xml
@@ -113,7 +113,7 @@
     <string name="rss_settings_general_software_notices">Software Notices</string>
     <string name="rss_settings_general_leave_study">Leave Study</string>
     <string name="rss_settings_general_join_study">Join Study</string>
-    <string name="rss_settings_version">Build number %1$s (%2$s)</string>
+    <string name="rss_settings_version">Build number %1$s (%2$d)</string>
     <string name="rss_settings_version_unknown">Unknown version</string>
     <string name="rss_settings_dialog_leave_study">Are you sure you want to leave the study? This
         action cannot be undone and you will need to provide consent in order to re-enroll.

From 2864071afa7bef6305e0f3c3098e1fea4d1306e2 Mon Sep 17 00:00:00 2001
From: James Kizer <james.kizer@gmail.com>
Date: Wed, 2 Jan 2019 23:16:58 -0500
Subject: [PATCH 35/53] Corrected locations of values

---
 .../res/layout/rsb_activity_step_switcher.xml |   2 +-
 backbone/src/main/res/values/colors.xml       |  16 --
 backbone/src/main/res/values/dimens.xml       |  19 ---
 backbone/src/main/res/values/strings.xml      | 161 ------------------
 backbone/src/main/res/values/styles.xml       |  34 ++--
 foundation/src/main/res/values/ids.xml        |   5 -
 .../skin/model/ConsentQuizModel.java          |   2 +-
 .../SimpleNotificationConfig.java             |   2 +-
 .../skin/step/ConsentQuizEvaluationStep.java  |   2 +-
 .../skin/step/ConsentQuizQuestionStep.java    |   2 +-
 .../researchstack/skin/task/ConsentTask.java  |  44 ++---
 .../skin/task/OnboardingTask.java             |   2 +-
 .../skin/task/SmartSurveyTask.java            |   6 +-
 .../skin/ui/OnboardingActivity.java           |   2 +-
 .../skin/ui/fragment/SettingsFragment.java    |  22 +--
 .../ConsentQuizEvaluationStepLayout.java      |  10 +-
 .../layout/ConsentQuizQuestionStepLayout.java |   8 +-
 .../skin/ui/layout/PermissionStepLayout.java  |   2 +-
 .../skin/utils/ConsentFormUtils.java          |   2 +-
 .../rss_activity_email_verification.xml       |   8 +-
 .../main/res/layout/rss_activity_fragment.xml |   2 +-
 .../main/res/layout/rss_layout_sign_in.xml    |   2 +-
 .../main/res/layout/rss_layout_sign_up.xml    |   2 +-
 23 files changed, 78 insertions(+), 279 deletions(-)

diff --git a/backbone/src/main/res/layout/rsb_activity_step_switcher.xml b/backbone/src/main/res/layout/rsb_activity_step_switcher.xml
index b6c6b76e2..61d30b83a 100644
--- a/backbone/src/main/res/layout/rsb_activity_step_switcher.xml
+++ b/backbone/src/main/res/layout/rsb_activity_step_switcher.xml
@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <include layout="@layout/rsb_layout_toolbar" />
+    <include layout="@layout/rsf_layout_toolbar" />
 
     <org.researchstack.backbone.ui.views.StepSwitcher
         android:id="@+id/container"
diff --git a/backbone/src/main/res/values/colors.xml b/backbone/src/main/res/values/colors.xml
index 35770d03d..d781ec5f1 100644
--- a/backbone/src/main/res/values/colors.xml
+++ b/backbone/src/main/res/values/colors.xml
@@ -1,20 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="rsb_colorPrimary">#3F51B5</color>
-    <color name="rsb_colorPrimaryDark">#303F9F</color>
-    <color name="rsb_colorAccent">#FF4081</color>
-    <color name="rsb_colorAccentDark">#cc3367</color>
-    <color name="rsb_black">#000</color>
-    <color name="rsb_black_20">#33000000</color>
-    <color name="rsb_black_40">#66000000</color>
-    <color name="rsb_white_60">#CCFFFFFF</color>
-    <color name="rsb_warm_gray">#FF757575</color>
-    <color name="rsb_warm_gray_20">#33757575</color>
-    <color name="rsb_submit_bar_gray">#EEEEEE</color>
-    <color name="rsb_submit_bar_negative">#979797</color>
-    <color name="rsb_list_divider">#e5e5e5</color>
-    <color name="rsb_error">#ffff5722</color>
 
-    <color name="rsb_tab_indicator">#2196f3</color>
-    <color name="rsb_tab_text_selected">#662196f3</color>
 </resources>
diff --git a/backbone/src/main/res/values/dimens.xml b/backbone/src/main/res/values/dimens.xml
index 861d46016..0d2c4cc40 100644
--- a/backbone/src/main/res/values/dimens.xml
+++ b/backbone/src/main/res/values/dimens.xml
@@ -1,23 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <!-- Padding -->
-    <dimen name="rsb_padding_small">8dp</dimen>
-    <dimen name="rsb_padding_wedge">12dp</dimen>
-    <dimen name="rsb_padding_medium">16dp</dimen>
-    <dimen name="rsb_padding_large">24dp</dimen>
-
-    <!-- Item Height -->
-    <dimen name="rsb_item_size_small">48dp</dimen>
-    <dimen name="rsb_item_size_medium">56dp</dimen>
-    <dimen name="rsb_item_size_default">@dimen/rsb_item_size_small</dimen>
-    <dimen name="rsb_item_size_divider">1dp</dimen>
-
-    <!-- Item Margin -->
-    <dimen name="rsb_margin_left">48dp</dimen>
-    <dimen name="rsb_margin_right">16dp</dimen>
-
-    <!-- Text Size -->
-    <dimen name="rsb_text_size_title">20sp</dimen>
-
 </resources>
\ No newline at end of file
diff --git a/backbone/src/main/res/values/strings.xml b/backbone/src/main/res/values/strings.xml
index 0af128914..13e6f0480 100644
--- a/backbone/src/main/res/values/strings.xml
+++ b/backbone/src/main/res/values/strings.xml
@@ -1,164 +1,3 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Debug -->
-    <string name="lorem_name" tools:ignore="ResourceName">Lorem Ipsum</string>
-    <string name="lorem_short" tools:ignore="ResourceName">Lorem ipsum dolor sit amet, consectetur
-        adipiscing elit.
-    </string>
-    <string name="lorem_medium" tools:ignore="ResourceName">Lorem ipsum dolor sit amet, consectetur
-        adipiscing elit sed do
-        eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim.
-    </string>
-    <string name="lorem_long" tools:ignore="ResourceName">Lorem ipsum dolor sit amet, consectetur
-        adipiscing elit, sed do
-        eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis
-        nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute
-        irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
-        Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit
-        anim id est laborum.
-    </string>
 
-    <!-- Consent Section -->
-    <string name="rsb_consent">Consent</string>
-    <string name="rsb_consent_section_welcome">Welcome</string>
-    <string name="rsb_consent_section_data_gathering">Data Gathering</string>
-    <string name="rsb_consent_section_privacy">Privacy</string>
-    <string name="rsb_consent_section_data_use">Data Use</string>
-    <string name="rsb_consent_section_time_commitment">Time Commitment</string>
-    <string name="rsb_consent_section_study_survey">Study Survey</string>
-    <string name="rsb_consent_section_study_tasks">Study Tasks</string>
-    <string name="rsb_consent_section_withdrawing">Withdrawing</string>
-    <string name="rsb_consent_learn_more">Learn More</string>
-
-    <!-- Consent section learn more -->
-    <string name="rsb_consent_section_more_info">Learn more</string>
-    <string name="rsb_consent_section_more_info_data_gathering">Learn more about how data is
-        gathered
-    </string>
-    <string name="rsb_consent_section_more_info_data_use">Learn more about how data is used</string>
-    <string name="rsb_consent_section_more_info_privacy">Learn more about how your privacy and
-        identity are protected
-    </string>
-    <string name="rsb_consent_section_more_info_welcome">Learn more about the study first</string>
-    <string name="rsb_consent_section_more_info_study_survey">Learn more about the study survey
-    </string>
-    <string name="rsb_consent_section_more_info_time_commitment">Learn more about the study\'s
-        impact on your time
-    </string>
-    <string name="rsb_consent_section_more_info_study_tasks">Learn more about the tasks involved
-    </string>
-    <string name="rsb_consent_section_more_info_withdrawing">Learn more about withdrawing</string>
-
-    <!-- Consent sharing step -->
-    <string name="rsb_consent_share_title">Sharing Options</string>
-    <string name="rsb_consent_share_widely">Share my data with %1$s and qualified researchers
-        worldwide
-    </string>
-    <string name="rsb_consent_share_no">Not sharing your data</string>
-    <string name="rsb_consent_share_only">Only share my data with %1$s</string>
-    <string name="rsb_consent_share_description"><![CDATA[%1$s will receive your study data from your
-        participation in this study. \n\nSharing your coded study data more broadly (without
-        information such as your name) may benefit this and future research.<br/><br/><a href="%2$s">
-        Learn more about data sharing</a>]]>
-    </string>
-
-    <!-- Consent doc step -->
-    <string name="rsb_consent_review_title">Review</string>
-    <string name="rsb_consent_review_alert_title">Review</string>
-    <string name="rsb_consent_review_reason">By agreeing you confirm that you read the information
-        and that you wish to take part in this research study.
-    </string>
-    <string name="rsb_consent_review_instruction">Review the form below, and tap Agree if you\'re
-        ready to continue.
-    </string>
-    <string name="rsb_consent_review_cancel">Cancel</string>
-
-    <!-- Consent form step -->
-    <string name="rsb_consent_form_title">Consent</string>
-    <string name="rsb_consent_name_full">Full Name</string>
-    <string name="rsb_consent_dob_full">Date of Birth</string>
-    <string name="rsb_consent_name_placeholder">Required</string>
-
-    <!-- Consent sig step -->
-    <string name="rsb_consent_signature_title">Signature</string>
-    <string name="rsb_consent_signature_content">By agreeing you confirm that you read the consent
-        and that you wish to take part in this research study.
-    </string>
-    <string name="rsb_consent_signature_instruction">Please sign using your finger on the line
-        below.
-    </string>
-    <string name="rsb_consent_signature_placeholder">Sign Here</string>
-    <string name="rsb_consent_signature_clear">Clear</string>
-
-    <!-- Quiz -->
-    <string name="rsb_quiz">Quiz</string>
-    <string name="rsb_quiz_evaluation">Quiz Evaluation</string>
-    <string name="rsb_quiz_evaluation_try_again">Try Again</string>
-    <string name="rsb_quiz_evaluation_review_consent">Review Consent</string>
-    <string name="rsb_quiz_evaluation_retake">Retake Quiz</string>
-    <string name="rsb_quiz_evaluation_great_job">Great Job!</string>
-
-    <!-- Other -->
-    <string name="rsb_submit">Submit</string>
-    <string name="rsb_exit">Exit</string>
-    <string name="rsb_get_started">Get Started</string>
-    <string name="rsb_done">Done</string>
-    <string name="rsb_step_skip">Skip</string>
-    <string name="rsb_next">next</string>
-    <string name="rsb_what_to_expect">What to Expect</string>
-    <string name="rsb_name">Name</string>
-    <string name="rsb_email">Email</string>
-    <string name="rsb_disagree">Disagree</string>
-    <string name="rsb_agree">Agree</string>
-    <string name="rsb_ok">OK</string>
-    <string name="rsb_cancel">Cancel</string>
-    <string name="rsb_yes">Yes</string>
-    <string name="rsb_no">No</string>
-    <string name="rsb_format_step_title">Step %1$d of %2$d</string>
-    <string name="rsb_hours">Hours</string>
-    <string name="rsb_minutes">Minutes</string>
-
-    <!-- Step Errors -->
-    <string name="rsb_error_data_failed">Failed to load encrypted data, try again!</string>
-    <string name="rsb_error_invalid_signature">Signature Invalid</string>
-    <string name="rsb_invalid_answer_default">Invalid answer, try again!</string>
-    <string name="rsb_invalid_answer_date_over">Invalid answer, date must be before %1$s</string>
-    <string name="rsb_invalid_answer_date_under">Invalid answer, date must be after %1$s</string>
-    <string name="rsb_invalid_answer_integer_over">Invalid answer, your value must be %1$s or lower</string>
-    <string name="rsb_invalid_answer_integer_under">Invalid answer, your value must be %1$s or higher</string>
-    <string name="rsb_invalid_answer_choice">Please select a value!</string>
-    <string name="rsb_invalid_answer_date_none">Please choose a date.</string>
-    <string name="rsb_birth_date_too_old">You must be %1$s years or younger</string>
-    <string name="rsb_birth_date_too_young">You must be at least %1$s years old</string>
-
-
-    <!-- Pin Code -->
-    <string name="rsb_pincode_enter_title">Enter your passcode</string>
-    <string name="rsb_pincode_enter_summary">Enter your %1$d-%2$s code to confirm your identity.</string>
-    <string name="rsb_pincode_enter_digit">digit</string>
-    <string name="rsb_pincode_enter_letter">letter</string>
-    <string name="rsb_pincode_enter_character">character</string>
-    <string name="rsb_pincode_enter_error">That code doesn’t match the one you entered, Try again!</string>
-
-    <!-- Body Hints -->
-    <string name="rsb_hint_step_body_int">Enter a number %1$d-%2$d</string>
-    <string name="rsb_hint_step_body_dec">Enter a number %1$.2f-%2$.2f</string>
-    <string name="rsb_hint_step_body_int_no_max">Enter a number</string>
-    <string name="rsb_hint_step_body_date">Enter a date</string>
-    <string name="rsb_hint_step_body_time">Enter a time</string>
-    <string name="rsb_hint_step_body_datetime">Enter a date and a time</string>
-    <string name="rsb_hint_step_body_text">Answer</string>
-
-    <!-- Graphing -->
-    <string name="rsb_chart_progress_center">%1$s of %2$s</string>
-    <string name="rsb_chart_pie_value">%1$s&#65285;</string>
-
-    <!-- AssetVideoView -->
-    <!-- Title for error alert when a video cannot be played.  it can be used by any app. -->
-    <string name="rsb_error_assetvideoview_title">Video problem</string>
-    <!-- Text for error alert when a video container is not valid for progressive download/playback. -->
-    <string name="rsb_error_assetvideoview_invalid_progressive_playback">This video isn\'t valid for streaming to this device.</string>
-    <!-- Text for error alert when a video cannot be played. it can be used by any app. -->
-    <string name="rsb_error_assetvideoview_unknown">Can\'t play this video.</string>
-    <!-- Button to close error alert when a video cannot be played -->
-    <string name="rsb_error_assetvideoview_button">OK</string>
 </resources>
diff --git a/backbone/src/main/res/values/styles.xml b/backbone/src/main/res/values/styles.xml
index 743323ced..9953a6fea 100644
--- a/backbone/src/main/res/values/styles.xml
+++ b/backbone/src/main/res/values/styles.xml
@@ -2,31 +2,31 @@
 
     <style name="Backbone.Survey.Title" parent="">
         <item name="android:layout_marginTop">16dp</item>
-        <item name="android:minHeight">@dimen/rsb_item_size_default</item>
+        <item name="android:minHeight">@dimen/rsf_item_size_default</item>
         <item name="android:gravity">center_vertical</item>
-        <item name="android:paddingLeft">@dimen/rsb_margin_left</item>
-        <item name="android:paddingRight">@dimen/rsb_margin_right</item>
-        <item name="android:paddingTop">@dimen/rsb_padding_medium</item>
-        <item name="android:paddingBottom">@dimen/rsb_padding_medium</item>
+        <item name="android:paddingLeft">@dimen/rsf_margin_left</item>
+        <item name="android:paddingRight">@dimen/rsf_margin_right</item>
+        <item name="android:paddingTop">@dimen/rsf_padding_medium</item>
+        <item name="android:paddingBottom">@dimen/rsf_padding_medium</item>
         <item name="android:textColor">?attr/colorAccent</item>
-        <item name="android:textSize">@dimen/rsb_text_size_title</item>
+        <item name="android:textSize">@dimen/rsf_text_size_title</item>
     </style>
 
     <style name="Backbone.Survey.Summary" parent="">
-        <item name="android:layout_marginTop">@dimen/rsb_padding_wedge</item>
-        <item name="android:layout_marginBottom">@dimen/rsb_padding_small</item>
-        <item name="android:paddingLeft">@dimen/rsb_margin_left</item>
-        <item name="android:paddingRight">@dimen/rsb_margin_right</item>
-        <item name="android:paddingTop">@dimen/rsb_padding_wedge</item>
-        <item name="android:paddingBottom">@dimen/rsb_padding_small</item>
+        <item name="android:layout_marginTop">@dimen/rsf_padding_wedge</item>
+        <item name="android:layout_marginBottom">@dimen/rsf_padding_small</item>
+        <item name="android:paddingLeft">@dimen/rsf_margin_left</item>
+        <item name="android:paddingRight">@dimen/rsf_margin_right</item>
+        <item name="android:paddingTop">@dimen/rsf_padding_wedge</item>
+        <item name="android:paddingBottom">@dimen/rsf_padding_small</item>
     </style>
 
     <style name="Backbone.Survey.Summary.Link">
-        <item name="android:layout_marginTop">@dimen/rsb_padding_wedge</item>
-        <item name="android:paddingLeft">@dimen/rsb_margin_left</item>
-        <item name="android:paddingRight">@dimen/rsb_margin_right</item>
-        <item name="android:paddingTop">@dimen/rsb_padding_wedge</item>
-        <item name="android:paddingBottom">@dimen/rsb_padding_small</item>
+        <item name="android:layout_marginTop">@dimen/rsf_padding_wedge</item>
+        <item name="android:paddingLeft">@dimen/rsf_margin_left</item>
+        <item name="android:paddingRight">@dimen/rsf_margin_right</item>
+        <item name="android:paddingTop">@dimen/rsf_padding_wedge</item>
+        <item name="android:paddingBottom">@dimen/rsf_padding_small</item>
     </style>
 
 </resources>
diff --git a/foundation/src/main/res/values/ids.xml b/foundation/src/main/res/values/ids.xml
index 866814485..0d2c4cc40 100644
--- a/foundation/src/main/res/values/ids.xml
+++ b/foundation/src/main/res/values/ids.xml
@@ -1,9 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <!-- These ID's are used when adding and removing child steps in ViewTaskActivity -->
-    <item name="rsf_current_step" type="id" />
-
-    <item name="rsf_step_layout_id" type="id" />
-
 </resources>
\ No newline at end of file
diff --git a/skin/src/main/java/org/researchstack/skin/model/ConsentQuizModel.java b/skin/src/main/java/org/researchstack/skin/model/ConsentQuizModel.java
index 50b7c107c..6c66d500a 100644
--- a/skin/src/main/java/org/researchstack/skin/model/ConsentQuizModel.java
+++ b/skin/src/main/java/org/researchstack/skin/model/ConsentQuizModel.java
@@ -12,7 +12,7 @@ public class ConsentQuizModel implements Serializable {
     private List<QuizQuestion> questions;
 
     // fields with defaults
-    private String incorrectIcon = "rsb_quiz_retry";
+    private String incorrectIcon = "rsf_quiz_retry";
     private String correctIcon = "rss_ic_quiz_valid";
 
     public String getFailureTitle() {
diff --git a/skin/src/main/java/org/researchstack/skin/notification/SimpleNotificationConfig.java b/skin/src/main/java/org/researchstack/skin/notification/SimpleNotificationConfig.java
index 9886e8de2..66204538f 100644
--- a/skin/src/main/java/org/researchstack/skin/notification/SimpleNotificationConfig.java
+++ b/skin/src/main/java/org/researchstack/skin/notification/SimpleNotificationConfig.java
@@ -12,7 +12,7 @@ public int getSmallIcon() {
 
     @Override
     public int getLargeIconBackgroundColor(Context context) {
-        return context.getResources().getColor(R.color.rsb_error);
+        return context.getResources().getColor(R.color.rsf_error);
     }
 
     @Override
diff --git a/skin/src/main/java/org/researchstack/skin/step/ConsentQuizEvaluationStep.java b/skin/src/main/java/org/researchstack/skin/step/ConsentQuizEvaluationStep.java
index 9e84a5437..5d658f588 100644
--- a/skin/src/main/java/org/researchstack/skin/step/ConsentQuizEvaluationStep.java
+++ b/skin/src/main/java/org/researchstack/skin/step/ConsentQuizEvaluationStep.java
@@ -18,7 +18,7 @@ public ConsentQuizEvaluationStep(String identifier, ConsentQuizModel quizModel)
 
     @Override
     public int getStepTitle() {
-        return R.string.rsb_quiz_evaluation;
+        return R.string.rsfc_quiz_evaluation;
     }
 
     @Override
diff --git a/skin/src/main/java/org/researchstack/skin/step/ConsentQuizQuestionStep.java b/skin/src/main/java/org/researchstack/skin/step/ConsentQuizQuestionStep.java
index 71231ac28..84992f7a6 100644
--- a/skin/src/main/java/org/researchstack/skin/step/ConsentQuizQuestionStep.java
+++ b/skin/src/main/java/org/researchstack/skin/step/ConsentQuizQuestionStep.java
@@ -20,7 +20,7 @@ public Class getStepLayoutClass() {
 
     @Override
     public int getStepTitle() {
-        return R.string.rsb_quiz;
+        return R.string.rsfc_quiz;
     }
 
     @Override
diff --git a/skin/src/main/java/org/researchstack/skin/task/ConsentTask.java b/skin/src/main/java/org/researchstack/skin/task/ConsentTask.java
index 7c26e85b6..8ca9bc340 100644
--- a/skin/src/main/java/org/researchstack/skin/task/ConsentTask.java
+++ b/skin/src/main/java/org/researchstack/skin/task/ConsentTask.java
@@ -75,9 +75,9 @@ public static ConsentTask create(Context context, String taskId) {
         signature.setRequiresBirthDate(properties.requiresBirthdate());
 
         ConsentDocument doc = new ConsentDocument();
-        doc.setTitle(r.getString(R.string.rsb_consent_form_title));
-        doc.setSignaturePageTitle(R.string.rsb_consent_form_title);
-        doc.setSignaturePageContent(r.getString(R.string.rsb_consent_signature_content));
+        doc.setTitle(r.getString(R.string.rsfc_consent_form_title));
+        doc.setSignaturePageTitle(R.string.rsfc_consent_form_title);
+        doc.setSignaturePageContent(r.getString(R.string.rsfc_consent_signature_content));
         doc.setSections(sections);
         doc.addSignature(signature);
 
@@ -116,13 +116,13 @@ private static void initConsentSharingStep(Resources r, ConsentSectionModel data
 
         ConsentSharingStep sharingStep = new ConsentSharingStep(ID_SHARING);
         sharingStep.setOptional(false);
-        sharingStep.setStepTitle(R.string.rsb_consent);
+        sharingStep.setStepTitle(R.string.rsfc_consent);
         //        sharingStep.setLocalizedLearnMoreHTMLContent(localizedLearnMoreHTMLContent);
 
-        String shareWidely = r.getString(R.string.rsb_consent_share_widely, investigatorLongDesc);
+        String shareWidely = r.getString(R.string.rsfc_consent_share_widely, investigatorLongDesc);
         Choice<String> shareWidelyChoice = new Choice<>(shareWidely, "sponsors_and_partners", null);
 
-        String shareRestricted = r.getString(R.string.rsb_consent_share_only,
+        String shareRestricted = r.getString(R.string.rsfc_consent_share_only,
                 investigatorShortDesc);
         Choice<String> shareRestrictedChoice = new Choice<>(shareRestricted,
                 "all_qualified_researchers",
@@ -132,8 +132,8 @@ private static void initConsentSharingStep(Resources r, ConsentSectionModel data
                 shareWidelyChoice,
                 shareRestrictedChoice));
 
-        sharingStep.setTitle(r.getString(R.string.rsb_consent_share_title));
-        sharingStep.setText(r.getString(R.string.rsb_consent_share_description,
+        sharingStep.setTitle(r.getString(R.string.rsfc_consent_share_title));
+        sharingStep.setText(r.getString(R.string.rsfc_consent_share_description,
                 investigatorLongDesc,
                 localizedLearnMoreHTMLContent));
 
@@ -153,11 +153,11 @@ private static void initVisualSteps(Context ctx, ConsentDocument doc, List<Step>
             ConsentVisualStep step = new ConsentVisualStep("consent_" + i);
             step.setSection(section);
 
-            String nextString = ctx.getString(R.string.rsb_next);
+            String nextString = ctx.getString(R.string.rsf_next);
             if (section.getType() == ConsentSection.Type.Overview) {
-                nextString = ctx.getString(R.string.rsb_get_started);
+                nextString = ctx.getString(R.string.rsf_get_started);
             } else if (i == size - 1) {
-                nextString = ctx.getString(R.string.rsb_done);
+                nextString = ctx.getString(R.string.rsf_done);
             }
             step.setNextButtonString(nextString);
 
@@ -193,18 +193,18 @@ private static void initConsentReviewSteps(Context ctx, ConsentDocument doc, Lis
         // Add ConsentReviewDocumentStep (view html version of the PDF doc)
         StringBuilder docBuilder = new StringBuilder(
                 "</br><div style=\"padding: 10px 10px 10px 10px;\" class='header'>");
-        String title = ctx.getString(R.string.rsb_consent_review_title);
+        String title = ctx.getString(R.string.rsfc_consent_review_title);
         docBuilder.append(String.format(
                 "<h1 style=\"text-align: center; font-family:sans-serif-light;\">%1$s</h1>",
                 title));
-        String detail = ctx.getString(R.string.rsb_consent_review_instruction);
+        String detail = ctx.getString(R.string.rsfc_consent_review_instruction);
         docBuilder.append(String.format("<p style=\"text-align: center\">%1$s</p>", detail));
         docBuilder.append("</div></br>");
         docBuilder.append(doc.getHtmlReviewContent());
 
         ConsentDocumentStep step = new ConsentDocumentStep(ID_CONSENT_DOC);
         step.setConsentHTML(docBuilder.toString());
-        step.setConfirmMessage(ctx.getString(R.string.rsb_consent_review_reason));
+        step.setConfirmMessage(ctx.getString(R.string.rsfc_consent_review_reason));
         steps.add(step);
 
         // Add full-name input
@@ -217,8 +217,8 @@ private static void initConsentReviewSteps(Context ctx, ConsentDocument doc, Lis
                 format.setIsMultipleLines(false);
 
                 String placeholder = ctx.getResources()
-                        .getString(R.string.rsb_consent_name_placeholder);
-                String nameText = ctx.getResources().getString(R.string.rsb_consent_name_full);
+                        .getString(R.string.rsfc_consent_name_placeholder);
+                String nameText = ctx.getResources().getString(R.string.rsfc_consent_name_full);
                 formSteps.add(new QuestionStep(ID_FORM_NAME, nameText, format));
             }
 
@@ -226,13 +226,13 @@ private static void initConsentReviewSteps(Context ctx, ConsentDocument doc, Lis
                 Calendar maxDate = Calendar.getInstance();
                 maxDate.add(Calendar.YEAR, -18);
                 DateAnswerFormat dobFormat = new BirthDateAnswerFormat(null, 18, 0);
-                String dobText = ctx.getResources().getString(R.string.rsb_consent_dob_full);
+                String dobText = ctx.getResources().getString(R.string.rsfc_consent_dob_full);
                 formSteps.add(new QuestionStep(ID_FORM_DOB, dobText, dobFormat));
             }
 
-            String formTitle = ctx.getString(R.string.rsb_consent_form_title);
+            String formTitle = ctx.getString(R.string.rsfc_consent_form_title);
             FormStep formStep = new FormStep(ID_FORM, formTitle, step.getText());
-            formStep.setStepTitle(R.string.rsb_consent);
+            formStep.setStepTitle(R.string.rsfc_consent);
             formStep.setOptional(false);
             formStep.setFormSteps(formSteps);
             steps.add(formStep);
@@ -241,9 +241,9 @@ private static void initConsentReviewSteps(Context ctx, ConsentDocument doc, Lis
         // Add signature input
         if (doc.getSignature(0).requiresSignatureImage()) {
             ConsentSignatureStep signatureStep = new ConsentSignatureStep(ID_SIGNATURE);
-            signatureStep.setStepTitle(R.string.rsb_consent);
-            signatureStep.setTitle(ctx.getString(R.string.rsb_consent_signature_title));
-            signatureStep.setText(ctx.getString(R.string.rsb_consent_signature_instruction));
+            signatureStep.setStepTitle(R.string.rsfc_consent);
+            signatureStep.setTitle(ctx.getString(R.string.rsfc_consent_signature_title));
+            signatureStep.setText(ctx.getString(R.string.rsfc_consent_signature_instruction));
             signatureStep.setOptional(false);
             signatureStep.setSignatureDateFormat(doc.getSignature(0)
                     .getSignatureDateFormatString());
diff --git a/skin/src/main/java/org/researchstack/skin/task/OnboardingTask.java b/skin/src/main/java/org/researchstack/skin/task/OnboardingTask.java
index 42ebe2d93..49a3c092d 100644
--- a/skin/src/main/java/org/researchstack/skin/task/OnboardingTask.java
+++ b/skin/src/main/java/org/researchstack/skin/task/OnboardingTask.java
@@ -1,12 +1,12 @@
 package org.researchstack.skin.task;
 
+import org.researchstack.feature.authentication.pincode.step.PassCodeCreationStep;
 import org.researchstack.foundation.components.survey.ui.body.NotImplementedStepBody;
 import org.researchstack.foundation.core.models.result.StepResult;
 import org.researchstack.foundation.core.models.result.TaskResult;
 import org.researchstack.foundation.core.models.step.Step;
 import org.researchstack.foundation.core.models.task.Task;
 import org.researchstack.skin.R;
-import org.researchstack.skin.step.PassCodeCreationStep;
 import org.researchstack.skin.ui.layout.PermissionStepLayout;
 import org.researchstack.skin.ui.layout.SignInStepLayout;
 import org.researchstack.skin.ui.layout.SignUpEligibleStepLayout;
diff --git a/skin/src/main/java/org/researchstack/skin/task/SmartSurveyTask.java b/skin/src/main/java/org/researchstack/skin/task/SmartSurveyTask.java
index 164b6081a..7d8323a0c 100644
--- a/skin/src/main/java/org/researchstack/skin/task/SmartSurveyTask.java
+++ b/skin/src/main/java/org/researchstack/skin/task/SmartSurveyTask.java
@@ -95,8 +95,8 @@ private AnswerFormat from(Context context, TaskModel.ConstraintsModel constraint
         AnswerFormat answerFormat;
         String type = constraints.type;
         if (type.equals("BooleanConstraints")) {
-            answerFormat = new BooleanAnswerFormat(context.getString(R.string.rsb_yes),
-                    context.getString(R.string.rsb_no));
+            answerFormat = new BooleanAnswerFormat(context.getString(R.string.rsf_yes),
+                    context.getString(R.string.rsf_no));
         } else if (type.equals("MultiValueConstraints")) {
             AnswerFormat.ChoiceAnswerStyle answerStyle = constraints.allowMultiple
                     ? AnswerFormat.ChoiceAnswerStyle.MultipleChoice
@@ -215,7 +215,7 @@ public Step getStepWithIdentifier(String identifier) {
     @Override
     public String getTitleForStep(Context context, Step step) {
         int currentIndex = staticStepIdentifiers.indexOf(step.getIdentifier()) + 1;
-        return context.getString(R.string.rsb_format_step_title,
+        return context.getString(R.string.rsf_format_step_title,
                 currentIndex,
                 staticStepIdentifiers.size());
     }
diff --git a/skin/src/main/java/org/researchstack/skin/ui/OnboardingActivity.java b/skin/src/main/java/org/researchstack/skin/ui/OnboardingActivity.java
index 8031c81a5..f86f9732b 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/OnboardingActivity.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/OnboardingActivity.java
@@ -17,6 +17,7 @@
 
 import org.researchstack.backbone.ui.PinCodeActivity;
 import org.researchstack.backbone.ui.ViewTaskActivity;
+import org.researchstack.feature.authentication.pincode.step.PassCodeCreationStep;
 import org.researchstack.feature.storage.StorageAccess;
 import org.researchstack.foundation.components.common.task.OrderedTask;
 import org.researchstack.foundation.components.utils.ResUtils;
@@ -28,7 +29,6 @@
 import org.researchstack.skin.TaskProvider;
 import org.researchstack.skin.UiManager;
 import org.researchstack.skin.model.StudyOverviewModel;
-import org.researchstack.skin.step.PassCodeCreationStep;
 import org.researchstack.skin.task.OnboardingTask;
 import org.researchstack.skin.task.SignInTask;
 import org.researchstack.skin.task.SignUpTask;
diff --git a/skin/src/main/java/org/researchstack/skin/ui/fragment/SettingsFragment.java b/skin/src/main/java/org/researchstack/skin/ui/fragment/SettingsFragment.java
index 697602b3a..e4d022601 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/fragment/SettingsFragment.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/fragment/SettingsFragment.java
@@ -19,6 +19,8 @@
 
 import org.researchstack.backbone.ui.ViewTaskActivity;
 import org.researchstack.backbone.utils.ObservableUtils;
+import org.researchstack.feature.authentication.pincode.step.PassCodeCreationStep;
+import org.researchstack.feature.authentication.pincode.ui.SignUpPinCodeCreationStepLayout;
 import org.researchstack.feature.consent.step.ConsentSharingStep;
 import org.researchstack.feature.storage.StorageAccess;
 import org.researchstack.feature.storage.file.StorageAccessListener;
@@ -37,10 +39,8 @@
 import org.researchstack.skin.ResourceManager;
 import org.researchstack.skin.model.ConsentSectionModel;
 import org.researchstack.skin.notification.TaskAlertReceiver;
-import org.researchstack.skin.step.PassCodeCreationStep;
 import org.researchstack.skin.task.ConsentTask;
 import org.researchstack.skin.ui.OnboardingActivity;
-import org.researchstack.skin.ui.layout.SignUpPinCodeCreationStepLayout;
 import org.researchstack.skin.utils.ConsentFormUtils;
 
 import java.text.DateFormat;
@@ -203,7 +203,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         ViewGroup v = (ViewGroup) super.onCreateView(inflater, container, savedInstanceState);
         settingsRoot.addView(v);
 
-        progress = inflater.inflate(R.layout.rsb_progress, container, false);
+        progress = inflater.inflate(R.layout.rsf_progress, container, false);
         progress.setVisibility(View.GONE);
         settingsRoot.addView(progress);
 
@@ -251,13 +251,13 @@ public boolean onPreferenceTreeClick(Preference preference) {
                     sharingStep.setOptional(false);
                     sharingStep.setStepTitle(R.string.rss_settings_privacy_sharing_options);
 
-                    String shareWidely = getString(R.string.rsb_consent_share_widely,
+                    String shareWidely = getString(R.string.rsfc_consent_share_widely,
                             investigatorLongDesc);
                     Choice<String> shareWidelyChoice = new Choice<>(shareWidely,
                             "sponsors_and_partners",
                             null);
 
-                    String shareRestricted = getString(R.string.rsb_consent_share_only,
+                    String shareRestricted = getString(R.string.rsfc_consent_share_only,
                             investigatorShortDesc);
                     Choice<String> shareRestrictedChoice = new Choice<>(shareRestricted,
                             "all_qualified_researchers",
@@ -267,8 +267,8 @@ public boolean onPreferenceTreeClick(Preference preference) {
                             shareWidelyChoice,
                             shareRestrictedChoice));
 
-                    sharingStep.setTitle(getString(R.string.rsb_consent_share_title));
-                    sharingStep.setText(getString(R.string.rsb_consent_share_description,
+                    sharingStep.setTitle(getString(R.string.rsfc_consent_share_title));
+                    sharingStep.setText(getString(R.string.rsfc_consent_share_description,
                             investigatorLongDesc,
                             localizedLearnMoreHTMLContent));
 
@@ -308,7 +308,7 @@ public boolean onPreferenceTreeClick(Preference preference) {
                                                     progress.setVisibility(View.GONE);
                                                 });
                                     })
-                            .setNegativeButton(R.string.rsb_cancel, null)
+                            .setNegativeButton(R.string.rsf_cancel, null)
                             .show();
                     return true;
 
@@ -387,14 +387,14 @@ public String formatSharingOption(String option) {
             String investigatorLongDesc = data.getDocumentProperties()
                     .getInvestigatorLongDescription();
 
-            return getString(R.string.rsb_consent_share_widely, investigatorLongDesc);
+            return getString(R.string.rsfc_consent_share_widely, investigatorLongDesc);
         } else if (option.equals("all_qualified_researchers")) {
             String investigatorShortDesc = data.getDocumentProperties()
                     .getInvestigatorShortDescription();
 
-            return getString(R.string.rsb_consent_share_only, investigatorShortDesc);
+            return getString(R.string.rsfc_consent_share_only, investigatorShortDesc);
         } else if (option.equals("no_sharing")) {
-            return getString(R.string.rsb_consent_share_no);
+            return getString(R.string.rsfc_consent_share_no);
         } else {
             // If you want to add another sharing option, feel free, you just need to override this
             // method in your SettingsFragment
diff --git a/skin/src/main/java/org/researchstack/skin/ui/layout/ConsentQuizEvaluationStepLayout.java b/skin/src/main/java/org/researchstack/skin/ui/layout/ConsentQuizEvaluationStepLayout.java
index dce010e24..b3348dee9 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/layout/ConsentQuizEvaluationStepLayout.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/layout/ConsentQuizEvaluationStepLayout.java
@@ -64,14 +64,14 @@ private void initializeStep() {
                     step.getQuizModel().getIncorrectIcon());
 
             image.setImageResource(iconResId);
-            title.setText(R.string.rsb_quiz_evaluation_try_again);
+            title.setText(R.string.rsfc_quiz_evaluation_try_again);
 
             if (!step.isOverMaxAttempts()) {
                 summary.setText(step.getQuizModel().getFailureMessage());
-                submitBar.setPositiveTitle(R.string.rsb_quiz_evaluation_retake);
+                submitBar.setPositiveTitle(R.string.rsfc_quiz_evaluation_retake);
             } else {
                 summary.setText(step.getQuizModel().getFailureMessage());
-                submitBar.setPositiveTitle(R.string.rsb_quiz_evaluation_review_consent);
+                submitBar.setPositiveTitle(R.string.rsfc_quiz_evaluation_review_consent);
             }
         }
 
@@ -81,7 +81,7 @@ private void initializeStep() {
                     step.getQuizModel().getCorrectIcon());
 
             image.setImageResource(iconResId);
-            title.setText(R.string.rsb_quiz_evaluation_great_job);
+            title.setText(R.string.rsfc_quiz_evaluation_great_job);
 
             if (step.getIncorrect() == 0) {
                 summary.setText(step.getQuizModel().getSuccessMessage());
@@ -89,7 +89,7 @@ private void initializeStep() {
                 summary.setText(step.getQuizModel().getSuccessMessage());
             }
 
-            submitBar.setPositiveTitle(R.string.rsb_next);
+            submitBar.setPositiveTitle(R.string.rsf_next);
         }
     }
 
diff --git a/skin/src/main/java/org/researchstack/skin/ui/layout/ConsentQuizQuestionStepLayout.java b/skin/src/main/java/org/researchstack/skin/ui/layout/ConsentQuizQuestionStepLayout.java
index b22ee401d..1b5f69ae7 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/layout/ConsentQuizQuestionStepLayout.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/layout/ConsentQuizQuestionStepLayout.java
@@ -88,10 +88,10 @@ public void initializeStep() {
             instructionText.setVisibility(VISIBLE);
 
             // instruction steps don't need submit, also always count as correct answer
-            submitBar.setPositiveTitle(R.string.rsb_next);
+            submitBar.setPositiveTitle(R.string.rsf_next);
             submitBar.setPositiveAction(v -> onNext(true));
         } else {
-            submitBar.setPositiveTitle(R.string.rsb_submit);
+            submitBar.setPositiveTitle(R.string.rsf_submit);
             submitBar.setPositiveAction(v -> onSubmit());
 
             for (Choice<String> choice : getChoices(question)) {
@@ -148,7 +148,7 @@ public void onSubmit() {
                 }
 
                 // Set the drawable of the current checked button, with correct color tint
-                int resId = answerCorrect ? R.drawable.rsb_ic_check : R.drawable.rsb_ic_x;
+                int resId = answerCorrect ? R.drawable.rsf_ic_check : R.drawable.rsf_ic_x;
                 Drawable drawable = ContextCompat.getDrawable(getContext(), resId);
                 drawable = DrawableCompat.wrap(drawable);
                 DrawableCompat.setTint(drawable, resultTextColor);
@@ -211,7 +211,7 @@ private void onNext(boolean answerCorrect) {
 
     private void setSubmitBarNext() {
         // Change the submit bar positive-title to "next"
-        submitBar.setPositiveTitle(R.string.rsb_next);
+        submitBar.setPositiveTitle(R.string.rsf_next);
     }
 
     public boolean isAnswerValid() {
diff --git a/skin/src/main/java/org/researchstack/skin/ui/layout/PermissionStepLayout.java b/skin/src/main/java/org/researchstack/skin/ui/layout/PermissionStepLayout.java
index b6de09d0a..540e9a3a0 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/layout/PermissionStepLayout.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/layout/PermissionStepLayout.java
@@ -122,7 +122,7 @@ public void initializeStep() {
 
         // Set submit bar behavior
         submitBar = (SubmitBar) findViewById(R.id.submit_bar);
-        submitBar.setPositiveTitle(R.string.rsb_next);
+        submitBar.setPositiveTitle(R.string.rsf_next);
         submitBar.setPositiveAction(v -> {
             if (isAnswerValid()) {
                 onNext(true);
diff --git a/skin/src/main/java/org/researchstack/skin/utils/ConsentFormUtils.java b/skin/src/main/java/org/researchstack/skin/utils/ConsentFormUtils.java
index e38437c51..dffe662c1 100644
--- a/skin/src/main/java/org/researchstack/skin/utils/ConsentFormUtils.java
+++ b/skin/src/main/java/org/researchstack/skin/utils/ConsentFormUtils.java
@@ -27,7 +27,7 @@ private ConsentFormUtils() {
 
     public static void viewConsentForm(Context context) {
         String path = ResourceManager.getInstance().getConsentHtml().getAbsolutePath();
-        String title = context.getString(R.string.rsb_consent);
+        String title = context.getString(R.string.rsfc_consent);
         Intent intent = ViewWebDocumentActivity.newIntentForPath(context, title, path);
         context.startActivity(intent);
     }
diff --git a/skin/src/main/res/layout/rss_activity_email_verification.xml b/skin/src/main/res/layout/rss_activity_email_verification.xml
index 467de9be4..69d70de95 100644
--- a/skin/src/main/res/layout/rss_activity_email_verification.xml
+++ b/skin/src/main/res/layout/rss_activity_email_verification.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <include layout="@layout/rsb_layout_toolbar" />
+    <include layout="@layout/rsf_layout_toolbar" />
 
     <TextView
         android:id="@+id/title"
@@ -56,7 +56,7 @@
 
     <include
         android:id="@+id/progress"
-        layout="@layout/rsb_progress"
+        layout="@layout/rsf_progress"
         android:visibility="gone"
         tools:visibility="gone" />
 
@@ -136,10 +136,10 @@
         </LinearLayout>
 
         <include
-            android:id="@+id/rsb_progress"
+            android:id="@+id/rsf_progress"
             android:visibility="gone"
             tools:visibility="gone"
-            layout="@layout/rsb_progress"
+            layout="@layout/rsf_progress"
             />
     </FrameLayout>
         -->
\ No newline at end of file
diff --git a/skin/src/main/res/layout/rss_activity_fragment.xml b/skin/src/main/res/layout/rss_activity_fragment.xml
index 6e2f6f6d4..892998af6 100644
--- a/skin/src/main/res/layout/rss_activity_fragment.xml
+++ b/skin/src/main/res/layout/rss_activity_fragment.xml
@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <include layout="@layout/rsb_layout_toolbar" />
+    <include layout="@layout/rsf_layout_toolbar" />
 
     <FrameLayout
         android:id="@+id/container"
diff --git a/skin/src/main/res/layout/rss_layout_sign_in.xml b/skin/src/main/res/layout/rss_layout_sign_in.xml
index 40dfbd151..cb46277e2 100644
--- a/skin/src/main/res/layout/rss_layout_sign_in.xml
+++ b/skin/src/main/res/layout/rss_layout_sign_in.xml
@@ -96,7 +96,7 @@
 
     <include
         android:id="@+id/progress"
-        layout="@layout/rsb_progress"
+        layout="@layout/rsf_progress"
         android:visibility="gone"
         tools:visibility="gone" />
 
diff --git a/skin/src/main/res/layout/rss_layout_sign_up.xml b/skin/src/main/res/layout/rss_layout_sign_up.xml
index 972b419af..05e4f3ec2 100644
--- a/skin/src/main/res/layout/rss_layout_sign_up.xml
+++ b/skin/src/main/res/layout/rss_layout_sign_up.xml
@@ -95,7 +95,7 @@
 
     <include
         android:id="@+id/progress"
-        layout="@layout/rsb_progress"
+        layout="@layout/rsf_progress"
         android:visibility="gone"
         tools:visibility="gone" />
 

From 1d3afd7fbe9aa6508e37da9d142c16ccbd5ad7ef Mon Sep 17 00:00:00 2001
From: James Kizer <james.kizer@gmail.com>
Date: Wed, 2 Jan 2019 23:17:33 -0500
Subject: [PATCH 36/53] Build file fixes

---
 backbone/build.gradle                                        | 5 -----
 .../java/org/researchstack/backbone/ui/PinCodeActivity.java  | 4 ++--
 .../java/org/researchstack/backbone/ui/ViewTaskActivity.java | 2 +-
 build.gradle                                                 | 2 +-
 gradle.properties                                            | 3 ++-
 skin/build.gradle                                            | 4 +++-
 storage/build.gradle                                         | 5 +++--
 7 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/backbone/build.gradle b/backbone/build.gradle
index 6b16849b8..45e44f5b6 100644
--- a/backbone/build.gradle
+++ b/backbone/build.gradle
@@ -87,11 +87,6 @@ dependencies {
     implementation 'com.jakewharton.rxbinding:rxbinding-support-v4:0.4.0'
     implementation 'com.jakewharton.rxbinding:rxbinding-appcompat-v7:0.4.0'
     implementation 'com.jakewharton.rxbinding:rxbinding-design:0.4.0'
-    implementation 'com.github.PhilJay:MPAndroidChart:v2.2.3'
-    implementation 'com.scottyab:aes-crypto:0.0.3'
-    implementation 'co.touchlab.squeaky:squeaky-query:0.4.0.0'
-    annotationProcessor 'co.touchlab.squeaky:squeaky-processor:0.4.0.0'
-    implementation 'net.zetetic:android-database-sqlcipher:3.5.4@aar'
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.robolectric:robolectric:3.0'
     testImplementation 'org.mockito:mockito-core:1.10.19'
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/PinCodeActivity.java b/backbone/src/main/java/org/researchstack/backbone/ui/PinCodeActivity.java
index b5f084f9d..93679995d 100644
--- a/backbone/src/main/java/org/researchstack/backbone/ui/PinCodeActivity.java
+++ b/backbone/src/main/java/org/researchstack/backbone/ui/PinCodeActivity.java
@@ -140,7 +140,7 @@ public void onDataAuth() {
         pinCodeLayout = new PinCodeLayout(new ContextThemeWrapper(this, theme));
         pinCodeLayout.setBackgroundColor(Color.WHITE);
 
-        int errorColor = getResources().getColor(R.color.rsb_error);
+        int errorColor = getResources().getColor(R.color.rsf_error);
 
         TextView summary = (TextView) pinCodeLayout.findViewById(R.id.text);
         EditText pincode = (EditText) pinCodeLayout.findViewById(R.id.pincode);
@@ -169,7 +169,7 @@ public void onDataAuth() {
         }).compose(ObservableUtils.applyDefault()).doOnError(throwable -> {
             toggleKeyboardAction.call(true);
             throwable.printStackTrace();
-            summary.setText(R.string.rsb_pincode_enter_error);
+            summary.setText(R.string.rsfa_pincode_enter_error);
             summary.setTextColor(errorColor);
             pinCodeLayout.showProgress(false);
         }).onErrorResumeNext(throwable1 -> {
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/ViewTaskActivity.java b/backbone/src/main/java/org/researchstack/backbone/ui/ViewTaskActivity.java
index 7ed1216b7..de22df02b 100644
--- a/backbone/src/main/java/org/researchstack/backbone/ui/ViewTaskActivity.java
+++ b/backbone/src/main/java/org/researchstack/backbone/ui/ViewTaskActivity.java
@@ -209,7 +209,7 @@ public void onDataReady() {
     @Override
     public void onDataFailed() {
         super.onDataFailed();
-        Toast.makeText(this, R.string.rsb_error_data_failed, Toast.LENGTH_LONG).show();
+        Toast.makeText(this, R.string.rsf_error_data_failed, Toast.LENGTH_LONG).show();
         finish();
     }
 
diff --git a/build.gradle b/build.gradle
index a95e8a658..1cd0d5212 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@
 buildscript {
 
     ext {
-        research_stack_version = '1.5.0-SNAPSHOT'
+        research_stack_version = '1.5.0' + (Boolean.valueOf(System.getProperty("snapshot")) ? "-SNAPSHOT" : "")
         kotlin_version = '1.3.11'
         support_library_version = '28.0.0'
         gson_version = '2.8.2'
diff --git a/gradle.properties b/gradle.properties
index 7791533f8..50e199d6f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,4 +11,5 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
\ No newline at end of file
+# org.gradle.parallel=true
+systemProp.snapshot=true
\ No newline at end of file
diff --git a/skin/build.gradle b/skin/build.gradle
index e312d961d..6cc189c01 100644
--- a/skin/build.gradle
+++ b/skin/build.gradle
@@ -3,6 +3,8 @@ apply plugin: 'kotlin-android'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
+apply plugin: 'kotlin-kapt'
+
 version = research_stack_version
 
 android {
@@ -91,7 +93,7 @@ dependencies {
     implementation 'com.jakewharton.rxbinding:rxbinding-design:0.4.0'
 
     implementation 'co.touchlab.squeaky:squeaky-query:0.4.0.0'
-    annotationProcessor 'co.touchlab.squeaky:squeaky-processor:0.4.0.0'
+    kapt 'co.touchlab.squeaky:squeaky-processor:0.4.0.0'
 
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.robolectric:robolectric:3.0'
diff --git a/storage/build.gradle b/storage/build.gradle
index 91f3db834..45d92b9fa 100644
--- a/storage/build.gradle
+++ b/storage/build.gradle
@@ -5,6 +5,8 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
+apply plugin: 'kotlin-kapt'
+
 version = research_stack_version
 
 android {
@@ -74,9 +76,8 @@ dependencies {
     implementation "com.google.code.gson:gson:$gson_version"
     implementation 'com.scottyab:aes-crypto:0.0.3'
     implementation 'co.touchlab.squeaky:squeaky-query:0.4.0.0'
-    annotationProcessor 'co.touchlab.squeaky:squeaky-processor:0.4.0.0'
+    kapt 'co.touchlab.squeaky:squeaky-processor:0.4.0.0'
     implementation 'net.zetetic:android-database-sqlcipher:3.5.4@aar'
-    implementation 'com.android.support:appcompat-v7:28.0.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'

From c79201314cf9d8954abd34848bf4d0da0195684d Mon Sep 17 00:00:00 2001
From: James Kizer <james.kizer@gmail.com>
Date: Wed, 2 Jan 2019 23:17:48 -0500
Subject: [PATCH 37/53] removed build warning

---
 .../BackwardsCompatibleTaskPresentationFragment.kt            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/foundation/src/main/java/org/researchstack/foundation/components/presentation/compatibility/BackwardsCompatibleTaskPresentationFragment.kt b/foundation/src/main/java/org/researchstack/foundation/components/presentation/compatibility/BackwardsCompatibleTaskPresentationFragment.kt
index ab6d23269..4205cca85 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/presentation/compatibility/BackwardsCompatibleTaskPresentationFragment.kt
+++ b/foundation/src/main/java/org/researchstack/foundation/components/presentation/compatibility/BackwardsCompatibleTaskPresentationFragment.kt
@@ -38,13 +38,13 @@ open class BackwardsCompatibleTaskPresentationFragment: TaskPresentationFragment
     override fun initialize(savedInstanceState: Bundle?) {
 
         if (savedInstanceState == null) {
-            val taskIdentifier = this.arguments!!.getString(BackwardsCompatibleTaskPresentationFragment.EXTRA_TASK_IDENTIFIER)
+            val taskIdentifier: String = this.arguments!!.getString(BackwardsCompatibleTaskPresentationFragment.EXTRA_TASK_IDENTIFIER)!!
             this._task = this.taskProvider!!.task(taskIdentifier) as Task
             this._taskNavigator = this.task
             this._result = TaskResult(this.task.identifier)
             this.result.setStartDate(Date())
         } else {
-            val taskIdentifier = savedInstanceState.getString(BackwardsCompatibleTaskPresentationFragment.EXTRA_TASK_IDENTIFIER)
+            val taskIdentifier: String = savedInstanceState.getString(BackwardsCompatibleTaskPresentationFragment.EXTRA_TASK_IDENTIFIER)!!
             this._task = this.taskProvider!!.task(taskIdentifier) as Task
             this._taskNavigator = this.task
             this._result = savedInstanceState.getSerializable(BackwardsCompatibleTaskPresentationFragment.EXTRA_TASK_RESULT) as TaskResult

From c0902f9225435e5f2774a962c9f93ae4afeed64b Mon Sep 17 00:00:00 2001
From: James Kizer <james.kizer@gmail.com>
Date: Thu, 3 Jan 2019 00:05:32 -0500
Subject: [PATCH 38/53] Fixed color references

---
 .../main/res/drawable/rss_ic_circle_16dp.xml  |  2 +-
 .../res/drawable/rss_text_color_accent.xml    |  4 ++--
 .../rss_activity_email_verification.xml       | 16 ++++++-------
 .../res/layout/rss_activity_onboarding.xml    |  4 ++--
 .../res/layout/rss_fragment_dashboard.xml     | 14 +++++------
 .../main/res/layout/rss_item_radio_quiz.xml   |  6 ++---
 .../src/main/res/layout/rss_item_schedule.xml |  2 +-
 .../layout/rss_layout_consent_evaluation.xml  | 10 ++++----
 .../main/res/layout/rss_layout_permission.xml |  6 ++---
 .../res/layout/rss_layout_quiz_question.xml   | 24 +++++++++----------
 .../main/res/layout/rss_layout_sign_in.xml    | 20 ++++++++--------
 .../main/res/layout/rss_layout_sign_up.xml    | 18 +++++++-------
 skin/src/main/res/xml/rss_settings.xml        |  2 +-
 13 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/skin/src/main/res/drawable/rss_ic_circle_16dp.xml b/skin/src/main/res/drawable/rss_ic_circle_16dp.xml
index 5120fea77..c160d9398 100644
--- a/skin/src/main/res/drawable/rss_ic_circle_16dp.xml
+++ b/skin/src/main/res/drawable/rss_ic_circle_16dp.xml
@@ -6,6 +6,6 @@
         android:width="16dp"
         android:height="16dp" />
 
-    <solid android:color="@color/rsb_black" />
+    <solid android:color="@color/rsf_black" />
 
 </shape>
\ No newline at end of file
diff --git a/skin/src/main/res/drawable/rss_text_color_accent.xml b/skin/src/main/res/drawable/rss_text_color_accent.xml
index b9647e761..ffb387b7c 100644
--- a/skin/src/main/res/drawable/rss_text_color_accent.xml
+++ b/skin/src/main/res/drawable/rss_text_color_accent.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/rsb_colorAccentDark" android:state_pressed="true" />
-    <item android:color="@color/rsb_colorAccent" android:state_checked="true" />
+    <item android:color="@color/rsf_colorAccentDark" android:state_pressed="true" />
+    <item android:color="@color/rsf_colorAccent" android:state_checked="true" />
     <item android:color="#9000" />
 </selector>
\ No newline at end of file
diff --git a/skin/src/main/res/layout/rss_activity_email_verification.xml b/skin/src/main/res/layout/rss_activity_email_verification.xml
index 69d70de95..3bf02ddcc 100644
--- a/skin/src/main/res/layout/rss_activity_email_verification.xml
+++ b/skin/src/main/res/layout/rss_activity_email_verification.xml
@@ -12,8 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/toolbar"
-        android:layout_marginLeft="@dimen/rsb_margin_left"
-        android:layout_marginRight="@dimen/rsb_margin_right"
+        android:layout_marginLeft="@dimen/rsf_margin_left"
+        android:layout_marginRight="@dimen/rsf_margin_right"
         android:layout_marginTop="20dp"
         android:text="@string/rss_confirm_title"
         android:textColor="?attr/colorAccent"
@@ -25,8 +25,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/title"
-        android:layout_marginLeft="@dimen/rsb_margin_left"
-        android:layout_marginRight="@dimen/rsb_margin_right"
+        android:layout_marginLeft="@dimen/rsf_margin_left"
+        android:layout_marginRight="@dimen/rsf_margin_right"
         android:layout_marginTop="36dp"
         tools:text="@string/lorem_medium" />
 
@@ -36,9 +36,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/email_verification_body"
-        android:layout_marginLeft="@dimen/rsb_margin_left"
-        android:layout_marginRight="@dimen/rsb_margin_left"
-        android:layout_marginTop="@dimen/rsb_padding_medium"
+        android:layout_marginLeft="@dimen/rsf_margin_left"
+        android:layout_marginRight="@dimen/rsf_margin_left"
+        android:layout_marginTop="@dimen/rsf_padding_medium"
         android:background="@android:color/transparent"
         android:gravity="left|center_vertical"
         android:paddingLeft="0dp"
@@ -114,7 +114,7 @@
                 android:layout_height="1dp"
                 android:layout_marginBottom="12dp"
                 android:layout_marginTop="12dp"
-                android:background="@color/rsb_black"
+                android:background="@color/rsf_black"
                 />
 
 
diff --git a/skin/src/main/res/layout/rss_activity_onboarding.xml b/skin/src/main/res/layout/rss_activity_onboarding.xml
index d2c67e448..307000ffe 100644
--- a/skin/src/main/res/layout/rss_activity_onboarding.xml
+++ b/skin/src/main/res/layout/rss_activity_onboarding.xml
@@ -60,7 +60,7 @@
         android:layout_height="96dp"
         android:layout_alignParentBottom="true"
         android:layout_alignTop="@+id/intro_buttons"
-        android:background="@color/rsb_submit_bar_gray" />
+        android:background="@color/rsf_submit_bar_gray" />
 
     <FrameLayout
         android:id="@+id/pager_frame"
@@ -118,7 +118,7 @@
             android:onClick="onSkipClicked"
             android:text="@string/rss_skip_signup"
             android:visibility="gone"
-            app:backgroundTint="@color/rsb_submit_bar_negative"
+            app:backgroundTint="@color/rsf_submit_bar_negative"
             tools:visibility="visible" />
 
         <android.support.v7.widget.AppCompatButton
diff --git a/skin/src/main/res/layout/rss_fragment_dashboard.xml b/skin/src/main/res/layout/rss_fragment_dashboard.xml
index 4ebfb24c9..2b2cdc8b0 100644
--- a/skin/src/main/res/layout/rss_fragment_dashboard.xml
+++ b/skin/src/main/res/layout/rss_fragment_dashboard.xml
@@ -13,33 +13,33 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:clipToPadding="false"
-            android:divider="@drawable/rsb_divider_empty_16dp"
+            android:divider="@drawable/rsf_divider_empty_16dp"
             android:orientation="vertical"
             android:paddingBottom="56dp"
             android:paddingTop="16dp"
             android:showDividers="middle">
 
-            <org.researchstack.feature.chart.ui.graph.ProgressChartCard
+            <org.researchstack.feature.chart.ui.ProgressChartCard
                 android:id="@+id/dashboard_chart_progress"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
 
-            <org.researchstack.feature.chart.ui.graph.PieChartCard
+            <org.researchstack.feature.chart.ui.PieChartCard
                 android:id="@+id/dashboard_chart_pie"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
 
-            <org.researchstack.feature.chart.ui.graph.BarChartCard
+            <org.researchstack.feature.chart.ui.BarChartCard
                 android:id="@+id/dashboard_chart_bar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
 
-            <org.researchstack.feature.chart.ui.graph.BarChartCard
+            <org.researchstack.feature.chart.ui.BarChartCard
                 android:id="@+id/dashboard_chart_bar_stacked"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
 
-            <org.researchstack.feature.chart.ui.graph.LineChartCard
+            <org.researchstack.feature.chart.ui.LineChartCard
                 android:id="@+id/dashboard_chart_line"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
@@ -48,7 +48,7 @@
 
     </ScrollView>
 
-    <org.researchstack.feature.chart.ui.graph.EmptyView
+    <org.researchstack.feature.chart.ui.EmptyView
         android:id="@+id/dashboard_empty"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/skin/src/main/res/layout/rss_item_radio_quiz.xml b/skin/src/main/res/layout/rss_item_radio_quiz.xml
index bd56645bb..616770090 100644
--- a/skin/src/main/res/layout/rss_item_radio_quiz.xml
+++ b/skin/src/main/res/layout/rss_item_radio_quiz.xml
@@ -3,9 +3,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginLeft="@dimen/rsb_margin_left"
-    android:layout_marginRight="@dimen/rsb_margin_right"
+    android:layout_marginLeft="@dimen/rsf_margin_left"
+    android:layout_marginRight="@dimen/rsf_margin_right"
     android:gravity="center_vertical"
-    android:minHeight="@dimen/rsb_item_size_default"
+    android:minHeight="@dimen/rsf_item_size_default"
     android:padding="8dp"
     tools:text="@string/lorem_name" />
diff --git a/skin/src/main/res/layout/rss_item_schedule.xml b/skin/src/main/res/layout/rss_item_schedule.xml
index 15b87d605..e5aae86ac 100644
--- a/skin/src/main/res/layout/rss_item_schedule.xml
+++ b/skin/src/main/res/layout/rss_item_schedule.xml
@@ -22,7 +22,7 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="16dp"
         android:layout_marginRight="16dp"
-        android:textColor="@color/rsb_black"
+        android:textColor="@color/rsf_black"
         tools:text="Asthma history\n13 questions" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/skin/src/main/res/layout/rss_layout_consent_evaluation.xml b/skin/src/main/res/layout/rss_layout_consent_evaluation.xml
index f37baf4ba..32cc6b59a 100644
--- a/skin/src/main/res/layout/rss_layout_consent_evaluation.xml
+++ b/skin/src/main/res/layout/rss_layout_consent_evaluation.xml
@@ -10,15 +10,15 @@
         android:layout_height="180dp"
         android:layout_centerHorizontal="true"
         android:scaleType="center"
-        tools:src="@drawable/rsb_debug_gray" />
+        tools:src="@drawable/rsf_debug_gray" />
 
     <TextView
         android:id="@+id/rss_quiz_eval_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/rss_quiz_eval_image"
-        android:layout_marginLeft="@dimen/rsb_margin_left"
-        android:layout_marginRight="@dimen/rsb_margin_right"
+        android:layout_marginLeft="@dimen/rsf_margin_left"
+        android:layout_marginRight="@dimen/rsf_margin_right"
         android:layout_marginTop="20dp"
 
         android:textColor="?attr/colorAccent"
@@ -32,8 +32,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/rss_quiz_eval_title"
-        android:layout_marginLeft="@dimen/rsb_margin_left"
-        android:layout_marginRight="@dimen/rsb_margin_right"
+        android:layout_marginLeft="@dimen/rsf_margin_left"
+        android:layout_marginRight="@dimen/rsf_margin_right"
         android:layout_marginTop="36dp"
         tools:text="@string/lorem_medium" />
 
diff --git a/skin/src/main/res/layout/rss_layout_permission.xml b/skin/src/main/res/layout/rss_layout_permission.xml
index 50a48efdd..c6beebc70 100644
--- a/skin/src/main/res/layout/rss_layout_permission.xml
+++ b/skin/src/main/res/layout/rss_layout_permission.xml
@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="0dp"
-        android:paddingBottom="@dimen/rsb_padding_wedge"
+        android:paddingBottom="@dimen/rsf_padding_wedge"
         android:text="@string/rss_permission_disclaimer"
         android:visibility="visible" />
 
@@ -38,7 +38,7 @@
         android:id="@+id/submit_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:negativeActionTitle="@string/rsb_exit"
-        app:positiveActionTitle="@string/rsb_submit" />
+        app:negativeActionTitle="@string/rsf_exit"
+        app:positiveActionTitle="@string/rsf_submit" />
 
 </merge>
\ No newline at end of file
diff --git a/skin/src/main/res/layout/rss_layout_quiz_question.xml b/skin/src/main/res/layout/rss_layout_quiz_question.xml
index f93d715cb..cdb8648b3 100644
--- a/skin/src/main/res/layout/rss_layout_quiz_question.xml
+++ b/skin/src/main/res/layout/rss_layout_quiz_question.xml
@@ -12,7 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="0dp"
-        android:paddingBottom="@dimen/rsb_padding_wedge"
+        android:paddingBottom="@dimen/rsf_padding_wedge"
         android:text="@string/rss_quiz_question_disclamer"
         android:visibility="visible" />
 
@@ -38,8 +38,8 @@
                 style="@style/Backbone.Survey.Title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingBottom="@dimen/rsb_padding_wedge"
-                android:paddingTop="@dimen/rsb_padding_wedge"
+                android:paddingBottom="@dimen/rsf_padding_wedge"
+                android:paddingTop="@dimen/rsf_padding_wedge"
                 tools:text="@string/lorem_short" />
 
             <TextView
@@ -48,8 +48,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/title"
-                android:paddingBottom="@dimen/rsb_padding_wedge"
-                android:paddingTop="@dimen/rsb_padding_wedge"
+                android:paddingBottom="@dimen/rsf_padding_wedge"
+                android:paddingTop="@dimen/rsf_padding_wedge"
                 android:visibility="gone"
                 tools:text="@string/lorem_short" />
 
@@ -59,7 +59,7 @@
                 android:layout_height="wrap_content"
                 android:layout_alignTop="@+id/radio_group"
                 android:background="@android:color/holo_red_light"
-                android:minHeight="@dimen/rsb_item_size_default"
+                android:minHeight="@dimen/rsf_item_size_default"
                 android:visibility="gone" />
 
             <RadioGroup
@@ -75,8 +75,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/radio_group"
-                android:paddingBottom="@dimen/rsb_padding_wedge"
-                android:paddingTop="@dimen/rsb_padding_wedge"
+                android:paddingBottom="@dimen/rsf_padding_wedge"
+                android:paddingTop="@dimen/rsf_padding_wedge"
                 android:visibility="gone"
                 tools:text="@string/lorem_name"
                 tools:visibility="visible" />
@@ -88,8 +88,8 @@
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/quiz_result_title"
                 android:layout_marginTop="0dp"
-                android:paddingBottom="@dimen/rsb_padding_medium"
-                android:paddingTop="@dimen/rsb_padding_small"
+                android:paddingBottom="@dimen/rsf_padding_medium"
+                android:paddingTop="@dimen/rsf_padding_small"
                 android:text="@string/lorem_long"
                 android:visibility="gone"
                 tools:visibility="visible" />
@@ -102,8 +102,8 @@
         android:id="@+id/submit_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:negativeActionTitle="@string/rsb_exit"
-        app:positiveActionTitle="@string/rsb_submit"
+        app:negativeActionTitle="@string/rsf_exit"
+        app:positiveActionTitle="@string/rsf_submit"
 
         />
 
diff --git a/skin/src/main/res/layout/rss_layout_sign_in.xml b/skin/src/main/res/layout/rss_layout_sign_in.xml
index cb46277e2..1762231a2 100644
--- a/skin/src/main/res/layout/rss_layout_sign_in.xml
+++ b/skin/src/main/res/layout/rss_layout_sign_in.xml
@@ -19,19 +19,19 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/title"
-        android:layout_marginLeft="@dimen/rsb_margin_left"
-        android:layout_marginRight="@dimen/rsb_margin_right"
-        android:layout_marginTop="@dimen/rsb_padding_wedge"
+        android:layout_marginLeft="@dimen/rsf_margin_left"
+        android:layout_marginRight="@dimen/rsf_margin_right"
+        android:layout_marginTop="@dimen/rsf_padding_wedge"
         android:stretchColumns="1">
 
         <TableRow
             android:gravity="center_vertical"
-            android:minHeight="@dimen/rsb_item_size_default">
+            android:minHeight="@dimen/rsf_item_size_default">
 
             <android.support.v7.widget.AppCompatTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="@dimen/rsb_padding_small"
+                android:layout_marginRight="@dimen/rsf_padding_small"
                 android:fontFamily="sans-serif-medium"
                 android:gravity="right"
                 android:text="@string/rss_username" />
@@ -49,13 +49,13 @@
 
         <TableRow
             android:gravity="center_vertical"
-            android:minHeight="@dimen/rsb_item_size_default">
+            android:minHeight="@dimen/rsf_item_size_default">
 
             <android.support.v7.widget.AppCompatTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_column="0"
-                android:layout_marginRight="@dimen/rsb_padding_small"
+                android:layout_marginRight="@dimen/rsf_padding_small"
                 android:fontFamily="sans-serif-medium"
                 android:gravity="right"
                 android:text="@string/rss_password" />
@@ -79,8 +79,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        app:negativeActionTitle="@string/rsb_exit"
-        app:positiveActionTitle="@string/rsb_submit" />
+        app:negativeActionTitle="@string/rsf_exit"
+        app:positiveActionTitle="@string/rsf_submit" />
 
     <android.support.v7.widget.AppCompatTextView
         android:id="@+id/forgot_password"
@@ -92,7 +92,7 @@
         android:layout_alignParentStart="true"
         android:layout_alignTop="@+id/submit_bar"
         android:text="@string/rss_forgot_password"
-        android:textColor="@color/rsb_submit_bar_negative" />
+        android:textColor="@color/rsf_submit_bar_negative" />
 
     <include
         android:id="@+id/progress"
diff --git a/skin/src/main/res/layout/rss_layout_sign_up.xml b/skin/src/main/res/layout/rss_layout_sign_up.xml
index 05e4f3ec2..4c56918ba 100644
--- a/skin/src/main/res/layout/rss_layout_sign_up.xml
+++ b/skin/src/main/res/layout/rss_layout_sign_up.xml
@@ -30,21 +30,21 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/text"
-        android:layout_marginLeft="@dimen/rsb_margin_left"
-        android:layout_marginRight="@dimen/rsb_margin_right"
+        android:layout_marginLeft="@dimen/rsf_margin_left"
+        android:layout_marginRight="@dimen/rsf_margin_right"
         android:stretchColumns="1">
 
         <TableRow
             android:gravity="center_vertical"
-            android:minHeight="@dimen/rsb_item_size_default">
+            android:minHeight="@dimen/rsf_item_size_default">
 
             <android.support.v7.widget.AppCompatTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="@dimen/rsb_padding_small"
+                android:layout_marginRight="@dimen/rsf_padding_small"
                 android:fontFamily="sans-serif-medium"
                 android:gravity="right"
-                android:text="@string/rsb_email" />
+                android:text="@string/rsf_email" />
 
             <android.support.v7.widget.AppCompatEditText
                 android:id="@+id/email"
@@ -60,13 +60,13 @@
 
         <TableRow
             android:gravity="center_vertical"
-            android:minHeight="@dimen/rsb_item_size_default">
+            android:minHeight="@dimen/rsf_item_size_default">
 
             <android.support.v7.widget.AppCompatTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_column="0"
-                android:layout_marginRight="@dimen/rsb_padding_small"
+                android:layout_marginRight="@dimen/rsf_padding_small"
                 android:fontFamily="sans-serif-medium"
                 android:gravity="right"
                 android:text="@string/rss_password" />
@@ -90,8 +90,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        app:negativeActionTitle="@string/rsb_exit"
-        app:positiveActionTitle="@string/rsb_submit" />
+        app:negativeActionTitle="@string/rsf_exit"
+        app:positiveActionTitle="@string/rsf_submit" />
 
     <include
         android:id="@+id/progress"
diff --git a/skin/src/main/res/xml/rss_settings.xml b/skin/src/main/res/xml/rss_settings.xml
index 6f4dc5fce..e679e6700 100644
--- a/skin/src/main/res/xml/rss_settings.xml
+++ b/skin/src/main/res/xml/rss_settings.xml
@@ -88,7 +88,7 @@
             android:key="rss_settings_general_leave_study"
             android:order="2"
             android:title="@string/rss_settings_general_leave_study"
-            app:preferenceTextColor="@color/rsb_error" />
+            app:preferenceTextColor="@color/rsf_error" />
 
     </PreferenceCategory>
 

From 359b9c02bf530a868610562f914eeeea0be76d3e Mon Sep 17 00:00:00 2001
From: James Kizer <james.kizer@gmail.com>
Date: Thu, 17 Jan 2019 10:13:36 -0700
Subject: [PATCH 39/53] Added back and deprecated getAnswerFormat method, #491

---
 .../core/models/result/StepResult.java        | 33 ++++++++++++-------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/foundation/src/main/java/org/researchstack/foundation/core/models/result/StepResult.java b/foundation/src/main/java/org/researchstack/foundation/core/models/result/StepResult.java
index 4b9903b04..21bb11ab4 100644
--- a/foundation/src/main/java/org/researchstack/foundation/core/models/result/StepResult.java
+++ b/foundation/src/main/java/org/researchstack/foundation/core/models/result/StepResult.java
@@ -1,8 +1,9 @@
 package org.researchstack.foundation.core.models.result;
 
-//import org.researchstack.foundation.step.QuestionStep;
-//import org.researchstack.foundation.step.Step;
+import android.support.annotation.Nullable;
 
+import org.researchstack.foundation.components.survey.answerformat.AnswerFormat;
+import org.researchstack.foundation.components.survey.step.QuestionStep;
 import org.researchstack.foundation.core.models.step.Step;
 
 import java.util.Date;
@@ -105,16 +106,24 @@ public void setResultForIdentifier(String identifier, T result) {
     }
 
     //TODO: See if we can remove this... What if we remove this for foundation, but add it for backwards compat foundation
-//    /**
-//     * Gets the {@link AnswerFormat} for this step result. May be useful when processing the
-//     * result.
-//     *
-//     * @return the answer format associated with the step
-//     */
-//
-//    public AnswerFormat getAnswerFormat() {
-//        return answerFormat;
-//    }
+    /**
+     * Gets the {@link AnswerFormat} for this step result. May be useful when processing the
+     * result.
+     *
+     * @return the answer format associated with the step
+     */
+
+    @Deprecated
+    @Nullable
+    public AnswerFormat getAnswerFormat() {
+        if (step instanceof QuestionStep) {
+            AnswerFormat answerFormat = ((QuestionStep) step).getAnswerFormat();
+            return answerFormat;
+        }
+        else {
+            return null;
+        }
+    }
 
     public Step getStep() {
         return this.step;

From 2062d46a8b0c1e5c2e6e1cc258d30a4439a1d3a6 Mon Sep 17 00:00:00 2001
From: Joshua Liu <liujoshua@users.noreply.github.com>
Date: Wed, 6 Mar 2019 12:25:21 -0800
Subject: [PATCH 40/53] Build Tools update and lint fixes

---
 authentication/build.gradle                          |  3 ---
 .../feature/authentication/ReplaceMe.kt              |  2 --
 authentication/src/main/res/values/strings.xml       |  1 -
 backbone/build.gradle                                |  2 +-
 backbone/src/main/res/values/strings.xml             |  2 +-
 build.gradle                                         |  4 ++--
 chart/build.gradle                                   |  4 +---
 .../org/researchstack/feature/chart/ReplaceMe.kt     |  2 --
 chart/src/main/res/values/strings.xml                |  1 -
 consent/build.gradle                                 |  3 ---
 consent/src/main/res/values/strings.xml              |  1 -
 foundation/build.gradle                              |  1 +
 .../java/org/researchstack/foundation/ReplaceMe.kt   |  2 --
 foundation/src/main/res/values/strings.xml           |  1 -
 gradle/wrapper/gradle-wrapper.properties             | 12 ++++++------
 skin/build.gradle                                    |  2 +-
 skin/src/main/res/values/strings.xml                 |  2 +-
 storage/build.gradle                                 |  3 ---
 storage/src/main/res/values/strings.xml              |  1 -
 19 files changed, 14 insertions(+), 35 deletions(-)
 delete mode 100644 authentication/src/main/java/org/researchstack/feature/authentication/ReplaceMe.kt
 delete mode 100644 chart/src/main/java/org/researchstack/feature/chart/ReplaceMe.kt
 delete mode 100644 foundation/src/main/java/org/researchstack/foundation/ReplaceMe.kt

diff --git a/authentication/build.gradle b/authentication/build.gradle
index ae41785f9..7731e2194 100644
--- a/authentication/build.gradle
+++ b/authentication/build.gradle
@@ -26,12 +26,9 @@ android {
     }
     resourcePrefix 'rsfa_'
     compileOptions {
-        sourceCompatibility = '1.8'
-        targetCompatibility = '1.8'
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    buildToolsVersion '28.0.3'
 }
 
 Properties properties = new Properties()
diff --git a/authentication/src/main/java/org/researchstack/feature/authentication/ReplaceMe.kt b/authentication/src/main/java/org/researchstack/feature/authentication/ReplaceMe.kt
deleted file mode 100644
index 44215b40e..000000000
--- a/authentication/src/main/java/org/researchstack/feature/authentication/ReplaceMe.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-package org.researchstack.feature.authentication
-
diff --git a/authentication/src/main/res/values/strings.xml b/authentication/src/main/res/values/strings.xml
index 3ca9920b6..854200555 100644
--- a/authentication/src/main/res/values/strings.xml
+++ b/authentication/src/main/res/values/strings.xml
@@ -1,3 +1,2 @@
 <resources>
-    <string name="app_name">Authentication</string>
 </resources>
diff --git a/backbone/build.gradle b/backbone/build.gradle
index b56f8fcc4..9e39e8fc6 100644
--- a/backbone/build.gradle
+++ b/backbone/build.gradle
@@ -9,7 +9,6 @@ version = research_stack_version
 
 android {
     compileSdkVersion 28
-    buildToolsVersion "28.0.3"
 
     defaultConfig {
         minSdkVersion 19
@@ -82,6 +81,7 @@ dependencies {
     implementation 'io.reactivex:rxjava:1.2.5'
     implementation 'io.reactivex:rxandroid:1.2.1'
     implementation 'com.jakewharton.rxbinding:rxbinding:0.4.0'
+    implementation "com.android.support:support-v4:$support_library_version"
     implementation 'com.jakewharton.rxbinding:rxbinding-support-v4:0.4.0'
     implementation 'com.jakewharton.rxbinding:rxbinding-appcompat-v7:0.4.0'
     implementation 'com.jakewharton.rxbinding:rxbinding-design:0.4.0'
diff --git a/backbone/src/main/res/values/strings.xml b/backbone/src/main/res/values/strings.xml
index f4500d602..0af128914 100644
--- a/backbone/src/main/res/values/strings.xml
+++ b/backbone/src/main/res/values/strings.xml
@@ -113,7 +113,7 @@
     <string name="rsb_cancel">Cancel</string>
     <string name="rsb_yes">Yes</string>
     <string name="rsb_no">No</string>
-    <string name="rsb_format_step_title">Step %1$s of %2$s</string>
+    <string name="rsb_format_step_title">Step %1$d of %2$d</string>
     <string name="rsb_hours">Hours</string>
     <string name="rsb_minutes">Minutes</string>
 
diff --git a/build.gradle b/build.gradle
index a95e8a658..efa76234e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
 
     ext {
         research_stack_version = '1.5.0-SNAPSHOT'
-        kotlin_version = '1.3.11'
+        kotlin_version = '1.3.20'
         support_library_version = '28.0.0'
         gson_version = '2.8.2'
     }
@@ -18,7 +18,7 @@ buildscript {
 
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
 
diff --git a/chart/build.gradle b/chart/build.gradle
index 54d03b39d..3649697e4 100644
--- a/chart/build.gradle
+++ b/chart/build.gradle
@@ -26,12 +26,9 @@ android {
     }
     resourcePrefix 'rsfch_'
     compileOptions {
-        sourceCompatibility = '1.8'
-        targetCompatibility = '1.8'
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    buildToolsVersion '28.0.3'
 }
 
 Properties properties = new Properties()
@@ -73,6 +70,7 @@ dependencies {
     implementation project(':foundation')
     implementation 'com.github.PhilJay:MPAndroidChart:v2.2.3'
     implementation 'com.jakewharton.rxbinding:rxbinding:0.4.0'
+    implementation "com.android.support:support-v4:$support_library_version"
     implementation 'com.jakewharton.rxbinding:rxbinding-support-v4:0.4.0'
     implementation 'com.jakewharton.rxbinding:rxbinding-appcompat-v7:0.4.0'
     implementation 'com.jakewharton.rxbinding:rxbinding-design:0.4.0'
diff --git a/chart/src/main/java/org/researchstack/feature/chart/ReplaceMe.kt b/chart/src/main/java/org/researchstack/feature/chart/ReplaceMe.kt
deleted file mode 100644
index b86402bf2..000000000
--- a/chart/src/main/java/org/researchstack/feature/chart/ReplaceMe.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-package org.researchstack.feature.chart
-
diff --git a/chart/src/main/res/values/strings.xml b/chart/src/main/res/values/strings.xml
index 487a93aa7..854200555 100644
--- a/chart/src/main/res/values/strings.xml
+++ b/chart/src/main/res/values/strings.xml
@@ -1,3 +1,2 @@
 <resources>
-    <string name="app_name">Chart</string>
 </resources>
diff --git a/consent/build.gradle b/consent/build.gradle
index ba90b2b47..3a0c38f3d 100644
--- a/consent/build.gradle
+++ b/consent/build.gradle
@@ -26,12 +26,9 @@ android {
     }
     resourcePrefix 'rsfc_'
     compileOptions {
-        sourceCompatibility = '1.8'
-        targetCompatibility = '1.8'
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    buildToolsVersion '28.0.3'
 }
 
 Properties properties = new Properties()
diff --git a/consent/src/main/res/values/strings.xml b/consent/src/main/res/values/strings.xml
index 67cceb3f1..854200555 100644
--- a/consent/src/main/res/values/strings.xml
+++ b/consent/src/main/res/values/strings.xml
@@ -1,3 +1,2 @@
 <resources>
-    <string name="app_name">Consent</string>
 </resources>
diff --git a/foundation/build.gradle b/foundation/build.gradle
index 54ea21743..23cf6ee76 100644
--- a/foundation/build.gradle
+++ b/foundation/build.gradle
@@ -27,6 +27,7 @@ android {
         }
     }
 
+    resourcePrefix 'rsff_'
 }
 
 Properties properties = new Properties()
diff --git a/foundation/src/main/java/org/researchstack/foundation/ReplaceMe.kt b/foundation/src/main/java/org/researchstack/foundation/ReplaceMe.kt
deleted file mode 100644
index 76c9ce4ed..000000000
--- a/foundation/src/main/java/org/researchstack/foundation/ReplaceMe.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-package org.researchstack.foundation
-
diff --git a/foundation/src/main/res/values/strings.xml b/foundation/src/main/res/values/strings.xml
index 1d8501575..854200555 100644
--- a/foundation/src/main/res/values/strings.xml
+++ b/foundation/src/main/res/values/strings.xml
@@ -1,3 +1,2 @@
 <resources>
-    <string name="app_name">Foundation</string>
 </resources>
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1b1abf9a7..dc9460a65 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Nov 12 21:34:32 MST 2018
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+#Wed Feb 27 13:45:12 PST 2019
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
diff --git a/skin/build.gradle b/skin/build.gradle
index 8c0c93730..6f0d2b96f 100644
--- a/skin/build.gradle
+++ b/skin/build.gradle
@@ -7,7 +7,6 @@ version = research_stack_version
 
 android {
     compileSdkVersion 28
-    buildToolsVersion "28.0.3"
 
     lintOptions {
         warning "InvalidPackage"
@@ -82,6 +81,7 @@ dependencies {
     implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     implementation 'com.jakewharton.rxbinding:rxbinding:0.4.0'
+    implementation "com.android.support:support-v4:$support_library_version"
     implementation 'com.jakewharton.rxbinding:rxbinding-support-v4:0.4.0'
     implementation 'com.jakewharton.rxbinding:rxbinding-appcompat-v7:0.4.0'
     implementation 'com.jakewharton.rxbinding:rxbinding-design:0.4.0'
diff --git a/skin/src/main/res/values/strings.xml b/skin/src/main/res/values/strings.xml
index d413d21b5..b1a1b6465 100644
--- a/skin/src/main/res/values/strings.xml
+++ b/skin/src/main/res/values/strings.xml
@@ -113,7 +113,7 @@
     <string name="rss_settings_general_software_notices">Software Notices</string>
     <string name="rss_settings_general_leave_study">Leave Study</string>
     <string name="rss_settings_general_join_study">Join Study</string>
-    <string name="rss_settings_version">Build number %1$s (%2$s)</string>
+    <string name="rss_settings_version">Build number %1$s (%2$d)</string>
     <string name="rss_settings_version_unknown">Unknown version</string>
     <string name="rss_settings_dialog_leave_study">Are you sure you want to leave the study? This
         action cannot be undone and you will need to provide consent in order to re-enroll.
diff --git a/storage/build.gradle b/storage/build.gradle
index 91f3db834..0a4caaef9 100644
--- a/storage/build.gradle
+++ b/storage/build.gradle
@@ -26,12 +26,9 @@ android {
     }
     resourcePrefix 'rsfs_'
     compileOptions {
-        sourceCompatibility = '1.8'
-        targetCompatibility = '1.8'
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    buildToolsVersion '28.0.3'
 }
 
 Properties properties = new Properties()
diff --git a/storage/src/main/res/values/strings.xml b/storage/src/main/res/values/strings.xml
index 48044a87d..854200555 100644
--- a/storage/src/main/res/values/strings.xml
+++ b/storage/src/main/res/values/strings.xml
@@ -1,3 +1,2 @@
 <resources>
-    <string name="app_name">Storage</string>
 </resources>

From 5a390c584ae4bc03a5b502d8f1fdffad89a7d3bb Mon Sep 17 00:00:00 2001
From: Joshua Liu <liujoshua@users.noreply.github.com>
Date: Wed, 6 Mar 2019 12:32:18 -0800
Subject: [PATCH 41/53] Travis update

---
 .travis.yml | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e8e27f09b..774ffc332 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,23 +14,14 @@ android:
     # The BuildTools version used by your project
     # per travis-ci issue #5036, add '-tools' to use build-tools-23.0.2
     - tools
-    - build-tools-23.0.2
+    - build-tools-28.0.3
 
     # The SDK version used to compile your project
-    - android-23
-
-    # Additional components go here.
-    - extra-android-support
-    - extra-android-m2repository
+    - android-28
 
     # Specify at least one system image,
     # if you need to run emulator(s) during your tests
 
-# Required to run retrolambda
-before_install:
-  - export JAVA8_HOME=/usr/lib/jvm/java-8-oracle
-  - export JAVA_HOME=$JAVA8_HOME
-
 before_script:
   # Tests crash if a local.properties file isn't present; this file is not kept
   # under version control. Create an empty local.properties for testing.

From 69a5e9a9e9d119b65c2a9d54c3eeeec1515bc9be Mon Sep 17 00:00:00 2001
From: Joshua Liu <liujoshua@users.noreply.github.com>
Date: Wed, 6 Mar 2019 14:50:56 -0800
Subject: [PATCH 42/53] Fix compile errors and lint

---
 .../answerformat/AnswerFormatTest.java        |  1 +
 .../answerformat/ChoiceAnswerFormatTest.java  |  4 +++-
 .../backbone/task/OrderedTaskTest.java        |  4 +++-
 .../researchstack/backbone/task/TaskTest.java |  5 +++--
 chart/src/main/res/values/attrs.xml           | 16 +++++++--------
 chart/src/main/res/values/styles.xml          | 20 +++++++++----------
 chart/src/main/res/values/themes.xml          |  5 ++---
 consent/src/main/res/values/attrs.xml         |  6 +++---
 foundation/src/main/res/values/strings.xml    |  2 +-
 9 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/backbone/src/test/java/org/researchstack/backbone/answerformat/AnswerFormatTest.java b/backbone/src/test/java/org/researchstack/backbone/answerformat/AnswerFormatTest.java
index 26630cf8f..3e7f547e7 100644
--- a/backbone/src/test/java/org/researchstack/backbone/answerformat/AnswerFormatTest.java
+++ b/backbone/src/test/java/org/researchstack/backbone/answerformat/AnswerFormatTest.java
@@ -2,6 +2,7 @@
 
 import org.junit.Before;
 import org.junit.Test;
+import org.researchstack.foundation.components.survey.answerformat.EmailAnswerFormat;
 
 import static junit.framework.TestCase.assertFalse;
 import static junit.framework.TestCase.assertTrue;
diff --git a/backbone/src/test/java/org/researchstack/backbone/answerformat/ChoiceAnswerFormatTest.java b/backbone/src/test/java/org/researchstack/backbone/answerformat/ChoiceAnswerFormatTest.java
index 1460cde05..8556c22b5 100644
--- a/backbone/src/test/java/org/researchstack/backbone/answerformat/ChoiceAnswerFormatTest.java
+++ b/backbone/src/test/java/org/researchstack/backbone/answerformat/ChoiceAnswerFormatTest.java
@@ -3,7 +3,9 @@
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.researchstack.backbone.model.Choice;
+import org.researchstack.foundation.components.survey.answerformat.AnswerFormat;
+import org.researchstack.foundation.components.survey.answerformat.ChoiceAnswerFormat;
+import org.researchstack.foundation.components.survey.model.Choice;
 
 import static junit.framework.TestCase.assertEquals;
 
diff --git a/backbone/src/test/java/org/researchstack/backbone/task/OrderedTaskTest.java b/backbone/src/test/java/org/researchstack/backbone/task/OrderedTaskTest.java
index 7d3c2ea41..3c187d8c4 100644
--- a/backbone/src/test/java/org/researchstack/backbone/task/OrderedTaskTest.java
+++ b/backbone/src/test/java/org/researchstack/backbone/task/OrderedTaskTest.java
@@ -2,7 +2,9 @@
 
 import org.junit.Before;
 import org.junit.Test;
-import org.researchstack.backbone.step.Step;
+import org.researchstack.foundation.components.common.task.OrderedTask;
+import org.researchstack.foundation.core.models.step.Step;
+import org.researchstack.foundation.core.models.task.Task;
 
 import java.util.List;
 
diff --git a/backbone/src/test/java/org/researchstack/backbone/task/TaskTest.java b/backbone/src/test/java/org/researchstack/backbone/task/TaskTest.java
index 533711b76..a52d57710 100644
--- a/backbone/src/test/java/org/researchstack/backbone/task/TaskTest.java
+++ b/backbone/src/test/java/org/researchstack/backbone/task/TaskTest.java
@@ -8,8 +8,9 @@
 import org.mockito.Mockito;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.researchstack.backbone.R;
-import org.researchstack.backbone.result.TaskResult;
-import org.researchstack.backbone.step.Step;
+import org.researchstack.foundation.core.models.result.TaskResult;
+import org.researchstack.foundation.core.models.step.Step;
+import org.researchstack.foundation.core.models.task.Task;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/chart/src/main/res/values/attrs.xml b/chart/src/main/res/values/attrs.xml
index 1566856f0..7e97b251b 100644
--- a/chart/src/main/res/values/attrs.xml
+++ b/chart/src/main/res/values/attrs.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
-    <declare-styleable name="Feature.Chart">
+    <declare-styleable name="Feature.Chart" tools:ignore="ResourceName">
         <attr name="emptyviewStyle" format="reference" />
         <attr name="progressChartCardStyle" format="reference" />
         <attr name="pieChartCardStyle" format="reference" />
@@ -9,7 +9,7 @@
         <attr name="barChartCardStyle" format="reference" />
     </declare-styleable>
 
-    <declare-styleable name="EmptyView">
+    <declare-styleable name="EmptyView" tools:ignore="ResourceName">
         <attr name="android:background" />
         <attr name="emptyIcon" format="reference" />
         <attr name="emptyIconTint" format="color" />
@@ -17,14 +17,14 @@
         <attr name="emptyTextAppearance" format="reference" />
     </declare-styleable>
 
-    <declare-styleable name="ChartCard">
+    <declare-styleable name="ChartCard" tools:ignore="ResourceName">
         <attr name="titleText" format="string" />
         <attr name="titleTextColor" />
         <attr name="titleTextSize" format="dimension" />
         <attr name="titleTextTypeface" format="string" />
     </declare-styleable>
 
-    <declare-styleable name="ProgressChartCard">
+    <declare-styleable name="ProgressChartCard" tools:ignore="ResourceName">
         <attr name="centerTextFormat" format="reference" />
         <attr name="centerTextColor" format="color" />
         <attr name="centerTextSize" format="dimension" />
@@ -40,7 +40,7 @@
         <attr name="tabSelectedTextColor" />
     </declare-styleable>
 
-    <declare-styleable name="PieChartCard">
+    <declare-styleable name="PieChartCard" tools:ignore="ResourceName">
         <attr name="valueTextFormat" format="reference" />
         <attr name="titleText" />
         <attr name="titleTextColor" />
@@ -48,7 +48,7 @@
         <attr name="titleTextTypeface" />
     </declare-styleable>
 
-    <declare-styleable name="LineChartCard">
+    <declare-styleable name="LineChartCard" tools:ignore="ResourceName">
         <attr name="chartXAxisTextColor" format="color" />
         <attr name="chartXAxisTextSize" format="dimension" />
         <attr name="chartXAxisTextTypeface" format="string" />
@@ -62,7 +62,7 @@
         <attr name="titleTextTypeface" />
     </declare-styleable>
 
-    <declare-styleable name="BarChartCard">
+    <declare-styleable name="BarChartCard" tools:ignore="ResourceName">
         <attr name="chartXAxisTextColor" />
         <attr name="chartXAxisTextSize" />
         <attr name="chartXAxisTextTypeface" />
diff --git a/chart/src/main/res/values/styles.xml b/chart/src/main/res/values/styles.xml
index 585af2ebf..1a0906c1e 100644
--- a/chart/src/main/res/values/styles.xml
+++ b/chart/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
-    <style name="Widget.Feature.Chart.TabLayout.Chart" parent="@style/Widget.Design.TabLayout">
+    <style name="Widget.Feature.Chart.TabLayout.Chart" parent="@style/Widget.Design.TabLayout" tools:ignore="ResourceName">
         <item name="android:background">@android:color/transparent</item>
         <item name="android:paddingRight">50dp</item>
         <item name="android:clipToPadding">false</item>
@@ -9,7 +9,7 @@
         <item name="tabMode">scrollable</item>
     </style>
 
-    <style name="Widget.Feature.Chart.EmptyView" parent="">
+    <style name="Widget.Feature.Chart.EmptyView" parent="" tools:ignore="ResourceName">
         <item name="android:background">#d5e8ff</item>
         <item name="emptyIcon">@drawable/rsf_illo_dashboard_empty</item>
         <item name="emptyIconTint">?attr/colorPrimaryDark</item>
@@ -17,19 +17,19 @@
         <item name="emptyTextAppearance">@style/TextAppearance.Widget.Feature.Chart.EmptyView</item>
     </style>
 
-    <style name="TextAppearance.Widget.Feature.Chart.EmptyView" parent="@style/TextAppearance.AppCompat">
+    <style name="TextAppearance.Widget.Feature.Chart.EmptyView" parent="@style/TextAppearance.AppCompat" tools:ignore="ResourceName">
         <item name="android:textColor">?attr/colorPrimaryDark</item>
         <item name="android:textSize">16sp</item>
     </style>
 
-    <style name="Widget.Feature.Chart.Chart" parent="">
+    <style name="Widget.Feature.Chart.Chart" parent="" tools:ignore="ResourceName">
         <item name="titleText">Amount of pie eaten</item>
         <item name="titleTextColor">@color/rsf_warm_gray</item>
         <item name="titleTextSize">14sp</item>
         <item name="titleTextTypeface">sans-serif-medium</item>
     </style>
 
-    <style name="Widget.Feature.Chart.Chart.Progress">
+    <style name="Widget.Feature.Chart.Chart.Progress" tools:ignore="ResourceName">
         <item name="centerTextFormat">@string/rsf_chart_progress_center</item>
         <item name="centerTextColor">?attr/colorPrimary</item>
         <item name="centerTextSize">20sp</item>
@@ -41,11 +41,11 @@
         <item name="tabSelectedTextColor">@color/rsf_tab_indicator</item>
     </style>
 
-    <style name="Widget.Feature.Chart.Chart.Pie">
+    <style name="Widget.Feature.Chart.Chart.Pie" tools:ignore="ResourceName">
         <item name="valueTextFormat">@string/rsf_chart_pie_value</item>
     </style>
 
-    <style name="Widget.Feature.Chart.Chart.Line">
+    <style name="Widget.Feature.Chart.Chart.Line" tools:ignore="ResourceName">
         <item name="valueTextFormat">@string/rsf_chart_pie_value</item>
         <item name="chartXAxisTextColor">@color/rsf_warm_gray</item>
         <item name="chartXAxisTextSize">14sp</item>
@@ -56,7 +56,7 @@
         <item name="expandTintColor">@color/rsf_warm_gray</item>
     </style>
 
-    <style name="Widget.Feature.Chart.Chart.Bar">
+    <style name="Widget.Feature.Chart.Chart.Bar" tools:ignore="ResourceName">
         <item name="chartXAxisTextColor">@color/rsf_warm_gray</item>
         <item name="chartXAxisTextSize">14sp</item>
         <item name="chartXAxisTextTypeface">sans-serif-medium</item>
@@ -66,7 +66,7 @@
         <item name="expandTintColor">@color/rsf_warm_gray</item>
     </style>
 
-    <style name="Widget.Feature.Chart.Chart.Title" parent="">
+    <style name="Widget.Feature.Chart.Chart.Title" parent="" tools:ignore="ResourceName">
         <item name="android:padding">16dp</item>
         <item name="android:minHeight">48dp</item>
         <item name="android:gravity">center_vertical</item>
diff --git a/chart/src/main/res/values/themes.xml b/chart/src/main/res/values/themes.xml
index 815614633..b879397f6 100644
--- a/chart/src/main/res/values/themes.xml
+++ b/chart/src/main/res/values/themes.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme.Feature.Chart" parent="Theme.Foundation">
-
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <style name="Theme.Feature.Chart" parent="Theme.Foundation" tools:ignore="ResourceName">
         <!-- Custom Styles for Views -->
         <item name="emptyviewStyle">@style/Widget.Feature.Chart.EmptyView</item>
         <item name="progressChartCardStyle">@style/Widget.Feature.Chart.Chart.Progress</item>
diff --git a/consent/src/main/res/values/attrs.xml b/consent/src/main/res/values/attrs.xml
index a91557fe5..7c32f3f3b 100644
--- a/consent/src/main/res/values/attrs.xml
+++ b/consent/src/main/res/values/attrs.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
-    <declare-styleable name="Feature.Consent">
+    <declare-styleable name="Feature.Consent" tools:ignore="ResourceName">
         <attr name="signatureviewStyle" format="reference" />
     </declare-styleable>
 
-    <declare-styleable name="SignatureView">
+    <declare-styleable name="SignatureView" tools:ignore="ResourceName">
         <attr name="signatureColor" format="color" />
         <attr name="signaturePrintColor" format="color" />
         <attr name="signatureStrokeSize" format="dimension" />
diff --git a/foundation/src/main/res/values/strings.xml b/foundation/src/main/res/values/strings.xml
index b122b9465..77d9ae9a6 100644
--- a/foundation/src/main/res/values/strings.xml
+++ b/foundation/src/main/res/values/strings.xml
@@ -33,7 +33,7 @@
     <string name="rsf_cancel">Cancel</string>
     <string name="rsf_yes">Yes</string>
     <string name="rsf_no">No</string>
-    <string name="rsf_format_step_title">Step %1$s of %2$s</string>
+    <string name="rsf_format_step_title">Step %1$d of %2$d</string>
     <string name="rsf_hours">Hours</string>
     <string name="rsf_minutes">Minutes</string>
 

From d319dab5491744101dd4ebcd9ec45acae6daa19f Mon Sep 17 00:00:00 2001
From: James Kizer <james.kizer@gmail.com>
Date: Sat, 13 Apr 2019 20:41:38 -0600
Subject: [PATCH 43/53] #491

---
 .../pincode/ui/PasscodeAuthenticationFragment.kt         | 9 +++++++--
 .../pincode/ui/SignUpPinCodeCreationStepLayout.java      | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/authentication/src/main/java/org/researchstack/feature/authentication/pincode/ui/PasscodeAuthenticationFragment.kt b/authentication/src/main/java/org/researchstack/feature/authentication/pincode/ui/PasscodeAuthenticationFragment.kt
index 8b86fdef2..e6b82bbf7 100644
--- a/authentication/src/main/java/org/researchstack/feature/authentication/pincode/ui/PasscodeAuthenticationFragment.kt
+++ b/authentication/src/main/java/org/researchstack/feature/authentication/pincode/ui/PasscodeAuthenticationFragment.kt
@@ -73,12 +73,17 @@ open class PasscodeAuthenticationFragment: Fragment() {
         }
 
         val pinCodeWatcher = object: TextWatcher {
+            //JDK - 4/13/19
+            //It appears that Kotlin object expressions that implement interfaces
+            //MUST implement all methods and specify the 'override' modifier
             override fun afterTextChanged(s: Editable?) {
-
+                //JDK - 4/13/19
+                //do nothing
             }
 
             override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
-
+                //JDK - 4/13/19
+                //do nothing
             }
 
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
diff --git a/authentication/src/main/java/org/researchstack/feature/authentication/pincode/ui/SignUpPinCodeCreationStepLayout.java b/authentication/src/main/java/org/researchstack/feature/authentication/pincode/ui/SignUpPinCodeCreationStepLayout.java
index b24025c4d..c59b3a84e 100644
--- a/authentication/src/main/java/org/researchstack/feature/authentication/pincode/ui/SignUpPinCodeCreationStepLayout.java
+++ b/authentication/src/main/java/org/researchstack/feature/authentication/pincode/ui/SignUpPinCodeCreationStepLayout.java
@@ -55,9 +55,13 @@ private void initializeLayout() {
         refreshState();
 
         TextWatcher pinCodeWatcher = new TextWatcher() {
+            //JDK - 4/13/19
+            //It appears that anonymous classes that implement interfaces
+            //MUST implement all methods.
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
+                //JDK - 4/13/19
+                //do nothing
             }
 
             @Override
@@ -97,7 +101,8 @@ public void onTextChanged(CharSequence s, int start, int before, int count) {
 
             @Override
             public void afterTextChanged(Editable s) {
-
+                //JDK - 4/13/19
+                //do nothing
             }
         };
 

From 44c6d916d15976b527a028057b94ce83e4a2714b Mon Sep 17 00:00:00 2001
From: James Kizer <james.kizer@gmail.com>
Date: Sat, 13 Apr 2019 21:19:20 -0600
Subject: [PATCH 44/53] #491

---
 .../foundation/components/common/ui/views/SubmitBar.java   | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/SubmitBar.java b/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/SubmitBar.java
index 322c7b319..e9a00a23f 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/SubmitBar.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/SubmitBar.java
@@ -10,16 +10,9 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-//TODO: remove RX dependency
-//import com.jakewharton.rxbinding.view.RxView;
-
 import org.researchstack.foundation.R;
 import org.researchstack.foundation.components.utils.ThemeUtils;
 
-import java.util.function.Consumer;
-
-//import rx.functions.Action1;
-
 public class SubmitBar extends LinearLayout {
     private TextView positiveView;
     private TextView negativeView;

From 99128bda5eb7b27fd481438fa44ec721162776d9 Mon Sep 17 00:00:00 2001
From: James Kizer <james.kizer@gmail.com>
Date: Sat, 13 Apr 2019 21:19:29 -0600
Subject: [PATCH 45/53] #491

---
 .../components/presentation/interfaces/IStepFragment.kt        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/foundation/src/main/java/org/researchstack/foundation/components/presentation/interfaces/IStepFragment.kt b/foundation/src/main/java/org/researchstack/foundation/components/presentation/interfaces/IStepFragment.kt
index 2bb2deecf..14cc27e24 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/presentation/interfaces/IStepFragment.kt
+++ b/foundation/src/main/java/org/researchstack/foundation/components/presentation/interfaces/IStepFragment.kt
@@ -7,7 +7,8 @@ import org.researchstack.foundation.core.interfaces.IStep
 
 interface IStepFragment {
     fun initialize(step: IStep, result: IResult?)
-    //TODO: Understand if we need to change StepCallbacks
+    //TODO: JDK - 4/13/19 - Understand if we need to change StepCallbacks
+    //This interface may change depending on work on Actions
     fun setCallbacks(callbacks: StepCallbacks)
     fun onBackPressed()
     val fragment: Fragment

From 6c2bf644558d85f121f0a9ac0b7f746d3454ad98 Mon Sep 17 00:00:00 2001
From: James Kizer <james.kizer@gmail.com>
Date: Sat, 13 Apr 2019 21:19:50 -0600
Subject: [PATCH 46/53] #491

---
 .../presentation/TaskPresentationFragment.kt          |  7 -------
 .../foundation/core/models/result/StepResult.java     |  7 -------
 .../foundation/core/models/result/TaskResult.java     |  2 +-
 .../foundation/core/models/task/Task.java             | 11 ++++++++---
 4 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/foundation/src/main/java/org/researchstack/foundation/components/presentation/TaskPresentationFragment.kt b/foundation/src/main/java/org/researchstack/foundation/components/presentation/TaskPresentationFragment.kt
index 5097b1568..3dfa32e9a 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/presentation/TaskPresentationFragment.kt
+++ b/foundation/src/main/java/org/researchstack/foundation/components/presentation/TaskPresentationFragment.kt
@@ -42,17 +42,10 @@ abstract class TaskPresentationFragment<StepType: IStep, ResultType: IResult, Ta
     val currentStep: StepType?
         get() = this._currentStep
 
-
-//    var _task: ITask? = null
-//    val task: ITask
-//        get() = this._task!!
-
     var _result: ResultType? = null
     val result: ResultType
         get() = this._result!!
 
-//    var taskPresentaterDelegate: ITaskPresenterDelegate? = null
-
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
 
         val view = inflater.inflate(R.layout.rsf_fragment_task_presentation, container, false);
diff --git a/foundation/src/main/java/org/researchstack/foundation/core/models/result/StepResult.java b/foundation/src/main/java/org/researchstack/foundation/core/models/result/StepResult.java
index 21bb11ab4..d6c140ada 100644
--- a/foundation/src/main/java/org/researchstack/foundation/core/models/result/StepResult.java
+++ b/foundation/src/main/java/org/researchstack/foundation/core/models/result/StepResult.java
@@ -31,9 +31,6 @@ public class StepResult<T> extends Result {
 
     private Step step;
 
-    //TODO: See if we can remove this... What if we remove this for foundation, but add it for backwards compat foundation
-//    private AnswerFormat answerFormat;
-
     /**
      * Creates a StepResult from a {@link Step}.
      * <p>
@@ -47,9 +44,6 @@ public StepResult(Step step) {
         this.results = new HashMap<>();
         this.step = step;
 
-//        if (step instanceof QuestionStep) {
-//            answerFormat = ((QuestionStep) step).getAnswerFormat();
-//        }
         setStartDate(new Date());
         // this will be updated when the result is set
         setEndDate(new Date());
@@ -105,7 +99,6 @@ public void setResultForIdentifier(String identifier, T result) {
         results.put(identifier, result);
     }
 
-    //TODO: See if we can remove this... What if we remove this for foundation, but add it for backwards compat foundation
     /**
      * Gets the {@link AnswerFormat} for this step result. May be useful when processing the
      * result.
diff --git a/foundation/src/main/java/org/researchstack/foundation/core/models/result/TaskResult.java b/foundation/src/main/java/org/researchstack/foundation/core/models/result/TaskResult.java
index bdf14a7f0..4b33f7cac 100644
--- a/foundation/src/main/java/org/researchstack/foundation/core/models/result/TaskResult.java
+++ b/foundation/src/main/java/org/researchstack/foundation/core/models/result/TaskResult.java
@@ -20,7 +20,7 @@
 public class TaskResult extends Result {
     private Map<String, StepResult> results;
 
-    //TODO: add support for this
+    //TODO: JDK - 4/13/19 add support for this
     // unimplemented but exists in RK, implement or delete if not needed
     private UUID uuidTask;
 
diff --git a/foundation/src/main/java/org/researchstack/foundation/core/models/task/Task.java b/foundation/src/main/java/org/researchstack/foundation/core/models/task/Task.java
index 59e1071e5..4c8d57912 100644
--- a/foundation/src/main/java/org/researchstack/foundation/core/models/task/Task.java
+++ b/foundation/src/main/java/org/researchstack/foundation/core/models/task/Task.java
@@ -63,7 +63,6 @@ public String getIdentifier() {
         return identifier;
     }
 
-    //TODO: probably want to update / remove this method due to dependency on Android Context
     /**
      * Gets the title to display in the toolbar for a given step.
      * <p>
@@ -165,14 +164,20 @@ public String getTitleForStep(Step step) {
      */
     public abstract void validateParameters();
 
-    //TODO: probably want to remove this due to dependency on ViewTaskActivity
+    //JDK - 4/13/19 - changed this interface from
+    //onViewChange(ViewChangeType type, ViewTaskActivity activity, Step currentStep)
+    //to
+    //onViewChange(ViewChangeType type, TaskLifecycleObserver observer, Step currentStep)
+    //this was done to remove the circular dependency on ViewTaskActivity
+    //Note that this method is invoked by ViewTaskActivity, which was modified to implement TaskLifecycleObserver
+    //This is not (yet) invoked by TaskPresentationFragment, but this potentially change at some point
 //    /**
 //     * Function that can be overridden in order to access the low level changes in the view.
 //     * The function is called at Activity lifecycle events (creation, pause, resume, stop and whenever
 //     * the content of the activity is changed, according to the step.
 //     *
 //     * @param type        lifecycle event
-//     * @param activity    current activity
+//     * @param observer    current activity
 //     * @param currentStep the current step being shown
 //     */
     public void onViewChange(ViewChangeType type, TaskLifecycleObserver observer, Step currentStep) {

From e5645e441c3e5db60df7523d2d4bfead1ee2a29c Mon Sep 17 00:00:00 2001
From: James Kizer <james.kizer@gmail.com>
Date: Tue, 16 Apr 2019 11:50:39 -0600
Subject: [PATCH 47/53] #491 Added comment explaining onSaveStep, onCancelStep,
 onExecuteStepAction and showConfirmExitDialog

---
 .../components/presentation/TaskPresentationFragment.kt        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/foundation/src/main/java/org/researchstack/foundation/components/presentation/TaskPresentationFragment.kt b/foundation/src/main/java/org/researchstack/foundation/components/presentation/TaskPresentationFragment.kt
index 3dfa32e9a..61695ab76 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/presentation/TaskPresentationFragment.kt
+++ b/foundation/src/main/java/org/researchstack/foundation/components/presentation/TaskPresentationFragment.kt
@@ -188,6 +188,9 @@ abstract class TaskPresentationFragment<StepType: IStep, ResultType: IResult, Ta
         }
     }
 
+    //JDK - 4/16/19 - as part of future work, we will be removing conformance to StepCallbacks
+    //This means that onSaveStep, onCancelStep, onExecuteStepAction and showConfirmExitDialog will
+    //probably all go away
     protected fun onExecuteStepAction(action: Int) {
         if (action == StepCallbacks.ACTION_NEXT) {
             showNextStep()

From 5e98820c496eacd5afb7a3ebf1fb0b0733c6ae6a Mon Sep 17 00:00:00 2001
From: Joshua Liu <liujoshua@users.noreply.github.com>
Date: Wed, 1 May 2019 14:47:34 -0700
Subject: [PATCH 48/53] AndroidX Migration

---
 authentication/build.gradle                      | 14 +++++++-------
 .../authentication/ExampleInstrumentedTest.java  |  4 ++--
 .../feature/authentication/Authenticator.kt      |  2 +-
 .../pincode/PasscodeAuthenticator.kt             |  2 +-
 .../pincode/ui/PasscodeAuthenticationFragment.kt |  4 ++--
 .../authentication/pincode/ui/PinCodeLayout.java |  2 +-
 .../ui/SignUpPinCodeCreationStepLayout.java      |  2 +-
 .../main/res/layout/rsfa_step_layout_pincode.xml |  2 +-
 backbone/build.gradle                            | 10 +++++-----
 .../backbone/ui/PinCodeActivity.java             |  6 +++---
 .../backbone/ui/ViewTaskActivity.java            |  8 ++++----
 chart/build.gradle                               | 16 ++++++++--------
 .../feature/chart/ExampleInstrumentedTest.java   |  4 ++--
 .../feature/chart/ui/BarChartCard.java           |  6 +++---
 .../feature/chart/ui/EmptyView.java              |  4 ++--
 .../feature/chart/ui/LineChartCard.java          |  6 +++---
 .../feature/chart/ui/PieChartCard.java           |  4 ++--
 .../feature/chart/ui/ProgressChartCard.java      |  6 +++---
 .../src/main/res/layout/rsfch_view_chart_bar.xml |  2 +-
 .../main/res/layout/rsfch_view_chart_line.xml    |  2 +-
 .../res/layout/rsfch_view_chart_progress.xml     |  4 ++--
 consent/build.gradle                             | 14 +++++++-------
 .../feature/consent/ExampleInstrumentedTest.java |  4 ++--
 .../feature/consent/model/ConsentDocument.java   |  2 +-
 .../feature/consent/model/ConsentSignature.java  |  2 +-
 .../ui/layout/ConsentDocumentStepLayout.java     |  2 +-
 .../ui/layout/ConsentVisualStepLayout.java       |  2 +-
 .../feature/consent/ui/views/SignatureView.java  |  2 +-
 .../rsfc_step_layout_consent_signature.xml       |  2 +-
 foundation/build.gradle                          | 16 ++++++++--------
 .../foundation/ExampleInstrumentedTest.java      |  4 ++--
 .../common/ui/layout/FixedSubmitBarLayout.java   |  2 +-
 .../components/common/ui/views/IconTab.java      |  6 +++---
 .../common/ui/views/IconTabLayout.java           |  4 ++--
 .../components/common/ui/views/SubmitBar.java    |  4 ++--
 .../presentation/TaskPresentationFragment.kt     | 10 +++++-----
 .../BackwardsCompatibleStepFragment.kt           |  6 +++---
 .../presentation/interfaces/IStepFragment.kt     |  4 ++--
 .../components/survey/ui/body/BodyAnswer.java    |  2 +-
 .../survey/ui/body/DateQuestionBody.java         |  2 +-
 .../components/survey/ui/body/FormBody.java      |  2 +-
 .../survey/ui/body/MultiChoiceQuestionBody.java  |  4 ++--
 .../survey/ui/body/SingleChoiceQuestionBody.java |  2 +-
 .../survey/ui/layout/SurveyStepLayout.java       |  5 ++---
 .../foundation/components/utils/ViewUtils.java   |  2 +-
 .../web/ui/activities/ViewVideoActivity.java     |  2 +-
 .../ui/activities/ViewWebDocumentActivity.java   |  6 +++---
 .../core/models/result/StepResult.java           |  2 +-
 .../src/main/res/layout/rsf_item_checkbox.xml    |  2 +-
 .../src/main/res/layout/rsf_item_date_view.xml   |  4 ++--
 .../src/main/res/layout/rsf_item_radio.xml       |  2 +-
 .../src/main/res/layout/rsf_layout_toolbar.xml   |  2 +-
 .../src/main/res/layout/rsf_view_icon_tab.xml    |  6 +++---
 .../src/main/res/layout/rsf_view_submitbar.xml   |  4 ++--
 gradle.properties                                |  2 ++
 skin/build.gradle                                | 10 +++++-----
 .../skin/PermissionRequestManager.java           |  6 +++---
 .../java/org/researchstack/skin/UiManager.java   |  4 +++-
 .../skin/notification/NotificationConfig.java    |  4 ++--
 .../notification/TaskNotificationReceiver.java   |  2 +-
 .../org/researchstack/skin/ui/BaseActivity.java  |  8 ++++----
 .../skin/ui/EmailVerificationActivity.java       |  4 ++--
 .../org/researchstack/skin/ui/LearnActivity.java |  2 +-
 .../org/researchstack/skin/ui/MainActivity.java  |  6 +++---
 .../skin/ui/OnboardingActivity.java              |  8 ++++----
 .../researchstack/skin/ui/SettingsActivity.java  |  2 +-
 .../skin/ui/adapter/MainPagerAdapter.java        |  6 +++---
 .../skin/ui/adapter/OnboardingPagerAdapter.java  |  2 +-
 .../skin/ui/fragment/ActivitiesFragment.java     | 12 ++++++------
 .../skin/ui/fragment/LearnFragment.java          | 10 +++++-----
 .../skin/ui/fragment/SettingsFragment.java       | 10 +++++-----
 .../ui/layout/ConsentQuizQuestionStepLayout.java |  8 ++++----
 .../skin/ui/layout/PermissionStepLayout.java     |  4 ++--
 .../skin/ui/layout/SignInStepLayout.java         |  2 +-
 .../skin/ui/layout/SignUpStepLayout.java         |  2 +-
 .../skin/ui/preference/TextColorPreference.java  |  4 ++--
 .../skin/ui/views/DividerItemDecoration.java     |  6 +++---
 .../skin/utils/ConsentFormUtils.java             |  2 +-
 .../main/res/layout-v16/rss_item_row_learn.xml   |  2 +-
 .../res/layout-v21/rss_layout_toolbar_tabs.xml   |  2 +-
 .../layout/rss_activity_email_verification.xml   |  4 ++--
 skin/src/main/res/layout/rss_activity_main.xml   |  2 +-
 .../main/res/layout/rss_activity_onboarding.xml  | 14 +++++++-------
 .../res/layout/rss_button_study_overview.xml     |  2 +-
 .../main/res/layout/rss_fragment_activities.xml  |  2 +-
 skin/src/main/res/layout/rss_fragment_learn.xml  |  2 +-
 .../main/res/layout/rss_item_permission_card.xml |  4 ++--
 .../res/layout/rss_item_permission_content.xml   |  8 ++++----
 skin/src/main/res/layout/rss_item_radio_quiz.xml |  2 +-
 skin/src/main/res/layout/rss_item_row_learn.xml  |  2 +-
 skin/src/main/res/layout/rss_item_schedule.xml   |  4 ++--
 .../main/res/layout/rss_item_section_learn.xml   |  2 +-
 skin/src/main/res/layout/rss_layout_sign_in.xml  | 10 +++++-----
 skin/src/main/res/layout/rss_layout_sign_up.xml  |  8 ++++----
 .../main/res/layout/rss_layout_toolbar_tabs.xml  |  2 +-
 storage/build.gradle                             | 14 +++++++-------
 .../feature/storage/ExampleInstrumentedTest.java |  4 ++--
 .../feature/storage/StorageAccess.java           |  2 +-
 .../feature/storage/file/SimpleFileAccess.java   |  4 ++--
 .../storage/file/aes/PinProtectedProvider.java   |  2 +-
 .../feature/storage/utils/FileUtils.java         |  2 +-
 101 files changed, 237 insertions(+), 234 deletions(-)

diff --git a/authentication/build.gradle b/authentication/build.gradle
index 7731e2194..68028dcbc 100644
--- a/authentication/build.gradle
+++ b/authentication/build.gradle
@@ -15,7 +15,7 @@ android {
         versionCode 1
         versionName version
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
     buildTypes {
@@ -61,17 +61,17 @@ ext {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation "com.android.support:appcompat-v7:$support_library_version"
-    implementation "com.android.support:cardview-v7:$support_library_version"
-    implementation "com.android.support:preference-v14:$support_library_version"
-    implementation "com.android.support:design:$support_library_version"
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     implementation project(':foundation')
 
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
 }
 
 group = publishedGroupId                               // Maven Group ID for the artifact
diff --git a/authentication/src/androidTest/java/org/researchstack/feature/authentication/ExampleInstrumentedTest.java b/authentication/src/androidTest/java/org/researchstack/feature/authentication/ExampleInstrumentedTest.java
index 9606b2642..fb5163b05 100644
--- a/authentication/src/androidTest/java/org/researchstack/feature/authentication/ExampleInstrumentedTest.java
+++ b/authentication/src/androidTest/java/org/researchstack/feature/authentication/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package org.researchstack.feature.authentication;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/authentication/src/main/java/org/researchstack/feature/authentication/Authenticator.kt b/authentication/src/main/java/org/researchstack/feature/authentication/Authenticator.kt
index 7148d9b56..19f942ce4 100644
--- a/authentication/src/main/java/org/researchstack/feature/authentication/Authenticator.kt
+++ b/authentication/src/main/java/org/researchstack/feature/authentication/Authenticator.kt
@@ -1,6 +1,6 @@
 package org.researchstack.feature.authentication
 
-import android.support.v4.os.CancellationSignal
+import androidx.core.os.CancellationSignal
 
 open abstract class Authenticator<Result: Authenticator.AuthenticationResult, Callback: Authenticator.AuthenticationCallback<Result>> {
 
diff --git a/authentication/src/main/java/org/researchstack/feature/authentication/pincode/PasscodeAuthenticator.kt b/authentication/src/main/java/org/researchstack/feature/authentication/pincode/PasscodeAuthenticator.kt
index dc36ebaea..3c2c1d766 100644
--- a/authentication/src/main/java/org/researchstack/feature/authentication/pincode/PasscodeAuthenticator.kt
+++ b/authentication/src/main/java/org/researchstack/feature/authentication/pincode/PasscodeAuthenticator.kt
@@ -1,6 +1,6 @@
 package org.researchstack.feature.authentication.pincode
 
-import android.support.v4.os.CancellationSignal
+import androidx.core.os.CancellationSignal
 import java.lang.ref.WeakReference
 import org.researchstack.feature.authentication.Authenticator
 
diff --git a/authentication/src/main/java/org/researchstack/feature/authentication/pincode/ui/PasscodeAuthenticationFragment.kt b/authentication/src/main/java/org/researchstack/feature/authentication/pincode/ui/PasscodeAuthenticationFragment.kt
index e6b82bbf7..e4a2f8483 100644
--- a/authentication/src/main/java/org/researchstack/feature/authentication/pincode/ui/PasscodeAuthenticationFragment.kt
+++ b/authentication/src/main/java/org/researchstack/feature/authentication/pincode/ui/PasscodeAuthenticationFragment.kt
@@ -5,7 +5,7 @@ import android.graphics.Color
 import android.os.AsyncTask
 import android.os.Build
 import android.os.Bundle
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import android.text.Editable
 import android.text.TextWatcher
 import android.view.ContextThemeWrapper
@@ -19,7 +19,7 @@ import org.researchstack.feature.authentication.R
 import org.researchstack.feature.authentication.pincode.PasscodeAuthenticator
 import org.researchstack.foundation.components.utils.ThemeUtils
 
-open class PasscodeAuthenticationFragment: Fragment() {
+open class PasscodeAuthenticationFragment: androidx.fragment.app.Fragment() {
 
     open class AuthenticationCallback {
         open fun onAuthenticationFailed() {}
diff --git a/authentication/src/main/java/org/researchstack/feature/authentication/pincode/ui/PinCodeLayout.java b/authentication/src/main/java/org/researchstack/feature/authentication/pincode/ui/PinCodeLayout.java
index 870fd53b5..f250866ea 100644
--- a/authentication/src/main/java/org/researchstack/feature/authentication/pincode/ui/PinCodeLayout.java
+++ b/authentication/src/main/java/org/researchstack/feature/authentication/pincode/ui/PinCodeLayout.java
@@ -1,7 +1,7 @@
 package org.researchstack.feature.authentication.pincode.ui;
 
 import android.content.Context;
-import android.support.annotation.CallSuper;
+import androidx.annotation.CallSuper;
 import android.text.InputFilter;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
diff --git a/authentication/src/main/java/org/researchstack/feature/authentication/pincode/ui/SignUpPinCodeCreationStepLayout.java b/authentication/src/main/java/org/researchstack/feature/authentication/pincode/ui/SignUpPinCodeCreationStepLayout.java
index c59b3a84e..e45dbb227 100644
--- a/authentication/src/main/java/org/researchstack/feature/authentication/pincode/ui/SignUpPinCodeCreationStepLayout.java
+++ b/authentication/src/main/java/org/researchstack/feature/authentication/pincode/ui/SignUpPinCodeCreationStepLayout.java
@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.content.res.Resources;
 import android.os.Handler;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.AttributeSet;
diff --git a/authentication/src/main/res/layout/rsfa_step_layout_pincode.xml b/authentication/src/main/res/layout/rsfa_step_layout_pincode.xml
index b016481c3..dd512e117 100644
--- a/authentication/src/main/res/layout/rsfa_step_layout_pincode.xml
+++ b/authentication/src/main/res/layout/rsfa_step_layout_pincode.xml
@@ -22,7 +22,7 @@
         android:text="@string/rsfa_pincode_enter_summary"
         android:textColorLink="?attr/colorAccent" />
 
-    <android.support.v7.widget.AppCompatEditText
+    <androidx.appcompat.widget.AppCompatEditText
         android:id="@+id/pincode"
         android:layout_width="match_parent"
         android:layout_height="@dimen/rsf_item_size_default"
diff --git a/backbone/build.gradle b/backbone/build.gradle
index 173019efa..950479e0e 100644
--- a/backbone/build.gradle
+++ b/backbone/build.gradle
@@ -68,10 +68,10 @@ ext {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
-    implementation "com.android.support:appcompat-v7:$support_library_version"
-    implementation "com.android.support:cardview-v7:$support_library_version"
-    implementation "com.android.support:preference-v14:$support_library_version"
-    implementation "com.android.support:design:$support_library_version"
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
@@ -83,7 +83,7 @@ dependencies {
     implementation 'io.reactivex:rxjava:1.2.5'
     implementation 'io.reactivex:rxandroid:1.2.1'
     implementation 'com.jakewharton.rxbinding:rxbinding:0.4.0'
-    implementation "com.android.support:support-v4:$support_library_version"
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.jakewharton.rxbinding:rxbinding-support-v4:0.4.0'
     implementation 'com.jakewharton.rxbinding:rxbinding-appcompat-v7:0.4.0'
     implementation 'com.jakewharton.rxbinding:rxbinding-design:0.4.0'
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/PinCodeActivity.java b/backbone/src/main/java/org/researchstack/backbone/ui/PinCodeActivity.java
index 93679995d..2cf1c1832 100644
--- a/backbone/src/main/java/org/researchstack/backbone/ui/PinCodeActivity.java
+++ b/backbone/src/main/java/org/researchstack/backbone/ui/PinCodeActivity.java
@@ -4,9 +4,9 @@
 import android.graphics.Color;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.ContextThemeWrapper;
 import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
diff --git a/backbone/src/main/java/org/researchstack/backbone/ui/ViewTaskActivity.java b/backbone/src/main/java/org/researchstack/backbone/ui/ViewTaskActivity.java
index de22df02b..270b59fae 100644
--- a/backbone/src/main/java/org/researchstack/backbone/ui/ViewTaskActivity.java
+++ b/backbone/src/main/java/org/researchstack/backbone/ui/ViewTaskActivity.java
@@ -4,10 +4,10 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Toast;
diff --git a/chart/build.gradle b/chart/build.gradle
index 3649697e4..e22448086 100644
--- a/chart/build.gradle
+++ b/chart/build.gradle
@@ -15,7 +15,7 @@ android {
         versionCode 1
         versionName version
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
     buildTypes {
@@ -61,23 +61,23 @@ ext {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation "com.android.support:appcompat-v7:$support_library_version"
-    implementation "com.android.support:cardview-v7:$support_library_version"
-    implementation "com.android.support:preference-v14:$support_library_version"
-    implementation "com.android.support:design:$support_library_version"
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     implementation project(':foundation')
     implementation 'com.github.PhilJay:MPAndroidChart:v2.2.3'
     implementation 'com.jakewharton.rxbinding:rxbinding:0.4.0'
-    implementation "com.android.support:support-v4:$support_library_version"
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.jakewharton.rxbinding:rxbinding-support-v4:0.4.0'
     implementation 'com.jakewharton.rxbinding:rxbinding-appcompat-v7:0.4.0'
     implementation 'com.jakewharton.rxbinding:rxbinding-design:0.4.0'
 
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
 }
 
 group = publishedGroupId                               // Maven Group ID for the artifact
diff --git a/chart/src/androidTest/java/org/researchstack/feature/chart/ExampleInstrumentedTest.java b/chart/src/androidTest/java/org/researchstack/feature/chart/ExampleInstrumentedTest.java
index 0c16cbc49..6dd9cd4b2 100644
--- a/chart/src/androidTest/java/org/researchstack/feature/chart/ExampleInstrumentedTest.java
+++ b/chart/src/androidTest/java/org/researchstack/feature/chart/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package org.researchstack.feature.chart;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/chart/src/main/java/org/researchstack/feature/chart/ui/BarChartCard.java b/chart/src/main/java/org/researchstack/feature/chart/ui/BarChartCard.java
index 7d7e69a06..2d4e362cf 100644
--- a/chart/src/main/java/org/researchstack/feature/chart/ui/BarChartCard.java
+++ b/chart/src/main/java/org/researchstack/feature/chart/ui/BarChartCard.java
@@ -4,9 +4,9 @@
 import android.content.res.TypedArray;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.StringRes;
-import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v7.widget.CardView;
+import androidx.annotation.StringRes;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.cardview.widget.CardView;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
diff --git a/chart/src/main/java/org/researchstack/feature/chart/ui/EmptyView.java b/chart/src/main/java/org/researchstack/feature/chart/ui/EmptyView.java
index 20168b5bc..e793559ee 100644
--- a/chart/src/main/java/org/researchstack/feature/chart/ui/EmptyView.java
+++ b/chart/src/main/java/org/researchstack/feature/chart/ui/EmptyView.java
@@ -4,8 +4,8 @@
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
-import android.support.v4.graphics.drawable.DrawableCompat;
+import androidx.annotation.Nullable;
+import androidx.core.graphics.drawable.DrawableCompat;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.widget.FrameLayout;
diff --git a/chart/src/main/java/org/researchstack/feature/chart/ui/LineChartCard.java b/chart/src/main/java/org/researchstack/feature/chart/ui/LineChartCard.java
index b41bbce26..b927b6982 100644
--- a/chart/src/main/java/org/researchstack/feature/chart/ui/LineChartCard.java
+++ b/chart/src/main/java/org/researchstack/feature/chart/ui/LineChartCard.java
@@ -4,9 +4,9 @@
 import android.content.res.TypedArray;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.StringRes;
-import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v7.widget.CardView;
+import androidx.annotation.StringRes;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.cardview.widget.CardView;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
diff --git a/chart/src/main/java/org/researchstack/feature/chart/ui/PieChartCard.java b/chart/src/main/java/org/researchstack/feature/chart/ui/PieChartCard.java
index 4003a4886..f45f33977 100644
--- a/chart/src/main/java/org/researchstack/feature/chart/ui/PieChartCard.java
+++ b/chart/src/main/java/org/researchstack/feature/chart/ui/PieChartCard.java
@@ -3,8 +3,8 @@
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Typeface;
-import android.support.annotation.StringRes;
-import android.support.v7.widget.CardView;
+import androidx.annotation.StringRes;
+import androidx.cardview.widget.CardView;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
diff --git a/chart/src/main/java/org/researchstack/feature/chart/ui/ProgressChartCard.java b/chart/src/main/java/org/researchstack/feature/chart/ui/ProgressChartCard.java
index 7af3e6b9e..d517762a7 100644
--- a/chart/src/main/java/org/researchstack/feature/chart/ui/ProgressChartCard.java
+++ b/chart/src/main/java/org/researchstack/feature/chart/ui/ProgressChartCard.java
@@ -4,9 +4,9 @@
 import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.graphics.Typeface;
-import android.support.annotation.StringRes;
-import android.support.design.widget.TabLayout;
-import android.support.v7.widget.CardView;
+import androidx.annotation.StringRes;
+import com.google.android.material.tabs.TabLayout;
+import androidx.cardview.widget.CardView;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
diff --git a/chart/src/main/res/layout/rsfch_view_chart_bar.xml b/chart/src/main/res/layout/rsfch_view_chart_bar.xml
index 2c0e19f1a..d65fa5e24 100644
--- a/chart/src/main/res/layout/rsfch_view_chart_bar.xml
+++ b/chart/src/main/res/layout/rsfch_view_chart_bar.xml
@@ -15,7 +15,7 @@
             android:layout_height="wrap_content"
             tools:text="Amount of pie eaten" />
 
-        <android.support.v7.widget.AppCompatImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/view_chart_line_expand"
             style="@style/Widget.AppCompat.ActionButton"
             android:layout_width="wrap_content"
diff --git a/chart/src/main/res/layout/rsfch_view_chart_line.xml b/chart/src/main/res/layout/rsfch_view_chart_line.xml
index 37cb7d823..53890f152 100644
--- a/chart/src/main/res/layout/rsfch_view_chart_line.xml
+++ b/chart/src/main/res/layout/rsfch_view_chart_line.xml
@@ -16,7 +16,7 @@
             android:layout_height="wrap_content"
             tools:text="Amount of pie eaten" />
 
-        <android.support.v7.widget.AppCompatImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/view_chart_line_expand"
             style="@style/Widget.AppCompat.ActionButton"
             android:layout_width="wrap_content"
diff --git a/chart/src/main/res/layout/rsfch_view_chart_progress.xml b/chart/src/main/res/layout/rsfch_view_chart_progress.xml
index 7ed8ddbb9..065a58dec 100644
--- a/chart/src/main/res/layout/rsfch_view_chart_progress.xml
+++ b/chart/src/main/res/layout/rsfch_view_chart_progress.xml
@@ -15,7 +15,7 @@
             android:layout_height="wrap_content"
             tools:text="Amount of pie eaten" />
 
-        <android.support.v7.widget.AppCompatButton
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/view_chart_progress_finish"
             style="@style/Widget.AppCompat.Button.Borderless.Colored"
             android:layout_width="wrap_content"
@@ -36,7 +36,7 @@
             android:layout_marginBottom="8dp"
             android:layout_marginTop="16dp" />
 
-        <android.support.design.widget.TabLayout
+        <com.google.android.material.tabs.TabLayout
             android:id="@+id/view_chart_progress_tabs"
             style="@style/Widget.Feature.Chart.TabLayout.Chart"
             android:layout_width="wrap_content"
diff --git a/consent/build.gradle b/consent/build.gradle
index 3a0c38f3d..57146f778 100644
--- a/consent/build.gradle
+++ b/consent/build.gradle
@@ -15,7 +15,7 @@ android {
         versionCode 1
         versionName version
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
     buildTypes {
@@ -61,18 +61,18 @@ ext {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation "com.android.support:appcompat-v7:$support_library_version"
-    implementation "com.android.support:cardview-v7:$support_library_version"
-    implementation "com.android.support:preference-v14:$support_library_version"
-    implementation "com.android.support:design:$support_library_version"
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     implementation project(':foundation')
     implementation "com.google.code.gson:gson:$gson_version"
 
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
 }
 
 group = publishedGroupId                               // Maven Group ID for the artifact
diff --git a/consent/src/androidTest/java/org/researchstack/feature/consent/ExampleInstrumentedTest.java b/consent/src/androidTest/java/org/researchstack/feature/consent/ExampleInstrumentedTest.java
index 630a09580..d5490dc3b 100644
--- a/consent/src/androidTest/java/org/researchstack/feature/consent/ExampleInstrumentedTest.java
+++ b/consent/src/androidTest/java/org/researchstack/feature/consent/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package org.researchstack.feature.consent;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/consent/src/main/java/org/researchstack/feature/consent/model/ConsentDocument.java b/consent/src/main/java/org/researchstack/feature/consent/model/ConsentDocument.java
index c9b6d822b..fd0533227 100644
--- a/consent/src/main/java/org/researchstack/feature/consent/model/ConsentDocument.java
+++ b/consent/src/main/java/org/researchstack/feature/consent/model/ConsentDocument.java
@@ -1,6 +1,6 @@
 package org.researchstack.feature.consent.model;
 
-import android.support.annotation.StringRes;
+import androidx.annotation.StringRes;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/consent/src/main/java/org/researchstack/feature/consent/model/ConsentSignature.java b/consent/src/main/java/org/researchstack/feature/consent/model/ConsentSignature.java
index ed8416c70..dc840a45b 100644
--- a/consent/src/main/java/org/researchstack/feature/consent/model/ConsentSignature.java
+++ b/consent/src/main/java/org/researchstack/feature/consent/model/ConsentSignature.java
@@ -1,6 +1,6 @@
 package org.researchstack.feature.consent.model;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.io.Serializable;
 import java.util.UUID;
diff --git a/consent/src/main/java/org/researchstack/feature/consent/ui/layout/ConsentDocumentStepLayout.java b/consent/src/main/java/org/researchstack/feature/consent/ui/layout/ConsentDocumentStepLayout.java
index 6abc33b4e..34730d814 100644
--- a/consent/src/main/java/org/researchstack/feature/consent/ui/layout/ConsentDocumentStepLayout.java
+++ b/consent/src/main/java/org/researchstack/feature/consent/ui/layout/ConsentDocumentStepLayout.java
@@ -1,7 +1,7 @@
 package org.researchstack.feature.consent.ui.layout;
 
 import android.content.Context;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/consent/src/main/java/org/researchstack/feature/consent/ui/layout/ConsentVisualStepLayout.java b/consent/src/main/java/org/researchstack/feature/consent/ui/layout/ConsentVisualStepLayout.java
index 1cd07f5e9..cfa39cd6e 100644
--- a/consent/src/main/java/org/researchstack/feature/consent/ui/layout/ConsentVisualStepLayout.java
+++ b/consent/src/main/java/org/researchstack/feature/consent/ui/layout/ConsentVisualStepLayout.java
@@ -4,7 +4,7 @@
 import android.content.Intent;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
-import android.support.v4.graphics.drawable.DrawableCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.View;
diff --git a/consent/src/main/java/org/researchstack/feature/consent/ui/views/SignatureView.java b/consent/src/main/java/org/researchstack/feature/consent/ui/views/SignatureView.java
index 82766f8ce..fe4b4ab22 100644
--- a/consent/src/main/java/org/researchstack/feature/consent/ui/views/SignatureView.java
+++ b/consent/src/main/java/org/researchstack/feature/consent/ui/views/SignatureView.java
@@ -14,7 +14,7 @@
 import android.graphics.drawable.shapes.PathShape;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.v4.view.ViewCompat;
+import androidx.core.view.ViewCompat;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
diff --git a/consent/src/main/res/layout/rsfc_step_layout_consent_signature.xml b/consent/src/main/res/layout/rsfc_step_layout_consent_signature.xml
index 541153da3..9f47175a2 100644
--- a/consent/src/main/res/layout/rsfc_step_layout_consent_signature.xml
+++ b/consent/src/main/res/layout/rsfc_step_layout_consent_signature.xml
@@ -50,7 +50,7 @@
         android:layout_alignParentBottom="true" />
 
 
-    <android.support.v7.widget.AppCompatTextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/layout_consent_review_signature_clear"
         style="@style/Widget.AppCompat.Button.Borderless.Colored"
         android:layout_width="wrap_content"
diff --git a/foundation/build.gradle b/foundation/build.gradle
index e00439545..71a9ddded 100644
--- a/foundation/build.gradle
+++ b/foundation/build.gradle
@@ -15,7 +15,7 @@ android {
         versionCode 1
         versionName version
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
     buildTypes {
@@ -64,14 +64,14 @@ ext {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation "com.android.support:appcompat-v7:$support_library_version"
-    implementation "com.android.support:cardview-v7:$support_library_version"
-    implementation "com.android.support:preference-v14:$support_library_version"
-    implementation "com.android.support:design:$support_library_version"
-    implementation "com.android.support:support-compat:$support_library_version"
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.core:core:1.0.0'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     implementation "com.google.code.gson:gson:$gson_version"
diff --git a/foundation/src/androidTest/java/org/researchstack/foundation/ExampleInstrumentedTest.java b/foundation/src/androidTest/java/org/researchstack/foundation/ExampleInstrumentedTest.java
index 0a0870624..797eabc7f 100644
--- a/foundation/src/androidTest/java/org/researchstack/foundation/ExampleInstrumentedTest.java
+++ b/foundation/src/androidTest/java/org/researchstack/foundation/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package org.researchstack.foundation;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/common/ui/layout/FixedSubmitBarLayout.java b/foundation/src/main/java/org/researchstack/foundation/components/common/ui/layout/FixedSubmitBarLayout.java
index 6b82006c4..762b7aa34 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/common/ui/layout/FixedSubmitBarLayout.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/common/ui/layout/FixedSubmitBarLayout.java
@@ -2,7 +2,7 @@
 
 import android.annotation.TargetApi;
 import android.content.Context;
-import android.support.v4.view.ViewCompat;
+import androidx.core.view.ViewCompat;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/IconTab.java b/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/IconTab.java
index c892d0ea4..312fc5b7b 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/IconTab.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/IconTab.java
@@ -3,9 +3,9 @@
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.StringRes;
-import android.support.v4.graphics.drawable.DrawableCompat;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.StringRes;
+import androidx.core.graphics.drawable.DrawableCompat;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.LayoutInflater;
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/IconTabLayout.java b/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/IconTabLayout.java
index c056da635..10bdeb195 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/IconTabLayout.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/IconTabLayout.java
@@ -4,8 +4,8 @@
 import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TabLayout;
+import androidx.annotation.Nullable;
+import com.google.android.material.tabs.TabLayout;
 import android.util.AttributeSet;
 
 import org.researchstack.foundation.R;
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/SubmitBar.java b/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/SubmitBar.java
index e9a00a23f..2553a9a04 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/SubmitBar.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/common/ui/views/SubmitBar.java
@@ -2,8 +2,8 @@
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/presentation/TaskPresentationFragment.kt b/foundation/src/main/java/org/researchstack/foundation/components/presentation/TaskPresentationFragment.kt
index 61695ab76..f51726462 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/presentation/TaskPresentationFragment.kt
+++ b/foundation/src/main/java/org/researchstack/foundation/components/presentation/TaskPresentationFragment.kt
@@ -2,10 +2,10 @@ package org.researchstack.foundation.components.presentation
 
 import android.content.Context
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v7.app.AlertDialog
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.Toolbar
+import androidx.fragment.app.Fragment
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.Toolbar
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
@@ -21,7 +21,7 @@ import org.researchstack.foundation.core.interfaces.ITask
 import java.lang.RuntimeException
 import java.util.*
 
-abstract class TaskPresentationFragment<StepType: IStep, ResultType: IResult, TaskType: ITask>(): Fragment(), StepCallbacks {
+abstract class TaskPresentationFragment<StepType: IStep, ResultType: IResult, TaskType: ITask>(): androidx.fragment.app.Fragment(), StepCallbacks {
 
     public var taskProvider: ITaskProvider? = null
     public var stepFragmentProvider: IStepFragmentProvider? = null
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/presentation/compatibility/BackwardsCompatibleStepFragment.kt b/foundation/src/main/java/org/researchstack/foundation/components/presentation/compatibility/BackwardsCompatibleStepFragment.kt
index 41c581d94..2bf52f60c 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/presentation/compatibility/BackwardsCompatibleStepFragment.kt
+++ b/foundation/src/main/java/org/researchstack/foundation/components/presentation/compatibility/BackwardsCompatibleStepFragment.kt
@@ -1,7 +1,7 @@
 package org.researchstack.foundation.components.presentation.compatibility
 
 import android.os.Bundle
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -15,7 +15,7 @@ import org.researchstack.foundation.core.interfaces.IStep
 import org.researchstack.foundation.core.models.result.StepResult
 import org.researchstack.foundation.core.models.step.Step
 
-public class BackwardsCompatibleStepFragment(): Fragment(), IStepFragment {
+public class BackwardsCompatibleStepFragment(): androidx.fragment.app.Fragment(), IStepFragment {
 
     companion object {
 
@@ -29,7 +29,7 @@ public class BackwardsCompatibleStepFragment(): Fragment(), IStepFragment {
     //this will implement the traditional step layout
     var stepLayout: StepLayout? = null
 
-    override val fragment: Fragment
+    override val fragment: androidx.fragment.app.Fragment
         get() = this
 
     private fun getLayoutParams(stepLayout: StepLayout): FrameLayout.LayoutParams {
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/presentation/interfaces/IStepFragment.kt b/foundation/src/main/java/org/researchstack/foundation/components/presentation/interfaces/IStepFragment.kt
index 14cc27e24..1bacb507c 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/presentation/interfaces/IStepFragment.kt
+++ b/foundation/src/main/java/org/researchstack/foundation/components/presentation/interfaces/IStepFragment.kt
@@ -1,6 +1,6 @@
 package org.researchstack.foundation.components.presentation.interfaces
 
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import org.researchstack.foundation.components.common.ui.callbacks.StepCallbacks
 import org.researchstack.foundation.core.interfaces.IResult
 import org.researchstack.foundation.core.interfaces.IStep
@@ -11,5 +11,5 @@ interface IStepFragment {
     //This interface may change depending on work on Actions
     fun setCallbacks(callbacks: StepCallbacks)
     fun onBackPressed()
-    val fragment: Fragment
+    val fragment: androidx.fragment.app.Fragment
 }
\ No newline at end of file
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/BodyAnswer.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/BodyAnswer.java
index 4f7650f3d..db71d35e9 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/BodyAnswer.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/BodyAnswer.java
@@ -1,7 +1,7 @@
 package org.researchstack.foundation.components.survey.ui.body;
 
 import android.content.Context;
-import android.support.annotation.StringRes;
+import androidx.annotation.StringRes;
 
 import org.researchstack.foundation.R;
 
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/DateQuestionBody.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/DateQuestionBody.java
index 6b28e034b..195d60cf2 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/DateQuestionBody.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/DateQuestionBody.java
@@ -3,7 +3,7 @@
 import android.app.DatePickerDialog;
 import android.app.TimePickerDialog;
 import android.content.res.Resources;
-import android.support.v7.view.ContextThemeWrapper;
+import androidx.appcompat.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/FormBody.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/FormBody.java
index c27349ee6..96fffaff9 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/FormBody.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/FormBody.java
@@ -1,6 +1,6 @@
 package org.researchstack.foundation.components.survey.ui.body;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/MultiChoiceQuestionBody.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/MultiChoiceQuestionBody.java
index c1ee7329d..99a31dc94 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/MultiChoiceQuestionBody.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/MultiChoiceQuestionBody.java
@@ -1,8 +1,8 @@
 package org.researchstack.foundation.components.survey.ui.body;
 
 import android.content.res.Resources;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.AppCompatCheckBox;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.widget.AppCompatCheckBox;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/SingleChoiceQuestionBody.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/SingleChoiceQuestionBody.java
index c7018745e..bd6212eaf 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/SingleChoiceQuestionBody.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/body/SingleChoiceQuestionBody.java
@@ -1,7 +1,7 @@
 package org.researchstack.foundation.components.survey.ui.body;
 
 import android.content.res.Resources;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/layout/SurveyStepLayout.java b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/layout/SurveyStepLayout.java
index 19a5f8840..95849ecda 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/layout/SurveyStepLayout.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/survey/ui/layout/SurveyStepLayout.java
@@ -1,10 +1,9 @@
 package org.researchstack.foundation.components.survey.ui.layout;
 
 import android.content.Context;
-import android.content.Intent;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.StringRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
 import android.text.Html;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/utils/ViewUtils.java b/foundation/src/main/java/org/researchstack/foundation/components/utils/ViewUtils.java
index b8aafc4ea..744a15315 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/utils/ViewUtils.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/utils/ViewUtils.java
@@ -3,7 +3,7 @@
 import android.app.Activity;
 import android.content.Context;
 import android.os.Build;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.text.InputFilter;
 import android.text.InputType;
 import android.view.View;
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/web/ui/activities/ViewVideoActivity.java b/foundation/src/main/java/org/researchstack/foundation/components/web/ui/activities/ViewVideoActivity.java
index cf37d05d3..00ad23486 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/web/ui/activities/ViewVideoActivity.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/web/ui/activities/ViewVideoActivity.java
@@ -4,7 +4,7 @@
 import android.content.Intent;
 import android.content.res.AssetFileDescriptor;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.MediaController;
 
 import org.researchstack.foundation.R;
diff --git a/foundation/src/main/java/org/researchstack/foundation/components/web/ui/activities/ViewWebDocumentActivity.java b/foundation/src/main/java/org/researchstack/foundation/components/web/ui/activities/ViewWebDocumentActivity.java
index 006f660bc..0236a2884 100644
--- a/foundation/src/main/java/org/researchstack/foundation/components/web/ui/activities/ViewWebDocumentActivity.java
+++ b/foundation/src/main/java/org/researchstack/foundation/components/web/ui/activities/ViewWebDocumentActivity.java
@@ -3,9 +3,9 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 
 import org.researchstack.foundation.R;
diff --git a/foundation/src/main/java/org/researchstack/foundation/core/models/result/StepResult.java b/foundation/src/main/java/org/researchstack/foundation/core/models/result/StepResult.java
index d6c140ada..a2dad1984 100644
--- a/foundation/src/main/java/org/researchstack/foundation/core/models/result/StepResult.java
+++ b/foundation/src/main/java/org/researchstack/foundation/core/models/result/StepResult.java
@@ -1,6 +1,6 @@
 package org.researchstack.foundation.core.models.result;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import org.researchstack.foundation.components.survey.answerformat.AnswerFormat;
 import org.researchstack.foundation.components.survey.step.QuestionStep;
diff --git a/foundation/src/main/res/layout/rsf_item_checkbox.xml b/foundation/src/main/res/layout/rsf_item_checkbox.xml
index 3889a23b4..231aa349f 100644
--- a/foundation/src/main/res/layout/rsf_item_checkbox.xml
+++ b/foundation/src/main/res/layout/rsf_item_checkbox.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.AppCompatCheckBox xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.appcompat.widget.AppCompatCheckBox xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/foundation/src/main/res/layout/rsf_item_date_view.xml b/foundation/src/main/res/layout/rsf_item_date_view.xml
index e73fc53d4..358737762 100644
--- a/foundation/src/main/res/layout/rsf_item_date_view.xml
+++ b/foundation/src/main/res/layout/rsf_item_date_view.xml
@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <android.support.v7.widget.AppCompatTextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/label"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -15,7 +15,7 @@
         android:textSize="16sp"
         tools:text="title" />
 
-    <android.support.v7.widget.AppCompatTextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/value"
         style="?attr/editTextStyle"
         android:layout_width="match_parent"
diff --git a/foundation/src/main/res/layout/rsf_item_radio.xml b/foundation/src/main/res/layout/rsf_item_radio.xml
index 5559bd8f1..9a44b4d79 100644
--- a/foundation/src/main/res/layout/rsf_item_radio.xml
+++ b/foundation/src/main/res/layout/rsf_item_radio.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.AppCompatRadioButton xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.appcompat.widget.AppCompatRadioButton xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/foundation/src/main/res/layout/rsf_layout_toolbar.xml b/foundation/src/main/res/layout/rsf_layout_toolbar.xml
index 3493d8f39..68e769205 100644
--- a/foundation/src/main/res/layout/rsf_layout_toolbar.xml
+++ b/foundation/src/main/res/layout/rsf_layout_toolbar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/toolbar"
     android:layout_width="match_parent"
diff --git a/foundation/src/main/res/layout/rsf_view_icon_tab.xml b/foundation/src/main/res/layout/rsf_view_icon_tab.xml
index aa80ad839..5a654796e 100644
--- a/foundation/src/main/res/layout/rsf_view_icon_tab.xml
+++ b/foundation/src/main/res/layout/rsf_view_icon_tab.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <android.support.v7.widget.AppCompatTextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -21,7 +21,7 @@
         android:textAllCaps="true"
         tools:text="TEXT" />
 
-    <android.support.v7.widget.AppCompatImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/icon"
         android:layout_width="24dp"
         android:layout_height="24dp"
@@ -30,7 +30,7 @@
         android:tint="@android:color/white"
         tools:src="@drawable/icon" />
 
-    <android.support.v7.widget.AppCompatImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/indicator"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/foundation/src/main/res/layout/rsf_view_submitbar.xml b/foundation/src/main/res/layout/rsf_view_submitbar.xml
index 8e3386312..bba385e8e 100644
--- a/foundation/src/main/res/layout/rsf_view_submitbar.xml
+++ b/foundation/src/main/res/layout/rsf_view_submitbar.xml
@@ -11,14 +11,14 @@
         android:layout_height="wrap_content"
         android:layout_weight="1" />
 
-    <android.support.v7.widget.AppCompatTextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/bar_submit_negative"
         style="@style/Widget.AppCompat.Button.Borderless.Colored"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         tools:text="EXIT" />
 
-    <android.support.v7.widget.AppCompatTextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/bar_submit_postitive"
         style="@style/Widget.AppCompat.Button.Borderless.Colored"
         android:layout_width="wrap_content"
diff --git a/gradle.properties b/gradle.properties
index 50e199d6f..9d24db0b8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,4 +12,6 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+android.enableJetifier=true
+android.useAndroidX=true
 systemProp.snapshot=true
\ No newline at end of file
diff --git a/skin/build.gradle b/skin/build.gradle
index b1570fff4..685c7dbbf 100644
--- a/skin/build.gradle
+++ b/skin/build.gradle
@@ -79,15 +79,15 @@ dependencies {
 
     implementation project(':backbone')
 
-    implementation "com.android.support:appcompat-v7:$support_library_version"
-    implementation "com.android.support:cardview-v7:$support_library_version"
-    implementation "com.android.support:preference-v14:$support_library_version"
-    implementation "com.android.support:design:$support_library_version"
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
 
     implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     implementation 'com.jakewharton.rxbinding:rxbinding:0.4.0'
-    implementation "com.android.support:support-v4:$support_library_version"
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.jakewharton.rxbinding:rxbinding-support-v4:0.4.0'
     implementation 'com.jakewharton.rxbinding:rxbinding-appcompat-v7:0.4.0'
     implementation 'com.jakewharton.rxbinding:rxbinding-design:0.4.0'
diff --git a/skin/src/main/java/org/researchstack/skin/PermissionRequestManager.java b/skin/src/main/java/org/researchstack/skin/PermissionRequestManager.java
index 23c748e4e..175de0a30 100644
--- a/skin/src/main/java/org/researchstack/skin/PermissionRequestManager.java
+++ b/skin/src/main/java/org/researchstack/skin/PermissionRequestManager.java
@@ -5,9 +5,9 @@
 import android.app.Application;
 import android.content.Context;
 import android.content.Intent;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.StringRes;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.StringRes;
+import androidx.core.content.ContextCompat;
 
 import org.researchstack.skin.ui.layout.PermissionStepLayout;
 
diff --git a/skin/src/main/java/org/researchstack/skin/UiManager.java b/skin/src/main/java/org/researchstack/skin/UiManager.java
index 60fb0220a..7f14c8ce4 100644
--- a/skin/src/main/java/org/researchstack/skin/UiManager.java
+++ b/skin/src/main/java/org/researchstack/skin/UiManager.java
@@ -3,6 +3,8 @@
 import android.app.Application;
 import android.content.Context;
 
+import androidx.fragment.app.Fragment;
+
 import org.researchstack.foundation.core.models.result.StepResult;
 import org.researchstack.foundation.core.models.step.Step;
 import org.researchstack.skin.notification.TaskNotificationReceiver;
@@ -53,7 +55,7 @@ public static UiManager getInstance() {
      * All ActionItems returned by this method should define a title, icon, and class. These items
      * are used to fill a pager in the MainActivity. The framework uses the class objects from this
      * list to create a Fragments for tha pager. It is imperative that the defined classes be of
-     * instance  {@link android.support.v4.app.Fragment}.
+     * instance  {@link Fragment}.
      *
      * @return a list of ActionItems for display in the MainActivity ActionBar
      */
diff --git a/skin/src/main/java/org/researchstack/skin/notification/NotificationConfig.java b/skin/src/main/java/org/researchstack/skin/notification/NotificationConfig.java
index 0190423eb..59b2b632a 100644
--- a/skin/src/main/java/org/researchstack/skin/notification/NotificationConfig.java
+++ b/skin/src/main/java/org/researchstack/skin/notification/NotificationConfig.java
@@ -2,8 +2,8 @@
 
 import android.app.Application;
 import android.content.Context;
-import android.support.annotation.ColorInt;
-import android.support.annotation.DrawableRes;
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
 
 /**
  * Configuration class for framework notifciations
diff --git a/skin/src/main/java/org/researchstack/skin/notification/TaskNotificationReceiver.java b/skin/src/main/java/org/researchstack/skin/notification/TaskNotificationReceiver.java
index 73fca01c0..f07a4528e 100644
--- a/skin/src/main/java/org/researchstack/skin/notification/TaskNotificationReceiver.java
+++ b/skin/src/main/java/org/researchstack/skin/notification/TaskNotificationReceiver.java
@@ -7,7 +7,7 @@
 import android.content.Context;
 import android.content.Intent;
 //import android.support.v7.app.NotificationCompat;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
 import android.util.Log;
 
 import org.researchstack.skin.ui.MainActivity;
diff --git a/skin/src/main/java/org/researchstack/skin/ui/BaseActivity.java b/skin/src/main/java/org/researchstack/skin/ui/BaseActivity.java
index b9a082276..23eebeb57 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/BaseActivity.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/BaseActivity.java
@@ -5,9 +5,9 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.graphics.Color;
-import android.support.design.widget.Snackbar;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.content.LocalBroadcastManager;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.core.content.ContextCompat;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
@@ -124,7 +124,7 @@ private TextView getSnackBarMessageView(Snackbar snackbar) {
         }
 
         // Try id for lib level snackbar id
-        id = android.support.design.R.id.snackbar_text;
+        id = com.google.android.material.R.id.snackbar_text;
         tv = (TextView) snackbar.getView().findViewById(id);
         if (tv != null) {
             return tv;
diff --git a/skin/src/main/java/org/researchstack/skin/ui/EmailVerificationActivity.java b/skin/src/main/java/org/researchstack/skin/ui/EmailVerificationActivity.java
index 3a2be325e..18ce888a2 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/EmailVerificationActivity.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/EmailVerificationActivity.java
@@ -3,8 +3,8 @@
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.v7.widget.AppCompatTextView;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.AppCompatTextView;
+import androidx.appcompat.widget.Toolbar;
 import android.text.Html;
 import android.view.MenuItem;
 import android.view.View;
diff --git a/skin/src/main/java/org/researchstack/skin/ui/LearnActivity.java b/skin/src/main/java/org/researchstack/skin/ui/LearnActivity.java
index 47e186804..e32a19e63 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/LearnActivity.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/LearnActivity.java
@@ -1,7 +1,7 @@
 package org.researchstack.skin.ui;
 
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 
 import org.researchstack.backbone.ui.PinCodeActivity;
diff --git a/skin/src/main/java/org/researchstack/skin/ui/MainActivity.java b/skin/src/main/java/org/researchstack/skin/ui/MainActivity.java
index 16a5b4dab..bcf803202 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/MainActivity.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/MainActivity.java
@@ -4,9 +4,9 @@
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
-import android.support.design.widget.TabLayout;
-import android.support.v4.view.ViewPager;
-import android.support.v7.widget.Toolbar;
+import com.google.android.material.tabs.TabLayout;
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 
diff --git a/skin/src/main/java/org/researchstack/skin/ui/OnboardingActivity.java b/skin/src/main/java/org/researchstack/skin/ui/OnboardingActivity.java
index f86f9732b..62e406c6b 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/OnboardingActivity.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/OnboardingActivity.java
@@ -4,10 +4,10 @@
 import android.animation.ValueAnimator;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.design.widget.TabLayout;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.view.ViewPager;
-import android.support.v7.widget.AppCompatButton;
+import com.google.android.material.tabs.TabLayout;
+import androidx.core.content.ContextCompat;
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.widget.AppCompatButton;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
diff --git a/skin/src/main/java/org/researchstack/skin/ui/SettingsActivity.java b/skin/src/main/java/org/researchstack/skin/ui/SettingsActivity.java
index 5615f0d10..15a34a964 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/SettingsActivity.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/SettingsActivity.java
@@ -1,7 +1,7 @@
 package org.researchstack.skin.ui;
 
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 
 import org.researchstack.skin.R;
diff --git a/skin/src/main/java/org/researchstack/skin/ui/adapter/MainPagerAdapter.java b/skin/src/main/java/org/researchstack/skin/ui/adapter/MainPagerAdapter.java
index 2b3e14538..11e1e5481 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/adapter/MainPagerAdapter.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/adapter/MainPagerAdapter.java
@@ -1,8 +1,8 @@
 package org.researchstack.skin.ui.adapter;
 
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
 
 import org.researchstack.foundation.components.utils.ViewUtils;
 import org.researchstack.skin.ActionItem;
diff --git a/skin/src/main/java/org/researchstack/skin/ui/adapter/OnboardingPagerAdapter.java b/skin/src/main/java/org/researchstack/skin/ui/adapter/OnboardingPagerAdapter.java
index df1c56311..7ea337053 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/adapter/OnboardingPagerAdapter.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/adapter/OnboardingPagerAdapter.java
@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.content.Intent;
-import android.support.v4.view.PagerAdapter;
+import androidx.viewpager.widget.PagerAdapter;
 import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/skin/src/main/java/org/researchstack/skin/ui/fragment/ActivitiesFragment.java b/skin/src/main/java/org/researchstack/skin/ui/fragment/ActivitiesFragment.java
index cefdf75d3..cd36cc1d6 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/fragment/ActivitiesFragment.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/fragment/ActivitiesFragment.java
@@ -5,12 +5,12 @@
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v7.widget.AppCompatTextView;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.appcompat.widget.AppCompatTextView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/skin/src/main/java/org/researchstack/skin/ui/fragment/LearnFragment.java b/skin/src/main/java/org/researchstack/skin/ui/fragment/LearnFragment.java
index 36f1deabf..e12bc3f5c 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/fragment/LearnFragment.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/fragment/LearnFragment.java
@@ -3,11 +3,11 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.AppCompatTextView;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.appcompat.widget.AppCompatTextView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/skin/src/main/java/org/researchstack/skin/ui/fragment/SettingsFragment.java b/skin/src/main/java/org/researchstack/skin/ui/fragment/SettingsFragment.java
index e4d022601..4cbddce0c 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/fragment/SettingsFragment.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/fragment/SettingsFragment.java
@@ -6,11 +6,11 @@
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceFragmentCompat;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceScreen;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/skin/src/main/java/org/researchstack/skin/ui/layout/ConsentQuizQuestionStepLayout.java b/skin/src/main/java/org/researchstack/skin/ui/layout/ConsentQuizQuestionStepLayout.java
index 1b5f69ae7..7e9fa0bd0 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/layout/ConsentQuizQuestionStepLayout.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/layout/ConsentQuizQuestionStepLayout.java
@@ -3,10 +3,10 @@
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v7.widget.AppCompatRadioButton;
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.appcompat.widget.AppCompatRadioButton;
 import android.text.Html;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
diff --git a/skin/src/main/java/org/researchstack/skin/ui/layout/PermissionStepLayout.java b/skin/src/main/java/org/researchstack/skin/ui/layout/PermissionStepLayout.java
index 540e9a3a0..673f9cc8c 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/layout/PermissionStepLayout.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/layout/PermissionStepLayout.java
@@ -2,8 +2,8 @@
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.graphics.drawable.DrawableCompat;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/skin/src/main/java/org/researchstack/skin/ui/layout/SignInStepLayout.java b/skin/src/main/java/org/researchstack/skin/ui/layout/SignInStepLayout.java
index 77bd550aa..21565c86d 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/layout/SignInStepLayout.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/layout/SignInStepLayout.java
@@ -1,7 +1,7 @@
 package org.researchstack.skin.ui.layout;
 
 import android.content.Context;
-import android.support.v7.widget.AppCompatEditText;
+import androidx.appcompat.widget.AppCompatEditText;
 import android.util.AttributeSet;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
diff --git a/skin/src/main/java/org/researchstack/skin/ui/layout/SignUpStepLayout.java b/skin/src/main/java/org/researchstack/skin/ui/layout/SignUpStepLayout.java
index 8187db200..cc217bc71 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/layout/SignUpStepLayout.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/layout/SignUpStepLayout.java
@@ -1,7 +1,7 @@
 package org.researchstack.skin.ui.layout;
 
 import android.content.Context;
-import android.support.v7.widget.AppCompatEditText;
+import androidx.appcompat.widget.AppCompatEditText;
 import android.util.AttributeSet;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
diff --git a/skin/src/main/java/org/researchstack/skin/ui/preference/TextColorPreference.java b/skin/src/main/java/org/researchstack/skin/ui/preference/TextColorPreference.java
index 8f92609f1..d4be03ab6 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/preference/TextColorPreference.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/preference/TextColorPreference.java
@@ -3,8 +3,8 @@
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Color;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceViewHolder;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
 import android.widget.TextView;
 
diff --git a/skin/src/main/java/org/researchstack/skin/ui/views/DividerItemDecoration.java b/skin/src/main/java/org/researchstack/skin/ui/views/DividerItemDecoration.java
index 63afc476f..3b88bd93b 100644
--- a/skin/src/main/java/org/researchstack/skin/ui/views/DividerItemDecoration.java
+++ b/skin/src/main/java/org/researchstack/skin/ui/views/DividerItemDecoration.java
@@ -21,9 +21,9 @@
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.core.view.ViewCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 public class DividerItemDecoration extends RecyclerView.ItemDecoration {
diff --git a/skin/src/main/java/org/researchstack/skin/utils/ConsentFormUtils.java b/skin/src/main/java/org/researchstack/skin/utils/ConsentFormUtils.java
index dffe662c1..c5b6d6a71 100644
--- a/skin/src/main/java/org/researchstack/skin/utils/ConsentFormUtils.java
+++ b/skin/src/main/java/org/researchstack/skin/utils/ConsentFormUtils.java
@@ -4,7 +4,7 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Environment;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.researchstack.backbone.utils.ObservableUtils;
 import org.researchstack.foundation.components.utils.LogExt;
diff --git a/skin/src/main/res/layout-v16/rss_item_row_learn.xml b/skin/src/main/res/layout-v16/rss_item_row_learn.xml
index cceb649f1..05d674717 100644
--- a/skin/src/main/res/layout-v16/rss_item_row_learn.xml
+++ b/skin/src/main/res/layout-v16/rss_item_row_learn.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.AppCompatTextView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.appcompat.widget.AppCompatTextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/learn_item_title"
     android:layout_width="match_parent"
diff --git a/skin/src/main/res/layout-v21/rss_layout_toolbar_tabs.xml b/skin/src/main/res/layout-v21/rss_layout_toolbar_tabs.xml
index 12dba4e7b..06345e57e 100644
--- a/skin/src/main/res/layout-v21/rss_layout_toolbar_tabs.xml
+++ b/skin/src/main/res/layout-v21/rss_layout_toolbar_tabs.xml
@@ -7,7 +7,7 @@
     android:orientation="vertical"
     android:outlineProvider="bounds">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/skin/src/main/res/layout/rss_activity_email_verification.xml b/skin/src/main/res/layout/rss_activity_email_verification.xml
index 3bf02ddcc..32def5430 100644
--- a/skin/src/main/res/layout/rss_activity_email_verification.xml
+++ b/skin/src/main/res/layout/rss_activity_email_verification.xml
@@ -19,7 +19,7 @@
         android:textColor="?attr/colorAccent"
         android:textSize="20sp" />
 
-    <android.support.v7.widget.AppCompatTextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/email_verification_body"
         style="@style/TextAppearance.AppCompat.Subhead"
         android:layout_width="wrap_content"
@@ -30,7 +30,7 @@
         android:layout_marginTop="36dp"
         tools:text="@string/lorem_medium" />
 
-    <android.support.v7.widget.AppCompatTextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/email_verification_wrong_email"
         style="@style/Widget.AppCompat.Button.Borderless.Colored"
         android:layout_width="match_parent"
diff --git a/skin/src/main/res/layout/rss_activity_main.xml b/skin/src/main/res/layout/rss_activity_main.xml
index d109a89ed..8aa264124 100644
--- a/skin/src/main/res/layout/rss_activity_main.xml
+++ b/skin/src/main/res/layout/rss_activity_main.xml
@@ -6,7 +6,7 @@
 
     <include layout="@layout/rss_layout_toolbar_tabs" />
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/pager"
         android:layout_width="match_parent"
         android:layout_height="0dp"
diff --git a/skin/src/main/res/layout/rss_activity_onboarding.xml b/skin/src/main/res/layout/rss_activity_onboarding.xml
index 307000ffe..0e1e7ac62 100644
--- a/skin/src/main/res/layout/rss_activity_onboarding.xml
+++ b/skin/src/main/res/layout/rss_activity_onboarding.xml
@@ -70,7 +70,7 @@
         android:visibility="gone"
         tools:visibility="visible">
 
-        <android.support.v7.widget.LinearLayoutCompat
+        <androidx.appcompat.widget.LinearLayoutCompat
             android:id="@+id/pager_container"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -83,7 +83,7 @@
             android:orientation="vertical"
             app:elevation="24dp">
 
-            <android.support.design.widget.TabLayout
+            <com.google.android.material.tabs.TabLayout
                 android:id="@+id/pager_title_strip"
                 style="@style/StudyOverviewTabStyle"
                 android:layout_width="match_parent"
@@ -92,13 +92,13 @@
                 android:fillViewport="false"
                 app:tabMode="scrollable" />
 
-            <android.support.v4.view.ViewPager
+            <androidx.viewpager.widget.ViewPager
                 android:id="@+id/pager"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:background="@android:color/white"
                 app:elevation="16dp" />
-        </android.support.v7.widget.LinearLayoutCompat>
+        </androidx.appcompat.widget.LinearLayoutCompat>
     </FrameLayout>
 
     <LinearLayout
@@ -112,7 +112,7 @@
             android:layout_width="16dp"
             android:layout_height="match_parent" />
 
-        <android.support.v7.widget.AppCompatButton
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/intro_skip"
             style="@style/Button.Skin.Onboarding"
             android:onClick="onSkipClicked"
@@ -121,7 +121,7 @@
             app:backgroundTint="@color/rsf_submit_bar_negative"
             tools:visibility="visible" />
 
-        <android.support.v7.widget.AppCompatButton
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/intro_sign_up"
             style="@style/Button.Skin.Onboarding"
             android:onClick="onSignUpClicked"
@@ -132,7 +132,7 @@
             android:layout_height="match_parent" />
     </LinearLayout>
 
-    <android.support.v7.widget.AppCompatButton
+    <androidx.appcompat.widget.AppCompatButton
         android:id="@+id/intro_sign_in"
         style="@style/Widget.AppCompat.Button.Borderless"
         android:layout_width="wrap_content"
diff --git a/skin/src/main/res/layout/rss_button_study_overview.xml b/skin/src/main/res/layout/rss_button_study_overview.xml
index 3c0fde911..2ebd9658d 100644
--- a/skin/src/main/res/layout/rss_button_study_overview.xml
+++ b/skin/src/main/res/layout/rss_button_study_overview.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.AppCompatButton xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.appcompat.widget.AppCompatButton xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/StudyOverviewItem"
     android:text="@string/rss_email_consent_doc" />
 
diff --git a/skin/src/main/res/layout/rss_fragment_activities.xml b/skin/src/main/res/layout/rss_fragment_activities.xml
index c9609588b..31e00c4db 100644
--- a/skin/src/main/res/layout/rss_fragment_activities.xml
+++ b/skin/src/main/res/layout/rss_fragment_activities.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/recycler_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/skin/src/main/res/layout/rss_fragment_learn.xml b/skin/src/main/res/layout/rss_fragment_learn.xml
index 1405e07cb..1096ae44c 100644
--- a/skin/src/main/res/layout/rss_fragment_learn.xml
+++ b/skin/src/main/res/layout/rss_fragment_learn.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/recycler_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/skin/src/main/res/layout/rss_item_permission_card.xml b/skin/src/main/res/layout/rss_item_permission_card.xml
index 6b3a111c0..cc578ae9a 100644
--- a/skin/src/main/res/layout/rss_item_permission_card.xml
+++ b/skin/src/main/res/layout/rss_item_permission_card.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <include layout="@layout/rss_item_permission_content" />
 
-</android.support.v7.widget.CardView>
+</androidx.cardview.widget.CardView>
 
diff --git a/skin/src/main/res/layout/rss_item_permission_content.xml b/skin/src/main/res/layout/rss_item_permission_content.xml
index eed09e395..236b06bf4 100644
--- a/skin/src/main/res/layout/rss_item_permission_content.xml
+++ b/skin/src/main/res/layout/rss_item_permission_content.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <android.support.v7.widget.AppCompatImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/permission_icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -14,7 +14,7 @@
         android:scaleType="center"
         tools:src="@drawable/rss_ic_location_24dp" />
 
-    <android.support.v7.widget.AppCompatTextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/permission_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -25,7 +25,7 @@
         android:textSize="16sp"
         tools:text="Permission Card Title" />
 
-    <android.support.v7.widget.AppCompatTextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/permission_details"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -37,7 +37,7 @@
         android:drawablePadding="24dp"
         tools:text="APPNAME needs permission to use your location to find accurate UV levels." />
 
-    <android.support.v7.widget.AppCompatButton
+    <androidx.appcompat.widget.AppCompatButton
         android:id="@+id/permission_button"
         style="@style/Widget.AppCompat.Button.Borderless.Colored"
         android:layout_width="wrap_content"
diff --git a/skin/src/main/res/layout/rss_item_radio_quiz.xml b/skin/src/main/res/layout/rss_item_radio_quiz.xml
index 616770090..efb9f900d 100644
--- a/skin/src/main/res/layout/rss_item_radio_quiz.xml
+++ b/skin/src/main/res/layout/rss_item_radio_quiz.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.AppCompatRadioButton xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.appcompat.widget.AppCompatRadioButton xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/skin/src/main/res/layout/rss_item_row_learn.xml b/skin/src/main/res/layout/rss_item_row_learn.xml
index 37e6bb521..cb5ca1ed2 100644
--- a/skin/src/main/res/layout/rss_item_row_learn.xml
+++ b/skin/src/main/res/layout/rss_item_row_learn.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.AppCompatTextView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.appcompat.widget.AppCompatTextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/learn_item_title"
     android:layout_width="match_parent"
diff --git a/skin/src/main/res/layout/rss_item_schedule.xml b/skin/src/main/res/layout/rss_item_schedule.xml
index e5aae86ac..878b6c461 100644
--- a/skin/src/main/res/layout/rss_item_schedule.xml
+++ b/skin/src/main/res/layout/rss_item_schedule.xml
@@ -8,7 +8,7 @@
     android:minHeight="56dp"
     android:orientation="horizontal">
 
-    <android.support.v7.widget.AppCompatImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/daily_indicator"
         android:layout_width="16dp"
         android:layout_height="16dp"
@@ -16,7 +16,7 @@
         android:clickable="false"
         android:src="@drawable/rss_ic_circle_16dp" />
 
-    <android.support.v7.widget.AppCompatTextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/task_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/skin/src/main/res/layout/rss_item_section_learn.xml b/skin/src/main/res/layout/rss_item_section_learn.xml
index 7c44ad971..c3dd63eed 100644
--- a/skin/src/main/res/layout/rss_item_section_learn.xml
+++ b/skin/src/main/res/layout/rss_item_section_learn.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.AppCompatTextView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.appcompat.widget.AppCompatTextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/learn_item_title"
     android:layout_width="match_parent"
diff --git a/skin/src/main/res/layout/rss_layout_sign_in.xml b/skin/src/main/res/layout/rss_layout_sign_in.xml
index 1762231a2..cdcb48499 100644
--- a/skin/src/main/res/layout/rss_layout_sign_in.xml
+++ b/skin/src/main/res/layout/rss_layout_sign_in.xml
@@ -28,7 +28,7 @@
             android:gravity="center_vertical"
             android:minHeight="@dimen/rsf_item_size_default">
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginRight="@dimen/rsf_padding_small"
@@ -36,7 +36,7 @@
                 android:gravity="right"
                 android:text="@string/rss_username" />
 
-            <android.support.v7.widget.AppCompatEditText
+            <androidx.appcompat.widget.AppCompatEditText
                 android:id="@+id/username"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -51,7 +51,7 @@
             android:gravity="center_vertical"
             android:minHeight="@dimen/rsf_item_size_default">
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_column="0"
@@ -60,7 +60,7 @@
                 android:gravity="right"
                 android:text="@string/rss_password" />
 
-            <android.support.v7.widget.AppCompatEditText
+            <androidx.appcompat.widget.AppCompatEditText
                 android:id="@+id/password"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -82,7 +82,7 @@
         app:negativeActionTitle="@string/rsf_exit"
         app:positiveActionTitle="@string/rsf_submit" />
 
-    <android.support.v7.widget.AppCompatTextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/forgot_password"
         style="@style/Widget.AppCompat.Button.Borderless.Colored"
         android:layout_width="wrap_content"
diff --git a/skin/src/main/res/layout/rss_layout_sign_up.xml b/skin/src/main/res/layout/rss_layout_sign_up.xml
index 4c56918ba..0d8bcb033 100644
--- a/skin/src/main/res/layout/rss_layout_sign_up.xml
+++ b/skin/src/main/res/layout/rss_layout_sign_up.xml
@@ -38,7 +38,7 @@
             android:gravity="center_vertical"
             android:minHeight="@dimen/rsf_item_size_default">
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginRight="@dimen/rsf_padding_small"
@@ -46,7 +46,7 @@
                 android:gravity="right"
                 android:text="@string/rsf_email" />
 
-            <android.support.v7.widget.AppCompatEditText
+            <androidx.appcompat.widget.AppCompatEditText
                 android:id="@+id/email"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -62,7 +62,7 @@
             android:gravity="center_vertical"
             android:minHeight="@dimen/rsf_item_size_default">
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_column="0"
@@ -71,7 +71,7 @@
                 android:gravity="right"
                 android:text="@string/rss_password" />
 
-            <android.support.v7.widget.AppCompatEditText
+            <androidx.appcompat.widget.AppCompatEditText
                 android:id="@+id/password"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
diff --git a/skin/src/main/res/layout/rss_layout_toolbar_tabs.xml b/skin/src/main/res/layout/rss_layout_toolbar_tabs.xml
index 31474927f..9c05019b8 100644
--- a/skin/src/main/res/layout/rss_layout_toolbar_tabs.xml
+++ b/skin/src/main/res/layout/rss_layout_toolbar_tabs.xml
@@ -6,7 +6,7 @@
     android:foreground="?android:attr/windowContentOverlay"
     android:orientation="vertical">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/storage/build.gradle b/storage/build.gradle
index 49757905f..cd7bd2087 100644
--- a/storage/build.gradle
+++ b/storage/build.gradle
@@ -17,7 +17,7 @@ android {
         versionCode 1
         versionName version
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
     buildTypes {
@@ -63,10 +63,10 @@ ext {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation "com.android.support:appcompat-v7:$support_library_version"
-    implementation "com.android.support:cardview-v7:$support_library_version"
-    implementation "com.android.support:preference-v14:$support_library_version"
-    implementation "com.android.support:design:$support_library_version"
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation project(':foundation')
     implementation project(':authentication')
@@ -76,8 +76,8 @@ dependencies {
     kapt 'co.touchlab.squeaky:squeaky-processor:0.4.0.0'
     implementation 'net.zetetic:android-database-sqlcipher:3.5.4@aar'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
 }
 
 group = publishedGroupId                               // Maven Group ID for the artifact
diff --git a/storage/src/androidTest/java/org/researchstack/feature/storage/ExampleInstrumentedTest.java b/storage/src/androidTest/java/org/researchstack/feature/storage/ExampleInstrumentedTest.java
index 657ef7ff5..c87c689af 100644
--- a/storage/src/androidTest/java/org/researchstack/feature/storage/ExampleInstrumentedTest.java
+++ b/storage/src/androidTest/java/org/researchstack/feature/storage/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package org.researchstack.feature.storage;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/storage/src/main/java/org/researchstack/feature/storage/StorageAccess.java b/storage/src/main/java/org/researchstack/feature/storage/StorageAccess.java
index 9e203e152..ec7e6e795 100644
--- a/storage/src/main/java/org/researchstack/feature/storage/StorageAccess.java
+++ b/storage/src/main/java/org/researchstack/feature/storage/StorageAccess.java
@@ -4,7 +4,7 @@
 import android.content.Context;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.MainThread;
+import androidx.annotation.MainThread;
 
 import org.researchstack.foundation.components.utils.UiThreadContext;
 import org.researchstack.feature.storage.database.AppDatabase;
diff --git a/storage/src/main/java/org/researchstack/feature/storage/file/SimpleFileAccess.java b/storage/src/main/java/org/researchstack/feature/storage/file/SimpleFileAccess.java
index 747ab09eb..f6f1bc3d3 100644
--- a/storage/src/main/java/org/researchstack/feature/storage/file/SimpleFileAccess.java
+++ b/storage/src/main/java/org/researchstack/feature/storage/file/SimpleFileAccess.java
@@ -1,8 +1,8 @@
 package org.researchstack.feature.storage.file;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.WorkerThread;
 
 import org.researchstack.feature.storage.utils.FileUtils;
 import org.researchstack.feature.storage.file.aes.Encrypter;
diff --git a/storage/src/main/java/org/researchstack/feature/storage/file/aes/PinProtectedProvider.java b/storage/src/main/java/org/researchstack/feature/storage/file/aes/PinProtectedProvider.java
index a791b6b1f..3c8905174 100644
--- a/storage/src/main/java/org/researchstack/feature/storage/file/aes/PinProtectedProvider.java
+++ b/storage/src/main/java/org/researchstack/feature/storage/file/aes/PinProtectedProvider.java
@@ -1,7 +1,7 @@
 package org.researchstack.feature.storage.file.aes;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.tozny.crypto.android.AesCbcWithIntegrity;
 
diff --git a/storage/src/main/java/org/researchstack/feature/storage/utils/FileUtils.java b/storage/src/main/java/org/researchstack/feature/storage/utils/FileUtils.java
index 15032b3ec..4351465b4 100644
--- a/storage/src/main/java/org/researchstack/feature/storage/utils/FileUtils.java
+++ b/storage/src/main/java/org/researchstack/feature/storage/utils/FileUtils.java
@@ -2,7 +2,7 @@
 
 //TODO: MOVE TO STORAGE MODULE
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.researchstack.feature.storage.file.StorageAccessException;
 

From bfd5263842511918fca4410b3e8924809844efda Mon Sep 17 00:00:00 2001
From: Joshua Liu <liujoshua@users.noreply.github.com>
Date: Wed, 1 May 2019 14:52:31 -0700
Subject: [PATCH 49/53] Update AndroidX dependencies

---
 authentication/build.gradle | 6 +++---
 backbone/build.gradle       | 2 +-
 chart/build.gradle          | 6 +++---
 consent/build.gradle        | 6 +++---
 foundation/build.gradle     | 8 ++++----
 skin/build.gradle           | 2 +-
 storage/build.gradle        | 6 +++---
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/authentication/build.gradle b/authentication/build.gradle
index 68028dcbc..db77370e9 100644
--- a/authentication/build.gradle
+++ b/authentication/build.gradle
@@ -61,7 +61,7 @@ ext {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
     implementation 'com.google.android.material:material:1.0.0'
@@ -70,8 +70,8 @@ dependencies {
     implementation project(':foundation')
 
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.1.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
 
 group = publishedGroupId                               // Maven Group ID for the artifact
diff --git a/backbone/build.gradle b/backbone/build.gradle
index 950479e0e..b0f14a40d 100644
--- a/backbone/build.gradle
+++ b/backbone/build.gradle
@@ -68,7 +68,7 @@ ext {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
-    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
     implementation 'com.google.android.material:material:1.0.0'
diff --git a/chart/build.gradle b/chart/build.gradle
index e22448086..93d53871b 100644
--- a/chart/build.gradle
+++ b/chart/build.gradle
@@ -61,7 +61,7 @@ ext {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
     implementation 'com.google.android.material:material:1.0.0'
@@ -76,8 +76,8 @@ dependencies {
     implementation 'com.jakewharton.rxbinding:rxbinding-design:0.4.0'
 
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.1.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
 
 group = publishedGroupId                               // Maven Group ID for the artifact
diff --git a/consent/build.gradle b/consent/build.gradle
index 57146f778..6ad7ed4c4 100644
--- a/consent/build.gradle
+++ b/consent/build.gradle
@@ -61,7 +61,7 @@ ext {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
     implementation 'com.google.android.material:material:1.0.0'
@@ -71,8 +71,8 @@ dependencies {
     implementation "com.google.code.gson:gson:$gson_version"
 
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.1.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
 
 group = publishedGroupId                               // Maven Group ID for the artifact
diff --git a/foundation/build.gradle b/foundation/build.gradle
index 71a9ddded..428d564a4 100644
--- a/foundation/build.gradle
+++ b/foundation/build.gradle
@@ -64,14 +64,14 @@ ext {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
     implementation 'com.google.android.material:material:1.0.0'
-    implementation 'androidx.core:core:1.0.0'
+    implementation 'androidx.core:core:1.0.1'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.1.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     implementation "com.google.code.gson:gson:$gson_version"
diff --git a/skin/build.gradle b/skin/build.gradle
index 685c7dbbf..07c2d932b 100644
--- a/skin/build.gradle
+++ b/skin/build.gradle
@@ -79,7 +79,7 @@ dependencies {
 
     implementation project(':backbone')
 
-    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
     implementation 'com.google.android.material:material:1.0.0'
diff --git a/storage/build.gradle b/storage/build.gradle
index cd7bd2087..5d5702de5 100644
--- a/storage/build.gradle
+++ b/storage/build.gradle
@@ -63,7 +63,7 @@ ext {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
     implementation 'com.google.android.material:material:1.0.0'
@@ -76,8 +76,8 @@ dependencies {
     kapt 'co.touchlab.squeaky:squeaky-processor:0.4.0.0'
     implementation 'net.zetetic:android-database-sqlcipher:3.5.4@aar'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.1.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
 
 group = publishedGroupId                               // Maven Group ID for the artifact

From 9a7437a7147ed8fc8b8d125aaca2dd770ee0320d Mon Sep 17 00:00:00 2001
From: Joshua Liu <liujoshua@users.noreply.github.com>
Date: Fri, 10 May 2019 11:18:46 -0700
Subject: [PATCH 50/53] Update Gradle plugin and kotlin

---
 build.gradle                             | 4 ++--
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 43c9b5833..43a219325 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
 
     ext {
         research_stack_version = '1.5.0' + (Boolean.valueOf(System.getProperty("snapshot")) ? "-SNAPSHOT" : "")
-        kotlin_version = '1.3.20'
+        kotlin_version = '1.3.31'
         support_library_version = '28.0.0'
         gson_version = '2.8.2'
     }
@@ -18,7 +18,7 @@ buildscript {
 
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:3.3.1'
+        classpath 'com.android.tools.build:gradle:3.4.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index dc9460a65..2be106237 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

From 60081fcf89b245c9df113b4e83875915f5f89948 Mon Sep 17 00:00:00 2001
From: Joshua Liu <liujoshua@users.noreply.github.com>
Date: Fri, 10 May 2019 12:59:36 -0700
Subject: [PATCH 51/53] Update Android build and dependencies

---
 app/build.gradle                                   | 14 +++++++-------
 .../researchstack/backboneapp/MainActivity.java    |  8 ++++----
 app/src/main/res/layout/activity_main.xml          |  4 ++--
 build.gradle                                       |  4 +++-
 gradle.properties                                  |  4 +++-
 gradle/wrapper/gradle-wrapper.properties           | 12 ++++++------
 6 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 76ff1a2c2..da5463eb8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,13 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "org.researchstack.backboneapp"
         minSdkVersion 16
-        targetSdkVersion 23
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
     }
@@ -20,8 +19,9 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.2.1'
-    compile 'org.researchstack:backbone:1.0.0.rc1'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'org.researchstack:backbone:1.1.2'
+
+    testImplementation 'junit:junit:4.12'
 }
diff --git a/app/src/main/java/org/researchstack/backboneapp/MainActivity.java b/app/src/main/java/org/researchstack/backboneapp/MainActivity.java
index 1eabaa0f8..09b50a942 100644
--- a/app/src/main/java/org/researchstack/backboneapp/MainActivity.java
+++ b/app/src/main/java/org/researchstack/backboneapp/MainActivity.java
@@ -3,10 +3,10 @@
 import android.content.Intent;
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.ActionBar;
-import android.support.v7.widget.AppCompatButton;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.widget.AppCompatButton;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Base64;
 import android.view.Menu;
 import android.view.MenuItem;
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 449f8124d..29bd51f79 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -17,7 +17,7 @@
         android:padding="16dp"
     >
 
-        <android.support.v7.widget.AppCompatButton
+        <androidx.appcompat.widget.AppCompatButton
             style="@style/Widget.AppCompat.Button.Borderless.Colored"
             android:id="@+id/consent_button"
             android:layout_width="wrap_content"
@@ -72,7 +72,7 @@
         android:orientation="vertical"
     >
 
-        <android.support.v7.widget.AppCompatButton
+        <androidx.appcompat.widget.AppCompatButton
             style="@style/Widget.AppCompat.Button.Borderless.Colored"
             android:id="@+id/survey_button"
             android:layout_width="wrap_content"
diff --git a/build.gradle b/build.gradle
index 7f69adb9e..020bda127 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,9 +3,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0'
+        classpath 'com.android.tools.build:gradle:3.4.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -14,6 +15,7 @@ buildscript {
 
 allprojects {
     repositories {
+        google()
         jcenter()
         mavenCentral()
         maven { url "https://jitpack.io" } // for MPAndroidChart dependency, not on jcenter yet
diff --git a/gradle.properties b/gradle.properties
index 1d3591c8a..915f0e66f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,4 +15,6 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
\ No newline at end of file
+# org.gradle.parallel=true
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 122a0dca2..728cbafc0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+#Fri May 10 12:49:24 PDT 2019
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

From 68505a91b656a4732943803e8b64799857e4b4a9 Mon Sep 17 00:00:00 2001
From: Joshua Liu <liujoshua@users.noreply.github.com>
Date: Fri, 10 May 2019 17:25:01 -0700
Subject: [PATCH 52/53] Add basic UI test

---
 app/build.gradle                              |  13 +
 .../backboneapp/ApplicationTest.java          |  15 -
 .../backboneapp/MainActivityTest.kt           | 292 ++++++++++++++++++
 .../backboneapp/MainActivity.java             |   2 +-
 build.gradle                                  |   2 +
 5 files changed, 308 insertions(+), 16 deletions(-)
 delete mode 100644 app/src/androidTest/java/org/researchstack/backboneapp/ApplicationTest.java
 create mode 100644 app/src/androidTest/java/org/researchstack/backboneapp/MainActivityTest.kt

diff --git a/app/build.gradle b/app/build.gradle
index da5463eb8..de4a36095 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,4 +1,6 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-android'
 
 android {
     compileSdkVersion 28
@@ -9,6 +11,7 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -24,4 +27,14 @@ dependencies {
     implementation 'org.researchstack:backbone:1.1.2'
 
     testImplementation 'junit:junit:4.12'
+
+    androidTestImplementation "androidx.core:core-ktx:1.0.0"
+    androidTestImplementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    androidTestImplementation "androidx.test.espresso:espresso-contrib:3.1.1"
+
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0-beta01'
+    androidTestImplementation 'androidx.test:rules:1.2.0-beta01'
+}
+repositories {
+    mavenCentral()
 }
diff --git a/app/src/androidTest/java/org/researchstack/backboneapp/ApplicationTest.java b/app/src/androidTest/java/org/researchstack/backboneapp/ApplicationTest.java
deleted file mode 100644
index a299254bb..000000000
--- a/app/src/androidTest/java/org/researchstack/backboneapp/ApplicationTest.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.researchstack.backboneapp;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application>
-{
-    public ApplicationTest()
-    {
-        super(Application.class);
-    }
-}
\ No newline at end of file
diff --git a/app/src/androidTest/java/org/researchstack/backboneapp/MainActivityTest.kt b/app/src/androidTest/java/org/researchstack/backboneapp/MainActivityTest.kt
new file mode 100644
index 000000000..b44b910e7
--- /dev/null
+++ b/app/src/androidTest/java/org/researchstack/backboneapp/MainActivityTest.kt
@@ -0,0 +1,292 @@
+package org.researchstack.backboneapp
+
+import android.view.View
+import android.view.ViewGroup
+import android.widget.DatePicker
+import android.widget.LinearLayout
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.closeSoftKeyboard
+import androidx.test.espresso.action.ViewActions.replaceText
+import androidx.test.espresso.action.ViewActions.scrollTo
+import androidx.test.espresso.action.ViewActions.swipeDown
+import androidx.test.espresso.action.ViewActions.swipeRight
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.contrib.PickerActions.setDate
+import androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withClassName
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withSubstring
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.filters.LargeTest
+import androidx.test.rule.ActivityTestRule
+import org.hamcrest.*
+import org.hamcrest.Matchers.*
+import org.hamcrest.core.*
+import org.junit.*
+import org.researchstack.backboneapp.R.id
+
+@LargeTest
+class MainActivityTest {
+
+    @Rule
+    @JvmField
+    var mActivityTestRule = ActivityTestRule(MainActivity::class.java)
+
+    @Test
+    fun mainActivityTest() {
+
+        // reset state, TODO: better way to setup/cleanup
+        onView(withId(R.id.menu_clear)).perform(click())
+
+        // Launch consent task
+        onView(withId(R.id.consent_button)).perform(click())
+
+        testConsentTask()
+
+        // Launch survey task
+        onView(withId(R.id.survey_button)).perform(click())
+
+        testSurvey()
+    }
+
+    private fun testSurvey() {
+        val appCompatTextView5 = onView(
+                allOf(withId(id.bar_submit_postitive), withText("next"),
+                        childAtPosition(
+                                allOf(withId(id.rsb_submit_bar),
+                                        childAtPosition(
+                                                withId(id.rsb_current_step),
+                                                1)),
+                                2),
+                        isDisplayed()))
+        appCompatTextView5.perform(click())
+
+        val appCompatEditText2 = onView(
+                allOf(withId(id.value),
+                        childAtPosition(
+                                allOf(withId(id.rsb_survey_step_body),
+                                        childAtPosition(
+                                                withId(id.rsb_survey_content_container),
+                                                2)),
+                                1),
+                        isDisplayed()))
+        appCompatEditText2.perform(replaceText("test"), closeSoftKeyboard())
+
+        val appCompatTextView6 = onView(
+                allOf(withId(id.bar_submit_postitive), withText("next"),
+                        childAtPosition(
+                                allOf(withId(id.rsb_submit_bar),
+                                        childAtPosition(
+                                                withId(id.rsb_current_step),
+                                                1)),
+                                2),
+                        isDisplayed()))
+        appCompatTextView6.perform(click())
+
+
+        onView(withId(id.value))
+                .perform(click())
+
+        onView(isAssignableFrom(DatePicker::class.java))
+                .perform(setDate(2017, 6, 30));
+
+        val appCompatButton4 = onView(
+                allOf(withId(android.R.id.button1), withText("OK"),
+                        childAtPosition(
+                                childAtPosition(
+                                        withClassName(`is`("android.widget.ScrollView")),
+                                        0),
+                                3)))
+        appCompatButton4.perform(scrollTo(), click())
+
+        val appCompatTextView7 = onView(
+                allOf(withId(id.bar_submit_postitive), withText("next"),
+                        childAtPosition(
+                                allOf(withId(id.rsb_submit_bar),
+                                        childAtPosition(
+                                                withId(id.rsb_current_step),
+                                                1)),
+                                2),
+                        isDisplayed()))
+        appCompatTextView7.perform(click())
+
+        val appCompatRadioButton = onView(
+                allOf(withText("Yes"),
+                        childAtPosition(
+                                allOf(withId(id.rsb_survey_step_body),
+                                        childAtPosition(
+                                                withId(id.rsb_survey_content_container),
+                                                2)),
+                                0),
+                        isDisplayed()))
+        appCompatRadioButton.perform(click())
+
+        val appCompatTextView8 = onView(
+                allOf(withId(id.bar_submit_postitive), withText("next"),
+                        childAtPosition(
+                                allOf(withId(id.rsb_submit_bar),
+                                        childAtPosition(
+                                                withId(id.rsb_current_step),
+                                                1)),
+                                2),
+                        isDisplayed()))
+        appCompatTextView8.perform(click())
+
+        val appCompatCheckBox = onView(
+                allOf(withText("One"),
+                        childAtPosition(
+                                allOf(withId(id.rsb_survey_step_body),
+                                        childAtPosition(
+                                                withId(id.rsb_survey_content_container),
+                                                2)),
+                                1),
+                        isDisplayed()))
+        appCompatCheckBox.perform(click())
+
+        val appCompatCheckBox2 = onView(
+                allOf(withText("Two"),
+                        childAtPosition(
+                                allOf(withId(id.rsb_survey_step_body),
+                                        childAtPosition(
+                                                withId(id.rsb_survey_content_container),
+                                                2)),
+                                2),
+                        isDisplayed()))
+        appCompatCheckBox2.perform(click())
+
+        val appCompatTextView9 = onView(
+                allOf(withId(id.bar_submit_postitive), withText("next"),
+                        childAtPosition(
+                                allOf(withId(id.rsb_submit_bar),
+                                        childAtPosition(
+                                                withId(id.rsb_current_step),
+                                                1)),
+                                2),
+                        isDisplayed()))
+        appCompatTextView9.perform(click())
+
+        val textView = onView(
+                allOf(withId(id.survey_results),
+                        childAtPosition(
+                                childAtPosition(
+                                        IsInstanceOf.instanceOf(LinearLayout::class.java),
+                                        3),
+                                1),
+                        isDisplayed()))
+        textView.check(
+                matches(allOf(
+                        withSubstring("multi_step: [1.0, 2.0]"),
+                        withSubstring("nutrition: true"),
+                        withSubstring("date: 1.49"),
+                        withSubstring("name: test")))
+
+        )
+    }
+
+    private fun testConsentTask() {
+        // ConsentVisualStep
+
+        onView(withId(id.title))
+                .check(matches(allOf(
+                        withText("The title of the section goes here ..."),
+                        isDisplayed())))
+
+        onView(withId(id.summary))
+                .check(matches(allOf(
+                        withText("The summary about the section goes here ..."),
+                        isDisplayed())))
+
+        onView(withId(id.bar_submit_negative))
+                .check(matches(not(isDisplayed())))
+
+        onView(withId(id.bar_submit_postitive))
+                .check(matches(allOf(withText("next"), isDisplayed())))
+                .perform(click())
+
+        // ConsentDocumentStep
+
+        onView(withId(id.bar_submit_negative))
+                .check(matches(allOf(
+                        isDisplayed(),
+                        withText("DISAGREE")
+                )))
+
+        onView(withId(id.bar_submit_postitive))
+                .check(matches(allOf(
+                        withText("Agree"),
+                        isDisplayed())))
+                .perform(click())
+
+
+        onView(withId(android.R.id.button2))
+                .check(matches(allOf(
+                        withText("CANCEL"),
+                        isDisplayed()
+                )))
+
+        onView(withId(android.R.id.button1))
+                .check(matches(allOf(
+                        withText("Agree"),
+                        isDisplayed())))
+                .perform(scrollTo(), click())
+
+        // FormStep (for signature)
+
+        val appCompatEditText = onView(
+                allOf(withId(id.value),
+                        childAtPosition(
+                                childAtPosition(
+                                        withId(id.rsb_survey_step_body),
+                                        0),
+                                1),
+                        isDisplayed()))
+        appCompatEditText.perform(replaceText("test"), closeSoftKeyboard())
+
+        val appCompatTextView3 = onView(
+                allOf(withId(id.bar_submit_postitive), withText("next"),
+                        childAtPosition(
+                                allOf(withId(id.rsb_submit_bar),
+                                        childAtPosition(
+                                                withId(id.rsb_current_step),
+                                                1)),
+                                2),
+                        isDisplayed()))
+        appCompatTextView3.perform(click())
+
+        val appCompatTextView4 = onView(
+                allOf(withId(id.bar_submit_postitive), withText("next"),
+                        childAtPosition(
+                                allOf(withId(id.submit_bar),
+                                        childAtPosition(
+                                                withId(id.rsb_current_step),
+                                                3)),
+                                2),
+                        isDisplayed()))
+
+        // ConsentSignatureStep
+        onView(withId(id.layout_consent_review_signature))
+                .perform(swipeRight())
+                .perform(swipeDown())
+
+        appCompatTextView4.perform(click())
+    }
+
+    private fun childAtPosition(
+            parentMatcher: Matcher<View>, position: Int): Matcher<View> {
+
+        return object : TypeSafeMatcher<View>() {
+            override fun describeTo(description: Description) {
+                description.appendText("Child at position $position in parent ")
+                parentMatcher.describeTo(description)
+            }
+
+            public override fun matchesSafely(view: View): Boolean {
+                val parent = view.parent
+                return parent is ViewGroup && parentMatcher.matches(parent)
+                        && view == parent.getChildAt(position)
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/org/researchstack/backboneapp/MainActivity.java b/app/src/main/java/org/researchstack/backboneapp/MainActivity.java
index 09b50a942..315cf95d1 100644
--- a/app/src/main/java/org/researchstack/backboneapp/MainActivity.java
+++ b/app/src/main/java/org/researchstack/backboneapp/MainActivity.java
@@ -131,7 +131,7 @@ public boolean onOptionsItemSelected(MenuItem item)
         }
     }
 
-    private void clearData()
+    void clearData()
     {
         AppPrefs appPrefs = AppPrefs.getInstance(this);
         appPrefs.setHasSurveyed(false);
diff --git a/build.gradle b/build.gradle
index 020bda127..28863a6b8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+    ext.kotlin_version = '1.3.31'
     repositories {
         jcenter()
         google()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.4.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

From 311f86c3e898c83ef4c61e591a1fd778f6c53347 Mon Sep 17 00:00:00 2001
From: Joshua Liu <liujoshua@users.noreply.github.com>
Date: Mon, 8 Jul 2019 15:59:00 -0700
Subject: [PATCH 53/53] add sample_backbone_app to build

---
 {app => sample_backbone_app}/.gitignore             |   0
 {app => sample_backbone_app}/build.gradle           |   2 +-
 {app => sample_backbone_app}/proguard-rules.pro     |   0
 .../researchstack/backboneapp/MainActivityTest.kt   |   0
 .../src/main/AndroidManifest.xml                    |   0
 .../org/researchstack/backboneapp/AppPrefs.java     |   0
 .../backboneapp/BackboneApplication.java            |   0
 .../org/researchstack/backboneapp/MainActivity.java |   0
 .../src/main/res/layout/activity_main.xml           |   0
 .../src/main/res/menu/activity_main.xml             |   0
 .../src/main/res/mipmap-hdpi/ic_launcher.png        | Bin
 .../src/main/res/mipmap-mdpi/ic_launcher.png        | Bin
 .../src/main/res/mipmap-xhdpi/ic_launcher.png       | Bin
 .../src/main/res/mipmap-xxhdpi/ic_launcher.png      | Bin
 .../src/main/res/mipmap-xxxhdpi/ic_launcher.png     | Bin
 .../src/main/res/values-v21/styles.xml              |   0
 .../src/main/res/values-w820dp/dimens.xml           |   0
 .../src/main/res/values/colors.xml                  |   0
 .../src/main/res/values/dimens.xml                  |   0
 .../src/main/res/values/strings.xml                 |   0
 .../src/main/res/values/styles.xml                  |   0
 .../researchstack/backboneapp/ExampleUnitTest.java  |   0
 settings.gradle                                     |   1 +
 23 files changed, 2 insertions(+), 1 deletion(-)
 rename {app => sample_backbone_app}/.gitignore (100%)
 rename {app => sample_backbone_app}/build.gradle (100%)
 rename {app => sample_backbone_app}/proguard-rules.pro (100%)
 rename {app => sample_backbone_app}/src/androidTest/java/org/researchstack/backboneapp/MainActivityTest.kt (100%)
 rename {app => sample_backbone_app}/src/main/AndroidManifest.xml (100%)
 rename {app => sample_backbone_app}/src/main/java/org/researchstack/backboneapp/AppPrefs.java (100%)
 rename {app => sample_backbone_app}/src/main/java/org/researchstack/backboneapp/BackboneApplication.java (100%)
 rename {app => sample_backbone_app}/src/main/java/org/researchstack/backboneapp/MainActivity.java (100%)
 rename {app => sample_backbone_app}/src/main/res/layout/activity_main.xml (100%)
 rename {app => sample_backbone_app}/src/main/res/menu/activity_main.xml (100%)
 rename {app => sample_backbone_app}/src/main/res/mipmap-hdpi/ic_launcher.png (100%)
 rename {app => sample_backbone_app}/src/main/res/mipmap-mdpi/ic_launcher.png (100%)
 rename {app => sample_backbone_app}/src/main/res/mipmap-xhdpi/ic_launcher.png (100%)
 rename {app => sample_backbone_app}/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%)
 rename {app => sample_backbone_app}/src/main/res/mipmap-xxxhdpi/ic_launcher.png (100%)
 rename {app => sample_backbone_app}/src/main/res/values-v21/styles.xml (100%)
 rename {app => sample_backbone_app}/src/main/res/values-w820dp/dimens.xml (100%)
 rename {app => sample_backbone_app}/src/main/res/values/colors.xml (100%)
 rename {app => sample_backbone_app}/src/main/res/values/dimens.xml (100%)
 rename {app => sample_backbone_app}/src/main/res/values/strings.xml (100%)
 rename {app => sample_backbone_app}/src/main/res/values/styles.xml (100%)
 rename {app => sample_backbone_app}/src/test/java/org/researchstack/backboneapp/ExampleUnitTest.java (100%)

diff --git a/app/.gitignore b/sample_backbone_app/.gitignore
similarity index 100%
rename from app/.gitignore
rename to sample_backbone_app/.gitignore
diff --git a/app/build.gradle b/sample_backbone_app/build.gradle
similarity index 100%
rename from app/build.gradle
rename to sample_backbone_app/build.gradle
index de4a36095..f87f61fee 100644
--- a/app/build.gradle
+++ b/sample_backbone_app/build.gradle
@@ -1,6 +1,6 @@
 apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 28
diff --git a/app/proguard-rules.pro b/sample_backbone_app/proguard-rules.pro
similarity index 100%
rename from app/proguard-rules.pro
rename to sample_backbone_app/proguard-rules.pro
diff --git a/app/src/androidTest/java/org/researchstack/backboneapp/MainActivityTest.kt b/sample_backbone_app/src/androidTest/java/org/researchstack/backboneapp/MainActivityTest.kt
similarity index 100%
rename from app/src/androidTest/java/org/researchstack/backboneapp/MainActivityTest.kt
rename to sample_backbone_app/src/androidTest/java/org/researchstack/backboneapp/MainActivityTest.kt
diff --git a/app/src/main/AndroidManifest.xml b/sample_backbone_app/src/main/AndroidManifest.xml
similarity index 100%
rename from app/src/main/AndroidManifest.xml
rename to sample_backbone_app/src/main/AndroidManifest.xml
diff --git a/app/src/main/java/org/researchstack/backboneapp/AppPrefs.java b/sample_backbone_app/src/main/java/org/researchstack/backboneapp/AppPrefs.java
similarity index 100%
rename from app/src/main/java/org/researchstack/backboneapp/AppPrefs.java
rename to sample_backbone_app/src/main/java/org/researchstack/backboneapp/AppPrefs.java
diff --git a/app/src/main/java/org/researchstack/backboneapp/BackboneApplication.java b/sample_backbone_app/src/main/java/org/researchstack/backboneapp/BackboneApplication.java
similarity index 100%
rename from app/src/main/java/org/researchstack/backboneapp/BackboneApplication.java
rename to sample_backbone_app/src/main/java/org/researchstack/backboneapp/BackboneApplication.java
diff --git a/app/src/main/java/org/researchstack/backboneapp/MainActivity.java b/sample_backbone_app/src/main/java/org/researchstack/backboneapp/MainActivity.java
similarity index 100%
rename from app/src/main/java/org/researchstack/backboneapp/MainActivity.java
rename to sample_backbone_app/src/main/java/org/researchstack/backboneapp/MainActivity.java
diff --git a/app/src/main/res/layout/activity_main.xml b/sample_backbone_app/src/main/res/layout/activity_main.xml
similarity index 100%
rename from app/src/main/res/layout/activity_main.xml
rename to sample_backbone_app/src/main/res/layout/activity_main.xml
diff --git a/app/src/main/res/menu/activity_main.xml b/sample_backbone_app/src/main/res/menu/activity_main.xml
similarity index 100%
rename from app/src/main/res/menu/activity_main.xml
rename to sample_backbone_app/src/main/res/menu/activity_main.xml
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/sample_backbone_app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to sample_backbone_app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/sample_backbone_app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/ic_launcher.png
rename to sample_backbone_app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/sample_backbone_app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to sample_backbone_app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/sample_backbone_app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to sample_backbone_app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/sample_backbone_app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to sample_backbone_app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/app/src/main/res/values-v21/styles.xml b/sample_backbone_app/src/main/res/values-v21/styles.xml
similarity index 100%
rename from app/src/main/res/values-v21/styles.xml
rename to sample_backbone_app/src/main/res/values-v21/styles.xml
diff --git a/app/src/main/res/values-w820dp/dimens.xml b/sample_backbone_app/src/main/res/values-w820dp/dimens.xml
similarity index 100%
rename from app/src/main/res/values-w820dp/dimens.xml
rename to sample_backbone_app/src/main/res/values-w820dp/dimens.xml
diff --git a/app/src/main/res/values/colors.xml b/sample_backbone_app/src/main/res/values/colors.xml
similarity index 100%
rename from app/src/main/res/values/colors.xml
rename to sample_backbone_app/src/main/res/values/colors.xml
diff --git a/app/src/main/res/values/dimens.xml b/sample_backbone_app/src/main/res/values/dimens.xml
similarity index 100%
rename from app/src/main/res/values/dimens.xml
rename to sample_backbone_app/src/main/res/values/dimens.xml
diff --git a/app/src/main/res/values/strings.xml b/sample_backbone_app/src/main/res/values/strings.xml
similarity index 100%
rename from app/src/main/res/values/strings.xml
rename to sample_backbone_app/src/main/res/values/strings.xml
diff --git a/app/src/main/res/values/styles.xml b/sample_backbone_app/src/main/res/values/styles.xml
similarity index 100%
rename from app/src/main/res/values/styles.xml
rename to sample_backbone_app/src/main/res/values/styles.xml
diff --git a/app/src/test/java/org/researchstack/backboneapp/ExampleUnitTest.java b/sample_backbone_app/src/test/java/org/researchstack/backboneapp/ExampleUnitTest.java
similarity index 100%
rename from app/src/test/java/org/researchstack/backboneapp/ExampleUnitTest.java
rename to sample_backbone_app/src/test/java/org/researchstack/backboneapp/ExampleUnitTest.java
diff --git a/settings.gradle b/settings.gradle
index 667b831c4..46157c442 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,2 @@
 include ':backbone', ':skin', ':foundation', ':authentication', ':chart', ':consent', ':storage'
+include ':sample_backbone_app'
\ No newline at end of file