Continued work on Menu items that work and feel like the native exper…

…iance.

GlassShare/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.w9jds.glassshare"
-    android:versionCode="9"
-    android:versionName="0.9-alpha" >
+    android:versionCode="10"
+    android:versionName="0.10-alpha" >
 
     <uses-sdk
         android:minSdkVersion="15"

GlassShare/src/main/java/com/w9jds/glassshare/Classes/StorageService.java

@@ -42,6 +42,7 @@ public StorageService(Context context)
         mContext = context;
         try
         {
+
             mTableContainers = mClient.getTable("blobcontainers");
             mTableBlobs = mClient.getTable("blobs");
         }

GlassShare/src/main/java/com/w9jds/glassshare/MainActivity.java

@@ -18,6 +18,8 @@
 import android.view.Menu;
 import android.view.View;
 import android.widget.AdapterView;
+import android.widget.ImageView;
+import android.widget.TextView;
 
 import com.google.android.glass.widget.CardScrollView;
 import com.google.api.client.extensions.android.http.AndroidHttp;
@@ -73,6 +75,7 @@ protected void onCreate(Bundle savedInstanceState)
         if (mcmCon.getActiveNetworkInfo().isConnected())
         {
 
+
             StorageApplication myApp = (StorageApplication) getApplication();
             mStorageService = myApp.getStorageService();
         }
@@ -248,7 +251,9 @@ public boolean onOptionsItemSelected(android.view.MenuItem iItem)
 //                    View loadCard = findViewById(R.layout.loading_card);
 //                    ((TextView) loadCard.findViewById(R.id.label_text)).setText("Uploading");
 //                    ((ImageView) loadCard.findViewById(R.id.menu_image)).setImageResource(R.drawable.ic_mobile_phone_50);
-                    setContentView(R.layout.loading_card);
+                    setContentView(R.layout.menu_layout);
+                    ((ImageView)findViewById(R.id.icon)).setImageResource(R.drawable.ic_mobile_phone_50);
+                    ((TextView)findViewById(R.id.label)).setText("Uploading");
 
 //                    String sContainer = "";
 //                    String[] saImage = mlsPaths.get(miPosition).split("/|\\.");

GlassShare/src/main/res/drawable/progress_indeterminate_horizontal_holo.xml

@@ -1,12 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <animation-list android:oneshot="false"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:duration="50" android:drawable="@drawable/progressbar_indeterminate_holo1" />
-    <item android:duration="50" android:drawable="@drawable/progressbar_indeterminate_holo2" />
-    <item android:duration="50" android:drawable="@drawable/progressbar_indeterminate_holo3" />
-    <item android:duration="50" android:drawable="@drawable/progressbar_indeterminate_holo4" />
-    <item android:duration="50" android:drawable="@drawable/progressbar_indeterminate_holo5" />
-    <item android:duration="50" android:drawable="@drawable/progressbar_indeterminate_holo6" />
-    <item android:duration="50" android:drawable="@drawable/progressbar_indeterminate_holo7" />
-    <item android:duration="50" android:drawable="@drawable/progressbar_indeterminate_holo8" />
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:duration="50"
+        android:drawable="@drawable/progressbar_indeterminate_holo1" />
+    <item
+        android:duration="50"
+        android:drawable="@drawable/progressbar_indeterminate_holo2" />
+    <item
+        android:duration="50"
+        android:drawable="@drawable/progressbar_indeterminate_holo3" />
+    <item
+        android:duration="50"
+        android:drawable="@drawable/progressbar_indeterminate_holo4" />
+    <item
+        android:duration="50"
+        android:drawable="@drawable/progressbar_indeterminate_holo5" />
+    <item
+        android:duration="50"
+        android:drawable="@drawable/progressbar_indeterminate_holo6" />
+    <item
+        android:duration="50"
+        android:drawable="@drawable/progressbar_indeterminate_holo7" />
+    <item
+        android:duration="50"
+        android:drawable="@drawable/progressbar_indeterminate_holo8" />
 </animation-list>

GlassShare/src/main/res/layout/loading_card.xml → GlassShare/src/main/res/layout/menu_layout.xml

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<view
+<LinearLayout
     android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:layout_marginLeft="@dimen/card_generic_padding"
-    android:layout_marginRight="@dimen/card_generic_padding"
+    android:layout_marginLeft="@dimen/card_generic_padding" android:layout_marginRight="@dimen/card_generic_padding" class="com.google.android.glass.menu.SliderMenuView$SliderMenuItemView"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
 
@@ -15,7 +13,8 @@
         android:layout_width="wrap_content"
         android:layout_height="fill_parent">
 
-        <ImageView android:id="@+id/icon"
+        <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"
@@ -24,27 +23,36 @@
         <TextView
             android:textSize="@dimen/menu_text_size"
             android:ellipsize="end"
-            android:id="@+id/label"
+            android:id="@id/label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:singleLine="true" />
 
     </LinearLayout>
 
 
-    <TextView
-        android:textSize="@dimen/menu_description_text_size"
-        android:ellipsize="end"
-        android:layout_gravity="bottom|center"
-        android:id="@+id/description"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/card_generic_padding"
-        android:singleLine="true" />
+    <!--<TextView-->
+    <!--android:textSize="@dimen/menu_description_text_size"-->
+    <!--android:ellipsize="end"-->
+    <!--android:layout_gravity="bottom|center"-->
+    <!--android:id="@id/description"-->
+    <!--android:layout_width="wrap_content"-->
+    <!--android:layout_height="wrap_content"-->
+    <!--android:layout_marginBottom="@dimen/card_generic_padding"-->
+    <!--android:singleLine="true" />-->
 
     <ProgressBar
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:indeterminateOnly="true"
+        android:indeterminateDrawable="@drawable/progress_indeterminate_horizontal_holo"
         android:indeterminate="true"
-        android:indeterminateDrawable="@drawable/progress_indeterminate_horizontal_holo"/>
+        android:minWidth="360px"
+        android:paddingLeft="0px"
+        android:paddingRight="0px"
+        android:max="100"
+        android:layout_marginLeft="-10dp"
+        android:layout_marginTop="-13dp"/>
 
 
-</view>
+</LinearLayout>

GlassShare/src/main/res/values/styles.xml

@@ -2,9 +2,4 @@
 
     <style name="CustomTheme" parent="@android:style/Theme.DeviceDefault" />
 
-    <style name="MenuAnimation" parent="@*android:style/Animation">
-        <item name="android:windowEnterAnimation">@anim/menu_enter</item>
-        <item name="android:windowExitAnimation">@anim/menu_exit</item>
-    </style>
-
 </resources>