57 files changed, 319 insertions, 69 deletions
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/controls/ToggleImageButton.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/controls/ToggleImageButton.java
new file mode 100644
index 000000000..466b6de7e
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/controls/ToggleImageButton.java
@@ -0,0 +1,122 @@
+package com.twine.colorcapture.controls;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.databinding.BindingAdapter;
+import android.databinding.BindingMethod;
+import android.databinding.InverseBindingAdapter;
+import android.databinding.InverseBindingListener;
+import android.databinding.InverseBindingMethod;
+import android.databinding.InverseBindingMethods;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.widget.Checkable;
+
+import com.twine.colorcapture.R;
+
+public class ToggleImageButton extends android.support.v7.widget.AppCompatImageButton implements Checkable
+{
+    private OnCheckedChangeListener onCheckedChangeListener;
+    private Drawable normalImage;
+    private Drawable checkedImage;
+
+    public ToggleImageButton(Context context)
+    {
+        super(context);
+    }
+
+    public ToggleImageButton(Context context, AttributeSet attrs)
+    {
+        super(context, attrs);
+        setAttributes(attrs);
+    }
+
+    public ToggleImageButton(Context context, AttributeSet attrs, int defStyle)
+    {
+        super(context, attrs, defStyle);
+        setAttributes(attrs);
+    }
+
+    private void setAttributes(AttributeSet attrs)
+    {
+        TypedArray a = getContext().obtainStyledAttributes(attrs, R.styleable.ToggleImageButton);
+
+        normalImage = getContext().getDrawable(a.getResourceId(R.styleable.ToggleImageButton_normalImage, 0));
+        checkedImage = getContext().getDrawable(a.getResourceId(R.styleable.ToggleImageButton_checkedImage, 0));
+
+        setChecked(a.getBoolean(R.styleable.ToggleImageButton_android_checked, false));
+        a.recycle();
+    }
+
+    @Override
+    public boolean isChecked()
+    {
+        return isSelected();
+    }
+
+    @Override
+    public void setChecked(boolean checked)
+    {
+        setSelected(checked);
+
+        if (checked)
+        {
+            setImageDrawable(checkedImage);
+        }
+        else
+        {
+            setImageDrawable(normalImage);
+        }
+
+        if (onCheckedChangeListener != null)
+        {
+            onCheckedChangeListener.onCheckedChanged(this, checked);
+        }
+    }
+
+    @Override
+    public void toggle()
+    {
+        setChecked(!isChecked());
+    }
+
+    @Override
+    public boolean performClick()
+    {
+        toggle();
+        return super.performClick();
+    }
+
+    public OnCheckedChangeListener getOnCheckedChangeListener()
+    {
+        return onCheckedChangeListener;
+    }
+
+    public void setOnCheckedChangeListener(OnCheckedChangeListener onCheckedChangeListener)
+    {
+        this.onCheckedChangeListener = onCheckedChangeListener;
+    }
+
+    public static interface OnCheckedChangeListener
+    {
+        public void onCheckedChanged(ToggleImageButton buttonView, boolean isChecked);
+    }
+
+    @BindingAdapter(value = "cccAttrChanged")
+    public static void createCheckedBinding(ToggleImageButton btn, InverseBindingListener listener)
+    {
+        btn.setOnCheckedChangeListener((e, r) -> listener.onChange());
+    }
+
+    @BindingAdapter("ccc")
+    public static void setChecked(ToggleImageButton view, boolean value)
+    {
+        view.setChecked(value);
+    }
+
+    @InverseBindingAdapter(attribute = "ccc")
+    public static boolean getChecked(ToggleImageButton view)
+    {
+        return view.isChecked();
+    }
+}
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/mvvm/BindingAdapters.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/mvvm/BindingAdapters.java
new file mode 100644
index 000000000..41bfb052b
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/mvvm/BindingAdapters.java
@@ -0,0 +1,9 @@
+package com.twine.colorcapture.mvvm;
+
+import android.databinding.BindingConversion;
+import android.databinding.InverseBindingMethod;
+
+public class BindingAdapters
+{
+
+}
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/mvvm/BindingConverters.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/mvvm/BindingConverters.java
new file mode 100644
index 000000000..929d1ee0e
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/mvvm/BindingConverters.java
@@ -0,0 +1,17 @@
+package com.twine.colorcapture.mvvm;
+
+import android.databinding.BindingConversion;
+import android.databinding.InverseBindingMethod;
+
+public class BindingConverters
+{
+//    @BindingConversion
+//    public static boolean toInt(Boolean value) {
+//        return value;
+//    }
+//
+//    @InverseBindingMethod()
+//    public static int toObject(int number) {
+//        return number;
+//    }
+}
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/home/HomeFragment.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/home/HomeFragment.java
index 76bdfe20f..4dc05b81d 100644
--- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/home/HomeFragment.java
+++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/home/HomeFragment.java
@@ -1,4 +1,5 @@
 package com.twine.colorcapture.views.home;
+
 import android.Manifest;
 import android.content.pm.PackageManager;
 import android.os.Build;
@@ -15,37 +16,39 @@ import com.twine.colorcapture.mvvm.FragmentBase;
 public class HomeFragment extends FragmentBase<FragmentHomeBinding, HomeFragmentVM> implements IHomeFragment
 {
     private IAction1<Boolean> cameraAccessAction;
-    
+
     public HomeFragment()
     {
         // Required empty public constructor
     }
-    
+
     @Override
     protected int getLayoutId()
     {
         return R.layout.fragment_home;
     }
-    
+
     @Override
     protected void inject()
     {
         App.getComponent().inject(this);
     }
-    
+
     @Override
     public String getTitle()
     {
         return "Home";
     }
-    
+
     @Override
     public void requestCameraAccess(IAction1<Boolean> action)
     {
         cameraAccessAction = action;
-        
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-            if (ContextCompat.checkSelfPermission(this.getActivity(), Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) {
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN)
+        {
+            if (ContextCompat.checkSelfPermission(this.getActivity(), Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED)
+            {
                 ActivityCompat.requestPermissions(this.getActivity(),
                         new String[]{Manifest.permission.CAMERA},
                         1);
@@ -56,17 +59,23 @@ public class HomeFragment extends FragmentBase<FragmentHomeBinding, HomeFragment
             }
         }
     }
-    
+
     @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults)
+    {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        
-        switch (requestCode) {
-            case 1: {
+
+        switch (requestCode)
+        {
+            case 1:
+            {
                 if (grantResults.length > 0
-                        && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                        && grantResults[0] == PackageManager.PERMISSION_GRANTED)
+                {
                     cameraAccessAction.invoke(true);
-                } else {
+                }
+                else
+                {
                     cameraAccessAction.invoke(false);
                 }
             }
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/loading/LoadingFragmentVM.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/loading/LoadingFragmentVM.java
index ecce7a74e..39a93450e 100644
--- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/loading/LoadingFragmentVM.java
+++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/loading/LoadingFragmentVM.java
@@ -31,7 +31,7 @@ public class LoadingFragmentVM extends ViewModelBase<ILoadingFragment>
     {
         super.onViewAttached(view);
 
-        new CountDownTimer(2000,50)
+        new CountDownTimer(5000,50)
         {
 
             @Override
@@ -44,7 +44,7 @@ public class LoadingFragmentVM extends ViewModelBase<ILoadingFragment>
             public void onFinish() {
 
                 loadingProgress.set(2000);
-                navigationProvider.navigateTo(NavigationView.Home, false);
+                navigationProvider.navigateTo(NavigationView.Capture, false);
             }
         }.start();
     }
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/main/MainActivity.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/main/MainActivity.java
index 74e3d5707..5ff99751f 100644
--- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/main/MainActivity.java
+++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/main/MainActivity.java
@@ -8,6 +8,8 @@ import android.support.v4.widget.DrawerLayout;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
 import android.view.animation.AlphaAnimation;
 import android.view.animation.Animation;
 import android.view.animation.Animation.AnimationListener;
@@ -18,6 +20,7 @@ import android.widget.LinearLayout;
 
 import com.twine.colorcapture.App;
 import com.twine.colorcapture.R;
+import com.twine.colorcapture.controls.ToggleImageButton;
 import com.twine.colorcapture.core.IAction;
 import com.twine.colorcapture.core.Task;
 import com.twine.colorcapture.databinding.ActivityMainBinding;
@@ -42,7 +45,7 @@ public class MainActivity extends ActivityBase<ActivityMainBinding, MainActivity
     public INavigationProvider navigationProvider;
     
     @BindView(R.id.btnMenu)
-    Button btnMenu;
+    ToggleImageButton btnMenu;
     
     @BindView(R.id.header)
     LinearLayout frameHeader;
@@ -60,6 +63,10 @@ public class MainActivity extends ActivityBase<ActivityMainBinding, MainActivity
     @Override
     protected void onCreate(Bundle savedInstanceState)
     {
+        Window window = getWindow();
+        window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+        window.setStatusBarColor(getResources().getColor(R.color.colorPrimaryBackground));
+
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
         
@@ -99,7 +106,7 @@ public class MainActivity extends ActivityBase<ActivityMainBinding, MainActivity
         }
         else
         {
-            new Handler().postDelayed(this::showHeader,2000);
+            new Handler().postDelayed(this::showHeader,5000);
             navigationProvider.navigateTo(NavigationView.Loading, false);
         }
         
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/main/MainActivityVM.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/main/MainActivityVM.java
index dc08f701c..c07e59aaf 100644
--- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/main/MainActivityVM.java
+++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/main/MainActivityVM.java
@@ -13,10 +13,35 @@ import javax.inject.Inject;
 public class MainActivityVM extends ViewModelBase<IMainActivity>
 {
     private INavigationProvider navigationProvider;
+
+    public DependencyProperty<Boolean> isMoreToggled;
+    public DependencyProperty<Boolean> isCaptureToggled;
+    public DependencyProperty<Boolean> isMyColorsToggled;
     
     @Inject
     public MainActivityVM(Bus eventBus, INotificationProvider notificationProvider, INavigationProvider navigationProvider)
     {
         this.navigationProvider = navigationProvider;
+        isMoreToggled = new DependencyProperty<Boolean>(false,this::onMoreToggled);
+        isCaptureToggled = new DependencyProperty<Boolean>(true,this::onCaptureToggled);
+        isMyColorsToggled = new DependencyProperty<Boolean>(false,this::onMyColorsToggled);
+    }
+
+    private void onMyColorsToggled(DependencyProperty<Boolean> booleanDependencyProperty, Boolean value)
+    {
+        isMoreToggled.set(false);
+        isCaptureToggled.set(false);
+    }
+
+    private void onCaptureToggled(DependencyProperty<Boolean> booleanDependencyProperty, Boolean value)
+    {
+        isMoreToggled.set(false);
+        isMyColorsToggled.set(false);
+    }
+
+    private void onMoreToggled(DependencyProperty<Boolean> booleanDependencyProperty, Boolean value)
+    {
+        isCaptureToggled.set(false);
+        isMyColorsToggled.set(false);
     }
 }
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/logo.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/logo.png
new file mode 100644
index 000000000..d603442d6
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/logo.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/more_normal.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/more_normal.png
new file mode 100644
index 000000000..8f8c4e153
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/more_normal.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/more_selected.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/more_selected.png
new file mode 100644
index 000000000..28b678a74
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/more_selected.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/my_colors.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/my_colors.png
new file mode 100644
index 000000000..64433b097
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/my_colors.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/selected.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/selected.png
new file mode 100644
index 000000000..59b34c80f
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/selected.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/twine_logo.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/twine_logo.png
new file mode 100644
index 000000000..bad8273ba
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/twine_logo.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/twinesnap_normal.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/twinesnap_normal.png
new file mode 100644
index 000000000..79705e9ca
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/twinesnap_normal.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/twinesnap_selected.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/twinesnap_selected.png
new file mode 100644
index 000000000..3ca5bf9b7
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/twinesnap_selected.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/logo.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/logo.png
new file mode 100644
index 000000000..d9dc2cf15
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/logo.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/more_normal.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/more_normal.png
new file mode 100644
index 000000000..6c8ce0b9a
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/more_normal.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/more_selected.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/more_selected.png
new file mode 100644
index 000000000..179384dd0
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/more_selected.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/my_colors.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/my_colors.png
new file mode 100644
index 000000000..c38fbefc1
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/my_colors.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/selected.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/selected.png
new file mode 100644
index 000000000..0a5041bb9
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/selected.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/twine_logo.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/twine_logo.png
new file mode 100644
index 000000000..0c56ba31b
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/twine_logo.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/twinesnap_normal.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/twinesnap_normal.png
new file mode 100644
index 000000000..3999dfb84
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/twinesnap_normal.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/twinesnap_selected.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/twinesnap_selected.png
new file mode 100644
index 000000000..6bd9f3638
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/twinesnap_selected.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/logo.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/logo.png
new file mode 100644
index 000000000..f6b3bf9be
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/logo.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/more_normal.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/more_normal.png
new file mode 100644
index 000000000..a540c41be
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/more_normal.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/more_selected.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/more_selected.png
new file mode 100644
index 000000000..60494cce8
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/more_selected.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/my_colors.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/my_colors.png
new file mode 100644
index 000000000..2eae175fd
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/my_colors.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/selected.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/selected.png
new file mode 100644
index 000000000..e1aa19889
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/selected.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/twine_logo.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/twine_logo.png
new file mode 100644
index 000000000..9009dd34a
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/twine_logo.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/twinesnap_normal.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/twinesnap_normal.png
new file mode 100644
index 000000000..bf6509ea2
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/twinesnap_normal.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/twinesnap_selected.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/twinesnap_selected.png
new file mode 100644
index 000000000..f71ff6ea5
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/twinesnap_selected.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/logo.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/logo.png
new file mode 100644
index 000000000..fe384b6dd
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/logo.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/more_normal.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/more_normal.png
new file mode 100644
index 000000000..edbed5b5e
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/more_normal.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/more_selected.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/more_selected.png
new file mode 100644
index 000000000..263622f94
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/more_selected.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/my_colors.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/my_colors.png
new file mode 100644
index 000000000..1570ddb97
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/my_colors.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/selected.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/selected.png
new file mode 100644
index 000000000..6c4d944f2
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/selected.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/twine_logo.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/twine_logo.png
new file mode 100644
index 000000000..ce0f15c34
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/twine_logo.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/twinesnap_normal.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/twinesnap_normal.png
new file mode 100644
index 000000000..6b098152f
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/twinesnap_normal.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/twinesnap_selected.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/twinesnap_selected.png
new file mode 100644
index 000000000..94e490595
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/twinesnap_selected.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/logo.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/logo.png
new file mode 100644
index 000000000..b173a3c86
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/logo.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/more_normal.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/more_normal.png
new file mode 100644
index 000000000..1f009161c
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/more_normal.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/more_selected.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/more_selected.png
new file mode 100644
index 000000000..80b2611cf
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/more_selected.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/my_colors.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/my_colors.png
new file mode 100644
index 000000000..b816454ed
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/my_colors.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/selected.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/selected.png
new file mode 100644
index 000000000..705b88dfe
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/selected.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/twine_logo.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/twine_logo.png
new file mode 100644
index 000000000..d9ff791bc
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/twine_logo.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/twinesnap_normal.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/twinesnap_normal.png
new file mode 100644
index 000000000..f48411cb9
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/twinesnap_normal.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/twinesnap_selected.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/twinesnap_selected.png
new file mode 100644
index 000000000..3741bdb4a
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/twinesnap_selected.png
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable/background_gradient.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable/background_gradient.xml
new file mode 100644
index 000000000..9a95bd708
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable/background_gradient.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:type="linear"
+        android:angle="270"
+        android:startColor="@color/colorPrimaryBackground"
+        android:endColor="#07101e" />
+</shape>
+\ No newline at end of file
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable/border.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable/border.xml
new file mode 100644
index 000000000..2f0177da9
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable/border.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <corners android:radius="5dp" />
+    <stroke android:width="2px" android:color="#E2E2E2"/>
+
+</shape>
+\ No newline at end of file
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable/border_shadow.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable/border_shadow.xml
new file mode 100644
index 000000000..cf3d424af
--- /dev/null
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable/border_shadow.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <layer-list>
+            <item>
+                <shape android:shape="rectangle">
+                    <solid android:color="#54000000"/>
+                    <corners android:radius="2dp" />
+                </shape>
+            </item>
+            <item android:bottom="5dp">
+                <shape android:shape="rectangle">
+                    <solid android:color="@color/colorPrimaryBackground"/>
+                    <corners android:radius="2dp" />
+                </shape>
+            </item>
+        </layer-list>
+    </item>
+</selector>
+\ No newline at end of file
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/activity_main.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/activity_main.xml
index 1d7d77ad4..e650b8328 100644
--- a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/activity_main.xml
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/activity_main.xml
@@ -21,60 +21,64 @@
         <RelativeLayout xmlns:tools="http://schemas.android.com/tools"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:background="@color/colorPrimaryBackground"
             tools:context="com.twine.colorcapture.views.main.MainActivity">
 
             <LinearLayout
                 android:id="@+id/header"
                 android:layout_width="match_parent"
                 android:layout_height="80dp"
-                android:background="@android:color/darker_gray"
+                android:background="@color/colorPrimaryBackground"
                 android:gravity="center_vertical"
+                android:elevation="20dp"
                 android:orientation="horizontal"
-                android:visibility="gone">
+                android:visibility="visible">
 
-                <Space
-                    android:layout_width="0dp"
-                    android:layout_height="1dp"
-                    android:layout_weight="1" />
-
-                <Button
+                <com.twine.colorcapture.controls.ToggleImageButton
                     android:id="@+id/btnMenu"
                     android:layout_width="68dp"
                     android:layout_height="65dp"
                     android:layout_alignParentStart="true"
                     android:layout_centerVertical="true"
-                    android:text="Menu" />
+                    android:layout_marginLeft="20dp"
+                    android:background="@color/colorTransparent"
+                    bind:normalImage="@drawable/more_normal"
+                    bind:checkedImage="@drawable/more_selected"
+                    bind:ccc="@={vm.isMoreToggled}"/>
 
                 <Space
                     android:layout_width="0dp"
                     android:layout_height="1dp"
                     android:layout_weight="1" />
 
-                <ImageButton
+                <com.twine.colorcapture.controls.ToggleImageButton
                     android:id="@+id/imageButton2"
                     android:layout_width="68dp"
                     android:layout_height="65dp"
                     android:layout_alignParentStart="true"
                     android:layout_centerVertical="true"
-                    bind:srcCompat="@drawable/onboarding_pager_circle_icon" />
+                    android:background="@color/colorTransparent"
+                    bind:normalImage="@drawable/twinesnap_normal"
+                    bind:checkedImage="@drawable/twinesnap_selected"
+                    bind:ccc="@={vm.isCaptureToggled}"/>
 
                 <Space
                     android:layout_width="0dp"
                     android:layout_height="1dp"
                     android:layout_weight="1" />
 
-                <ImageButton
+                <com.twine.colorcapture.controls.ToggleImageButton
                     android:id="@+id/imageButton3"
                     android:layout_width="68dp"
                     android:layout_height="65dp"
+                    android:layout_marginRight="20dp"
                     android:layout_alignParentStart="true"
                     android:layout_centerVertical="true"
-                    bind:srcCompat="@drawable/onboarding_pager_circle_icon" />
-
-                <Space
-                    android:layout_width="0dp"
-                    android:layout_height="1dp"
-                    android:layout_weight="1" />
+                    android:background="@color/colorTransparent"
+                    bind:normalImage="@drawable/my_colors"
+                    bind:checkedImage="@drawable/selected"
+                    bind:ccc="@={vm.isMyColorsToggled}"
+                    />
             </LinearLayout>
 
             <FrameLayout
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_capture.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_capture.xml
index 7f8e470d0..0dd8ed653 100644
--- a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_capture.xml
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_capture.xml
@@ -41,7 +41,7 @@
                 android:layout_alignParentBottom="true"
                 android:layout_marginEnd="22dp"
                 android:layout_marginBottom="28dp"
-                app:srcCompat="@android:color/black" />
+                app:srcCompat="@android:color/black" android:visibility="gone" />
         </RelativeLayout>
 
         <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -51,7 +51,7 @@
 
             <View
                 android:layout_width="match_parent"
-                android:layout_height="100dp"
+                android:layout_height="30dp"
                 android:background="#9A000000" />
 
 
@@ -68,7 +68,7 @@
                     android:layout_alignParentStart="true"
                     android:background="#9A000000" />
 
-                <LinearLayout
+                <FrameLayout
                     android:id="@+id/scannerLayout"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
@@ -77,17 +77,19 @@
                     android:layout_toLeftOf="@id/right"
                     android:layout_toRightOf="@id/left"
                     android:layout_toStartOf="@+id/right"
-                    android:background="@drawable/ic_viewfinder"
+                    android:background="@drawable/border"
                     android:orientation="horizontal">
 
                     <View
                         android:id="@+id/scannerBar"
                         android:layout_width="match_parent"
+                        android:layout_marginTop="5dp"
+                        android:layout_marginBottom="5dp"
                         android:layout_height="5dp"
                         android:background="@color/colorPrimary" />
 
 
-                </LinearLayout>
+                </FrameLayout>
 
 
                 <View
@@ -100,10 +102,20 @@
 
             </RelativeLayout>
 
-            <View
+            <FrameLayout
                 android:layout_width="match_parent"
                 android:layout_height="100dp"
-                android:background="#9A000000" />
+                android:background="#9A000000"
+                android:paddingLeft="40dp"
+                android:paddingRight="40dp">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:textSize="13.4sp"
+                    android:text="@string/twine_snap_message" />
+            </FrameLayout>
 
         </LinearLayout>
     </FrameLayout>
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_loading.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_loading.xml
index 21fbf6485..a301532a2 100644
--- a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_loading.xml
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_loading.xml
@@ -11,17 +11,10 @@
     </data>
 
     <FrameLayout
-        android:background="#000000"
+        android:background="@drawable/background_gradient"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <ImageView
-            android:id="@+id/imageView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:scaleType="fitXY"
-            bind:srcCompat="@drawable/loading_background_brush" />
-
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -31,26 +24,33 @@
             tools:context="com.twine.colorcapture.views.loading.LoadingFragment">
 
 
-            <TextView
-                android:id="@+id/textView"
+            <!--<TextView-->
+                <!--android:id="@+id/textView"-->
+                <!--android:layout_width="wrap_content"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:layout_centerHorizontal="true"-->
+                <!--android:layout_centerVertical="true"-->
+                <!--android:text="Loading..."-->
+                <!--android:textSize="21sp" />-->
+
+            <!--<ProgressBar-->
+                <!--android:id="@+id/progressBar"-->
+                <!--style="@android:style/Widget.ProgressBar.Horizontal"-->
+                <!--android:layout_width="301dp"-->
+                <!--android:layout_height="22dp"-->
+                <!--android:layout_below="@+id/textView"-->
+                <!--android:layout_marginTop="15dp"-->
+                <!--android:layout_centerHorizontal="true"-->
+                <!--android:max="2000"-->
+                <!--android:progress="@{vm.loadingProgress}"-->
+                <!--android:progressDrawable="@drawable/gradient_progressbar" />-->
+            <ImageView
+                android:id="@+id/imageView2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
                 android:layout_centerHorizontal="true"
-                android:layout_centerVertical="true"
-                android:text="Loading..."
-                android:textSize="21sp" />
-
-            <ProgressBar
-                android:id="@+id/progressBar"
-                style="@android:style/Widget.ProgressBar.Horizontal"
-                android:layout_width="301dp"
-                android:layout_height="22dp"
-                android:layout_below="@+id/textView"
-                android:layout_marginTop="15dp"
-                android:layout_centerHorizontal="true"
-                android:max="2000"
-                android:progress="@{vm.loadingProgress}"
-                android:progressDrawable="@drawable/gradient_progressbar" />
+                bind:srcCompat="@drawable/twine_logo" />
         </RelativeLayout>
 
     </FrameLayout>
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/values/colors.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/values/colors.xml
index 451d7b6f1..4eaef06cb 100644
--- a/Software/Android_Studio/ColorCapture/app/src/main/res/values/colors.xml
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/values/colors.xml
@@ -8,4 +8,6 @@
 
     <color name="colorMask">#BB000000</color>
     <color name="colorTransparent">#00000000</color>
+
+    <color name="colorPrimaryBackground">#0e2340</color>
 </resources>
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/values/strings.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/values/strings.xml
index 8e5e37080..934bc49fb 100644
--- a/Software/Android_Studio/ColorCapture/app/src/main/res/values/strings.xml
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/values/strings.xml
@@ -3,4 +3,6 @@
 
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
+
+    <string name="twine_snap_message">Place your Twine TCC™ card on the object you want to color match</string>
 </resources>
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/values/styles.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/values/styles.xml
index 743fe092c..1b6d287fa 100644
--- a/Software/Android_Studio/ColorCapture/app/src/main/res/values/styles.xml
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/values/styles.xml
@@ -9,4 +9,10 @@
 
     </style>
 
+    <declare-styleable name="ToggleImageButton">
+        <attr name="android:checked" />
+        <attr name="normalImage" format="reference" />
+        <attr name="checkedImage" format="reference" />
+    </declare-styleable>
+
 </resources>
diff --git a/Software/Android_Studio/settings.jar b/Software/Android_Studio/settings.jar
new file mode 100644
index 000000000..3646d910b
--- /dev/null
+++ b/Software/Android_Studio/settings.jar