diff --git a/.DS_Store b/.DS_Store
index 41123d5..cfe5429 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6ff5299..88d57cc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -22,12 +22,6 @@
@android:style/Theme.Holo.Light
-
-
- Nexus 4
- @android:style/Theme.Holo
-
-
@@ -89,73 +83,16 @@
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -582,15 +519,16 @@
-
-
+
+
-
-
+
+
+
@@ -633,6 +571,7 @@
+
@@ -665,205 +604,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
+
@@ -880,22 +625,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -918,14 +647,6 @@
-
-
-
-
-
-
-
-
@@ -957,95 +678,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1124,19 +758,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1164,6 +785,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1298,36 +932,36 @@
-
-
+
+
-
-
-
-
+
+
-
+
-
-
+
+
-
+
-
+
+
+
@@ -1352,89 +986,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1457,84 +1008,57 @@
-
-
-
+
-
-
-
+
-
-
-
+
-
-
-
-
-
-
-
-
+
-
-
-
+
-
-
-
+
-
-
-
+
-
-
-
+
-
-
-
+
-
-
-
+
-
-
-
+
@@ -1603,9 +1127,7 @@
-
-
-
+
@@ -1632,83 +1154,119 @@
-
+
-
-
-
+
-
+
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
+
-
+
-
-
-
+
-
+
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
+
diff --git a/GlassShare/GlassShare-GlassShare.iml b/GlassShare/GlassShare-GlassShare.iml
index f5597a7..67018cd 100644
--- a/GlassShare/GlassShare-GlassShare.iml
+++ b/GlassShare/GlassShare-GlassShare.iml
@@ -96,10 +96,9 @@
-
+
-
diff --git a/GlassShare/build.gradle b/GlassShare/build.gradle
index 12b47e6..548b044 100644
--- a/GlassShare/build.gradle
+++ b/GlassShare/build.gradle
@@ -4,11 +4,10 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:0.7.+'
- classpath 'com.newrelic.agent.android:agent-gradle-plugin:3.239.0'
}
}
+
apply plugin: 'android'
-apply plugin: 'newrelic'
repositories {
mavenCentral()
@@ -19,7 +18,8 @@ android {
compileSdkVersion 'Google Inc.:Glass Development Kit Sneak Peek:15'
buildToolsVersion '17.0.0'
- defaultConfig {
+ defaultConfig
+ {
minSdkVersion 15
targetSdkVersion 15
}
@@ -37,7 +37,6 @@ android {
dependencies
{
- compile 'com.newrelic.agent.android:android-agent:3.239.0'
compile 'com.google.api-client:google-api-client:1.17.0-rc@jar'
compile 'com.google.api-client:google-api-client-android:1.17.0-rc@jar'
compile 'com.google.http-client:google-http-client:1.17.0-rc@jar'
@@ -52,4 +51,4 @@ dependencies
compile files('libs/google-play-services.jar')
compile files('libs/gson-2.2.2.jar')
compile files('libs/mobileservices-1.1.0.jar')
-}
\ No newline at end of file
+ }
\ No newline at end of file
diff --git a/GlassShare/src/main/AndroidManifest.xml b/GlassShare/src/main/AndroidManifest.xml
index 2634ea5..a13f1f2 100644
--- a/GlassShare/src/main/AndroidManifest.xml
+++ b/GlassShare/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
+ android:versionCode="12"
+ android:versionName="0.12-alpha" >
-
-
diff --git a/GlassShare/src/main/java/com/w9jds/glassshare/Classes/StorageService.java b/GlassShare/src/main/java/com/w9jds/glassshare/Classes/StorageService.java
index 900468a..f0f41c2 100644
--- a/GlassShare/src/main/java/com/w9jds/glassshare/Classes/StorageService.java
+++ b/GlassShare/src/main/java/com/w9jds/glassshare/Classes/StorageService.java
@@ -42,7 +42,7 @@ public StorageService(Context context)
mContext = context;
try
{
-
+ mClient = new MobileServiceClient("https://glassshare.azure-mobile.net/", "hGZSWGJntAFbXLmYRitDivIhrClsgA21", mContext);
mTableContainers = mClient.getTable("blobcontainers");
mTableBlobs = mClient.getTable("blobs");
}
diff --git a/GlassShare/src/main/java/com/w9jds/glassshare/MainActivity.java b/GlassShare/src/main/java/com/w9jds/glassshare/MainActivity.java
index 619de27..31e0f00 100644
--- a/GlassShare/src/main/java/com/w9jds/glassshare/MainActivity.java
+++ b/GlassShare/src/main/java/com/w9jds/glassshare/MainActivity.java
@@ -15,12 +15,14 @@
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Environment;
+import android.os.Handler;
import android.provider.MediaStore;
import android.util.Log;
import android.view.Menu;
import android.view.View;
import android.widget.AdapterView;
import android.widget.ImageView;
+import android.widget.ProgressBar;
import android.widget.TextView;
import com.google.android.glass.media.Sounds;
@@ -222,7 +224,17 @@ public boolean onOptionsItemSelected(android.view.MenuItem iItem)
{
case R.id.delete_menu_item:
//set the text as deleting
- iItem.setTitle(R.string.deleting_label);
+ setContentView(R.layout.menu_layout);
+ ((ImageView)findViewById(R.id.icon)).setImageResource(R.drawable.ic_delete_50);
+ ((TextView)findViewById(R.id.label)).setText("Deleting");
+ ProgressBar pbProgress = (ProgressBar)findViewById(R.id.progress);
+
+ pbProgress.setIndeterminate(false);
+
+ for (int i = 0; i <= 100; i++)
+ {
+ pbProgress.setProgress(i);
+ }
//pull the file from the path of the selected item
java.io.File fPic = new java.io.File(mlsPaths.get(miPosition));
@@ -236,6 +248,7 @@ public boolean onOptionsItemSelected(android.view.MenuItem iItem)
mcvAdapter.notifyDataSetChanged();
//handled
+ maManager.playSoundEffect(Sounds.SUCCESS);
return true;
// case R.id.upload_menu_item:
//
@@ -268,10 +281,6 @@ public boolean onOptionsItemSelected(android.view.MenuItem iItem)
((ImageView)findViewById(R.id.icon)).setImageResource(R.drawable.ic_mobile_phone_50);
((TextView)findViewById(R.id.label)).setText("Uploading");
-// final PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
-// this.mWakeLock = pm.newWakeLock(PowerManager.SCREEN_DIM_WAKE_LOCK, "My Tag");
-// this.mWakeLock.acquire();
-
String sContainer = "";
String[] saImage = mlsPaths.get(miPosition).split("/|\\.");
@@ -385,18 +394,24 @@ protected void onPostExecute(Boolean uploaded)
{
if (uploaded)
{
-// setContentView(R.layout.menu_layout);
-// ((ImageView)findViewById(R.id.icon)).setImageResource(R.drawable.ic_bike_50);
-// ((TextView)findViewById(R.id.label)).setText("Uploaded");
-// findViewById(R.id.progress).setVisibility(View.GONE);
-
+ setContentView(R.layout.menu_layout);
+ ((ImageView)findViewById(R.id.icon)).setImageResource(R.drawable.ic_done_50);
+ ((TextView)findViewById(R.id.label)).setText("Uploaded");
+ findViewById(R.id.progress).setVisibility(View.GONE);
maManager.playSoundEffect(Sounds.SUCCESS);
// mWakeLock.release();
+
}
- CreatePictureView();
+ new Handler().postDelayed(new Runnable()
+ {
+ public void run()
+ {
+ CreatePictureView();
+ }
+ }, 1000);
}
}
diff --git a/GlassShare/src/main/res/drawable-hdpi/progress_primary_holo_dark.9.png b/GlassShare/src/main/res/drawable-hdpi/progress_primary_holo_dark.9.png
index 350b408..5515f8e 100644
Binary files a/GlassShare/src/main/res/drawable-hdpi/progress_primary_holo_dark.9.png and b/GlassShare/src/main/res/drawable-hdpi/progress_primary_holo_dark.9.png differ
diff --git a/GlassShare/src/main/res/drawable-hdpi/progress_secondary_holo_dark.9.png b/GlassShare/src/main/res/drawable-hdpi/progress_secondary_holo_dark.9.png
index cf1f421..122cc1b 100644
Binary files a/GlassShare/src/main/res/drawable-hdpi/progress_secondary_holo_dark.9.png and b/GlassShare/src/main/res/drawable-hdpi/progress_secondary_holo_dark.9.png differ
diff --git a/GlassShare/src/main/res/drawable/progress_horizontal_holo_dark.xml b/GlassShare/src/main/res/drawable/progress_horizontal_holo_dark.xml
index de9d38b..07ad157 100644
--- a/GlassShare/src/main/res/drawable/progress_horizontal_holo_dark.xml
+++ b/GlassShare/src/main/res/drawable/progress_horizontal_holo_dark.xml
@@ -11,6 +11,7 @@
android:drawable="@drawable/progress_secondary_holo_dark"
android:scaleWidth="100%" />
+
-
-
\ No newline at end of file