From 209846f2b60dbbd965763c227f206c4f23604dde Mon Sep 17 00:00:00 2001
From: Xlythe <xlythe@gmail.com>
Date: Sun, 29 Jun 2014 19:09:50 -0400
Subject: [PATCH] more glass improvements

---
 Calculator/build.gradle                       |   1 +
 .../calculator3/GlassHomeActivity.java        | 125 ++++---
 .../calculator3/GlassResultActivity.java      |  32 +-
 .../main/res/drawable-hdpi/ic_warning_150.png | Bin 0 -> 2791 bytes
 Calculator/src/main/res/layout/glass_home.xml |  35 ++
 .../src/main/res/layout/glass_result.xml      |   5 +-
 GDK-ProgressBar/.gitignore                    |   1 +
 GDK-ProgressBar/build.gradle                  |  29 ++
 GDK-ProgressBar/proguard-rules.txt            |  17 +
 GDK-ProgressBar/src/main/AndroidManifest.xml  |   9 +
 .../w9jds/gdk_progress_widget/SliderView.java | 330 ++++++++++++++++++
 .../main/res/drawable-hdpi/bar_candy0000.png  | Bin 0 -> 171 bytes
 .../main/res/drawable-hdpi/bar_candy0001.png  | Bin 0 -> 202 bytes
 .../main/res/drawable-hdpi/bar_candy0002.png  | Bin 0 -> 209 bytes
 .../main/res/drawable-hdpi/bar_candy0003.png  | Bin 0 -> 220 bytes
 .../main/res/drawable-hdpi/bar_candy0004.png  | Bin 0 -> 229 bytes
 .../main/res/drawable-hdpi/bar_candy0005.png  | Bin 0 -> 202 bytes
 .../main/res/drawable-hdpi/bar_candy0006.png  | Bin 0 -> 226 bytes
 .../main/res/drawable-hdpi/bar_candy0007.png  | Bin 0 -> 205 bytes
 .../main/res/drawable-hdpi/bar_candy0008.png  | Bin 0 -> 194 bytes
 .../main/res/drawable-hdpi/bar_candy0009.png  | Bin 0 -> 189 bytes
 .../main/res/drawable-hdpi/bar_candy0010.png  | Bin 0 -> 216 bytes
 .../main/res/drawable-hdpi/bar_candy0011.png  | Bin 0 -> 219 bytes
 .../main/res/drawable-hdpi/bar_candy0012.png  | Bin 0 -> 210 bytes
 .../main/res/drawable-hdpi/bar_candy0013.png  | Bin 0 -> 236 bytes
 .../main/res/drawable-hdpi/bar_candy0014.png  | Bin 0 -> 189 bytes
 .../main/res/drawable-hdpi/bar_candy0015.png  | Bin 0 -> 210 bytes
 .../main/res/drawable-hdpi/bar_candy0016.png  | Bin 0 -> 223 bytes
 .../main/res/drawable-hdpi/bar_candy0017.png  | Bin 0 -> 225 bytes
 .../main/res/drawable-hdpi/bar_candy0018.png  | Bin 0 -> 213 bytes
 .../main/res/drawable-hdpi/bar_candy0019.png  | Bin 0 -> 176 bytes
 .../main/res/drawable-hdpi/bar_candy0020.png  | Bin 0 -> 171 bytes
 .../main/res/drawable-hdpi/bar_candy0021.png  | Bin 0 -> 195 bytes
 .../main/res/drawable-hdpi/bar_candy0022.png  | Bin 0 -> 211 bytes
 .../main/res/drawable-hdpi/bar_candy0023.png  | Bin 0 -> 207 bytes
 .../main/res/drawable-hdpi/bar_candy0024.png  | Bin 0 -> 233 bytes
 .../main/res/drawable-hdpi/bar_candy0025.png  | Bin 0 -> 223 bytes
 .../main/res/drawable-hdpi/bar_candy0026.png  | Bin 0 -> 219 bytes
 .../main/res/drawable-hdpi/bar_candy0027.png  | Bin 0 -> 197 bytes
 .../main/res/drawable-hdpi/bar_candy0028.png  | Bin 0 -> 163 bytes
 .../main/res/drawable-hdpi/bar_candy0029.png  | Bin 0 -> 220 bytes
 .../main/res/drawable-hdpi/bar_candy0030.png  | Bin 0 -> 227 bytes
 .../main/res/drawable-hdpi/bar_candy0031.png  | Bin 0 -> 227 bytes
 .../main/res/drawable-hdpi/bar_candy0032.png  | Bin 0 -> 201 bytes
 .../main/res/drawable-hdpi/bar_candy0033.png  | Bin 0 -> 189 bytes
 .../main/res/drawable-hdpi/bar_candy0034.png  | Bin 0 -> 184 bytes
 .../main/res/drawable-hdpi/bar_candy0035.png  | Bin 0 -> 220 bytes
 .../main/res/drawable-hdpi/bar_candy0036.png  | Bin 0 -> 225 bytes
 .../main/res/drawable-hdpi/bar_candy0037.png  | Bin 0 -> 212 bytes
 .../main/res/drawable-hdpi/bar_candy0038.png  | Bin 0 -> 190 bytes
 .../main/res/drawable-hdpi/bar_candy0039.png  | Bin 0 -> 154 bytes
 .../main/res/drawable-hdpi/bar_candy0040.png  | Bin 0 -> 185 bytes
 .../main/res/drawable-hdpi/bar_candy0041.png  | Bin 0 -> 223 bytes
 .../main/res/drawable-hdpi/bar_candy0042.png  | Bin 0 -> 220 bytes
 .../main/res/drawable-hdpi/bar_candy0043.png  | Bin 0 -> 225 bytes
 .../main/res/drawable-hdpi/bar_candy0044.png  | Bin 0 -> 227 bytes
 .../main/res/drawable-hdpi/bar_candy0045.png  | Bin 0 -> 226 bytes
 .../main/res/drawable-hdpi/bar_candy0046.png  | Bin 0 -> 228 bytes
 .../main/res/drawable-hdpi/bar_candy0047.png  | Bin 0 -> 190 bytes
 .../main/res/drawable-hdpi/bar_candy0048.png  | Bin 0 -> 198 bytes
 .../main/res/drawable-hdpi/bar_candy0049.png  | Bin 0 -> 188 bytes
 .../main/res/drawable-hdpi/bar_candy0050.png  | Bin 0 -> 224 bytes
 .../main/res/drawable-hdpi/bar_candy0051.png  | Bin 0 -> 209 bytes
 .../main/res/drawable-hdpi/bar_candy0052.png  | Bin 0 -> 204 bytes
 .../main/res/drawable-hdpi/bar_candy0053.png  | Bin 0 -> 216 bytes
 .../main/res/drawable-hdpi/bar_candy0054.png  | Bin 0 -> 215 bytes
 .../main/res/drawable-hdpi/bar_candy0055.png  | Bin 0 -> 199 bytes
 .../main/res/drawable-hdpi/bar_candy0056.png  | Bin 0 -> 231 bytes
 .../main/res/drawable-hdpi/bar_candy0057.png  | Bin 0 -> 222 bytes
 .../main/res/drawable-hdpi/bar_candy0058.png  | Bin 0 -> 188 bytes
 .../main/res/drawable-hdpi/bar_candy0059.png  | Bin 0 -> 221 bytes
 .../res/drawable/progress_bar_determinate.xml |   8 +
 .../res/drawable/slider_indeterminate.xml     |  66 ++++
 .../src/main/res/layout/menu_layout.xml       |  40 +++
 .../src/main/res/layout/slider.xml            |  19 +
 .../src/main/res/values/dimens.xml            |   9 +
 GDK-ProgressBar/src/main/res/values/ids.xml   |   8 +
 .../src/main/res/values/integers.xml          |   7 +
 settings.gradle                               |   2 +-
 79 files changed, 688 insertions(+), 55 deletions(-)
 create mode 100644 Calculator/src/main/res/drawable-hdpi/ic_warning_150.png
 create mode 100644 Calculator/src/main/res/layout/glass_home.xml
 create mode 100644 GDK-ProgressBar/.gitignore
 create mode 100644 GDK-ProgressBar/build.gradle
 create mode 100644 GDK-ProgressBar/proguard-rules.txt
 create mode 100644 GDK-ProgressBar/src/main/AndroidManifest.xml
 create mode 100644 GDK-ProgressBar/src/main/java/com/w9jds/gdk_progress_widget/SliderView.java
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0000.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0001.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0002.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0003.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0004.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0005.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0006.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0007.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0008.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0009.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0010.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0011.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0012.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0013.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0014.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0015.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0016.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0017.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0018.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0019.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0020.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0021.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0022.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0023.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0024.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0025.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0026.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0027.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0028.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0029.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0030.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0031.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0032.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0033.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0034.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0035.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0036.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0037.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0038.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0039.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0040.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0041.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0042.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0043.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0044.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0045.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0046.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0047.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0048.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0049.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0050.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0051.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0052.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0053.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0054.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0055.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0056.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0057.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0058.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0059.png
 create mode 100644 GDK-ProgressBar/src/main/res/drawable/progress_bar_determinate.xml
 create mode 100644 GDK-ProgressBar/src/main/res/drawable/slider_indeterminate.xml
 create mode 100644 GDK-ProgressBar/src/main/res/layout/menu_layout.xml
 create mode 100644 GDK-ProgressBar/src/main/res/layout/slider.xml
 create mode 100644 GDK-ProgressBar/src/main/res/values/dimens.xml
 create mode 100644 GDK-ProgressBar/src/main/res/values/ids.xml
 create mode 100644 GDK-ProgressBar/src/main/res/values/integers.xml

diff --git a/Calculator/build.gradle b/Calculator/build.gradle
index 4d5f9e5d8..a72ca59c6 100644
--- a/Calculator/build.gradle
+++ b/Calculator/build.gradle
@@ -26,4 +26,5 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile project(':ThemeEngine')
     compile project(':FloatingView')
+    compile project(':GDK-ProgressBar')
 }
diff --git a/Calculator/src/main/java/com/android2/calculator3/GlassHomeActivity.java b/Calculator/src/main/java/com/android2/calculator3/GlassHomeActivity.java
index 498ef9253..18c0e5b6c 100644
--- a/Calculator/src/main/java/com/android2/calculator3/GlassHomeActivity.java
+++ b/Calculator/src/main/java/com/android2/calculator3/GlassHomeActivity.java
@@ -1,70 +1,68 @@
 package com.android2.calculator3;
 
+import android.animation.Animator;
 import android.app.Activity;
 import android.content.Intent;
+import android.media.AudioManager;
 import android.os.Bundle;
 import android.speech.RecognizerIntent;
 import android.util.Log;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
+import android.widget.ImageView;
+import android.widget.TextView;
 
 import com.google.android.glass.app.Card;
+import com.google.android.glass.media.Sounds;
+import com.google.android.glass.touchpad.Gesture;
+import com.google.android.glass.touchpad.GestureDetector;
 import com.google.android.glass.widget.CardScrollAdapter;
 import com.google.android.glass.widget.CardScrollView;
+import com.w9jds.gdk_progress_widget.SliderView;
 
 import org.javia.arity.SyntaxException;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class GlassHomeActivity extends Activity {
     private static final int SPEECH_REQUEST = 1000;
-    private List<Card> mCards = new ArrayList<Card>();
-    private CardScrollView mCardScrollView;
-    ;
-
-    private class ExampleCardScrollAdapter extends CardScrollAdapter {
-        @Override
-        public int getCount() {
-            return mCards.size();
-        }
-
-        @Override
-        public Object getItem(int position) {
-            return mCards.get(position);
-        }
+    private GestureDetector mGestureDetector;
 
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            return mCards.get(position).getView();
-        }
-
-        @Override
-        public int getPosition(Object obj) {
-            return mCards.indexOf(obj);
-        }
-    }    @Override
+    @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.glass_home);
+
+        if(savedInstanceState == null) displaySpeechRecognizer();
 
-        mCardScrollView = new CardScrollView(this);
-        ExampleCardScrollAdapter adapter = new ExampleCardScrollAdapter();
-        mCardScrollView.setAdapter(adapter);
-        mCardScrollView.setOnItemClickListener(new OnItemClickListener() {
+        mGestureDetector = new GestureDetector(this);
+        mGestureDetector.setBaseListener(new GestureDetector.BaseListener() {
             @Override
-            public void onItemClick(AdapterView<?> av, View v, int position, long id) {
-                mCards.clear();
-                mCardScrollView.getAdapter().notifyDataSetChanged();
-                displaySpeechRecognizer();
+            public boolean onGesture(Gesture gesture) {
+                if (gesture == Gesture.TAP) {
+                    ((AudioManager) getSystemService(AUDIO_SERVICE)).playSoundEffect(Sounds.TAP);
+                    displaySpeechRecognizer();
+                    return true;
+                }
+
+                return false;
             }
         });
-        mCardScrollView.activate();
-        setContentView(mCardScrollView);
+    }
 
-        if(savedInstanceState == null) displaySpeechRecognizer();
+    @Override
+    public boolean onGenericMotionEvent(MotionEvent event) {
+        if (mGestureDetector != null) {
+            return mGestureDetector.onMotionEvent(event);
+        }
+        return false;
     }
 
     @Override
@@ -84,14 +82,17 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if(requestCode == SPEECH_REQUEST) {
             if(resultCode == RESULT_OK) {
                 List<String> results = data.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS);
-                String spokenText = results.get(0).toLowerCase(Locale.US).replace("point", ".").replace("minus", "-").replace("plus", "+").replace("divided by", "/").replace("times", "*").replace("x", "*").replace(" ", "");
-                spokenText = SpellContext.replaceAllWithNumbers(spokenText);
-                spokenText = spokenText.replaceAll("[a-z]", "");
+                String spokenText = parseText(results.get(0));
+
+                if(spokenText.isEmpty()) {
+                    detectionFailed();
+                    return;
+                }
 
                 Log.v("Calculator", "Glass user queried \"" + spokenText + "\"");
 
                 Logic logic = new Logic(getBaseContext());
-                logic.setLineLength(100);
+                logic.setLineLength(10);
 
                 String result;
                 try {
@@ -112,13 +113,47 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
     }
 
     private void detectionFailed() {
-        mCards.clear();
-
-        Card card = new Card(this);
-        card.setText(R.string.voice_detection_failed);
-        mCards.add(card);
-        mCardScrollView.getAdapter().notifyDataSetChanged();
+        findViewById(R.id.layout).setVisibility(View.VISIBLE);
     }
 
+    private String parseText(String text) {
+        EquationFormatter formatter = new EquationFormatter();
+        text = text.toLowerCase(Locale.US);
+        text = text.replace("point", ".");
+        text = text.replace("minus", "-");
+        text = text.replace("plus", "+");
+        text = text.replace("divided", "/");
+        text = text.replace("over", "/");
+        text = text.replace("times", "*");
+        text = text.replace("x", "*");
+        text = text.replace("multiplied", "*");
+        text = text.replace(" ", "");
+        text = text.replace("sign", "sin(");
+        text = text.replace("cosine", "cos(");
+        text = text.replace("tangent", "tan(");
+        text = text.replace("pie", getString(R.string.pi));
+        text = text.replace("pi", getString(R.string.pi));
+        text = SpellContext.replaceAllWithNumbers(text);
+        text = removeChars(text);
+        text = formatter.appendParenthesis(text);
+        return text;
+    }
 
+    private String removeChars(String input) {
+        Pattern pattern = Pattern.compile("[a-z]");
+        String text = "";
+        for(int i = 0; i < input.length(); i++) {
+            if(input.substring(i).startsWith("sin(")
+                    || input.substring(i).startsWith("cos(")
+                    || input.substring(i).startsWith("tan(")) {
+                text += input.substring(i, i+4);
+                i+=3;
+            }
+            else {
+                Matcher matcher = pattern.matcher(input.substring(i, i+1));
+                if(!matcher.matches()) text += input.substring(i, i+1);
+            }
+        }
+        return text;
+    }
 }
diff --git a/Calculator/src/main/java/com/android2/calculator3/GlassResultActivity.java b/Calculator/src/main/java/com/android2/calculator3/GlassResultActivity.java
index 14449b263..96b295eab 100644
--- a/Calculator/src/main/java/com/android2/calculator3/GlassResultActivity.java
+++ b/Calculator/src/main/java/com/android2/calculator3/GlassResultActivity.java
@@ -8,6 +8,7 @@
 import android.speech.tts.TextToSpeech.OnInitListener;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.MotionEvent;
 import android.widget.TextView;
 
 import com.google.android.glass.media.Sounds;
@@ -15,13 +16,14 @@
 import com.google.android.glass.touchpad.GestureDetector;
 
 public class GlassResultActivity extends Activity {
-    public static String EXTRA_QUESTION;
-    public static String EXTRA_RESULT;
+    public static final String EXTRA_QUESTION = "question";
+    public static final String EXTRA_RESULT = "result";
 
     private String mQuestion;
     private String mResult;
     private boolean mIsTextToSpeechInit = false;
     private TextToSpeech mTextToSpeech;
+    private GestureDetector mGestureDetector;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -33,8 +35,8 @@ protected void onCreate(Bundle savedInstanceState) {
         TextView resultView = (TextView) findViewById(R.id.result);
         resultView.setText(mQuestion + " = " + mResult);
 
-        GestureDetector detector = new GestureDetector(this);
-        detector.setBaseListener(new GestureDetector.BaseListener() {
+        mGestureDetector = new GestureDetector(this);
+        mGestureDetector.setBaseListener(new GestureDetector.BaseListener() {
             @Override
             public boolean onGesture(Gesture gesture) {
                 if (gesture == Gesture.TAP) {
@@ -48,6 +50,14 @@ public boolean onGesture(Gesture gesture) {
         });
     }
 
+    @Override
+    public boolean onGenericMotionEvent(MotionEvent event) {
+        if (mGestureDetector != null) {
+            return mGestureDetector.onMotionEvent(event);
+        }
+        return false;
+    }
+
     private void askNewQuestion() {
         startActivity(new Intent(getBaseContext(), GlassHomeActivity.class));
         finish();
@@ -98,7 +108,19 @@ private void speakResult() {
                 // Speech can't say "-1". It says "1" instead.
                 mResult = getString(R.string.speech_helper_negative, mResult.substring(1));
             }
-            mTextToSpeech.speak(getString(R.string.speech_helper_equals, mQuestion, mResult), TextToSpeech.QUEUE_ADD, null);
+            String question = formatQuestion(mQuestion);
+            mTextToSpeech.speak(getString(R.string.speech_helper_equals, question, mResult), TextToSpeech.QUEUE_ADD, null);
         }
     }
+
+    private String formatQuestion(String question) {
+        String text = question;
+        text = text.replace("-", " minus ");
+        text = text.replace("*", " times ");
+        text = text.replace("*", " times ");
+        text = text.replace("sin", " sine of ");
+        text = text.replace("cos", " cosine of ");
+        text = text.replace("tan", " tangent of ");
+        return text;
+    }
 }
diff --git a/Calculator/src/main/res/drawable-hdpi/ic_warning_150.png b/Calculator/src/main/res/drawable-hdpi/ic_warning_150.png
new file mode 100644
index 0000000000000000000000000000000000000000..48d7c6f5f54435a19b8a297cc8e7651928155bf0
GIT binary patch
literal 2791
zcmbVOX;>5I7LHof>H`!6ji3<H3IZV;A&|g8fdpj7uo$&a!(<>aWFZL{K&=-lAVh6V
zMP!v&5D=lMfTCRYKq<u%C|G3^*@B9eO;n`biIv{_qmMuCJhPndn{(dtp7%T7Gjk*~
z*jImz*%|}_q3^ei#(<x>x@+}H`0lnW;Sv1UD5W!{VZvDHK9(3lc(R2t5Xz6wih~#s
zi=CX%3b`Q=D>&S6rj!{JNCky_EKBEumGMPzGz{Y*6R|)ZBt^wQaa;j_etz{j8pUM;
z=p9Z$_#lxt#NlpB5kp}q!Qo&E52Ucs9_}bN85IWLLsAw>#*Y_Bs4@Wk4wnksx@jC5
z_0C1g1JHkwVg`kxyoF*2<%D%~0PzF@icH25NKRxj0fQpq2}B$oKFJOQ64i-JB|4+t
zA80t6m>o-H(0tzKf=2+FBbAD%INZK{`>^{Qu|jbijzFPMbQnaU1MJ}-Nft<1G6#X=
z(<KBNBmu=-k(4VGpmd0=7-6CmK*LP`DuFKw3i=yZAbBqoEE!J565$9~JdV%T)%DI>
zB4t4TrSXs6lJH~^gkwMwVWJp>*CY1RrC?aQ4=2(&!fdD^VlKQWtazFbOyolXsUHnM
z!*8%`E}M!cxWFnplkm<&JlTZ+k6aunPL3ox#S`xY3%i8zPqB2mrxS@pAd!d^GJ!yM
z^l~APT}XH$!HMkSg2$7VV*LaXDN6uCOL@6)-uJPNAB?4Xiy@X&C=M42<Ci)hlp~Z1
zB^;p$<sC*wZ4F|9T!C)FR<}TZ)k}lK+$4zYBNp;e?-ZtT|A7G!50^<K>TaZWl@p1c
zF5X^59~#}$g+?Kx-^a55AJuR$8Jw;?{-<4*rr;jbnSVDwJotP2KmvHrh~dpKHn!&g
z0<p@}kLDRJd+@YqcUD9MvgIBrR-sRb$%QU`i;Z=*cRY&C>ukp|{GBmGzpd^5s<nsz
zwUbN)k88X`I>T_LM!>A`_J`^84f$Km{FP^vs})Cl&OMjZmadGwOIdhYKOcQ+(D2W#
zznlgZs^>fg2U3gbd#;00>2HY3W2^HK`1N}*H<$?ITAhKA>*)+c^KzYm0GH{EbrOa4
zfaak6;@fso+lUmeskJIn?x6FmU%lcf6O~5!d)>k~X&FtOH^Q6$tUlYyyKHjH<(csX
z{!rq4@4e-xZk2Dcf4z%zUVZN^hPr#!CdgO4_f8ij5PHfh`Tl+d^QhMJz!s|A_;dZ7
zu_GBAFS{PvY(2}aEMV5S-B+ETWly&>d3k{U%Xyk5L-p`2pAb5mZubCst7eMwx|Mnc
z$1dKm$O*8@6Sy{sPMjTH<YZd@sf;OWU!Pgdi0uU#D&w(m*Cu@XRDxmFSoVwUs?HI$
zF`S+7<(ZhWR<y=<i@W;hgX^ly?2{dtRcWQmfER7H1|HwXSG)3^Yzx#%*UKj5H#JJn
z)Zu77kKczfS$2_q@iiUcU`TO61vBC7a0C_kAZlu`yKy@1$U$X{y7h$_j6c{Htj<;h
zJU#nWlx2mtGJu|1$xI-G&ZH(0(wBqD&Hjq^lT`)h>6a30<tvJess>lRND;dao{l%0
z84R!f;lB3U%I_#j-wGy6(xf$4I801`9A%f3q1|8?nHN9P5#C(fMTX5U_E=830>Jfj
zWe%+*Om)jVT08sl4HevcFzY_^QdaItQE^+~*Spc`6k9jO?BUjH1#6crKAYaJ@d(FU
z-)Z?xrAZNE<`dI4VQkhl)47k52CnDaHCgmgPb<cklTH$&>P}{l+KgwpI}SYycZqpk
zzta18*6$73PjN4cr4A2W^?qeFa=)V7H(9XA4O6`tO3_@^J6<a33bB{Tp9f8Ge|;T2
zFl^Cw{O8_~Q8lwh<DeR+v#TX^!<g!n2~|j%TYn7ZoSQur>jk!(0O_j7o~ulp^JMq;
z41U^Nl~-iF5RH#4&yT+tC6BPWmnCqTy69E+5g6fJH<M?5b3Pf;AOmK2*ubBdGn1*!
z%q>cZy2N>6=t<uqM_xv8w)u=xeP%kv%Q3e`zmL;7O3+Lo+kpItu9H8gX8%3U!d&9q
zZMR!-WtG|#+18(I@UZgsN8jFCm#z9@wC_&Zd@^8#e1cST1j{HLqBJh@{DETpPO`o{
zu7PhZ?_SwDNiJO1zxc{TZo0E^9wD4b*-!3)lvk&M!=4#A++i94jMU#E2S(>!?!~k>
z?v%&vYQEZJVR;lL=K6=fpy~CMHeZlW>>h)2?Fi|(w($vVc<T2+gtjh!CzAJQ=&<08
zhTPw*7+O`LD`x)D(OZ2sSCHUh%OR^beGw%Fd#dHVM=dGNs?gNv<A%+hg$3?S4-1PL
z_zI`oyR4FQ!@@9LbV$E>?W<hLa9cC4roy52+_P-c-*z=3Dq%AioUpDj?3gdR7%7eR
zZ(bwtNc&tv9*CH;yud37fGLl$Y_tX`uA4U9c5a?d894T845%wCU{;W7&m9XGx}8_G
z-md*g<&~KBA8xPhni$_zfvG+BIJ@37tlJ+-1|lM>J0yab(i2U^cJ`4T<<n{Y47Vy`
zPomOX8z#KGUCP&<@>=|Q|K1;whJR$@f*LMOY^yNkZ7!ca!I(+;xrPZO$*jKHc4AR^
zZ>@#*4q+xy_+=cR&3j~7x-md#Y-y+s+tgckI&y&{*>=inbJp%(O<Pj^Tc6l=F{%AB
zyTvh}Y-H{`NT<DLiC+3lQ!!C~a@XA;j7!wP9T_S{TjLSE&0V{O&#U$pfcn9rhLtz#
zRmH^Oc>iVmAxv#cnTj+%w*9rWtZ-!RGAZ&gEOZC7(76`mHnjP_{>&`$bXqcim8*T~
zrnX-Wi9!a<*P+L)-PerHnK-SdI45)^9rE4|@(Ck-cLIBp0eX2mC!_7m5&ILg@hzrN
zA72>$95AYHU8ea$bFE5V-^)%g|HR|!%z&_-2UC8PXLFMss=yde+Rj+y4C!T9`V(?v
z8@`b!EKU_{N(Pc~hpBzFS93q{J7Imr`g7+E8<V0`KQ;Q9PcG!HZyBj%zFrNO+&@bi
z@y%qX1Sz(F$#y+^1NC}V1Z7%GBXiV79Y1cEM)KSzKh7=ZnN9bBn@L}9^=!84Vz)eT
z^Vz5bN+WP1gr0&ro4Ut`-A;M+6UNqQTI+b7TFff_2XDF~)SW9FOef3u3i`r9KgY1q
z3rtXJa3CL3nq#v*JJu{MH-_GITWaV~)cr?>)}iZ>!J)*KpFO|F@Bh%p=8y^jdZxXx
azkwLOKrIv7DhqYLo__RTT8-D9wEqByuCK2E

literal 0
HcmV?d00001

diff --git a/Calculator/src/main/res/layout/glass_home.xml b/Calculator/src/main/res/layout/glass_home.xml
new file mode 100644
index 000000000..17836132e
--- /dev/null
+++ b/Calculator/src/main/res/layout/glass_home.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_margin="15dp" >
+
+    <TextView
+        android:id="@+id/text2"
+        android:text="Tap to speak again"
+        android:textColor="#ffffff"
+        android:textSize="20sp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_alignParentBottom="true" />
+
+    <TextView
+        android:id="@+id/text1"
+        android:text="No message recorded"
+        android:textColor="#ffffff"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_above="@id/text2" />
+
+    <ImageView
+        android:src="@drawable/ic_warning_150"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_above="@id/text1"
+        android:layout_margin="20dp"/>
+
+</RelativeLayout>
diff --git a/Calculator/src/main/res/layout/glass_result.xml b/Calculator/src/main/res/layout/glass_result.xml
index 1231da843..884132f40 100644
--- a/Calculator/src/main/res/layout/glass_result.xml
+++ b/Calculator/src/main/res/layout/glass_result.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/body_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_margin="40dp"
-    tools:ignore="UselessLeaf" >
+    android:layout_margin="40dp" >
 
     <TextView
         android:id="@+id/result"
diff --git a/GDK-ProgressBar/.gitignore b/GDK-ProgressBar/.gitignore
new file mode 100644
index 000000000..796b96d1c
--- /dev/null
+++ b/GDK-ProgressBar/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/GDK-ProgressBar/build.gradle b/GDK-ProgressBar/build.gradle
new file mode 100644
index 000000000..f68aa41ca
--- /dev/null
+++ b/GDK-ProgressBar/build.gradle
@@ -0,0 +1,29 @@
+apply plugin: 'android-library'
+
+android {
+    compileSdkVersion 19
+    buildToolsVersion "20"
+
+    defaultConfig {
+        minSdkVersion 14
+        targetSdkVersion 19
+        versionCode 1
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            runProguard false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+        }
+    }
+
+    packagingOptions {
+        exclude 'META-INF/LICENSE.txt'
+        exclude 'META-INF/NOTICE.txt'
+    }
+}
+
+dependencies {
+    compile 'com.android.support:appcompat-v7:19.+'
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+}
diff --git a/GDK-ProgressBar/proguard-rules.txt b/GDK-ProgressBar/proguard-rules.txt
new file mode 100644
index 000000000..043e6ac5b
--- /dev/null
+++ b/GDK-ProgressBar/proguard-rules.txt
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in C:/Users/Will/AppData/Local/Android/android-studio1/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# 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 *;
+#}
\ No newline at end of file
diff --git a/GDK-ProgressBar/src/main/AndroidManifest.xml b/GDK-ProgressBar/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..6e7d32e9d
--- /dev/null
+++ b/GDK-ProgressBar/src/main/AndroidManifest.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="com.w9jds.gdk_progress_widget"
+      android:versionCode="1"
+      android:versionName="1.0">
+    <application/>
+</manifest>
+
diff --git a/GDK-ProgressBar/src/main/java/com/w9jds/gdk_progress_widget/SliderView.java b/GDK-ProgressBar/src/main/java/com/w9jds/gdk_progress_widget/SliderView.java
new file mode 100644
index 000000000..6ee19c638
--- /dev/null
+++ b/GDK-ProgressBar/src/main/java/com/w9jds/gdk_progress_widget/SliderView.java
@@ -0,0 +1,330 @@
+package com.w9jds.gdk_progress_widget;
+
+import android.animation.Animator;
+import android.animation.ObjectAnimator;
+import android.animation.TimeInterpolator;
+import android.content.Context;
+import android.graphics.drawable.AnimationDrawable;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewPropertyAnimator;
+import android.view.animation.AccelerateDecelerateInterpolator;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+
+public class SliderView extends FrameLayout
+{
+    private float animatedCount = 0.0F;
+    private int count = 0;
+    private ObjectAnimator countAnimator;
+
+    private Runnable hideSliderRunnable = new Runnable()
+    {
+        public void run()
+        {
+            SliderView.this.hideSlider(true);
+        }
+    };
+
+    private final ImageView indeterminateSlider;
+    private float index = 0.0F;
+    private ViewPropertyAnimator progressAnimator;
+    private float slideableScale = 1.0F;
+    private final View slider;
+    private boolean sliderShowing = true;
+    private boolean sliderWasShowing = false;
+
+    public SliderView(Context paramContext)
+    {
+        this(paramContext, null);
+    }
+
+    public SliderView(Context paramContext, AttributeSet paramAttributeSet)
+    {
+        this(paramContext, paramAttributeSet, 0);
+    }
+
+    public SliderView(Context paramContext, AttributeSet paramAttributeSet, int paramInt)
+    {
+        super(paramContext, paramAttributeSet, paramInt);
+        LayoutInflater.from(getContext()).inflate(R.layout.slider, this);
+        this.slider = findViewById(R.id.slider_control);
+        this.indeterminateSlider = ((ImageView)findViewById(R.id.indeterminate_slider));
+        hideSlider(false);
+        hideIndeterminateSlider(false);
+    }
+
+    private void animateCountTo(float paramFloat)
+    {
+        if ((this.countAnimator != null) && (this.countAnimator.isRunning()))
+            this.countAnimator.cancel();
+
+        float[] arrayOfFloat = new float[2];
+        arrayOfFloat[0] = this.animatedCount;
+        arrayOfFloat[1] = paramFloat;
+        this.countAnimator = ObjectAnimator.ofFloat(this, "animatedCount", arrayOfFloat);
+        this.countAnimator.setDuration(300L);
+        this.countAnimator.start();
+    }
+
+    private int getBaseSliderWidth()
+    {
+        return Math.max((int)(getResources().getDisplayMetrics().widthPixels / this.animatedCount), 40);
+    }
+
+    private void hideIndeterminateSlider(boolean paramBoolean)
+    {
+        int i = getResources().getDimensionPixelSize(R.dimen.slider_bar_height);
+
+        if (paramBoolean)
+        {
+            this.indeterminateSlider.animate().translationY(i).setDuration(getResources().getInteger(R.integer.slider_in_out_animation_duration_ms));
+            return;
+        }
+
+        this.indeterminateSlider.setTranslationY(i);
+    }
+
+    private void hideSlider(boolean paramBoolean)
+    {
+        if (!this.sliderShowing)
+            return;
+
+        int i = getResources().getDimensionPixelSize(R.dimen.slider_bar_height);
+        this.slider.animate().cancel();
+
+        if (paramBoolean)
+            this.slider.animate().translationY(i).setDuration(getResources().getInteger(R.integer.slider_in_out_animation_duration_ms));
+
+        while (true)
+        {
+            this.sliderShowing = false;
+            this.slider.setTranslationY(i);
+            return;
+        }
+    }
+
+    private void hideSliderAfterTimeout()
+    {
+        removeCallbacks(this.hideSliderRunnable);
+        postDelayed(this.hideSliderRunnable, 2000L);
+    }
+
+    private void setProportionalIndex(float paramFloat, int paramInt, boolean paramBoolean)
+    {
+        if (this.count < 2)
+            hideSlider(true);
+
+        while (true)
+        {
+            this.index = paramFloat;
+            float f1 = 1.0F / this.slideableScale;
+            float f2 = (0.5F + this.index - f1 / 2.0F) * (getResources().getDisplayMetrics().widthPixels / this.count);
+            if (paramInt != 0)
+            this.slider.animate().translationX(f2).setDuration(paramInt).setInterpolator(new AccelerateDecelerateInterpolator());
+
+            while (paramBoolean)
+            {
+                showSlider(true);
+                hideSliderAfterTimeout();
+                this.slider.setTranslationX(f2);
+            }
+        }
+    }
+
+    private void showIndeterminateSlider(boolean paramBoolean)
+    {
+        if (paramBoolean)
+        {
+            this.indeterminateSlider.animate().translationY(0.0F).setDuration(getResources().getInteger(R.integer.slider_in_out_animation_duration_ms));
+            return;
+        }
+
+        this.indeterminateSlider.setTranslationY(0.0F);
+    }
+
+    private void showSlider(boolean paramBoolean)
+    {
+        removeCallbacks(this.hideSliderRunnable);
+
+        if (this.sliderShowing)
+            return;
+
+        this.slider.animate().cancel();
+
+        if (paramBoolean)
+            this.slider.animate().translationY(0.0F).setDuration(getResources().getInteger(R.integer.slider_in_out_animation_duration_ms));
+
+        while (true)
+        {
+            this.sliderShowing = true;
+            this.slider.setTranslationY(0.0F);
+            return;
+        }
+    }
+
+    private void updateSliderWidth(boolean paramBoolean)
+    {
+        if (this.count < 2)
+        {
+            hideSlider(true);
+            return;
+        }
+
+        FrameLayout.LayoutParams localLayoutParams = (FrameLayout.LayoutParams)this.slider.getLayoutParams();
+        localLayoutParams.width = ((int)(1.0F / this.slideableScale * getBaseSliderWidth()));
+        localLayoutParams.leftMargin = 0;
+        this.slider.setLayoutParams(localLayoutParams);
+
+        if (paramBoolean)
+            showSlider(true);
+
+        setProportionalIndex(this.index, 0, paramBoolean);
+    }
+
+    public void dismissManualProgress()
+    {
+        hideSlider(true);
+    }
+
+    float getAnimatedCount()
+    {
+    return this.animatedCount;
+    }
+
+    void setAnimatedCount(float paramFloat)
+    {
+        setAnimatedCount(paramFloat, true);
+    }
+
+    void setAnimatedCount(float paramFloat, boolean paramBoolean)
+    {
+        this.animatedCount = paramFloat;
+        updateSliderWidth(paramBoolean);
+    }
+
+    public void setCount(int paramInt)
+    {
+        setCount(paramInt, true);
+    }
+
+    public void setCount(int paramInt, boolean paramBoolean)
+    {
+        hideIndeterminateSlider(true);
+        hideSlider(true);
+        this.count = paramInt;
+        this.index = Math.max(Math.min(this.index, paramInt - 1), 0.0F);
+
+        if (paramBoolean)
+        {
+            animateCountTo(paramInt);
+            return;
+        }
+
+        setAnimatedCount(paramInt, false);
+    }
+
+    public void setManualProgress(float paramFloat)
+    {
+        setManualProgress(paramFloat, false);
+    }
+
+    public void setManualProgress(float paramFloat, boolean paramBoolean)
+    {
+        hideIndeterminateSlider(true);
+        showSlider(false);
+        int i = getResources().getDisplayMetrics().widthPixels;
+        FrameLayout.LayoutParams localLayoutParams = (FrameLayout.LayoutParams)this.slider.getLayoutParams();
+        localLayoutParams.width = i;
+        localLayoutParams.setMargins(-i, 0, 0, 0);
+        this.slider.setLayoutParams(localLayoutParams);
+
+        if (paramBoolean)
+        {
+            this.slider.animate().translationX(paramFloat * i);
+            return;
+        }
+
+        this.slider.setTranslationX(paramFloat * i);
+    }
+
+    public void setProportionalIndex(float paramFloat)
+    {
+        setProportionalIndex(paramFloat, 0, true);
+    }
+
+    public void setProportionalIndex(float paramFloat, int paramInt)
+    {
+        setProportionalIndex(paramFloat, paramInt, true);
+    }
+
+    public void setScale(float paramFloat)
+    {
+        this.slideableScale = paramFloat;
+        updateSliderWidth(true);
+    }
+
+    public void startIndeterminate()
+    {
+        int i = getResources().getDisplayMetrics().widthPixels;
+        FrameLayout.LayoutParams localLayoutParams = (FrameLayout.LayoutParams)this.slider.getLayoutParams();
+        localLayoutParams.width = i;
+        localLayoutParams.setMargins(0, 0, 0, 0);
+        this.slider.setLayoutParams(localLayoutParams);
+
+        if (this.sliderShowing)
+        {
+            this.sliderWasShowing = true;
+            hideSlider(true);
+        }
+
+        showIndeterminateSlider(true);
+        ((AnimationDrawable)this.indeterminateSlider.getBackground()).start();
+    }
+
+    public void startProgress(long paramLong)
+    {
+        startProgress(paramLong, new AccelerateDecelerateInterpolator());
+    }
+
+    public void startProgress(long paramLong, Animator.AnimatorListener paramAnimatorListener)
+    {
+        startProgress(paramLong, new AccelerateDecelerateInterpolator(), paramAnimatorListener);
+    }
+
+    public void startProgress(long paramLong, TimeInterpolator paramTimeInterpolator)
+    {
+        startProgress(paramLong, paramTimeInterpolator, null);
+    }
+
+    public void startProgress(long paramLong, TimeInterpolator paramTimeInterpolator, Animator.AnimatorListener paramAnimatorListener)
+    {
+        hideIndeterminateSlider(true);
+        this.slider.setTranslationX(0.0F);
+        showSlider(false);
+        int i = getResources().getDisplayMetrics().widthPixels;
+        FrameLayout.LayoutParams localLayoutParams = (FrameLayout.LayoutParams)this.slider.getLayoutParams();
+        localLayoutParams.width = i;
+        localLayoutParams.setMargins(-i, 0, 0, 0);
+        this.slider.setLayoutParams(localLayoutParams);
+        this.progressAnimator = this.slider.animate().translationX(i).setDuration(paramLong).setInterpolator(paramTimeInterpolator).setListener(paramAnimatorListener);
+    }
+
+    public void stopIndeterminate()
+    {
+        if (this.sliderWasShowing)
+            showSlider(true);
+
+        ((AnimationDrawable)this.indeterminateSlider.getBackground()).stop();
+        hideIndeterminateSlider(true);
+    }
+
+    public void stopProgress()
+    {
+        if (this.progressAnimator != null)
+            this.progressAnimator.cancel();
+
+        hideSlider(true);
+    }
+}
\ No newline at end of file
diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0000.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0000.png
new file mode 100644
index 0000000000000000000000000000000000000000..64d91fcd0e60f6d749914702010bc47b25a51685
GIT binary patch
literal 171
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW`j5ZJ|V9Ek-*obe8oU<mXaX9
z;QtJn8M6*Vz6bKXJY5_^A`ZX3evy+wfy2S^^561z$3>M^?&e+69&tow_0jH4?WYs8
z7?lnLuWHwRuj3#sz^LTF_$js_&w-IkV1EKj2D6d_i^hR&GyV*QcXPfbCj(7o@O1Ta
JS?83{1OOsAKf3?`

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0001.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0001.png
new file mode 100644
index 0000000000000000000000000000000000000000..17b52fd0976af40ce70797998c0b90ca79f2f277
GIT binary patch
literal 202
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<hF0G|-o|JXpfN8?4H0``(1
zzu^D64C^!XGSV2<TLFb)JzX3_A`ZX3ep8S^k%J}B<}-h#{WXaxm##|&l$>>Naq{|`
zS*TgddxKe0ayz%h^@hvqf|VE@56CikIf$-l`WVL~6u`7h-~z9Q1Jfg0#@d5<4xAjK
gJ`S8Oxb04}$E;@(E|j>k6KD~Gr>mdKI;Vst0C@#W&j0`b

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0002.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0002.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf5f80c40b5a9ffc0f69bae528f92905b26228ab
GIT binary patch
literal 209
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gS0G|-o|2TlA_JI>XH5?^D
ze!&cx|JUng=xxYuSbrQSmf-2)7!q;#?KMZP0}4DY7c<u0`+v;!&W@Lx6wc0;u6Z`u
z^N7#N^k-dD!|LaVOjsZJW_zB4(1eCeR+EDYoE{FsYosUWDKN%5+-*>KaLreJ0q3=|
m?vgAj3ykxd{x)c`)-XgYwVKMwyS)Wy7lWs(pUXO@geCyQty+x$

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0003.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0003.png
new file mode 100644
index 0000000000000000000000000000000000000000..db660265586d068ad4137bf59f5ba472e6615a6a
GIT binary patch
literal 220
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gS0G|-o|2TlA_JI>XH5?^D
ze!>5B8P;cJ=xyM&o%0qbmhI`{7!q;#?e&YI4GKKY7gs6#&Og(>=E22FvpHu?c8^k0
z>ic|A^nYly@wXc>l808j*tuSEw!yc{b2%J%Piz*A*~_~oA+e%F-ZVjyp`ERSnX5Tn
xdxt=SGGl|(1zrw^{SV4*vK<&c@f?U^@GIEF%sk^`vOUmR22WQ%mvv4FO#qGaUE=@%

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0004.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0004.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6d26685cb5c58c340083df2923a4f8011d4edde
GIT binary patch
literal 229
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gS0G|-o|2TlA_JI>XH5?^D
ze!>5B88&3D&(J&d(`z?Sti;pBF(l&f+v%Qs2NZainG=8h@3)-r?F6sO>yO+rnJLH9
z`h(^b?T%Kh5&OMA>&`5eyjsRJ(|_kY+|0>%gK+{2%Yn16<e38$8Rv4TG5%!aXFkEP
zu*uUwOM)TtV2A;O9z)2AgmhMB1#Jn2RK_Jukq3Jw?3GGh!mM5yb@>d?eg;ohKbLh*
G2~7az=3S})

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0005.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0005.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ce59b3bff3ba5e7999d4837f2ed557b177a389e
GIT binary patch
literal 202
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW`j5ZJ|V9Ek-*obe8oU<mXaX9
z;QyHn8JRyT*8%yNo-U3d5r^MiH{@$z;9z!`@c;kKgD1}(bn#rT->_xr(pP<UdOm;U
zXQ$N`-}j3sVqQ7f!DH4#vz<K*oEO%}OXTTzHs~n?JyxoiG*3X#r$I?Vv9c{&cEUrB
p0L}h-rx=Gj3ZW`%-#+gzWKufBR9QdY>@Uz#22WQ%mvv4FO#lvTP-OrB

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0006.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0006.png
new file mode 100644
index 0000000000000000000000000000000000000000..845822da47724dd09dee1df45d4d1779cb9961ce
GIT binary patch
literal 226
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gS0G|-o|2TlA_JI>XH5?^D
ze!>4YFzBt<&CHN}oc|0cR_N*C7!q;#?M*|W1_d6MiwhLK@88%uMQmEz9$QAqe{a;C
zk3`@4_@qbX<?B7lubxC1pO<ZaeUc%Em2r+JgUq?#zuESb$*f}(Xb|x^7%#Gh(Nuwf
zamMP6xd&%6W^jLFTav)Fu6p6N1co33)@+CP!k0zNU)h*FPD+=u0WD|nboFyt=akR{
E0Nfv7YXATM

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0007.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0007.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5a6d6da672125f17ba1e3a4fa97eac0efd5e591
GIT binary patch
literal 205
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gq0G|-o{}^D`(-J12EL%yC
zU+{lDhV{A|&i*;a1{6v0ba4!cIQ;g8CEo!B9u|k@hyUaK7*nU1$!yl&u=HY-z{iO}
z?nd8E%IrKAdva%)b=GP&g$4#D4j}Q5a|1KS0yY)_2L?tKfdkXOC^P<IztZ5%@P&i%
l0w)^~75rq=+0FZpVcG|#P4ml@tbq10c)I$ztaD0e0syD?Prm>F

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0008.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0008.png
new file mode 100644
index 0000000000000000000000000000000000000000..811e95b6470e61a36c933fd047e22a8031a47e8c
GIT binary patch
literal 194
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gq0G|-o{}^D`(-J12EL%yC
zU+{m1^}2c+@@Jls1&Ty^x;TbJ9DaL!H!p(%5A($jx9d}9nS_{_2%Z;CxO-Ai@cR~@
zD_-Z*`+w-WP86KbaLY!#Kqx?(n?sV3b49N(&rS2(X{;&>gn2-GUPi^woQey~!~`}O
ZOHVn?7{2Lmo*~c@22WQ%mvv4FO#rv%Nk;$x

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0009.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0009.png
new file mode 100644
index 0000000000000000000000000000000000000000..29798fe98441e754046453c1ab1c0616137e0373
GIT binary patch
literal 189
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW`j5ZJ|V9Ek-*obe8oU<mXaX9
z;QtI6nP2WiSOEDko-U3d5r^MiJ1EGYz`^V|<zMx;WJbHIIa(7QJ_#zFvoZL6>bvFV
zyL|o|{$pn-Gi%^=P(SdWS%H=L0$a#~BYYBdjG7UgN(>A^1`Kl<9=kJn9AtQ+z`zv1
bzDJGwfEr`1m1kfw&>jX)S3j3^P6<r_`f)_L

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0010.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0010.png
new file mode 100644
index 0000000000000000000000000000000000000000..353a35e3b56edac83b111864fcb8787e8bfaf6bc
GIT binary patch
literal 216
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gS0G|-o|2TlA_JI>XH5?^D
ze!>44GIiHyY|wji^Wq(#Sh}Z+V@Sl|w>J**9#G(6*)YZFX8q&3O$_TzR^>NwM2ags
zG6`3!N_+A{xo);~f5JBzc?SkY7J&oHmhUh6!}@?(p+V{b7n{HVrUoei2i}OuybG)s
sux)8F1&VJFT97}(t0C^-{fq<R1xk$jEEk+`09wi5>FVdQ&MBb@07{`+Z2$lO

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0011.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0011.png
new file mode 100644
index 0000000000000000000000000000000000000000..84e11eabd157e9d6b3666dcac6fdb29ad65c5649
GIT binary patch
literal 219
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gq0G|-o{}^D`(-J12EL%yC
zU+{lDhV{A|&i*;a1{5jsba4!cIQ;g8Bi{i94wt|+RsXfi7k00kt;YM~84HK~;e;dJ
zTeDZXM}7U<BIus|#_Y_TRB?t4j0TDgG8?2CWE&X%6i<@5z-8vi5Ot7YOOvc(>gl?y
zq60_xA|6Pm6*))-u$8dNziu!}cxLdFV<O}J3%utpF<sH%70dzJ&fw|l=d#Wzp$PzT
CB3SVN

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0012.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0012.png
new file mode 100644
index 0000000000000000000000000000000000000000..9c26dc3d09e13dffa0306d29408af6e62139be62
GIT binary patch
literal 210
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gq0G|-o{}^D`(-J12EL%yC
zU-17847z&jpT`|r4;0Dtba4!cIQ;hdN!|krJS+~g7yqC3xr5tdihsjRE*`0$9Y3b!
zlvk~pTjkdM*!Y$DGpVQNw8|NFc>aoF5O!er&v1d`UM|aWL7oMCKO`3Lae$Dvgad=D
qBE!7$7KRLVlP1P3%uE~)R>v$dXF9$i`R75Pr3{{~elF{r5}E*lR#eyk

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0013.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0013.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a2ec2e75211ff3ef5fd882d8df03f67c42e0e2e
GIT binary patch
literal 236
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gS0G|-o|2TlA_JI>XH5?^D
ze!>5B8P;cH>TTHKJaIoztlHDXF(l&f+ZhLW8w_}ugFO!YlWt}alAmXj_1(rXJ2rW_
z;Qx%A?cXMZ+l8NWSTAk*)ABa|fu?=ls*l<(vgk1UDNuH0u<1xR&oS?A@3+|v3@buB
z*klD57zG%npKVU#T*z$180j>P{XzzJ8k5#j$IraZ>?%z!8;Z_<WVy4JS?=zf=G{PN
OFnGH9xvX<aXaWF9Ct_d#

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0014.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0014.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f77d80fe1adc324d3312ede5740541c70ec3a79
GIT binary patch
literal 189
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gq0G|-o{}^D`(-J12EL%yC
zU+{kh-3{yYUg&nX14TkST^vIq4!^yAl9R!JgT<lv>-{3TX#yOla#-7BmE886J>k-S
zrsf>i%D{r)hS@d@^-mZ$7RU!2WSGRhKy*z410%}?t}ufJhFSa$tjrt>e#$6L<=&?f
W!I;tSZsGzopTX1B&t;ucLK6TPK}OdA

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0015.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0015.png
new file mode 100644
index 0000000000000000000000000000000000000000..e959261654d10e0fee2869beeaba4eda2ec65c66
GIT binary patch
literal 210
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gS0G|-o|2TlA_JI>XH5?^D
ze!>44bk}EO>TOskeV-dBmgwo?7!q;#?e&Yi4GKIC2Nx;)&VS>7n2qH~weX6aTTGMu
zRJ)6JeVY32!is0^D|g#UH2hz|$f3}{5Ot7&X-5&083UsUBV!3Olf_zg2Zr()4YJnS
mH@MgY9DZ__G1vWNt6?;`#<=Tu%q?%AWelFKelF{r5}E*ul2yR~

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0016.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0016.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f3f9688d2d4aa0dd81e9610484ec2f7cfd39dfe
GIT binary patch
literal 223
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gS0G|-o|2TlA_JI>XH5?^D
ze!>6s7}o1<$jq3-xo#U!EYH)$F(l&f+v|>e4GIFz7ac|3)hCN@GQ7ByvuC}z#-A;h
zJMu%fd7B1h%5UpiF#A@;47=O@s;nEF-bo&Kw)_TD!aXiMh8P{j$+F%;A6#QuH>b9E
z9JsH(K=ch;$U(ObK_y1U6-|s8EesRZS_*$)(cZ?a<$1>D3(#f;Pgg&ebxsLQ0K*?$
AeE<Le

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0017.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0017.png
new file mode 100644
index 0000000000000000000000000000000000000000..594c29f0923b8ece6ca99ea8ab711d7308efb5d1
GIT binary patch
literal 225
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gS0G|-o|2TlA_JI>XH5?^D
ze!>4YFz97wtk+%K6mkG4R^aL47!q;#?R87B1_K^v$9A1N|Bs0*S-K#x(_OvbOUhr1
zN0L+DhV(wY^6YZdg{78%-#Q+XNqJtV^>uwtdZc+nEJJ<5xrPK@j)PJLwG7(*iV@6Q
z3AeO&L=|ydYhar3&Z!wB*Ii%y;Gn2aIdcVr$b061+lR}Z0_|q-boFyt=akR{0RH!5
APXGV_

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0018.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0018.png
new file mode 100644
index 0000000000000000000000000000000000000000..85771e6cd987a4974f63eb819814c2b7d5ead20c
GIT binary patch
literal 213
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<hF0G|-o|JXpfN8?4H0``(1
zzu^D64C^y8_1s;5WC4XTJY5_^A`ZX3?kLn?z`^2p<j8+}OZMU~I@7-FV+ab~toZ1u
zOy%>Q__X}#iv5zmYu#?LFyzdQ<a@yCz;<R14~K&&4+t@QGg@G;z#u8ma8)#>yv0C)
o*+_xmx11tS0UOJMbgc@;@Iy>{EY3Er0NTmm>FVdQ&MBb@0Iv~ImH+?%

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0019.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0019.png
new file mode 100644
index 0000000000000000000000000000000000000000..b114d5572a67cc06c0095df8edc888874e4c10e7
GIT binary patch
literal 176
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<hy0G|-o|EOSMd9Wx@inS!j
zFZe&hdR;xW>pc!Y0dG$i$B>A_Z*QFDWl-R7Ir#N*{n@xRj+`^EGbSEtd=mb6+P1US
z54*V77BH{~9QenuJ(c+d6PE)c#{veC1_mY|Rl|5en$1CcLl%2WCBx@w$v36}jb-q3
L^>bP0l+XkKzd}Mw

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0020.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0020.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d57e775ad0f980192a55b048f8920eb0cb29c3b
GIT binary patch
literal 171
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW`j5ZJ|V9Ek-*obe8oU<mXaX9
z;QtI6nP2WiSOEE6o-U3d5r^MizsSj;z~SI{`EU8V<B~?N?y)^;lrX&a>e0(h%hy~;
zWz=BkXY}D_FIdDR;K1;dCEB8a;gq-z1LG8R7X~Jd1;T$arL`Y1yxYFe^#;&X22WQ%
Jmvv4FO#m_^Ksx{c

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0021.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0021.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b3f4eb9c64f5f8e06599c9e780895bb63264a20
GIT binary patch
literal 195
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW`j5ZJ|V9Ek-*obe8oU<mXaX9
zV1~^987eoLbb<UNPZ!6Kh{JDhH1aYia<Dia_*ZQ<e><D1)%C_5H=ULDrIdQCx$;%=
z^^(Z*&*hIWJh+xpGON1TJN<w$gOLLBssx68+zYta6qs)@zHMM&0g2o<;Nfr(J<||(
f5J+1;nCDZ)WhMV~$K>Nc+Za4u{an^LB{Ts5yMsy(

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0022.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0022.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2ec1ef16bfb0db36e402b05705c8c40130f0a94
GIT binary patch
literal 211
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gq0G|-o{}^D`(-J12EL%yC
zU+{ljhV^<I78X7i1&U;Ox;TbJ9DaM_AnySM9_K*kNq@tiIfQ3qpS&;J@Tp*x*QHzL
zs*`WXzPNg&_;y&<Ezt)qj4>M--aeaqvw>mD%yQ-lqG!4p65i}#<Z!U_Vm!gMjFFM!
vz<GvG@&y%w^(h$+QWHddn3)WO?lZo8&$R9TBlD?1TNylE{an^LB{Ts5kBwN+

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0023.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0023.png
new file mode 100644
index 0000000000000000000000000000000000000000..67ac40795211b059d006578d7116c9972bfb07d9
GIT binary patch
literal 207
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gq0G|-o{}^D`(-J12EL%yC
zU+{ljhV^<I78X7i1&XA3x;TbJ9DaNKAm;%C9_PU2h2P?Lwl7f@VXB&S!08cpc&*g=
zYip`a&ilq1?lNqPdH(v2$)}_Ut_nfMb_omfgIp5F>sVYISVfqbW+j{xy&(Q){VkTq
q49__v{2k&A_zLEEAK=q|z+HNoX;a7Y$df=D89ZJ6T-G@yGywntKvUlU

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0024.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0024.png
new file mode 100644
index 0000000000000000000000000000000000000000..02005d2bf0db1a6c33c6d70e89510783ff839fea
GIT binary patch
literal 233
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gS0G|-o|2TlA_JI>XH5?^D
ze!>4U7&15Lt=Ii$HtQBptisd9F(l&f+vx`d8yt9;nl1PKv;LN7C-#6x*_+j<-Froq
z_i^Q^)2sHa*7nSfnQuAmwn@V}`(xX89s7E2qfYQ8jY$m$8ATYEH0|8F;(-NI5wjJW
zK}W;7(CZT!Q&^oHv}UxYv9jN5=n>GG!Ej8tz|cuyfipvW%t7<XtxT79%k2^Zx`Dyd
L)z4*}Q$iB}6rf_F

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0025.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0025.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6111576d9bacb1c46c8b65e7b0c5b4321f76546
GIT binary patch
literal 223
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gS0G|-o|2TlA_JI>XH5?^D
ze!>4YFz9Ax=&e7>lPU%j%ky+`42d}WcKSxa0}4Dxd=4c3?+s?z#q&VnFUy~~I<q_0
zZ+Y$8UnTiES2^S6+0TDgO=a}aX;|<~`am>4#{#wz*2ix7{|+>)OJHb-<riTIV9s*j
zJz<*gDBnS#LF&RYCJmqzqlg3Jk^fEoGJDx?&0{uSR&nzo&}IftS3j3^P6<r_a2sHx

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0026.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0026.png
new file mode 100644
index 0000000000000000000000000000000000000000..02110744c80a7fddb8caadda90b931e140954236
GIT binary patch
literal 219
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gS0G|-o|2TlA_JI>XH5?^D
ze!>5B8P;cJ=xyM&o%0qbmgVW<7!q;#?G10fh5!!dz$@Qx{_m50abxDm%k$PTO!DRq
zvCX)xFS~Wgt=PELE~+K}1sSSU8f+K*W<2nf@ks;2lLmcei(JQJ{w(fQ4IE+z8CVn;
wj2UJAHS`JaaX5r;;9y(8(RZh*j{gDYgy+oi2U<9;0&QjRboFyt=akR{0C(zJbN~PV

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0027.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0027.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba993b2c5f5ac864b256abf3286befd1ab6dc1f8
GIT binary patch
literal 197
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gq0G|-o{}^D`(-J12EL%yC
zU+{m1^?Dn0c^2Df0!3mxT^vIq4!^y&o0ma>hxy`%+x4llzHD)rr{3YGZY}tHi%-n#
zdE$L5X8km7EN6*HW&Ja&f$d5Ii;4mxXGRm}3wD(SY$gX;t~5vq)Uj}QI0(OCcUiEb
f;WEp9uLS1zI~bQT9?kdxw1>gd)z4*}Q$iB}_$^J!

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0028.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0028.png
new file mode 100644
index 0000000000000000000000000000000000000000..d3cfd1d8816251d3db5a2cd6644536b883b2ee80
GIT binary patch
literal 163
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<g<0G|-o|6mYW^EC%3!c-FE
z7yO^$>2?DzAkWLw#W5t}@Y_opc^Moym>llZXU>*?;B9)G#X;|<-`<pxvMpZ@-3(-4
zTCr4|fknVUcQ1oNgInfHRt82BFK>MYjs<~HRg4Y{=}Q=+y%`lld-iJpO=a+O^>bP0
Hl+XkKo`f{F

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0029.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0029.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd0d4acabf3a20cc1b8944dc72a1f8647420502c
GIT binary patch
literal 220
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gS0G|-o|2TlA_JI>XH5?^D
ze!>44*6U?t>TU=<vA_~2mhI`{7!q;#?R9Ih1_d6MiwhR~zQ55|%UYVXIGuIE=W{hm
z^HwcQD$D(O!FJW^=c>o_>o&_YxK}c`$1P$OXozPz!5Dv)^FTC9v4gBYgHi+wP%zAZ
v!BT;t)PXO9^?IR$atkw)K!eo-pIr>ITNy8T99O#rw3fls)z4*}Q$iB}^gdXL

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0030.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0030.png
new file mode 100644
index 0000000000000000000000000000000000000000..0008a753a99b8f4957f14811487ca02893f6871e
GIT binary patch
literal 227
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gS0G|-o|2TlA_JI>XH5?^D
ze!>6s7}jU%W^8z~T=51_tjN>FF(l&f+vz6-4=C_3KP_1DzwdJcTSA3PT4<x`y^SfE
z!5?`<C0CqFTs`5+oUrMKUFRPzd%^6$kW#81yT`?V;ZYNJg=_<314BpmQ4ThT-QT8g
zJ6J7<t$6yXfnf&wfr39xoe5S73`LCZ|2B0#xNoZ{AKt*M?zinV3($53Pgg&ebxsLQ
E06QvTr2qf`

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0031.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0031.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec4cc3d077c73f58be31e7b74e70c5f4acad462e
GIT binary patch
literal 227
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gS0G|-o|2TlA_JI>XH5?^D
ze!>4YFz9Bi&(u3}{ly`mSdpiTV@Sl|w=)h3GAME!`4IAAf3kc~qurjXOPJbD>a0tv
zo{}Hr+cJ&WyxH??Z^_A*PgzP>_IMpwH>;tq(({QM7iUL<I;#q!-~{14a~cjx3or@_
zFls7lsY?KbSX>T#kJ=FI<l(^bN4UJ^FbmV925p|?hs^qpTpf)-+ZjAv{an^LB{Ts5
DgOOa@

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0032.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0032.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc01dcb8d562718fe83ff3e1d75aabe98b4b31d9
GIT binary patch
literal 201
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gq0G|-o{}^D`(-J12EL%yC
zU+{ljhV^<I78X7i1&Snix;TbJ9DaM_AnySK4rYf-6aI$3Q<hyQzxXrDv>gf)SJiKt
zH#^qyX8d!#lk-#>nlH^{u$FkRNUxrm$%6O6$2<m>0+R#G3zUzrnRqg+JiWh(aSP*B
kHUS6uiwvuH6V9o`Pi<ye{?+ewH_$EyPgg&ebxsLQ09~<C!2kdN

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0033.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0033.png
new file mode 100644
index 0000000000000000000000000000000000000000..880ce920f095f9da39c0a89790e8f46396687200
GIT binary patch
literal 189
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW`j5ZJ|V9Ek-*obe8oU<mXaX9
z;QtJn8M6*Vz6bJSJY5_^A`ZX3ev+3#frt4Z!{6^`)Kv>yd$c1SP7PGLwk&l~#Hylv
z|MTrHyN=W<H#h8vk2tW<<Br&bhWlI@jD^3OI6WL(AAMsLz96^=EG!l<k;SH{<&97Q
Z(}~55K|Hs^-GTNnc)I$ztaD0e0ssl_OMU<V

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0034.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0034.png
new file mode 100644
index 0000000000000000000000000000000000000000..30881bb7d21394d38e0650f2d18916afa33d54c1
GIT binary patch
literal 184
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW`j5ZJ|V9Ek-*obe8oU<mXaX9
z;QtI6nP2WiSOEFqo-U3d5r^MiKgi3Vz`^X$^0)lkVXj#Vu5)@+d73`*2~&Tj`uhvl
z%;+}>4Of?|=Q1#@xRK8|D}jMAWDTbn!`~)R?gb1lcvnQ^J1{WrF*?Y=l+iR_zl>RY
WF=I%$q5p576%3xPelF{r5}E*)LPUlD

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0035.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0035.png
new file mode 100644
index 0000000000000000000000000000000000000000..86a3d82fdfc2fdd8b60d4501af4d38c4b75ac99f
GIT binary patch
literal 220
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gS0G|-o|2TlA_JI>XH5?^D
ze!>6s7}o1%WNw%~d%_K%ShlB&V@Sl|x7RI&8Vq=x12?PO`F~6#;BsoygO@CFzxz`{
zd#`SayQLLW{q4u&tM6D##ZCVCFwEvQDq!e(aDU};mk*2%_78m6c~}Ejels$jVBDI(
yz%+q*-_DkfgvZ$j<#iMvs>X2&9#r}fsm^?rS)yj~)89aA89ZJ6T-G@yGywp?RbSo!

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0036.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0036.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8609b4e29dc105610e5565d8a1e62e62ae64f69
GIT binary patch
literal 225
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gS0G|-o|2TlA_JI>XH5?^D
ze!>6OGw5dMZOCN(a^D;%R^aL47!q;#?R7`K1_d4#2Z0Iy|KDh~&9af;ees6d%Q*7V
zlzX0W-=>)4df6zdTl)5@UcJc1Ea1TKekr4c;Q>>&Y^e{IUv6Boj*;<713NFr1AB(7
z1J4=O&4{f(*eAfdf{~F0sF;!Ef+&wdLo(AH1~FNthYnUtrUC6{@O1TaS?83{1OQzC
BSy=!8

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0037.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0037.png
new file mode 100644
index 0000000000000000000000000000000000000000..f087f88df124fa430048a06700558126802d49a3
GIT binary patch
literal 212
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gS0G|-o|2TlA_JI>XH5?^D
ze!>5B88)oX%+TZcD>xY_mh9=`7!q;#?KMZf1_d6Mi&_Ei>XXG@T|07Q!Ljf8245~`
z9!Z&2y7<U+%b+U<G;`}$m{@7fQ{dES<z3OlnNboXFrk4Z<ly!ToE5$Y(n|JC1Pa%?
ouS#HAl^`9!x|@;nhZiHe^DSm3=}EJf0Ig&2boFyt=akR{07HvfUH||9

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0038.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0038.png
new file mode 100644
index 0000000000000000000000000000000000000000..df77e1aa444a3ed17060a83e4b446e3a03aaabf6
GIT binary patch
literal 190
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW`j5ZJ|V9Ek-*obe8oU<mXaX9
z;QtI6nP2WiSOEF4o-U3d5r^Mi-zmtTz{Bj={QLdPBbJiyS21VjsaPgWkJ8KwU+-LX
z!8gs8J>gLHI-BD<4F7l*u!J1cl4uYTXkhqLy8cGPJOKtT2k8mR%@i0yH*m2nU|~^U
c2xqonII)efdh$A751>U1p00i_>zopr0MWQa&;S4c

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0039.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0039.png
new file mode 100644
index 0000000000000000000000000000000000000000..8cab6f0976bb5d7856a1f88465b5407bbcd36d0c
GIT binary patch
literal 154
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<g<0G|-o|6mYW^EC%3!c-FE
z7yO^$>2?DzAkWd$#W5t}@Y_p{ybK0BhY$4FzpOiz7*v&(aPwsOy-94VQu-1cGTe?e
xq%4q>WS-QRmcrw~HcRpXkUx`=*JIg4#)TId4jS~Nb^#4z@O1TaS?83{1OR@}Hyi)}

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0040.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0040.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd266e36e83a788f4ac10ed456ca5ac8d3078cab
GIT binary patch
literal 185
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gq0G|-o{}^D`(-J12EL%yC
zU+{m1^|~AMroXv-3Mdlb>Eaj?aro_xlbj3+JPZdbzTV$7U*v)FhlFL#4}^|(R8J9^
zzrxa=d!B*=%Z|YFm2Hbf7w~p42tMd!h&{-(g>fUJ-~t9g1*R`-PyRF1y6Df4F=u4-
Ti@o#}Xf}hVtDnm{r-UW|R4+=z

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0041.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0041.png
new file mode 100644
index 0000000000000000000000000000000000000000..1cf6066e29d689310a8129f63b1c6875f72ea2ef
GIT binary patch
literal 223
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gS0G|-o|2TlA_JI>XH5?^D
ze!&cx|8>`A=xuoZ&8QV9mgni>7!q;#?e&Aa4GIFRfesV@S(~}>$?e!2dB22V=9%^&
zxh(FZfpO=iwcDM)BE7F=&(t2KYn97R?QCt}TG7Duqn}AAfN{In1s358EVC2l3ur9h
zR8wH&lqhJ@&v#&Q(|GWK&E%jp_Y6-5;XTjTj(xW3)ro!i31~Ber>mdKI;Vst0JlC}
A+W-In

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0042.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0042.png
new file mode 100644
index 0000000000000000000000000000000000000000..bab824e7bee95a0989802526f68af147df18a1ff
GIT binary patch
literal 220
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gS0G|-o|2TlA_JI>XH5?^D
ze!>5B8P@A%W^7m^Uw0QMmhI`{7!q;#?e&wq2NZZ%9E8{Xvp%OhWr9cBnXrT<7p2@?
zro8s-%~_efNi2Qo`tsfhx(s3rj4U5&8)Wy{GR)i7)XsLLLCU~)78{FzgSLc&b_DY;
w=6{?E*h*NLXRtr;F~3>Tk^z)Bz+cS#FOBI><@a5lKx-L1UHx3vIVCg!00whfU;qFB

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0043.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0043.png
new file mode 100644
index 0000000000000000000000000000000000000000..04d82327972afddee3bf29cb4b1203c9a19a3c2b
GIT binary patch
literal 225
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gS0G|-o|2TlA_JI>XH5?^D
ze!>6s7}jU%W^8z~T=51_tiaR7F(l&f+v%2k42nF=XGQ=0Pv%;1Cr?#Da=(JdV#8@=
zLGv_s8J5O|Kh;aM)zvJMVwlIef$_mn1}TQB^U|U@AqH$m8ul+sKG6QJ;hFe>7i=l4
z$qo!DEddATa<Mt^{740H5*!$gH1IL@>}+D6$<HjleCMhXpxq3fu6{1-oD!M<K%83U

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0044.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0044.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ad50da5ba39fd6bc4128729202adf8525d922f7
GIT binary patch
literal 227
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gS0G|-o|2TlA_JI>XH5?^D
ze!>4U88UP?=&k>=B0d@@R^;j87!q;#?aYmW2Mjov6^kDIHTM&gx}I6`VHQK*c9!QI
z!IiZ^J5KFC6d!f<o~-fGSN3li&&*@4Shd$y#6d=Y{YX560Q(o#fW68URt=lJi*ICR
zQV@OAkbHc$i-EO*KMO-=LYV`@6OMz7$6XEV71w@Y;&)(roZ$8NGthPhPgg&ebxsLQ
E0BkK^Bme*a

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0045.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0045.png
new file mode 100644
index 0000000000000000000000000000000000000000..f19abdb02bbf0ac3c8c4c94b61750d5d5b2db48f
GIT binary patch
literal 226
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gS0G|-o|2TlA_JI>XH5?^D
ze!>6OGw5by>TO7P(>V<&R_N*C7!q;#?R7_?1_d7Hi>n&G@88HB`RY)su}GYs!?K6w
zy%m?X-M30gnfmXP&}OaUGSf`servC`Jd?F&DaV67EH<nLhq>Gwj+GvW=e!ZdyFiqO
zrRQ~n6^O38r_Cs<cxt_N1Vik>RTCJL6qxERvu-wI`j*V246>ZT)78&qol`;+0K1c4
Awg3PC

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0046.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0046.png
new file mode 100644
index 0000000000000000000000000000000000000000..1581c2c78f385feeacd1bc833098df77d1f62d26
GIT binary patch
literal 228
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gS0G|-o|2TlA_JI>XH5?^D
ze!>5B8P;d$ZOFVBeOwMGR_y8G7!q;#?R9Ui1_J?>i=993{y(O7=Frpy3T&TWv2cpq
zwG|X!@>b#alP4c9h}19ZiJunHYE^fK!(wtntt6wW0wbr#fl}6xgDg`T%30R*2{3sb
z*#6=)*NUdl56h(knEa+Tm@VMVU>5q|6MT?GWr6Y&M(YxOreF8sk2V9XXYh3Ob6Mw<
G&;$Tr!eO-l

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0047.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0047.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e7c04d897903bc6f25964391bfeefe1cddad8d1
GIT binary patch
literal 190
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW`j5ZJ|V9Ek-*obe8oU<mXaX9
z;QtI6nP2WiSOEF4o-U3d5r^MiH{@eb;9zl_^8f$MwtI)142$(64n1QM{N3YK;-P(G
z@)@a;I(tpV`99Yccsgt_m!8m&V7g%LE=Ep{Z(hto0&Cc|1p9L^9u&IZS9_3!#oK}D
dSJUhiMmbr=pqbvqJAf83c)I$ztaD0e0suWUM#2C9

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0048.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0048.png
new file mode 100644
index 0000000000000000000000000000000000000000..454722194022e4480a7bb764343d31eec1997a9f
GIT binary patch
literal 198
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gq0G|-o{}^D`(-J12EL%yC
zU+{m1^?JG++&-zd14UvzT^vIq4!^y2l9xe&hxuT^*ZW5DTo0rxV;HAR4_&p-IBu2a
zv+DP&8dRpd<$B=9RKPqzWD2VSGt&h%o*BFkJefWi0678;8`(;jZyn*~IIzQ4;(}V8
fGy~&}?Qd9X5*g>7{jPKuXc2>_tDnm{r-UW|K?6<u

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0049.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0049.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8fa75027846927d0e2b1d272bfa2346258ebce5
GIT binary patch
literal 188
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW`j5ZJ|V9Ek-*obe8oU<mXaX9
z;QtI6nP2WiSOEFao-U3d5r^MiJ;}?Uz{7md;n(|_{Jb9?bV!6xm>OPqB<q%sh}V4c
z?>|&Ty_FVB+K}rdBygKs-hi{??K5^21vB9_D#AVvIcgD}YBL&c^!XVuZWIgvvCpS4
Y@Z~c4bLBF%0<B^2boFyt=akR{0E~1*zW@LL

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0050.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0050.png
new file mode 100644
index 0000000000000000000000000000000000000000..c917884b6a0191f5081d22671a5ff787f194e52e
GIT binary patch
literal 224
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gS0G|-o|2TlA_JI>XH5?^D
ze!>5B88&2OuGdSx)3y{Smhb7}7!q;#?Mz3Z0}33>nSy`+_uFcG_sgGfmit7C>f%{{
zuY8u<dG*qcV*bm4RegTTgbqaJyn7+hX4K#(A!Eg`q$!ng4g*I65XCd(Jgp2onB!ok
yz;G)6z$ykUyTbtoffBDoW&X4<C?pnedgf;QW>%YVSojpsY6eeNKbLh*2~7Z(m|nX8

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0051.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0051.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2e373d33f8bf685642a7e186d53ad44d392ddfa
GIT binary patch
literal 209
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gq0G|-o{}^D`(-J12EL%yC
zU-19+47wZi3MOB=2NcQhba4!cIQ;g;LEZ)f9_Ncw)PAo&!)T`Aw8X~$!HM{7w>nIF
zA7ARJd-bN)_47XKatk%a8)64G9yXlo?8Cq`;rsVcHHikP4-W;n8yG~C81^<Xu3+>v
tVDL3~uNJ|~^ue6rSI4`>zb>)Nzx0@C<0tR6H9$KVJYD@<);T3K0RZ@VS%Lrn

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0052.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0052.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d1b7eb49ed68315a56d768c5b2a1ccc1b03d82c
GIT binary patch
literal 204
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gq0G|-o{}^D`(-J12EL%yC
zU+{ljhV^<I78X7i1&Snlx;TbJ9DaL!r|1C%9+tqFi~moPbztP1<MAt+vC5i9<I#MZ
z$0=^-?mX^)G5yU|MuW;QP6ly?(BlmZIlozq6RH@tXR|n5HB7i|pTNtU$6&NTli@}g
mcbdaH16BrIMFy4!%lG`6#Wb-`)@35lItEWyKbLh*2~7ZV<4_9#

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0053.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0053.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1f4a3c0b074e161c858539ce208c18ff75b873e
GIT binary patch
literal 216
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gS0G|-o|2TlA_JI>XH5?^D
ze!>44GBWkn>u#8_`guK2EZx(^F(l&f+Z!i&4=C`kI25aVxnF3fr>LYfZ!Lqjvb@Wl
z+0#0UFK=!UR5jlG=k=NA|2Y!a1sr4xs^96<GyVu{<6FVZ#IZnj!#57L3w#_2F9mrN
t8W@;fa4-ruxS#l^eZzi%V9Y{hyWh2phmAPayaigx;OXk;vd$@?2>`dgSv3Fv

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0054.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0054.png
new file mode 100644
index 0000000000000000000000000000000000000000..70a1ef5e1d3caa5ce996789072445a662d39eaa9
GIT binary patch
literal 215
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gS0G|-o|2TlA_JI>XH5?^D
ze!>44bT?#VuGcGTIUxuXOY?Mb42d}W_WDKM1_d701B(=X=fClHKOpdCFK0tcT;>t;
z%$XL};c<`qR=xbm^ms$@f1U@yVh>J;zhGe6v6+#PMZkgKbzegL0o|DlSq{7zEX)yd
s3j}!-8W@;37N{N(TEwWUxcU>5tp(%FOAmyn0c~XPboFyt=akR{0JyDK#{d8T

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0055.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0055.png
new file mode 100644
index 0000000000000000000000000000000000000000..24dd98f7c293a17467eef3eac80bb9305c73a00f
GIT binary patch
literal 199
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gq0G|-o{}^D`(-J12EL%yC
zU+{ljhV>itB3b?&0*b_Wx;TbJ9DaNKAnySM9+nLb3IC`5&X8nWB66RN@imiR_2pl)
zdp<=j?%82^U$JC+nT_y)Lkyqo8H61erdl>!f2+&;f_KFk#w|^ZEEl-gE~v9OFqkSd
hFfef}2t379!ys48G(}=Z%_g8t44$rjF6*2UngBh5PJ{pe

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0056.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0056.png
new file mode 100644
index 0000000000000000000000000000000000000000..56c1c36f2fb6f513db710a0898b6b7df479c0d9c
GIT binary patch
literal 231
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gS0G|-o|2TlA_JI>XH5?^D
ze!>6OGw5b!Y|vADK35nhR_5vA7!q;#?Tp*J3<?~~A5Z?1{;kOTBeCb&YZeE+)}%5w
zO@GnJ0i9)&YS&3MXKWY0#TXEz%NCfgA99A#_SQ>=A05n03%+q3V~jk=u%n3Cib2S!
zz=7cj8;gU?1W}%b-7+6$3MjED<Vyq@Ffcu+XZXZ^hxGx&rjyL90rB6D0$sr1>FVdQ
I&MBb@09o8y@&Et;

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0057.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0057.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b2a7ea46106a63ade920103c68a48b1c6cb9288
GIT binary patch
literal 222
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gS0G|-o|2TlA_JI>XH5?^D
ze!>5B8P;cJY|#7a(P{-0%k^||42d}W_QpZM1_d6Miz_<6-QUQrd0?{Bvs~5>&(Avv
zeJtGe_oQI#q{nWOLZ%5<wy3|+PPo|LP;Yd-!TW$h!s{h$Dhd+$EH;Mk?=*Zqw8Q71
z)P#m*3C<m7nHm2w+8&e&U@jB6AjS6CRO$oU?5)hA%dNyBfEF`&y85}Sb4q9e0O22D
AEdT%j

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0058.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0058.png
new file mode 100644
index 0000000000000000000000000000000000000000..32ad7f1731ec6dcee0fd101060d36fc64b9c0380
GIT binary patch
literal 188
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW`j5ZJ|V9Ek-*obe8oU<mXaX9
z;QtJn8M6*Vz6bK7JzX3_A`ZX3zLA$ffrt5^!?*i0)pU7%mlWK4@R3_vFg9|k#MGG~
z?{9vUTd5T?mnkoF;VTazfvKEo3XGwxT@5THEi1S}j|)CxcS&vH%xDU2J;fsY!Jcuw
b{R76ZJB$I|E35ATtzqzV^>bP0l+XkK(Zfg5

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0059.png b/GDK-ProgressBar/src/main/res/drawable-hdpi/bar_candy0059.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1bd8a5af8f5991fdf6a5d3caf56932fb6c89c59
GIT binary patch
literal 221
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xec{rGX<k5eBW&<gS0G|-o|2TlA_JI>XH5?^D
ze!>44Ht1!n*UdbeI^io&EXUKuF(l&f+v|=(4F()6j#o1N{ZH0kE&l#k*Is>wtgMDr
z4<jed(#@8-?X_;pnI*L=mSr;DxqPE>x3#VDONJVL2ey<03$<r3&Szs;AU%QcZbO~}
xL)1Z@6AcV33-l!#!ZrX2o)?^n2jnF`uuOl+`22}j;bfq_44$rjF6*2UngHT1Uqb)@

literal 0
HcmV?d00001

diff --git a/GDK-ProgressBar/src/main/res/drawable/progress_bar_determinate.xml b/GDK-ProgressBar/src/main/res/drawable/progress_bar_determinate.xml
new file mode 100644
index 000000000..a7d45816f
--- /dev/null
+++ b/GDK-ProgressBar/src/main/res/drawable/progress_bar_determinate.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<clip android:clipOrientation="horizontal"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <shape android:shape="rectangle">
+        <solid android:color="@android:color/white" />
+        <size android:height="@dimen/slider_bar_height" />
+    </shape>
+</clip>
\ No newline at end of file
diff --git a/GDK-ProgressBar/src/main/res/drawable/slider_indeterminate.xml b/GDK-ProgressBar/src/main/res/drawable/slider_indeterminate.xml
new file mode 100644
index 000000000..7bc4618dd
--- /dev/null
+++ b/GDK-ProgressBar/src/main/res/drawable/slider_indeterminate.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<animation-list
+    android:oneshot="false"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:duration="33" android:drawable="@drawable/bar_candy0000" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0001" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0002" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0003" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0004" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0005" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0006" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0007" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0008" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0009" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0010" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0011" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0012" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0013" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0014" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0015" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0016" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0017" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0018" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0019" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0020" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0021" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0022" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0023" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0024" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0025" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0026" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0027" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0028" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0029" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0030" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0031" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0032" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0033" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0034" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0035" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0036" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0037" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0038" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0039" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0040" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0041" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0042" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0043" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0044" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0045" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0046" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0047" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0048" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0049" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0050" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0051" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0052" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0053" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0054" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0055" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0056" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0057" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0058" />
+    <item android:duration="33" android:drawable="@drawable/bar_candy0059" />
+</animation-list>
\ No newline at end of file
diff --git a/GDK-ProgressBar/src/main/res/layout/menu_layout.xml b/GDK-ProgressBar/src/main/res/layout/menu_layout.xml
new file mode 100644
index 000000000..73ad0d294
--- /dev/null
+++ b/GDK-ProgressBar/src/main/res/layout/menu_layout.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:keepScreenOn="true"
+    class="com.google.android.glass.menu.SliderMenuView$SliderMenuItemView"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <LinearLayout
+        android:gravity="center"
+        android:layout_gravity="center"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent">
+
+        <ImageView
+            android:id="@id/icon"
+            android:layout_width="@dimen/menu_icon_size"
+            android:layout_height="@dimen/menu_icon_size"
+            android:layout_marginRight="@dimen/menu_icon_margin"
+            android:adjustViewBounds="true" />
+
+        <TextView
+            android:textSize="@dimen/menu_text_size"
+            android:ellipsize="end"
+            android:id="@id/label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true" />
+
+    </LinearLayout>
+
+    <com.w9jds.gdk_progress_widget.SliderView
+        android:id="@id/slider"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="-12px"/>
+
+</LinearLayout>
+
diff --git a/GDK-ProgressBar/src/main/res/layout/slider.xml b/GDK-ProgressBar/src/main/res/layout/slider.xml
new file mode 100644
index 000000000..de6616434
--- /dev/null
+++ b/GDK-ProgressBar/src/main/res/layout/slider.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    android:layout_width="fill_parent"
+    android:layout_height="@dimen/slider_bar_height"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <View
+        android:id="@+id/slider_control"
+        android:background="@android:color/white"
+        android:layout_width="0.0px"
+        android:layout_height="@dimen/slider_bar_height" />
+
+    <ImageView
+        android:id="@+id/indeterminate_slider"
+        android:background="@drawable/slider_indeterminate"
+        android:layout_width="fill_parent"
+        android:layout_height="@dimen/slider_bar_height" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/GDK-ProgressBar/src/main/res/values/dimens.xml b/GDK-ProgressBar/src/main/res/values/dimens.xml
new file mode 100644
index 000000000..74ad11b57
--- /dev/null
+++ b/GDK-ProgressBar/src/main/res/values/dimens.xml
@@ -0,0 +1,9 @@
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="card_generic_padding">40.0px</dimen>
+    <dimen name="menu_text_size">70.0px</dimen>
+    <dimen name="menu_icon_margin">20.0px</dimen>
+    <dimen name="menu_icon_size">50.0px</dimen>
+    <dimen name="slider_bar_height">12.0px</dimen>
+
+    </resources>
diff --git a/GDK-ProgressBar/src/main/res/values/ids.xml b/GDK-ProgressBar/src/main/res/values/ids.xml
new file mode 100644
index 000000000..b20b25c17
--- /dev/null
+++ b/GDK-ProgressBar/src/main/res/values/ids.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item type="id" name="label">false</item>
+    <item type="id" name="slider">false</item>
+    <item type="id" name="icon">false</item>
+    <item type="id" name="slider_control">false</item>
+    <item type="id" name="indeterminate_slider">false</item>
+</resources>
diff --git a/GDK-ProgressBar/src/main/res/values/integers.xml b/GDK-ProgressBar/src/main/res/values/integers.xml
new file mode 100644
index 000000000..23c239940
--- /dev/null
+++ b/GDK-ProgressBar/src/main/res/values/integers.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="slider_in_out_animation_duration_ms">300</integer>
+    <integer name="horizontal_scroll_deferred_load_animation_duration_ms">200</integer>
+    <integer name="horizontal_scroll_deferred_sizing_animation_duration_ms">50</integer>
+
+</resources>
diff --git a/settings.gradle b/settings.gradle
index c366a7d20..a9766cd5f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':Calculator', ':ThemeEngine', ':FloatingView'
+include ':Calculator', ':ThemeEngine', ':FloatingView', ':GDK-ProgressBar'